Merge pull request #31 from elm-tooling/develop

Release 5.1.0

Author: ahankinson

.github/workflows/build.yml

@@ -16,7 +16,7 @@ name: Build
 on:
   # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
   push:
-    branches: [main]
+    branches: [main, develop]
   # Trigger the workflow on any pull request
   pull_request:
 

.idea/dictionaries/project.xml

@@ -3,9 +3,20 @@
 # Changelog for et-intellij-elm
 
 ## [Unreleased]
-*   Moved the plugin to [elm-tooling/intellij](https://github.com/elm-tooling/intellij-elm)
+
+
+## [5.1.0] - 2025-08-05
+*   Moved the plugin to [elm-tooling/intellij](https://github.com/elm-tooling/intellij-elm) (@lydell)
 *   Fix latest version not working on newer IntelliJ versions
-*   Upgraded some dependencies
+*   Fixed issue with structure browser not working (@dillonkearns)
+*   Upgraded colormath dependencies (@ahankinson, @andipabst)
+*   Fixed issue with syntax highlighting in let statements (@ilsasdo)
+*   Improved syntax highlighting (@ilsado)
+*   Fixes for compiler and review panels (@andipabst)
+*   All tests now run and pass (@ahankinson, @andipabst)
+*   Fixed test runs on non-English locales (@andipabst)
+*   Use non-deprecated DelayedDocumentWatcher (@andipabst)
+
 
 ## [5.0.1] - 2022-04-23
 *   Fix parse error when pattern matching in function-argument (issue #742)

CHANGELOG.md

@@ -2,7 +2,32 @@ Elm Plugin for JetBrains IDEs
 =============================
 
 <!-- Plugin description -->
-Provides support for the Elm programming language.
+Provides support for the [Elm programming language](https://elm-lang.org). This plugin is developed
+by the [Elm Tooling community](https://github.com/elm-tooling/intellij-elm/).
+
+Features:
+
+- Code completion
+- Go to declaration
+- Go to symbol
+- Find usages
+- Type Inference and Type Checking
+- Rename refactoring
+- Introduce "variable" refactoring (let/in)
+- Generate JSON encoders/decoders
+- Generate type annotation for un-annotated function
+- Graphical UI for running elm-test
+- Re-format code using elm-format
+- Detect unused code
+- Detect and remove unused imports
+- 'Add Import' quick fix for unresolved references
+- Code folding
+- Structure view
+- Syntax highlighting
+- WebGL/GLSL support
+- Spell checking
+- Lamdera platform support
+
 <!-- Plugin description end -->
 
 Should work on most, if not all, IntelliJ Platform IDEs: IDEA (Community and Ultimate), WebStorm, PyCharm, RubyMine and more. If not please raise an issue.
@@ -15,33 +40,29 @@ The original repo was [klazuka/intellij-elm](https://github.com/klazuka/intellij
 
 ## Install
 
-> [!NOTE]
-> This elm-tooling/intellij-elm repo has not yet been released to the JetBrains Marketplace. The Elm plugin you’ll find over there is from the original [intellij-elm/intellij-elm](https://github.com/intellij-elm/intellij-elm) repo. See the [History](#history) section for more information. 
-
 You may want to have some CLI tools --`elm` (the Elm compiler), [`elm-test`](docs/elm-test.md), [`elm-format`](docs/features/elm-format.md),
 [`elm-review`](docs/features/elm-review.md) and [`lamdera`](docs/features/lamdera.md)-- installed for certain features of this plugin to work.
 
-Install the first three with:
+You can install these globally with:
 
 ```bash
-sudo npm install -g elm elm-test elm-format elm-review
+sudo npm install -g elm elm-test elm-format elm-review lamdera
 ```
 
 **NOTE**: if you have [node](https://nodejs.org) installed using [nvm](https://github.com/nvm-sh/nvm), make sure to read [our NVM setup guide](docs/nvm.md).
 
-To install the Lamdera Elm compiler, follow [their instructions](https://lamdera.com/start).
-
 To install the plugin itself first make sure to uninstall all other Elm plugins you may have installed (this requires a restart of the IDE).
 Some have reported that having two Elm plugins installed results in the IDE not starting but showing a seemingly unrelated error
 (if you have this problem, there are [ways to fix it](https://intellij-support.jetbrains.com/hc/en-us/community/posts/360000524244-Disable-Uninstall-plugin-without-launching-Idea)).
 
-From within a JetBrains IDE, go to `Settings` -> `Plugins` -> `Marketplace` and search for "TODO name of new plugin" (not yet available on the JetBrains Marketplace).
-After installing the plugin, restart the IDE and then [open your existing Elm project](docs/existing-project.md) or [create a new project](docs/new-project.md).
+From within a JetBrains IDE, go to `Settings` -> `Plugins` -> `Marketplace` and search for "Elm Language". If you get multiple hits look 
+for the most recently updated version, since there are still older versions of the plugin available. After installing the plugin, 
+restart the IDE and then [open your existing Elm project](docs/existing-project.md) or [create a new project](docs/new-project.md).
 
 Alternatively you can install it manually by downloading a [release](https://github.com/elm-tooling/intellij-elm/releases) (or downloading the source and building it yourself) and
 installing it with `Settings` -> `Plugins` -> `⚙️ (gear icon)` -> `Install plugin from disk...`
 
-Once the plugin is installed it is advised to double check all CLI tools are found by going to
+Once the plugin is installed it is advised to double-check all CLI tools are found by going to
 **Settings** -> **Languages & Frameworks** -> **Elm** and see the CLI tools. 
 
 

README.md

@@ -1,8 +1,8 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 
 fun properties(key: String) = project.findProperty(key).toString()
@@ -19,7 +19,7 @@ plugins {
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "2.2.1"
     // Gradle Qodana Plugin
-    id("org.jetbrains.qodana") version "2025.1.1"
+    id("org.jetbrains.qodana") version "2023.3.1"
 }
 
 group = properties("pluginGroup")

build.gradle.kts

@@ -4,7 +4,7 @@
 pluginGroup = io.github.elm-tooling
 pluginName = Elm Language
 # SemVer format -> https://semver.org
-pluginVersion = 5.1.0-beta2
+pluginVersion = 5.1.0
 
 # We also set since and until build manually in `plugin.xml`. Keep them in sync!
 # See: https://intellij-support.jetbrains.com/hc/en-us/community/posts/360010590059-Why-pluginUntilBuild-is-mandatory

gradle.properties

@@ -1,6 +1,4 @@
-# Qodana configuration:
-# https://www.jetbrains.com/help/qodana/qodana-yaml.html
-
-version: 1.0
+version: "1.0"
+linter: jetbrains/qodana-jvm-community:2023.3
 profile:
   name: qodana.recommended

qodana.yml

@@ -9,16 +9,15 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.KeyWithDefaultValue
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import org.elm.ide.notifications.showBalloon
 import org.elm.lang.core.ElmFileType
 import org.elm.openapiext.saveAllDocuments
-import org.elm.workspace.*
 import org.elm.workspace.commandLineTools.makeProject
 import org.elm.workspace.compiler.findEntrypoints
-import java.util.*
+import org.elm.workspace.elmToolchain
+import org.elm.workspace.elmWorkspace
 
 private val log = logger<ElmExternalReviewAction>()
 

src/main/kotlin/org/elm/ide/actions/ElmExternalReviewWatchmodeAction.kt

@@ -72,6 +72,7 @@ type <type_decl>Msg</type_decl> <type>a</type>
 <func_decl>update</func_decl> : <type>Msg</type> -> <type>Model</type> -> ( <type>Model</type>, <type>Cmd Msg</type> )
 <func_decl>update</func_decl> <fn_arg>msg</fn_arg> <fn_arg>model</fn_arg> =
     let
+        <fn_loc>localFunction</fn_loc> : <type>String</type> =
         <fn_loc>localFunction</fn_loc> <fn_loc_arg>a</fn_loc_arg> =
             <fn_loc_arg>a</fn_loc_arg>
     in

src/main/kotlin/org/elm/ide/color/ElmColorSettingsPage.kt

@@ -217,7 +217,11 @@ class ElmSyntaxHighlightAnnotator : Annotator {
     }
 
     private fun AnnotationHolder.typeAnnotation(typeAnnotation: ElmTypeAnnotation) {
-        applyColor(typeAnnotation.lowerCaseIdentifier, ElmColor.DEFINITION_NAME)
+        if (typeAnnotation.isTopLevel) {
+            applyColor(typeAnnotation.lowerCaseIdentifier, ElmColor.DEFINITION_NAME)
+        } else {
+            applyColor(typeAnnotation.lowerCaseIdentifier, ElmColor.LOCAL_FUNCTION)
+        }
     }
 
     private fun AnnotationHolder.field(element: PsiElement?) {