Skip to content

Commit 7255789

Browse files
authored
fix ember detection ins subfolder (#319)
1 parent 9e3c3fc commit 7255789

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.emberjs.icons.EmberIcons
1212
import com.emberjs.index.EmberNameIndex
1313
import com.emberjs.resolver.EmberName
1414
import com.emberjs.utils.EmberUtils
15+
import com.emberjs.utils.emberRoot
1516
import com.emberjs.utils.ifTrue
1617
import com.intellij.formatting.*
1718
import com.intellij.formatting.templateLanguages.DataLanguageBlockWrapper
@@ -640,7 +641,7 @@ class GtsTypeScriptImportsResolverProvider : TypeScriptImportsResolverProvider {
640641
override fun contributeResolver(project: Project,
641642
context: TypeScriptImportResolveContext,
642643
contextFile: VirtualFile): TypeScriptFileImportsResolver? {
643-
val detectedEmber = EmberUtils.isEmber(project)
644+
val detectedEmber = contextFile.emberRoot != null
644645
if (detectedEmber) {
645646
return GtsImportResolver(project, context, contextFile)
646647
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class EmberModuleReferenceContributor : JSModuleReferenceContributor {
191191
}.flatten().toTypedArray()
192192
}
193193

194-
override fun isApplicable(host: PsiElement): Boolean = EmberUtils.isEmber(host.project)
194+
override fun isApplicable(host: PsiElement): Boolean = host.containingFile.originalVirtualFile?.emberRoot != null
195195

196196
/** Detect the name of the ember application */
197197
private fun getAppName(appRoot: VirtualFile): String? = getModulePrefix(appRoot) ?: getAddonName(appRoot)

0 commit comments

Comments
 (0)