Skip to content

Commit c6fbd81

Browse files
authored
fix missing gjs ts analysis (#341)
1 parent 4a28e58 commit c6fbd81

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

src/main/kotlin/com/emberjs/gts/GtsSupport.kt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,9 @@ val GTS_DEFAULT_EXTENSIONS_WITH_DOT = arrayOf(".gts", ".gjs")
602602

603603
class GtsImportResolver(project: Project,
604604
resolveContext: JSImportResolveContext,
605-
private val contextFile: VirtualFile): TypeScriptFileImportsResolverImpl(project, resolveContext, GTS_DEFAULT_EXTENSIONS_WITH_DOT, listOf(GtsFileType.INSTANCE)) {
605+
private val contextFile: VirtualFile):
606+
TypeScriptFileImportsResolverImpl(project, resolveContext, GTS_DEFAULT_EXTENSIONS_WITH_DOT, listOf(GtsFileType.INSTANCE, GjsFileType.INSTANCE
607+
)) {
606608

607609
override fun processAllFilesInScope(includeScope: GlobalSearchScope, processor: Processor<in VirtualFile>) {
608610
if (includeScope == GlobalSearchScope.EMPTY_SCOPE) return
@@ -621,6 +623,9 @@ class GtsImportResolver(project: Project,
621623
TypeScriptImportsResolverProvider.getDefaultProvider(project, resolveContext)
622624
.resolveFileModule("gts", contextFile)
623625
?.let { processor.process(it) }
626+
TypeScriptImportsResolverProvider.getDefaultProvider(project, resolveContext)
627+
.resolveFileModule("gjs", contextFile)
628+
?.let { processor.process(it) }
624629
}
625630

626631
override fun getPriority(): Int = TypeScriptFileImportsResolver.JS_DEFAULT_PRIORITY
@@ -660,6 +665,13 @@ class GtsComponentCandidatesProvider(val placeInfo: JSImportPlaceInfo) : JSImpor
660665
.flatten()
661666
.toMutableList()
662667

668+
list.addAll(FilenameIndex.getAllFilesByExt(project, "gjs",
669+
createProjectImportsScope(placeInfo, getStructureModuleRoot(placeInfo)))
670+
.map { getExports(it) }
671+
.flatten()
672+
.toMutableList()
673+
)
674+
663675
val scopes = EmberUtils.getScopesForFile(myPlaceInfo.file)
664676

665677
val scope = ProjectScope.getAllScope(project)
@@ -728,6 +740,9 @@ class GtsComponentCandidatesProvider(val placeInfo: JSImportPlaceInfo) : JSImpor
728740
return if (virtualFile.name == "index.gts") {
729741
virtualFile.parent.name
730742
}
743+
else if (virtualFile.name == "index.gjs") {
744+
virtualFile.parent.name
745+
}
731746
else {
732747
virtualFile.nameWithoutExtension
733748
}

0 commit comments

Comments
 (0)