2025.3

Author: joshuataylor

build.gradle

@@ -70,7 +70,6 @@ subprojects {
             create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
 
             bundledPlugins providers.gradleProperty("platformBundledPlugins").map { it.split(',').toList() }
-
             bundledModules providers.gradleProperty("platformBundledModules").map { it.split(',').toList() }
 
             instrumentationTools()
@@ -89,8 +88,8 @@ subprojects {
             java.srcDir 'tests'
         }
     }
-
 }
+
 sourceSets {
     main {
         java.srcDirs 'src', 'gen'
@@ -182,9 +181,8 @@ tasks.withType(RunIdeTask).configureEach {
     // Set JVM arguments
     jvmArguments.addAll(["-Didea.debug.mode=true", "-Didea.is.internal=true", "-Dlog4j2.debug=true", "-Dlogger.org=TRACE", "-XX:+AllowEnhancedClassRedefinition", "-XXHotswapAgent=fatjar"])
 
-
     // Set system properties to debug log
-    systemProperty "idea.log.debug.categories", "org.elixir_lang:all"
+    systemProperty "idea.log.debug.categories", "org.elixir_lang"
 
     // Set the maximum heap size
     maxHeapSize = "7g"
@@ -421,8 +419,7 @@ task stopQuoter(type: Exec, dependsOn: releaseQuoter) {
 }
 
 runIde {
-    systemProperty "idea.log.debug.categories", "org.elixir_lang:all"
-    systemProperty "org.elixir_lang.statusBar.enabled", "true"
+    systemProperty "idea.log.debug.categories", "org.elixir_lang"
     // When wanting to disable EDT slow assertion..
     // systemProperty "ide.slow.operations.assertion", "true"
 
@@ -440,6 +437,7 @@ runIde {
     //This disables the throwing of ProcessCanceledException, which is typically used to cancel long-running processes in IntelliJ IDEA. Disabling it can be useful in certain debugging scenarios.
     jvmArgs "-Didea.debug.mode=true", "-XX:+AllowEnhancedClassRedefinition", "-Didea.is.internal=true", "-Dlog4j2.debug=true", "-Dlogger.org=TRACE", "-Didea.ProcessCanceledException=disabled"
     maxHeapSize = "7g"
+    autoReload = false
     // get from runIdeWorkingDirectory
     if (project.hasProperty("runIdeWorkingDirectory") && !project.property("runIdeWorkingDirectory").isEmpty()) {
         workingDir = file(project.property("runIdeWorkingDirectory"))

gradle.properties

@@ -6,7 +6,7 @@ pluginVersion=22.0.0
 vendorName=Elle Imhoff
 vendorEmail=[email protected]
 # https://youtrack.jetbrains.com/articles/IDEA-A-2100661899/IntelliJ-IDEA-2024.1-241.14494.240-build-Release-Notes
-pluginSinceBuild=243.21565.180
+pluginSinceBuild=253.22441.1
 pluginUntilBuild=
 #pluginVerificationIDEAVersions="251.26927.53"
 #pluginVerificationRubyMineVersions="251.26927.47"
@@ -56,7 +56,7 @@ runIdeCompatiblePlugins=
 # We need com.intellij.java to compile JPS, and markdown.
 # @todo fix org.intellij.intelliLang
 platformBundledPlugins=org.intellij.plugins.markdown,com.intellij.java
-platformBundledModules=intellij.platform.langInjection
+platformBundledModules=intellij.platform.langInjection,intellij.spellchecker
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 # 8.5 is set because newer versions have weird run time caching issues, even with caching turned off.
@@ -78,6 +78,7 @@ kotlin.daemon.jvmargs=-Xmx7906m
 # Gradle Configuration Cache - https://docs.gradle.org/current/userguide/configuration_cache.html
 # Gradle Build Cache - https://docs.gradle.org/current/userguide/build_cache.html
 # Parallel Gradle Builds - https://docs.gradle.org/current/userguide/performance.html#parallel_execution
-org.gradle.configuration-cache=true
-org.gradle.caching=true
+org.gradle.configuration-cache=false
+org.gradle.caching=false
 org.gradle.parallel=false
+#org.gradle.daemon=false

jps-builder/tests/org/elixir_lang/jps/BuildResult.java

@@ -1,7 +1,5 @@
 package org.elixir_lang.jps;
 
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.Function;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.incremental.MessageHandler;
 import org.jetbrains.jps.incremental.messages.BuildMessage;
@@ -10,6 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created by zyuyou on 15/7/17.
@@ -56,9 +55,16 @@ public boolean isSuccessful(){
   }
 
   public void assertSuccessful(){
-    Function<BuildMessage, String> toStringFunction = StringUtil.createToStringFunction(BuildMessage.class);
-    Assert.assertTrue("Build failed. \nErrors:\n" + StringUtil.join(myErrorMessages, toStringFunction, "\n") +
-        "\nInfo messages:\n" + StringUtil.join(myInfoMessages, toStringFunction, "\n"), isSuccessful());
+      String errors = myErrorMessages.stream()
+              .map(BuildMessage::toString)
+              .collect(Collectors.joining("\n"));
+
+      String infos = myInfoMessages.stream()
+              .map(BuildMessage::toString)
+              .collect(Collectors.joining("\n"));
+
+      Assert.assertTrue("Build failed. \nErrors:\n" + errors +
+              "\nInfo messages:\n" + infos, isSuccessful());
   }
 
   @NotNull

resources/META-INF/optional/org.elixir_lang-withIntellijLang.xml

@@ -6,9 +6,6 @@
 
     <extensions defaultExtensionNs="com.intellij">
         <multiHostInjector implementation="org.elixir_lang.injection.markdown.Injector"/>
-        <multiHostInjector
-                id="org.elixir_lang.injection.ElixirSigilInjector"
-                implementation="org.elixir_lang.injection.ElixirSigilInjector"/>
+        <multiHostInjector implementation="org.elixir_lang.injection.ElixirSigilInjector"/>
     </extensions>
-
 </idea-plugin>

resources/META-INF/plugin.xml

@@ -4,13 +4,16 @@
     <vendor email="[email protected]">Elle Imhoff</vendor>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="243.21565.180"/>
+    <idea-version since-build="253.22441.1"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
+    <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.modules.lang</depends>
+    <depends>com.intellij.modules.xml</depends>
     <depends>org.intellij.plugins.markdown</depends>
     <depends config-file="rich-platform-plugin.xml" optional="true">com.intellij.modules.java</depends>
+    <depends config-file="optional/org.elixir_lang-withIntellijLang.xml" optional="true">org.intellij.intelliLang</depends>
 
     <extensionPoints>
         <extensionPoint qualifiedName="org.elixir_lang.packageManager" interface="org.elixir_lang.PackageManager"
@@ -22,11 +25,12 @@
     </extensions>
 
     <extensions defaultExtensionNs="com.intellij">
-        <registryKey key="org.elixir_lang.injection.enableLiteralSigilInjection"
-                     defaultValue="false"
-                     description="Enables literal sigil injection, which allows the Elixir sigil ~S to work. WARNING: THIS IS CURRENTLY BUGGY AND CAUSING ISSUES WITH ~s"/>
 
-        <!--        <errorHandler implementation="org.elixir_lang.errorreport.Submitter"/>-->
+        <!-- Status Bar Widget -->
+        <statusBarWidgetFactory
+                id="ElixirSdkStatus"
+                implementation="org.elixir_lang.status_bar_widget.ElixirSdkStatusWidgetFactory"/>
+
         <errorHandler implementation="com.intellij.diagnostic.JetBrainsMarketplaceErrorReportSubmitter"/>
 
         <!-- `openProjectProcessor` for Small IDEs -->
@@ -90,6 +94,12 @@
         <fileType name="Elixir Script" implementationClass="org.elixir_lang.ElixirScriptFileType" fieldName="INSTANCE"
                   language="Elixir" extensions="exs"/>
 
+        <projectConfigurable
+                parentId="language.elixir"
+                displayName="Elixir Experimental Settings"
+                id="org.elixir_lang.settings.ElixirExperimentalSettingsConfigurable"
+                instance="org.elixir_lang.settings.ElixirExperimentalSettingsConfigurable"/>
+
         <!-- Facet -->
         <applicationConfigurable id="language.elixir.sdks.elixir"
                                  parentId="language.elixir"
@@ -273,7 +283,6 @@
 
         <lang.documentationProvider implementationClass="org.elixir_lang.documentation.ElixirDocumentationProvider"
                                     language="Elixir"/>
-        <multiHostInjector implementation="org.elixir_lang.injection.markdown.Injector"/>
 
         <!-- Dialyzer -->
         <globalInspection displayName="Dialyzer based inspections (Elixir)" shortName="Dialyzer"
@@ -303,7 +312,7 @@
         </group>
         <group id="LangElixir.HelpActions">
             <separator/>
-            <action id="Elixir.Help" class="org.elixir_lang.action.HelpAction" text="IntelliJ Elixir Help"/>
+            <action id="Elixir.Help" class="org.elixir_lang.action.HelpAction" text="IntelliJ Elixir Help" icon="AllIcons.Windows.Help" />
             <separator/>
             <add-to-group group-id="HelpMenu" anchor="before" relative-to-action="ProductivityGuide"/>
         </group>

resources/colorSchemes/ElixirDarcula.xml

@@ -184,7 +184,6 @@
     </option>
     <option name="ELIXIR_SIGIL_UPPER_H">
         <value>
-            <option name="FOREGROUND" value="5BB347" />
         </value>
     </option>
     <option name="ELIXIR_SIGIL_LOWER_I">
@@ -278,9 +277,9 @@
         </value>
     </option>
     <option name="ELIXIR_SIGIL_LOWER_R">
-        <value>
-            <option name="FOREGROUND" value="4749B3" />
-        </value>
+<!--        <value>-->
+<!--            <option name="FOREGROUND" value="4749B3" />-->
+<!--        </value>-->
     </option>
     <option name="ELIXIR_SIGIL_UPPER_R">
         <value>

resources/colorSchemes/ElixirDefault.xml

@@ -184,7 +184,6 @@
     </option>
     <option name="ELIXIR_SIGIL_UPPER_H">
         <value>
-            <option name="FOREGROUND" value="99186C" />
         </value>
     </option>
     <option name="ELIXIR_SIGIL_LOWER_I">
@@ -278,9 +277,9 @@
         </value>
     </option>
     <option name="ELIXIR_SIGIL_LOWER_R">
-        <value>
-            <option name="FOREGROUND" value="569918" />
-        </value>
+<!--        <value>-->
+<!--            <option name="FOREGROUND" value="569918" />-->
+<!--        </value>-->
     </option>
     <option name="ELIXIR_SIGIL_UPPER_R">
         <value>

settings.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 rootProject.name = 'intellij-elixir'
 include 'jps-shared'
-include 'jps-builder'
+include 'jps-builder'

src/org/elixir_lang/action/DeleteAllSdksAction.kt

@@ -5,7 +5,7 @@ import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.projectRoots.ProjectJdkTable
@@ -73,7 +73,7 @@ class DeleteAllSdksAction : AnAction() {
         val sdksRemoved = runWithModalProgressBlocking(project, "Removing All Elixir/Erlang SDKs") {
             var removedCount = 0
 
-            writeAction {
+            edtWriteAction {
                 LOG.info("Starting removal of ${allTargetSdks.size} SDK(s) and associated libraries")
 
                 for (sdk in allTargetSdks) {

src/org/elixir_lang/beam/StubBuilder.kt

@@ -21,7 +21,7 @@ class StubBuilder : BinaryFileStubBuilder {
         return if (stub != null) {
             stub
         } else {
-            LOGGER.debug("No stub built for file $fileContent")
+//            LOGGER.debug("No stub built for file $fileContent")
             null
         }
     }