Initial support for 243

Author: l2dy

.github/workflows/build-plugin.yml

@@ -28,7 +28,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                platform-version: [ 241, 242 ]
+                platform-version: [ 243 ]
         env:
             ORG_GRADLE_PROJECT_buildNumber: ${{ needs.generate-build-number.outputs.build_number }}
             ORG_GRADLE_PROJECT_platformVersion: ${{ matrix.platform-version }}

.github/workflows/check.yml

@@ -82,15 +82,15 @@ jobs:
                 # Make sequence from two outputs with version is not possible here.
                 rust-version: ${{ fromJSON(needs.get-rust-versions.outputs.matrix) }}
                 base-ide: [ IU ]
-                platform-version: [ 241, 242 ]
+                platform-version: [ 243 ]
                 # it's enough to verify plugin structure only once per platform version
                 verify-plugin: [ false ]
                 default-edition-for-tests: [ 2021 ]
                 include:
                     - os: ubuntu-latest
                       rust-version: ${{ needs.get-rust-versions.outputs.old }}
                       base-ide: IU
-                      platform-version: 241
+                      platform-version: 243
                       verify-plugin: true
                       default-edition-for-tests: 2021
 

build.gradle.kts

@@ -26,6 +26,7 @@ val ideToRun = prop("ideToRun").ifEmpty { baseIDE }
 val ideaVersion = prop("ideaVersion")
 val baseVersion = versionForIde(baseIDE)
 val baseVersionForRun = versionForIde(ideToRun)
+val useInstaller = !baseVersion.contains("-EAP-")
 
 val tomlPlugin: String by project
 val graziePlugin: String by project
@@ -34,6 +35,7 @@ val copyrightPlugin = "com.intellij.copyright"
 val javaPlugin = "com.intellij.java"
 val javaIdePlugin = "com.intellij.java.ide"
 val javaScriptPlugin = "JavaScript"
+val jsonPlugin = "com.intellij.modules.json"
 val mlCompletionPlugin = "com.intellij.completion.ml.ranking"
 
 val compileNativeCodeTaskName = "compileNativeCode"
@@ -72,6 +74,9 @@ allprojects {
         mavenCentral()
         intellijPlatform {
             defaultRepositories()
+            if (!useInstaller) {
+                jetbrainsRuntime()
+            }
         }
     }
 
