Merge main into feature/dev-execution

aws-toolkit-automation · web-flow · commit 6511d0c3c5c4 · 2025-05-08T16:09:25.000-04:00
diff --git a/.changes/next-release/bugfix-814bffb3-03aa-44ad-b639-008cf2929063.json b/.changes/next-release/bugfix-814bffb3-03aa-44ad-b639-008cf2929063.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix JavascriptLanguage not found on 2025.1+"
+}
diff --git a/plugins/core/jetbrains-ultimate/src-242-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt b/plugins/core/jetbrains-ultimate/src-242-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt
@@ -3,6 +3,6 @@
 
 package compat.com.intellij.lang.javascript
 
-// probably not necessary, but inline to avoid loading this through core classpath
+// inline to avoid loading this through core classpath
 inline val JavascriptLanguage
     get() = com.intellij.lang.javascript.JavascriptLanguage.INSTANCE
diff --git a/plugins/core/jetbrains-ultimate/src-251+/compat/com/intellij/lang/javascript/JavascriptLanguage.kt b/plugins/core/jetbrains-ultimate/src-251+/compat/com/intellij/lang/javascript/JavascriptLanguage.kt
@@ -3,4 +3,6 @@
 
 package compat.com.intellij.lang.javascript
 
-val JavascriptLanguage = com.intellij.lang.javascript.JavascriptLanguage
+// inline to avoid loading this through core classpath
+inline val JavascriptLanguage
+    get() = com.intellij.lang.javascript.JavascriptLanguage

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix JavascriptLanguage not found on 2025.1+"
 +}