fix unused imports

Author: patricklx

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

@@ -3,6 +3,8 @@ package com.emberjs.hbs
 import com.dmarcotte.handlebars.psi.HbSimpleMustache
 import com.dmarcotte.handlebars.psi.HbStringLiteral
 import com.dmarcotte.handlebars.psi.impl.HbStatementsImpl
+import com.emberjs.gts.GjsLanguage
+import com.emberjs.gts.GtsLanguage
 import com.emberjs.index.EmberNameIndex
 import com.emberjs.psi.EmberNamedAttribute
 import com.emberjs.psi.EmberNamedElement
@@ -11,6 +13,7 @@ import com.emberjs.resolver.EmberName
 import com.emberjs.utils.originalVirtualFile
 import com.emberjs.xml.EmberAttrDec
 import com.intellij.lang.Language
+import com.intellij.lang.ecmascript6.psi.ES6ImportSpecifier
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiElement
@@ -34,6 +37,28 @@ abstract class HbReference(element: PsiElement): PsiReferenceBase<PsiElement>(el
         if (res is EmberNamedElement) {
             res = res.target
         }
+        if (res is ES6ImportSpecifier) {
+            var resolved = res.containingFile.viewProvider.findReferenceAt(res.textOffset, GtsLanguage.INSTANCE)?.resolve()
+            resolved = resolved ?: res.containingFile.viewProvider.findReferenceAt(res.textOffset, GjsLanguage.INSTANCE)?.resolve()
+            if (element.manager.areElementsEquivalent(resolved, other)) {
+                return true
+            }
+            if (element.manager.areElementsEquivalent(res.reference?.resolve(), other)) {
+                return true
+            }
+            if (res.references.any {
+                    element.manager.areElementsEquivalent(it.element, other) || super.isReferenceTo(other)
+                }) {
+                return true
+            }
+            val results = res.multiResolve(false)
+            val r = results.any {
+                element.manager.areElementsEquivalent(it.element, other) || super.isReferenceTo(other)
+            }
+            if (r) {
+                return true
+            }
+        }
         return element.manager.areElementsEquivalent(res, other) || super.isReferenceTo(other)
     }
 }

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

@@ -12,7 +12,9 @@ import com.dmarcotte.handlebars.psi.impl.HbStatementsImpl
 import com.emberjs.xml.EmberAttrDec
 import com.emberjs.xml.EmberXmlElementDescriptor
 import com.emberjs.glint.GlintLanguageServiceProvider
+import com.emberjs.gts.GjsLanguage
 import com.emberjs.gts.GtsFileViewProvider
+import com.emberjs.gts.GtsLanguage
 import com.emberjs.index.EmberNameIndex
 import com.emberjs.psi.EmberNamedAttribute
 import com.emberjs.psi.EmberNamedElement
@@ -232,6 +234,11 @@ class TagReference(val element: XmlTag, val fullName: String, val rangeInElem: T
             }
         }
         if (res is ES6ImportSpecifier) {
+            var resolved = res.containingFile.viewProvider.findReferenceAt(res.textOffset, GtsLanguage.INSTANCE)?.resolve()
+            resolved = resolved ?: res.containingFile.viewProvider.findReferenceAt(res.textOffset, GjsLanguage.INSTANCE)?.resolve()
+            if (element.manager.areElementsEquivalent(resolved, other)) {
+                return true
+            }
             if (element.manager.areElementsEquivalent(res.reference?.resolve(), other)) {
                 return true
             }

src/test/kotlin/com/emberjs/gts/GtsFileTest.kt

@@ -76,7 +76,8 @@ class GtsFileTest : BasePlatformTestCase() {
             export const other = 2;
         """.trimIndent()
         val gts = """
-            import { OtherComponent, other } from './other-component';
+            import { OtherComponent } from './other-component';
+            import { other } from './other-component';
             import x from "a";
             import { y, quux } from "a";
             import qux from "a";
@@ -111,7 +112,7 @@ class GtsFileTest : BasePlatformTestCase() {
         val unusedConstants = highlighting.filter { it.description?.startsWith("Unused constant") == true }
         TestCase.assertEquals(unusedConstants.toString(), 0, unusedConstants.size)
         val highlightInfos: List<HighlightInfo> = highlighting.filter { it.inspectionToolId == "ES6UnusedImports" }
-        TestCase.assertEquals(2, highlightInfos.size)
+        TestCase.assertEquals(highlightInfos.toString(), 2, highlightInfos.size)
         TestCase.assertTrue(highlightInfos.first().description.contains("quux"))
         TestCase.assertTrue(highlightInfos.last().description.contains("qux"))
     }