lookup related for backing class

Author: patricklx

CHANGELOG.md

@@ -2,8 +2,11 @@
 
 Changelog
 ===============================================================================
+## 2022.2.14
+- improvement: better lookup for related files of templates and controller
+
 ## 2022.2.13
-- feaure: allow plugin reload without restart
+- feature: allow plugin reload without restart
 
 ## 2022.2.12
 - improvement: resolve this context in tests

build.gradle.kts

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

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

@@ -267,6 +267,14 @@ class HbsLocalCompletion : CompletionProvider<CompletionParameters>() {
                     result.addAllElements(args.properties.map { LookupElementBuilder.create("@${it.memberName}") })
                 }
             }
+            val modelProp = (cls as? JSClass)?.let { it.jsType.asRecordType().properties.find { it.memberName == "model" } }
+            modelProp?.let {
+                if (element.parent is HbData && !result.prefixMatcher.prefix.startsWith("@")) {
+                    result.addElement(LookupElementBuilder.create(it.memberName))
+                } else {
+                    result.addElement(LookupElementBuilder.create("@${it.memberName}"))
+                }
+            }
         }
     }
 

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

@@ -19,6 +19,7 @@ import com.intellij.lang.injection.InjectedLanguageManager
 import com.intellij.lang.javascript.psi.*
 import com.intellij.lang.javascript.psi.ecma6.ES6TaggedTemplateExpression
 import com.intellij.lang.javascript.psi.ecma6.JSTypedEntity
+import com.intellij.lang.javascript.psi.ecmal4.JSClass
 import com.intellij.lang.javascript.psi.impl.JSVariableImpl
 import com.intellij.lang.javascript.psi.jsdoc.impl.JSDocCommentImpl
 import com.intellij.lang.javascript.psi.resolve.JSContextResolver
@@ -378,6 +379,10 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
                     if (prop != null) {
                         return HbsLocalReference(element, prop.memberSource.singleElement)
                     }
+                    if (element.text == "model") {
+                        val modelProp = (cls as? JSClass)?.let { it.jsType.asRecordType().properties.find { it.memberName == "model" } }
+                        return modelProp?.let { HbsLocalReference(element, it.memberSource.singleElement) }
+                    }
                     return null
                 }
             }

src/main/kotlin/com/emberjs/utils/EmberUtils.kt

@@ -11,6 +11,7 @@ import com.emberjs.hbs.HbsLocalReference
 import com.emberjs.hbs.HbsModuleReference
 import com.emberjs.hbs.ImportNameReferences
 import com.emberjs.index.EmberNameIndex
+import com.emberjs.navigation.EmberGotoRelatedProvider
 import com.emberjs.psi.EmberNamedElement
 import com.emberjs.resolver.EmberJSModuleReference
 import com.intellij.injected.editor.VirtualFileWindow
@@ -28,6 +29,8 @@ import com.intellij.lang.javascript.psi.ecmal4.JSClass
 import com.intellij.lang.javascript.psi.jsdoc.JSDocComment
 import com.intellij.lang.javascript.psi.types.JSArrayType
 import com.intellij.lang.typescript.modules.TypeScriptFileModuleReference
+import com.intellij.navigation.GotoRelatedItem
+import com.intellij.navigation.GotoRelatedProvider
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.WriteAction
 import com.intellij.openapi.vfs.VirtualFile
@@ -217,7 +220,12 @@ class EmberUtils {
                     ?: dir?.findFile("$fileName.js")
                     ?: dir?.findFile("controller.ts")
                     ?: dir?.findFile("controller.js")
-            return cls ?: file?.let { findDefaultExportClass(it) }
+            val relatedItems = EmberGotoRelatedProvider().getItems(element.originalVirtualFile!!, element.project)
+            val related = (relatedItems.find { it.first.type == "component" } ?:
+                          relatedItems.find { it.first.type == "controller" }  ?:
+                          relatedItems.find { it.first.type == "router" })?.second
+            val relatedFile = related?.let { PsiManager.getInstance(element.project).findFile(it) }
+            return cls ?: file?.let { findDefaultExportClass(it) } ?: relatedFile?.let { findDefaultExportClass(it) }
         }
 
         fun findComponentArgsType(element: JSElement): JSRecordType? {