fix hbs imports

patricklx · patricklx · commit a9b3a7ab81c1 · 2022-11-29T15:53:26.000+01:00
diff --git a/src/main/kotlin/com/emberjs/hbs/HbsModuleReference.kt b/src/main/kotlin/com/emberjs/hbs/HbsModuleReference.kt
@@ -32,14 +32,14 @@ open class HbsModuleReference(element: PsiElement, val moduleType: String) :
     private val psiManager: PsiManager by lazy { PsiManager.getInstance(project) }
 
     private val hasHbsImports by lazy {
-        var f = element.containingFile
+        var f = element.containingFile.originalFile
         if (element.originalVirtualFile is VirtualFileWindow) {
             val psiManager = PsiManager.getInstance(element.project)
             f = psiManager.findFile((element.originalVirtualFile as VirtualFileWindow).delegate)!!
         }
         NodeModuleManager.getInstance(element.project).collectVisibleNodeModules(f.virtualFile).find { it.name == "ember-hbs-imports" || it.name == "ember-template-imports" }
     }
-    private val useImports = hasHbsImports != null
+    private val useImports by lazy { hasHbsImports != null }
 
 
     open fun matches(module: EmberName) =

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ open class HbsModuleReference(element: PsiElement, val moduleType: String) :`
`32`	`32`	`private val psiManager: PsiManager by lazy { PsiManager.getInstance(project) }`
`33`	`33`
`34`	`34`	`private val hasHbsImports by lazy {`
`35`		`- var f = element.containingFile`
	`35`	`+ var f = element.containingFile.originalFile`
`36`	`36`	`if (element.originalVirtualFile is VirtualFileWindow) {`
`37`	`37`	`val psiManager = PsiManager.getInstance(element.project)`
`38`	`38`	`f = psiManager.findFile((element.originalVirtualFile as VirtualFileWindow).delegate)!!`
`39`	`39`	`}`
`40`	`40`	`NodeModuleManager.getInstance(element.project).collectVisibleNodeModules(f.virtualFile).find { it.name == "ember-hbs-imports" \|\| it.name == "ember-template-imports" }`
`41`	`41`	`}`
`42`		`- private val useImports = hasHbsImports != null`
	`42`	`+ private val useImports by lazy { hasHbsImports != null }`
`43`	`43`
`44`	`44`
`45`	`45`	`open fun matches(module: EmberName) =`