fix: add reference to internal components

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog
 ===============================================================================
+## 2020.3.31
+- fix: add reference to internal components
+
 ## 2021.3.11
 - fix: another assertion
 

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 
 
 group = "com.emberjs"
-version = "2020.3.30"
+version = "2020.3.31"
 
 // Configure project's dependencies
 repositories {

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

@@ -16,6 +16,10 @@ class HbsComponentReference(element: PsiElement) : HbsModuleReference(element, "
             val prop = internalComponents.properties.find { it.name == element.text }
             return createResults((prop?.jsType?.sourceElement as JSReferenceExpression).resolve())
         }
+        if (internalHelpers.properties.map { it.name }.contains(element.text)) {
+            val prop = internalHelpers.properties.find { it.name == element.text }
+            return createResults((prop?.jsType?.sourceElement as JSReferenceExpression).resolve())
+        }
         return super.multiResolve(incompleteCode)
     }
 }

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

@@ -365,7 +365,7 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
                 return HbsLocalRenameReference(element, importRef)
             }
 
-            if (element.parent is HbOpenBlockMustache) {
+            if (element.parent is HbOpenBlockMustache && element.parent.children[0] != element) {
                 return HbsLocalRenameReference(element, element)
             }
 

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

@@ -21,7 +21,7 @@ open class HbsModuleReference(element: PsiElement, val moduleType: String) :
     private val internalModifiersFile = PsiFileFactory.getInstance(project).createFileFromText("intellij-emberjs/internal/modifiers-stub", Language.findLanguageByID("TypeScript")!!, this::class.java.getResource("/com/emberjs/external/ember-modifiers.ts").readText())
     private val internalComponentsFile = PsiFileFactory.getInstance(project).createFileFromText("intellij-emberjs/internal/components-stub", Language.findLanguageByID("TypeScript")!!, this::class.java.getResource("/com/emberjs/external/ember-components.ts").readText())
 
-    private val internalHelpers = EmberUtils.resolveDefaultExport(internalHelpersFile) as JSObjectLiteralExpression
+    protected val internalHelpers = EmberUtils.resolveDefaultExport(internalHelpersFile) as JSObjectLiteralExpression
     private val internalModifiers = EmberUtils.resolveDefaultExport(internalModifiersFile) as JSObjectLiteralExpression
     protected val internalComponents = EmberUtils.resolveDefaultExport(internalComponentsFile) as JSObjectLiteralExpression
 
@@ -33,7 +33,14 @@ open class HbsModuleReference(element: PsiElement, val moduleType: String) :
     override fun multiResolve(incompleteCode: Boolean): Array<out ResolveResult> {
         // Collect all components from the index
 
-        if (moduleType == "helper") {
+       if (moduleType == "helper") {
+            if (internalHelpers.properties.map { it.name }.contains(element.text)) {
+                val prop = internalHelpers.properties.find { it.name == element.text }
+                return createResults((prop?.jsType?.sourceElement as JSReferenceExpression).resolve())
+            }
+        }
+
+        if (moduleType == "component") {
             if (internalHelpers.properties.map { it.name }.contains(element.text)) {
                 val prop = internalHelpers.properties.find { it.name == element.text }
                 return createResults((prop?.jsType?.sourceElement as JSReferenceExpression).resolve())

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

@@ -8,7 +8,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiWhiteSpace
 
 object HbsPatterns {
-    val SIMPLE_MUSTACHE_NAME: Capture<HbMustacheName> = psiElement(HbMustacheName::class.java)
+    val SIMPLE_MUSTACHE_NAME: Capture<PsiElement> = psiElement(HbTokenTypes.MUSTACHE_NAME)
             .withTextLengthLongerThan(0)
             .withParent(psiElement(HbTokenTypes.MUSTACHE))
             .afterLeaf(psiElement(HbTokenTypes.OPEN))
@@ -17,7 +17,7 @@ object HbsPatterns {
             .withTextLengthLongerThan(0)
             .withSuperParent(3, SIMPLE_MUSTACHE_NAME)
 
-    val BLOCK_MUSTACHE_NAME: Capture<HbMustacheName> = psiElement(HbMustacheName::class.java)
+    val BLOCK_MUSTACHE_NAME: Capture<PsiElement> = psiElement(HbTokenTypes.MUSTACHE_NAME)
             .withTextLengthLongerThan(0)
             .withParent(psiElement(HbTokenTypes.OPEN_BLOCK_STACHE))
             .afterLeaf(psiElement(HbTokenTypes.OPEN_BLOCK))
@@ -33,7 +33,7 @@ object HbsPatterns {
     val MUSTACHE_ID_MISSING: Capture<PsiElement> = psiElement(HbTokenTypes.ID).withParent(psiElement(HbPsiElement::class.java)
             .afterSibling(psiElement(HbTokenTypes.SEP).afterSibling(psiElement(HbTokenTypes.ID))))
 
-    val SUB_EXPR_NAME: Capture<HbMustacheName> = psiElement(HbMustacheName::class.java)
+    val SUB_EXPR_NAME: Capture<PsiElement> = psiElement(HbTokenTypes.MUSTACHE_NAME)
             .withParent(psiElement(HbTokenTypes.PARAM)
                     .afterLeaf(psiElement(HbTokenTypes.OPEN_SEXPR)))
 

src/test/kotlin/com/emberjs/index/EmberNameIndexTest.kt

@@ -21,10 +21,10 @@ class EmberNameIndexTest : BasePlatformTestCase() {
     }
 
     fun testExample() = doTest(
-            "controller:application",
-            "controller:user/index",
-            "controller:user/new",
-            "route:index",
+            "controller:application:~/controllers/application",
+            "controller:user/index:~/controllers/user/index",
+            "controller:user/new:~/controllers/user/new",
+            "route:index:~/routes/index",
             "helper-test:format-number",
             "acceptance-test:user-page")