Skip to content

improve glint service detection #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 26, 2025
Merged

improve glint service detection #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
580e237
make optional
patricklx Sep 9, 2025
359e26c
use is available
patricklx Sep 9, 2025
faef436
fix
patricklx Sep 9, 2025
72b7831
fix
patricklx Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/kotlin/com/emberjs/glint/GlintLanguageService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ import java.util.concurrent.Future
import java.util.stream.Stream

class GlintLanguageServiceProvider(val project: Project) : JSLanguageServiceProvider {
val descriptor = getGlintDescriptor(project)

override fun isHighlightingCandidate(file: VirtualFile) = file.fileType is HbFileType || file.fileType is JavaScriptFileType || file.fileType is TypeScriptFileType || file.fileType is GtsFileType

override fun getService(file: VirtualFile) = allServices.firstOrNull()
override fun getService(file: VirtualFile) = if (descriptor.isAvailable(file)) GlintTypeScriptService.getInstance(project) else null

override val allServices: List<GlintTypeScriptService>
get() = if (EmberUtils.isEnabledEmberProject(project)) listOf(GlintTypeScriptService.getInstance(project)) else emptyList()
get() = if (descriptor.isAvailable(null)) listOf(GlintTypeScriptService.getInstance(project)) else emptyList()
}


Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/emberjs/glint/GlintLspSupportProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class GlintLspServerDescriptor(private val myProject: Project) : LspServerDescri
return true
}

fun isAvailable(vfile: VirtualFile): Boolean {
fun isAvailable(vfile: VirtualFile?): Boolean {
val config = GlintConfiguration.getInstance(myProject)
val pkg = config.getPackage()
val path = pkg.`package`.constantPackage?.systemIndependentPath
Expand Down
Loading