- fix: correctly resolve paths from args and fix completion

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog
 ===============================================================================
+## v2020.3.28
+- fix: correctly resolve paths from args and fix completion
+
 ## v2020.3.27
 - fix: correctly resolve paths in hash
 - feature: add parameter autocompletion for `{{component x param=1 ...}}`

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

@@ -252,11 +252,6 @@ class HbsLocalCompletion : CompletionProvider<CompletionParameters>() {
         }
         val txt = (element.parents.find { it is HbPathImpl || it is HbStringLiteral }?.text ?: element.text).replace("IntellijIdeaRulezzz", "")
 
-        if (element.parent is HbData) {
-            addArgsCompletion(element, result)
-            return
-        }
-
         val helperElement = EmberUtils.findFirstHbsParamFromParam(element)
         if (helperElement != null) {
             addHelperCompletions(helperElement, result)
@@ -271,6 +266,11 @@ class HbsLocalCompletion : CompletionProvider<CompletionParameters>() {
             return
         }
 
+        if (element.parent is HbData) {
+            addArgsCompletion(element, result)
+            return
+        }
+
         addArgsCompletion(element, result)
         addImportPathCompletions(element, result)
         addImportCompletions(element, result)

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

@@ -306,7 +306,9 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
 
         fun createReference(element: PsiElement): PsiReference? {
             val name = element.text.replace("IntellijIdeaRulezzz", "")
-            if (element.parent is HbData) {
+
+            val sibling = PsiTreeUtil.findSiblingBackward(element, HbTokenTypes.ID, null)
+            if (name == "this" && sibling == null) {
                 val fname = element.containingFile.name.split(".").first()
                 var fileName = fname
                 if (fileName == "template") {
@@ -319,17 +321,21 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
                         ?: dir?.findFile("controller.ts")
                         ?: dir?.findFile("controller.js")
                 if (file != null) {
-                    val cls = EmberUtils.findDefaultExportClass(file)
-                    val args = EmberUtils.findComponentArgsType(cls as JSElement)
-                    val prop = args?.properties?.find { it.memberName == name }
-                    if (prop != null) {
-                        return HbsLocalReference(element, prop.memberSource.singleElement)
-                    }
-                    return null
+                    return HbsLocalReference(element, resolveToJs(file, listOf()))
                 }
             }
-            val sibling = PsiTreeUtil.findSiblingBackward(element, HbTokenTypes.ID, null)
-            if (name == "this" && sibling == null) {
+
+            // for this.x.y
+            if (sibling != null && sibling.references.find { it is HbsLocalReference } != null) {
+                val ref = sibling.references.find { it is HbsLocalReference } as HbsLocalReference
+                val yieldRef = ref.resolveYield()
+                if (yieldRef != null) {
+                    return HbsLocalReference(element, resolveToJs(yieldRef, listOf(element.text)))
+                }
+                return HbsLocalReference(element, resolveToJs(ref.resolve(), listOf(element.text)))
+            }
+
+            if (element.parent is HbData) {
                 val fname = element.containingFile.name.split(".").first()
                 var fileName = fname
                 if (fileName == "template") {
@@ -342,7 +348,13 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
                         ?: dir?.findFile("controller.ts")
                         ?: dir?.findFile("controller.js")
                 if (file != null) {
-                    return HbsLocalReference(element, resolveToJs(file, listOf()))
+                    val cls = EmberUtils.findDefaultExportClass(file)
+                    val args = EmberUtils.findComponentArgsType(cls as JSElement)
+                    val prop = args?.properties?.find { it.memberName == name }
+                    if (prop != null) {
+                        return HbsLocalReference(element, prop.memberSource.singleElement)
+                    }
+                    return null
                 }
             }
 
@@ -351,16 +363,6 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
                 return HbsLocalRenameReference(element, importRef)
             }
 
-            // for this.x.y
-            if (sibling != null && sibling.references.find { it is HbsLocalReference } != null) {
-                val ref = sibling.references.find { it is HbsLocalReference } as HbsLocalReference
-                val yieldRef = ref.resolveYield()
-                if (yieldRef != null) {
-                    return HbsLocalReference(element, resolveToJs(yieldRef, listOf(element.text)))
-                }
-                return HbsLocalReference(element, resolveToJs(ref.resolve(), listOf(element.text)))
-            }
-
             if (element.parent is HbOpenBlockMustache) {
                 return HbsLocalRenameReference(element, element)
             }