@@ -192,10 +197,18 @@ allprojects {
 
     dependencies {
         intellijPlatform {
-            create(baseIDE, baseVersion)
+            create(baseIDE, baseVersion, useInstaller)
+            if (!useInstaller) {
+                jetbrainsRuntime()
+            }
 
             pluginVerifier()
             instrumentationTools()
+            // BACKCOMPAT: 2024.2. Always include jsonPlugin.
+            // Also move rust-toml.xml with explicit dependency on JSON plugin back to src.
+            if (baseVersion.startsWith("243.") || baseVersion.startsWith("2024.3")) {
+                bundledPlugin(jsonPlugin)
+            }
 
             // used in MacroExpansionManager.kt and ResolveCommonThreadPool.kt
             testFramework(TestFrameworkType.Platform, configurationName = Configurations.INTELLIJ_PLATFORM_DEPENDENCIES)
@@ -304,7 +317,10 @@ project(":plugin") {
                     javaPlugin,
                 )
             }
-            create(baseIDE, baseVersionForRun)
+            create(baseIDE, baseVersionForRun, useInstaller)
+            if (!useInstaller) {
+                jetbrainsRuntime()
+            }
             plugins(pluginList)
             bundledPlugins(bundledPluginList)
 
@@ -474,7 +490,10 @@ project(":") {
 project(":idea") {
     dependencies {
         intellijPlatform {
-            create(baseIDE, baseVersion)
+            create(baseIDE, baseVersion, useInstaller)
+            if (!useInstaller) {
+                jetbrainsRuntime()
+            }
 
             bundledPlugins(listOf(
                 javaPlugin,
@@ -491,7 +510,10 @@ project(":idea") {
 project(":copyright") {
     dependencies {
         intellijPlatform {
-            create(baseIDE, baseVersion)
+            create(baseIDE, baseVersion, useInstaller)
+            if (!useInstaller) {
+                jetbrainsRuntime()
+            }
 
             bundledPlugins(listOf(copyrightPlugin))
         }

gradle-243.properties

@@ -0,0 +1,15 @@
+# Existent IDE versions can be found in the following repos:
+# https://www.jetbrains.com/intellij-repository/releases/
+# https://www.jetbrains.com/intellij-repository/snapshots/
+ideaVersion=2024.3.1
+
+# https://plugins.jetbrains.com/plugin/8195-toml/versions
+tomlPlugin=org.toml.lang:243.21565.122
+# https://plugins.jetbrains.com/plugin/12175-grazie-lite/versions
+graziePlugin=tanvd.grazi:243.19420.33
+# https://plugins.jetbrains.com/plugin/227-psiviewer/versions
+psiViewerPlugin=PsiViewer:243.7768
+
+# please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description
+sinceBuild=243
+untilBuild=243.*

gradle.properties

@@ -1,6 +1,6 @@
 propertiesPluginEnvironmentNameProperty=platformVersion
-# Supported platforms: 241, 242
-platformVersion=242
+# Supported platforms: 241, 242, 243
+platformVersion=243
 # Supported IDEs: IU
 baseIDE=IU
 ideToRun=

js/src/main/kotlin/org/rust/js/RsWasmBindgenLineMarkerProvider.kt

@@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
-import icons.JavaScriptPsiIcons
+import icons.JavaScriptCoreIcons
 import org.rust.RsBundle
 import org.rust.lang.core.psi.*
 import org.rust.lang.core.psi.ext.*
@@ -32,7 +32,7 @@ import javax.swing.Icon
 class RsWasmBindgenLineMarkerProvider : RelatedItemLineMarkerProvider() {
 
     override fun getName(): String = RsBundle.message("gutter.rust.generated.typescript.declarations.name")
-    override fun getIcon(): Icon = JavaScriptPsiIcons.FileTypes.TypeScriptFile
+    override fun getIcon(): Icon = JavaScriptCoreIcons.FileTypes.TypeScriptFile
 
     override fun getLineMarkerInfo(element: PsiElement): RelatedItemLineMarkerInfo<*>? {
         val element = element as? RsOuterAttributeOwner ?: return null

src/243/test/kotlin/org/rust/TestCompat.kt

@@ -0,0 +1,42 @@
+/*
+ * Use of this source code is governed by the MIT license that can be
+ * found in the LICENSE file.
+ */
+
+package org.rust
+
+import com.intellij.ide.util.treeView.smartTree.Sorter
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.platform.navbar.NavBarItemPresentationData
+import com.intellij.platform.navbar.backend.NavBarItem
+import com.intellij.platform.navbar.backend.impl.pathToItem
+import com.intellij.util.concurrency.annotations.RequiresReadLock
+import org.jetbrains.annotations.TestOnly
+
+// BACKCOMPAT 2024.1: use directly in RsCombinedVisibilityAlphaSorterTest
+val alphaSorterId = Sorter.getAlphaSorterId()
+
+// BACKCOMPAT 2024.1: move to RsNavBarTest
+@Suppress("UnstableApiUsage")
+@TestOnly
+@RequiresReadLock
+fun contextNavBarPathStrings(ctx: DataContext): List<String> {
+    // Navigation bar implementation was split into several modules, which made `navbar.testFramework` test scope only.
+    //
+    // See https://youtrack.jetbrains.com/issue/IJPL-850/Split-navigation-bar-implementation-into-several-modules,
+    // https://github.com/JetBrains/intellij-community/commit/a9e1406257b330d17d2a3f78f47b2d2113eca97c and
+    // https://github.com/JetBrains/intellij-community/commit/bfa6619891699658f86a7bf8bdf7726a67bc6efd
+
+    // Code copied from [platform/navbar/testFramework/src/testFramework.kt](https://github.com/JetBrains/intellij-community/blob/d161fd043392998e10c4551df92634dbda5a06b5/platform/navbar/testFramework/src/testFramework.kt#L34).
+    val contextItem = NavBarItem.NAVBAR_ITEM_KEY.getData(ctx)
+        ?.dereference()
+        ?: return emptyList()
+    return contextItem.pathToItem().map {
+        (it.presentation() as NavBarItemPresentationData).text
+    }
+}
+
+// BACKCOMPAT 2024.1: unwrap to contextNavBarPathStrings
+fun contextNavBarPathStringsCompat(ctx: DataContext): List<String> {
+    return contextNavBarPathStrings(ctx)
+}

src/main/kotlin/org/rust/cargo/runconfig/buildtool/RsBuildTaskProvider.kt

@@ -28,7 +28,7 @@ abstract class RsBuildTaskProvider<T : RsBuildTaskProvider.BuildTask<T>> : Befor
 
         val result = CompletableFuture<Boolean>()
         ProjectTaskManager.getInstance(environment.project).build(buildableElement).onProcessed {
-            result.complete(!it.hasErrors() && !it.isAborted)
+            result.complete(it != null && !it.hasErrors() && !it.isAborted)
         }
         return result.get()
     }

src/main/kotlin/org/rust/ide/module/RsModuleBuilder.kt

@@ -5,7 +5,6 @@
 
 package org.rust.ide.module
 
-import com.intellij.ide.NewProjectWizardLegacy
 import com.intellij.ide.util.projectWizard.ModuleBuilder
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.WizardContext
@@ -32,9 +31,9 @@ class RsModuleBuilder : ModuleBuilder() {
 
     override fun getModuleType(): ModuleType<*> = RsModuleType.INSTANCE
 
-    override fun isSuitableSdkType(sdkType: SdkTypeId?): Boolean = true
+    override fun isSuitableSdkType(sdkType: SdkTypeId): Boolean = true
 
-    override fun isAvailable(): Boolean = NewProjectWizardLegacy.isAvailable()
+    override fun isAvailable(): Boolean = false
 
     override fun getCustomOptionsStep(context: WizardContext, parentDisposable: Disposable): ModuleWizardStep =
         CargoConfigurationWizardStep(context).apply {

src/main/resources/META-INF/rust-toml.xml

@@ -1,4 +1,6 @@
 <idea-plugin>
+    <depends>com.intellij.modules.json</depends>
+
     <extensions defaultExtensionNs="com.intellij">
         <psi.referenceContributor language="TOML"
                                   implementation="org.rust.toml.resolve.CargoTomlReferenceContributor"/>

src/test/kotlin/org/rust/cargo/project/model/impl/CargoTomlWatcherTest.kt

@@ -121,7 +121,7 @@ class CargoTomlWatcherTest : RsTestBase() {
     private fun newCreateEvent(name: String, requestor: Any? = null): Pair<VirtualFile, VFileCreateEvent> {
         val vFile = myFixture.tempDirFixture.createFile("proj/$name")
         @Suppress("UnstableApiUsage")
-        return vFile to VFileCreateEvent(requestor, vFile.parent, vFile.name, false, null, null, true, null)
+        return vFile to VFileCreateEvent(requestor, vFile.parent, vFile.name, false, null, null, null)
     }
 
     private fun newChangeEvent(vFile: VirtualFile, requestor: Any? = null): VFileContentChangeEvent =

src/test/kotlin/org/rust/ide/console/RsConsoleFoldingTestBase.kt

@@ -42,7 +42,7 @@ abstract class RsConsoleFoldingTestBase : RsTestBase() {
         console.print(input, ConsoleViewContentType.NORMAL_OUTPUT)
         console.flushDeferredText()
 
-        val editor = console.editor
+        val editor = console.editor!!
         val regions = editor.foldingModel.allFoldRegions
 
         val expectedText = renderTextWithFolds(input, expectedFolds)