upgrade intellij idea (#1)

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog
 ===============================================================================
+## v2021.10.5
+- upgrade to latest intellij idea
+
 ## v2020.3.29
 - fix: correctly resolve internal ember components
 

build.gradle

@@ -0,0 +1,58 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    // Java support
+    id("java")
+    // Kotlin support
+    id("org.jetbrains.kotlin.jvm") version "1.5.31"
+    // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
+    id("org.jetbrains.intellij") version "1.1.6"
+}
+
+group = "com.emberjs"
+version = "2021.2.1"
+
+// Configure project's dependencies
+repositories {
+    mavenCentral()
+}
+dependencies {
+    testImplementation("org.assertj:assertj-core:3.21.0")
+}
+
+// Configure gradle-intellij-plugin plugin.
+// Read more: https://github.com/JetBrains/gradle-intellij-plugin
+intellij {
+    pluginName.set("Ember.js")
+
+    // see https://www.jetbrains.com/intellij-repository/releases/
+    // and https://www.jetbrains.com/intellij-repository/snapshots/
+    version.set("2021.2")
+    type.set("IU")
+
+    downloadSources.set(!System.getenv().containsKey("CI"))
+    updateSinceUntilBuild.set(true)
+
+    // Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
+    // 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:212.4746.2"))
+
+    sandboxDir.set(project.rootDir.canonicalPath + "/.sandbox")
+}
+
+tasks {
+    // Set the compatibility versions to 1.8
+    withType<JavaCompile> {
+        sourceCompatibility = "1.8"
+        targetCompatibility = "1.8"
+    }
+    withType<KotlinCompile> {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+
+    publishPlugin {
+        token.set(System.getenv("ORG_GRADLE_PROJECT_intellijPublishToken"))
+    }
+}

build.gradle.kts

@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency = false

gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -232,20 +232,13 @@ class EmberTagNameProvider : XmlTagNameProvider {
         val componentMap = hashMapOf<String, LookupElement>()
 
         // Collect all components from the index
-        EmberNameIndex.getFilteredKeys(scope) { it.type == "component" }
-
-            // Filter out components that are not related to this project
-            .filter { EmberNameIndex.hasContainingFiles(it, scope) }
-
+        EmberNameIndex.getFilteredProjectKeys(scope) { it.type == "component" }
             // Convert search results for LookupElements
             .map { Pair(it.angleBracketsName, toLookupElement(it, useImports)) }
             .toMap(componentMap)
 
         // Collect all component templates from the index
-        EmberNameIndex.getFilteredKeys(scope) { it.isComponentTemplate }
-
-            // Filter out components that are not related to this project
-            .filter { EmberNameIndex.hasContainingFiles(it, scope) }
+        EmberNameIndex.getFilteredProjectKeys(scope) { it.isComponentTemplate }
 
             // Filter out components that are already in the map
             .filter { !componentMap.containsKey(it.angleBracketsName) }

src/main/kotlin/com/emberjs/EmberTagNameProvider.kt

@@ -21,26 +21,17 @@ class HbsLinkToReference(element: PsiElement, range: TextRange, val moduleName:
 
     override fun getVariants(): Array<out Any> {
         // Collect all components from the index
-        return EmberNameIndex.getFilteredKeys(scope) { matches(it) }
-
-                // Filter out components that are not related to this project
-                .filter { EmberNameIndex.hasContainingFiles(it, scope) }
-
+        return EmberNameIndex.getFilteredProjectKeys(scope) { matches(it) }
                 // Convert search results for LookupElements
                 .map { EmberLookupElementBuilder.create(it) }
                 .toTypedArray()
     }
 
     override fun multiResolve(incompleteCode: Boolean): Array<out ResolveResult> {
         // Collect all components from the index
-        return EmberNameIndex.getFilteredKeys(scope) { matches(it) && it.name == moduleName }
-
-                // Filter out components that are not related to this project
-                .flatMap { EmberNameIndex.getContainingFiles(it, scope) }
-
+        return EmberNameIndex.getFilteredFiles(scope) { matches(it) && it.name == moduleName }
                 // Convert search results for LookupElements
-                .map { psiManager.findFile(it) }
-                .filterNotNull()
+                .mapNotNull { psiManager.findFile(it) }
                 .let(::createResults)
     }
 

src/main/kotlin/com/emberjs/hbs/HbsLinkToReference.kt

@@ -47,11 +47,7 @@ open class HbsModuleReference(element: PsiElement, val moduleType: String) :
             }
         }
 
-        return EmberNameIndex.getFilteredKeys(scope) { matches(it) }
-
-                // Filter out components that are not related to this project
-                .flatMap { EmberNameIndex.getContainingFiles(it, scope) }
-
+        return EmberNameIndex.getFilteredFiles(scope) { matches(it) }
                 // Convert search results for LookupElements
                 .map { psiManager.findFile(it) }
                 .filterNotNull()
@@ -61,13 +57,8 @@ open class HbsModuleReference(element: PsiElement, val moduleType: String) :
     }
 
     override fun getVariants(): Array<out Any?> {
-
         // Collect all components from the index
-        return EmberNameIndex.getFilteredKeys(scope) { it.type == moduleType }
-
-                // Filter out components that are not related to this project
-                .filter { EmberNameIndex.hasContainingFiles(it, scope) }
-
+        return EmberNameIndex.getFilteredProjectKeys(scope) { it.type == moduleType }
                 // Convert search results for LookupElements
                 .map { EmberLookupElementBuilder.create(it, dots = false) }
                 .toTypedArray()

src/main/kotlin/com/emberjs/hbs/HbsModuleReference.kt

@@ -118,9 +118,8 @@ class ImportPathReferencesProvider : PsiReferenceProvider() {
         if (resolvedFile is PsiDirectory) {
             val resolvedPath = resolvedFile!!.virtualFile.path.replace("addon/", "").replace("app/", "")
             val scope = GlobalSearchScope.allScope(element.project)
-            file = EmberNameIndex.getFilteredKeys(scope) { it.importPath.isNotBlank() && resolvedPath.endsWith(it.importPath) }
-                    // Filter out files that are not related to this project
-                    .flatMap { EmberNameIndex.getContainingFiles(it, scope) }
+            file = EmberNameIndex.getFilteredFiles(scope) { it.importPath.isNotBlank() && resolvedPath.endsWith(it.importPath) }
+                    // Filter out files that are not related to this pr
                     .map { psiManager.findFile(it) }
                     .firstOrNull()
         } else {

src/main/kotlin/com/emberjs/hbs/HbsReferenceContributor.kt

@@ -203,16 +203,14 @@ class TagReferencesProvider : PsiReferenceProvider() {
             val scope = ProjectScope.getAllScope(project)
             val psiManager: PsiManager by lazy { PsiManager.getInstance(project) }
 
-            val templates = EmberNameIndex.getFilteredKeys(scope) { it.isComponentTemplate && it.angleBracketsName == name }
-                    .flatMap { EmberNameIndex.getContainingFiles(it, scope) }
+            val templates = EmberNameIndex.getFilteredFiles(scope) { it.isComponentTemplate && it.angleBracketsName == name }
                     .mapNotNull { psiManager.findFile(it) }
             // find name.hbs first, then template.hbs
             val componentTemplate = templates.find { !it.name.startsWith("template.") } ?: templates.find { it.name.startsWith("template.") }
 
             if (componentTemplate != null) return EmberUtils.resolveToEmber(componentTemplate)
 
-            val components = EmberNameIndex.getFilteredKeys(scope) { it.type == "component" && it.angleBracketsName == name }
-                    .flatMap { EmberNameIndex.getContainingFiles(it, scope) }
+            val components = EmberNameIndex.getFilteredFiles(scope) { it.type == "component" && it.angleBracketsName == name }
                     .mapNotNull { psiManager.findFile(it) }
             // find name.js first, then component.js
             val component = components.find { !it.name.startsWith("component.") } ?: components.find { it.name.startsWith("component.") }