Merge branch 'main' into fix-empty-glint-config

Author: patricklx

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
 
+## v2024.3.7 (2025-03-21)
+
+#### :bug: Bug Fix
+* [#225](https://github.com/patricklx/intellij-emberjs-experimental/pull/225) limit ember template lint processing to correct files ([@patricklx](https://github.com/patricklx))
+
+#### :house: Internal
+* [#208](https://github.com/patricklx/intellij-emberjs-experimental/pull/208) Delete GlintStatusBarWidget ([@alexander-doroshko](https://github.com/alexander-doroshko))
+
+#### Committers: 2
+- Alexander Doroshko ([@alexander-doroshko](https://github.com/alexander-doroshko))
+- Patrick Pircher ([@patricklx](https://github.com/patricklx))
+
+
 
 
 

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 
 group = "com.emberjs"
-version = "2024.3.6"
+version = "2024.3.7"
 
 dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")

src/main/kotlin/com/emberjs/hbs/linter/ember-template-lint/TemplateLintConfiguration.kt

@@ -24,7 +24,7 @@ class TemplateLintConfiguration(project: Project) : JSLinterConfiguration<Templa
 
         return state.copy(
                 myInterpreterRef = this.myPackage.interpreter,
-                myTemplateLintPackage = constantPackage
+                myTemplateLintPackage = this.myPackage.getPackage().constantPackage
         )
     }
 

src/main/kotlin/com/emberjs/hbs/linter/ember-template-lint/TemplateLintExternalAnnotator.kt

@@ -32,7 +32,14 @@ class TemplateLintExternalAnnotator(onTheFly: Boolean = true) : JSLinterExternal
 
     override fun acceptPsiFile(file: PsiFile): Boolean {
         val f = file
-        return f.viewProvider is GtsFileViewProvider || f.viewProvider is HbFileViewProvider || file is JSFile
+        val pkg = TemplateLintConfiguration.getInstance(file.project).extendedState.state.templateLintPackage
+        val supportsJS = pkg.version?.let { it.major < 8 } ?: false
+        return (f.name.endsWith(".hbs")
+                || (f.name.endsWith(".js") && supportsJS)
+                || (f.name.endsWith(".ts") && supportsJS)
+                || f.name.endsWith(".gjs")
+                || f.name.endsWith(".gts"))
+                && !f.name.endsWith(".d.ts")
     }
 
     override fun annotate(input: JSLinterInput<TemplateLintState>): JSLinterAnnotationResult? {

src/main/kotlin/com/emberjs/hbs/linter/ember-template-lint/TemplateLintFixAction.kt

@@ -60,8 +60,15 @@ class TemplateLintFixAction : JSLinterFixAction(
     }
 
     override fun isFileAccepted(project: Project, file: VirtualFile): Boolean {
-        val f = PsiManager.getInstance(project).findFile(file)
-        return f?.viewProvider is GtsFileViewProvider || f?.viewProvider is HbFileViewProvider || f is JSFile
+        val f = PsiManager.getInstance(project).findFile(file) ?: return false
+        val pkg = TemplateLintConfiguration.getInstance(project).extendedState.state.templateLintPackage
+        val supportsJS = pkg.version?.let { it.major < 8 } ?: false
+        return (f.name.endsWith(".hbs")
+                || (f.name.endsWith(".js") && supportsJS)
+                || (f.name.endsWith(".ts") && supportsJS)
+                || f.name.endsWith(".gjs")
+                || f.name.endsWith(".gts"))
+                && !f.name.endsWith(".d.ts")
     }
 
     private fun fixFile(psiFile: PsiFile) {

src/main/kotlin/com/emberjs/hbs/linter/ember-template-lint/TemplateLintState.kt

@@ -6,7 +6,7 @@ import com.intellij.lang.javascript.linter.JSNpmLinterState
 
 data class TemplateLintState(
         private val myInterpreterRef: NodeJsInterpreterRef,
-        private val myTemplateLintPackage: NodePackage,
+        private val myTemplateLintPackage: NodePackage?,
         val isRunOnSave: Boolean,
 ) : JSNpmLinterState<TemplateLintState> {
 
@@ -23,12 +23,12 @@ data class TemplateLintState(
     }
 
     override fun getNodePackageRef(): NodePackageRef {
-        return this.myPackageRef
+        return this.myPackageRef!!
     }
 
     val templateLintPackage: NodePackage
         get() {
-            return this.myTemplateLintPackage
+            return this.myTemplateLintPackage!!
         }
 
     companion object {