fix rename

Author: patricklx

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

@@ -123,7 +123,7 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
     }
 
     override fun isReferenceTo(element: PsiElement): Boolean {
-        return getElement().getManager().areElementsEquivalent(target, element);
+        return getElement().getManager().areElementsEquivalent(target, element) || super.isReferenceTo(element)
     }
 
     override fun resolve(): PsiElement? {
@@ -392,9 +392,9 @@ class HbsLocalReference(private val leaf: PsiElement, val target: PsiElement?) :
                 return HbsLocalRenameReference(element, importRef)
             }
 
-            if (element.parent is HbOpenBlockMustache && element.parent.children[0] != element) {
-                return HbsLocalRenameReference(element, element)
-            }
+//            if (element.parent is HbOpenBlockMustache && element.parent.children[0] != element) {
+//                return HbsLocalRenameReference(element, element)
+//            }
 
             return referenceBlocks(element, name)
                     ?: resolveToLocalJs(element)

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

@@ -26,7 +26,8 @@ fun filter(element: PsiElement, fn: (PsiElement) -> PsiReference?): PsiReference
     if (element.text.contains(".")) {
         return null
     }
-    if (HbsLocalReference.createReference(element) != null) {
+    val res = HbsLocalReference.createReference(element)
+    if (res != null && (res.resolve() as? EmberNamedElement)?.target != element) {
         return null
     }
     return fn(element)
@@ -258,7 +259,6 @@ class HbsReferenceContributor : PsiReferenceContributor() {
             register(PlatformPatterns.psiElement(XmlAttribute::class.java)) { toAttributeReference(it as XmlAttribute) }
             register(HbsPatterns.SIMPLE_MUSTACHE_NAME) { filter(it) { HbsComponentReference(it) } }
             register(HbsPatterns.BLOCK_MUSTACHE_NAME) { filter(it) { HbsComponentReference(it) } }
-            register(HbsPatterns.BLOCK_MUSTACHE_NAME) { filter(it) { HbsModuleReference(it, "component") } }
             register(HbsPatterns.MUSTACHE_ID) { HbsLocalReference.createReference(it) }
             register(HbsPatterns.SIMPLE_MUSTACHE_NAME) { filter(it) { HbsModuleReference(it, "helper") } }
             register(HbsPatterns.SIMPLE_MUSTACHE_NAME) { filter(it) { HbsModuleReference(it, "modifier") } }

src/main/kotlin/com/emberjs/psi/EmberNamedElement.kt

@@ -260,29 +260,24 @@ open class EmberNamedElement(val target: PsiElement, val range: IntRange? = null
         files.forEach { file ->
             val hbsView = file.viewProvider.getPsi(Language.findLanguageByID("Handlebars")!!)
             val htmlView = file.viewProvider.getPsi(Language.findLanguageByID("HTML")!!)
-            if (target.language == Language.findLanguageByID("Handlebars")) {
+            val htmlTarget = htmlView.findElementAt(target.startOffset+1)
+            val hbsTarget = hbsView.findElementAt(target.startOffset+1)
+            if (hbsTarget?.parents?.find { it is HbBlockWrapper } != null) {
                 val hbs = target.parents.find { it is HbBlockWrapper }
                 if (hbs != null) {
-                    val htmlElements = PsiTreeUtil.collectElements(htmlView) { hbs.textRange.contains(it.textRange) && it.references.any { it.isReferenceTo(target) } }
+                    val htmlElements = PsiTreeUtil.collectElements(htmlView) { hbs.textRange.contains(it.textRange) }
                     elements.add(hbs)
                     elements.addAll(htmlElements)
                 }
-                return@forEach
             }
-            if (target.language == Language.findLanguageByID("HTML") && target.parents.find { it is XmlTag } != null) {
+            if (htmlTarget?.parents?.find { it is XmlTag } != null) {
                 val html = target.parents.find { it is XmlTag }
                 if (html != null) {
-                    val hbsElements = PsiTreeUtil.collectElements(hbsView) { html.textRange.contains(it.textRange) && !it.references.any { it.isReferenceTo(target) } }
+                    val hbsElements = PsiTreeUtil.collectElements(hbsView) { html.textRange.contains(it.textRange) }
                     elements.add(html)
                     elements.addAll(hbsElements)
                 }
-                return@forEach
             }
-            val htmlElements = PsiTreeUtil.collectElements(htmlView) { it.references.any { it.isReferenceTo(target) } }
-            elements.addAll(htmlElements)
-
-            val hbsElements = PsiTreeUtil.collectElements(hbsView) { it.references.any { it.isReferenceTo(target) } }
-            elements.addAll(hbsElements)
         }
 
         if (elements.size == 0) {