fix multiple etl errors (#240)

Author: patricklx

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

@@ -1,5 +1,7 @@
 
+import com.dmarcotte.handlebars.file.HbFileType
 import com.dmarcotte.handlebars.file.HbFileViewProvider
+import com.emberjs.gts.GtsFileType
 import com.emberjs.gts.GtsFileViewProvider
 import com.emberjs.icons.EmberIcons
 import com.intellij.lang.annotation.AnnotationHolder
@@ -37,8 +39,8 @@ class TemplateLintExternalAnnotator(onTheFly: Boolean = true) : JSLinterExternal
         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(".gjs") && f.fileType === HbFileType.INSTANCE)
+                || (f.name.endsWith(".gts") && f.fileType === HbFileType.INSTANCE))
                 && !f.name.endsWith(".d.ts")
     }
 
@@ -48,6 +50,7 @@ class TemplateLintExternalAnnotator(onTheFly: Boolean = true) : JSLinterExternal
             res = TemplateLintExternalRunner(this.isOnTheFly).highlight(input)
         } catch (ex: Exception) {
             res = null
+            println(ex)
         }
 
         val errors: MutableList<JSLinterError> = mutableListOf()

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

@@ -1,4 +1,5 @@
 
+import com.dmarcotte.handlebars.file.HbFileType
 import com.dmarcotte.handlebars.file.HbFileViewProvider
 import com.emberjs.gts.GtsFileViewProvider
 import com.emberjs.icons.EmberIcons
@@ -66,8 +67,8 @@ class TemplateLintFixAction : JSLinterFixAction(
         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(".gjs") && f.fileType == HbFileType.INSTANCE)
+                || (f.name.endsWith(".gts") && f.fileType == HbFileType.INSTANCE))
                 && !f.name.endsWith(".d.ts")
     }
 

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

@@ -7,24 +7,26 @@ class TemplateLintUtil {
     companion object {
         const val PACKAGE_NAME = "ember-template-lint"
         const val CLI_PACKAGE_NAME = "ember-cli-template-lint"
-        const val CONFIG_FILE_NAME = ".template-lintrc.js"
+        const val CONFIG_FILE_NAME = ".template-lintrc"
 
         fun findWorkingDirectory(fileToLint: VirtualFile): VirtualFile? {
             val parent = fileToLint.parent ?: return null
 
-            val configFile = JSLinterConfigFileUtil.findFileUpToFileSystemRoot(parent, CONFIG_FILE_NAME)
+            val configFile = JSLinterConfigFileUtil.findFileUpToFileSystemRoot(parent, "$CONFIG_FILE_NAME.js") ?:
+            JSLinterConfigFileUtil.findFileUpToFileSystemRoot(parent, "$CONFIG_FILE_NAME.cjs")
             val configFileParent = configFile?.parent
             return ObjectUtils.chooseNotNull(configFileParent, parent) as VirtualFile
         }
 
         fun getPossibleConfigs(dir: VirtualFile): Collection<VirtualFile?> {
             return SmartList(
-                    JSLinterConfigFileUtil.findFileUpToFileSystemRoot(dir, CONFIG_FILE_NAME)
-            )
+                JSLinterConfigFileUtil.findFileUpToFileSystemRoot(dir, "$CONFIG_FILE_NAME.js"),
+                JSLinterConfigFileUtil.findFileUpToFileSystemRoot(dir, "$CONFIG_FILE_NAME.cjs"),
+            ).filterNotNull()
         }
 
         fun isTemplateLintConfigFile(file: VirtualFile): Boolean {
-            return file.name == CONFIG_FILE_NAME
+            return file.name == "$CONFIG_FILE_NAME.js" || file.name == "$CONFIG_FILE_NAME.cjs"
         }
     }
 }