- fix: completion did not provide all possibilities (when using with ember-hbs-imports)

- fix: tag completions & references did not work in some cases

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Changelog
 ===============================================================================
+## 2022.1.1
+- fix: completion did not provide all possibilities (when using with ember-hbs-imports)
+- fix: tag completions & references did not work in some cases
+
 ## 2022.1.0
 - upgrade to 2022.1.0
 

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

@@ -125,7 +125,8 @@ class EmberTagNameProvider : XmlTagNameProvider {
         val regex = Regex("\\|.*\\|")
         val txt = element.name.replace("IntellijIdeaRulezzz", "").split(".").first()
         // find all |blocks| from mustache
-        val blocks = PsiTreeUtil.collectElements(element.containingFile) { it is HbBlockWrapperImpl }
+        val hbsView = element.containingFile.viewProvider.getPsi(Language.findLanguageByID("Handlebars")!!)
+        val blocks = PsiTreeUtil.collectElements(hbsView) { it is HbBlockWrapperImpl }
                 .filter { it.children[0].text.contains(regex) }
                 .filter { it.textRange.contains(element.textRange) }
 
@@ -266,8 +267,8 @@ fun toLookupElement(name: EmberName, useImports: Boolean, priority: Double = 90.
         tagName = name.tagName
     }
     val lookupElement = LookupElementBuilder
-            .create(tagName)
-            .withTailText(" from ${name.importPath.split("/").first()}")
+            .create(name, tagName)
+            .withTailText(" from ${name.importPath}")
             .withTypeText("component")
             .withIcon(EmberIconProvider.getIcon("component"))
             .withCaseSensitivity(true)

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

@@ -272,7 +272,8 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
         fun referenceBlocks(element: PsiElement, name: String): PsiReference? {
             // any |block param|
             // as mustache
-            val hbblockRefs = PsiTreeUtil.collectElements(element.containingFile, { it is HbOpenBlockMustacheImpl })
+            val hbsView = element.containingFile.viewProvider.getPsi(Language.findLanguageByID("Handlebars")!!)
+            val hbblockRefs = PsiTreeUtil.collectElements(hbsView, { it is HbOpenBlockMustacheImpl })
                     .filter {
                         PsiTreeUtil.collectElements(PsiTreeUtil.getNextSiblingOfType(it, HbStatementsImpl::class.java), { it == element }).isNotEmpty()
                     }

src/main/kotlin/com/emberjs/lookup/EmberLookupElementBuilder.kt

@@ -10,9 +10,9 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder
 object EmberLookupElementBuilder {
     fun create(it: EmberName, dots: Boolean = true): LookupElement {
         val element = LookupElementBuilder
-                .create(if (dots) it.name.replace("/", ".") else it.name)
+                .create(it, if (dots) it.name.replace("/", ".") else it.name)
                 .withTypeText(it.type)
-                .withTailText(" from ${it.importPath.split("/").first()}")
+                .withTailText(" from ${it.importPath}")
                 .withIcon(EmberIconProvider.getIcon(it.type) ?: EmberIcons.EMPTY_16)
                 .withCaseSensitivity(true)
                 .withInsertHandler(HbsInsertHandler())

src/main/kotlin/com/emberjs/resolver/EmberName.kt

@@ -53,7 +53,8 @@ data class EmberName(val type: String, val path: String, val fullImportPath: Str
     val angleBracketsName by lazy {
         assert(type == "component" || isComponentTemplate)
 
-        val baseName = if (isComponentTemplate) name.removePrefix("components/") else name
+        var baseName = if (isComponentTemplate) name.removePrefix("components/") else name
+        baseName = baseName.first().uppercase() + baseName.subSequence(1, baseName.lastIndex)
 
         baseName.replace(SIMPLE_DASHERIZE_REGEXP) {
             assert(it.range.first - it.range.last == 0)