Skip to content

Commit 476a987

Browse files
committed
fix toc on other file
1 parent 0aea667 commit 476a987

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,11 +346,6 @@ class EmberUtils {
346346
}
347347

348348
if (element is ES6ImportedBinding) {
349-
var resolvedElement = (element).multiResolve(true)[0]?.element
350-
resolvedElement = followReferences(resolvedElement)
351-
if (resolvedElement != null) {
352-
return resolvedElement
353-
}
354349
var ref:PsiReference? = element.declaration?.fromClause?.references?.findLast { it is EmberJSModuleReference && it.rangeInElement.endOffset == it.element.textLength - 1 && it.resolve() != null } as EmberJSModuleReference?
355350
if (ref == null) {
356351
ref = element.declaration?.fromClause?.references?.findLast { it is JSFileModuleReference }
@@ -781,7 +776,8 @@ class EmberUtils {
781776
}
782777

783778
fun getComponentReferenceData(f: PsiElement): ComponentReferenceData {
784-
val file = resolveDefaultExport(f.containingFile)?.containingFile ?: f
779+
val defaultExport = resolveDefaultExport(f.containingFile)
780+
val file = defaultExport?.containingFile ?: f
785781
var name = file.containingFile.name.split(".").first()
786782
val dir = file.containingFile.parent as PsiDirectoryImpl?
787783
var template: PsiFile? = null
@@ -819,6 +815,7 @@ class EmberUtils {
819815
} else {
820816
cls = findDefaultExportClass(tsFile)
821817
?: findDefaultExportClass(containingFile)
818+
?: defaultExport
822819
?: file
823820
}
824821

0 commit comments

Comments
 (0)