Merge pull request #467 from Turbo87/update-intellij

Update IntelliJ to 2022.3
Turbo87 · Dec 1, 2022 · f60b94b · f60b94b
2 parents 4c56a31 + 943fa18
commit f60b94b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'zulu'
 
       - run: ./gradlew assemble

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'zulu'
 
       - run: ./gradlew buildPlugin

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,7 +27,7 @@ intellij {
 
     // see https://www.jetbrains.com/intellij-repository/releases/
     // and https://www.jetbrains.com/intellij-repository/snapshots/
-    version.set("2022.2")
+    version.set("2022.3")
     type.set("IU")
 
     downloadSources.set(!System.getenv().containsKey("CI"))
@@ -37,19 +37,18 @@ intellij {
     // Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
     //
     // com.dmarcotte.handlebars: see https://plugins.jetbrains.com/plugin/6884-handlebars-mustache/versions
-    plugins.set(listOf("JavaScriptLanguage", "CSS", "yaml", "com.dmarcotte.handlebars:222.3345.108"))
+    plugins.set(listOf("JavaScript", "com.intellij.css", "yaml", "com.dmarcotte.handlebars:223.7571.117"))
 
     sandboxDir.set(project.rootDir.canonicalPath + "/.sandbox")
 }
 
 tasks {
-    // Set the compatibility versions to 1.8
     withType<JavaCompile> {
-        sourceCompatibility = "1.8"
-        targetCompatibility = "1.8"
+        sourceCompatibility = "17"
+        targetCompatibility = "17"
     }
     withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.jvmTarget = "17"
     }
 
     publishPlugin {

diff --git a/src/main/kotlin/com/emberjs/navigation/EmberGotoClassContributor.kt b/src/main/kotlin/com/emberjs/navigation/EmberGotoClassContributor.kt
@@ -17,7 +17,7 @@ import com.intellij.util.indexing.FindSymbolParameters.searchScopeFor
 class EmberGotoClassContributor : GotoClassContributor {
     private val iconProvider by lazy { EmberIconProvider() }
 
-    override fun getQualifiedName(item: NavigationItem?): String? {
+    override fun getQualifiedName(item: NavigationItem): String? {
         if (item is DelegatingNavigationItem) {
             return item.presentation?.presentableText?.replace("-", qualifiedNameSeparator)
         }