sync with master

Author: patricklx

build.gradle.kts

@@ -13,15 +13,16 @@ plugins {
 
 
 group = "com.emberjs"
-version = "2021.3.11"
+version = "2020.3.30"
 
 // Configure project's dependencies
 repositories {
     mavenCentral()
 }
 dependencies {
-    testImplementation("org.assertj:assertj-core:3.21.0")
-    testImplementation(kotlin("test"))
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+    testImplementation("org.assertj:assertj-core:3.22.0")
+    implementation(kotlin("test"))
 }
 
 // Configure gradle-intellij-plugin plugin.
@@ -31,7 +32,7 @@ intellij {
 
     // see https://www.jetbrains.com/intellij-repository/releases/
     // and https://www.jetbrains.com/intellij-repository/snapshots/
-    version.set("2021.3")
+    version.set("2020.3")
     type.set("IU")
 
     downloadSources.set(!System.getenv().containsKey("CI"))
@@ -41,7 +42,7 @@ intellij {
     // Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
     //
     // com.dmarcotte.handlebars: see https://plugins.jetbrains.com/plugin/6884-handlebars-mustache/versions
-    plugins.set(listOf("JavaScriptLanguage", "CSS", "yaml", "com.dmarcotte.handlebars:213.5744.190"))
+    plugins.set(listOf("JavaScriptLanguage", "CSS", "yaml", "com.dmarcotte.handlebars:203.5981.152"))
 
     sandboxDir.set(project.rootDir.canonicalPath + "/.sandbox")
 }
@@ -60,6 +61,9 @@ tasks {
         token.set(System.getenv("ORG_GRADLE_PROJECT_intellijPublishToken"))
     }
 
+    buildSearchableOptions {
+        onlyIf {false}
+    }
 }
 
 tasks.test {

src/main/kotlin/com/emberjs/EmberAttributeDescriptor.kt

@@ -105,7 +105,7 @@ class EmberAttributeDescriptor(val context: XmlTag, value: String, isYield: Bool
             return null
         }
         if (this.values.isNotEmpty() && value != null) {
-            if (value.startsWith("{{") || value.startsWith("\"{{")) {
+            if (value == "" || value.startsWith("{{") || value.startsWith("\"{{")) {
                 return null;
             }
             if (this.values.contains(value)) {

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

@@ -1,10 +1,7 @@
 
-import com.intellij.ide.actionsOnSave.ActionOnSaveBackedByOwnConfigurable
-import com.intellij.ide.actionsOnSave.ActionOnSaveContext
 import com.intellij.lang.javascript.linter.JSLinterConfigurable
 import com.intellij.lang.javascript.linter.JSLinterView
 import com.intellij.openapi.project.Project
-import com.intellij.ui.components.ActionLink
 
 class TemplateLintConfigurable(project: Project, fullModeDialog: Boolean = false) :
         JSLinterConfigurable<TemplateLintState>(
@@ -28,45 +25,4 @@ class TemplateLintConfigurable(project: Project, fullModeDialog: Boolean = false
         return TemplateLintBundle.message("hbs.lint.configurable.name")
     }
 
-    override fun getView(): TemplateLintView? {
-        return super.getView() as TemplateLintView?
-    }
-
-    class TemplateLintOnSaveActionInfo(context: ActionOnSaveContext) :
-        ActionOnSaveBackedByOwnConfigurable<TemplateLintConfigurable>(
-            context, ID, TemplateLintConfigurable::class.java) {
-
-        override fun getActionOnSaveName(): String {
-            return TemplateLintBundle.message("hbs.lint.run.on.save.checkbox.on.actions.on.save.page")
-        }
-
-        override fun setActionOnSaveEnabled(configurable: TemplateLintConfigurable, enabled: Boolean) {
-            val view = configurable.view
-            if (view != null) {
-                view.myRunOnSaveCheckBox.isSelected = enabled
-            }
-        }
-
-        override fun isApplicableAccordingToStoredState(): Boolean {
-            return TemplateLintConfiguration.getInstance(this.project).isEnabled
-        }
-
-        override fun isApplicableAccordingToUiState(configurable: TemplateLintConfigurable): Boolean {
-            val checkbox = configurable.view?.myRunOnSaveCheckBox
-            return checkbox != null && checkbox.isVisible && checkbox.isEnabled
-        }
-
-        override fun isActionOnSaveEnabledAccordingToStoredState(): Boolean {
-            return TemplateLintActionOnSave.isFixOnSaveEnabled(this.project)
-        }
-
-        override fun isActionOnSaveEnabledAccordingToUiState(configurable: TemplateLintConfigurable): Boolean {
-            val checkbox = configurable.view?.myRunOnSaveCheckBox
-            return checkbox != null && checkbox.isVisible && checkbox.isEnabled && checkbox.isSelected
-        }
-
-        override fun getActionLinks(): MutableList<out ActionLink> {
-            return mutableListOf(createGoToPageInSettingsLink(ID))
-        }
-    }
-}
+}

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

@@ -5,53 +5,40 @@ import com.intellij.lang.javascript.linter.JSLinterInspection
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.JDOMExternalizerUtil
 import org.jdom.Element
+import kotlin.test.assertNotNull
 
 @State(name = "TemplateLintConfiguration", storages = [Storage("emberLinters/templatelint.xml")])
 class TemplateLintConfiguration(project: Project) : JSLinterConfiguration<TemplateLintState>(project) {
+    private val DEFAULT_STATE = TemplateLintState()
     private val myPackage: JSLinterPackage = JSLinterPackage(project, TemplateLintUtil.PACKAGE_NAME)
 
     override fun loadPrivateSettings(state: TemplateLintState): TemplateLintState {
         this.myPackage.readOrDetect()
         val constantPackage = myPackage.getPackage().constantPackage
-                ?: throw AssertionError("TemplateLint does not support non-constant node package refs")
 
-        return state.copy(
-                myInterpreterRef = this.myPackage.interpreter,
-                myTemplateLintPackage = constantPackage
-        )
+        assertNotNull(constantPackage, "TemplateLint does not support non-constant node package refs")
+
+        return TemplateLintState(this.myPackage.interpreter, constantPackage)
+    }
+
+    override fun fromXml(element: Element): TemplateLintState {
+        return this.defaultState
     }
 
     override fun savePrivateSettings(state: TemplateLintState) {
         this.myPackage.force(state.interpreterRef, state.templateLintPackage)
     }
 
     override fun toXml(state: TemplateLintState): Element? {
-        if (state == defaultState) {
-            return null
-        }
-        val parent = Element(TemplateLintUtil.PACKAGE_NAME)
-        JDOMExternalizerUtil.writeField(parent, TAG_RUN_ON_SAVE, state.isRunOnSave.toString(), false.toString())
-        return parent
-    }
-
-    override fun fromXml(element: Element): TemplateLintState {
-        val isRunOnSave = JDOMExternalizerUtil.readField(element, TAG_RUN_ON_SAVE, false.toString()).toBoolean()
-        return this.defaultState.copy(isRunOnSave = isRunOnSave)
+        return null
     }
 
     override fun getDefaultState(): TemplateLintState {
-        return TemplateLintState.DEFAULT
+        return DEFAULT_STATE
     }
 
     override fun getInspectionClass(): Class<out JSLinterInspection> {
         return TemplateLintInspection::class.java
     }
-
-    companion object {
-        private const val TAG_RUN_ON_SAVE = "fix-on-save"
-
-        fun getInstance(project: Project) = getInstance(project, TemplateLintConfiguration::class.java)
-    }
-}
+}

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

@@ -1,5 +1,6 @@
 import com.intellij.javascript.nodejs.PackageJsonData
 import com.intellij.lang.javascript.JSBundle
+import com.intellij.lang.javascript.linter.JSLinterConfiguration.getInstance
 import com.intellij.lang.javascript.linter.JSLinterGuesser
 import com.intellij.lang.javascript.linter.JSLinterUtil
 import com.intellij.notification.Notification
@@ -54,7 +55,7 @@ class TemplateLintEnabler : DirectoryProjectConfigurator {
         }
 
         fun templateLintEnabled(project: Project, enabled: Boolean) {
-            TemplateLintConfiguration.getInstance(project).isEnabled = enabled
+            getInstance(project, TemplateLintConfiguration::class.java).isEnabled = enabled
         }
 
         fun notifyEnabled(project: Project, dependency: String) {
@@ -71,4 +72,4 @@ class TemplateLintEnabler : DirectoryProjectConfigurator {
             }).notify(project)
         }
     }
-}
+}

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

@@ -27,7 +27,7 @@ class TemplateLintExternalAnnotator(onTheFly: Boolean = true) : JSLinterExternal
     }
 
     override fun annotate(input: JSLinterInput<TemplateLintState>): JSLinterAnnotationResult? {
-        return TemplateLintExternalRunner(this.isOnTheFly).highlight(input)
+        return TemplateLintExternalRunner(this.isOnTheFly).execute(input)
     }
 
     override fun apply(file: PsiFile, annotationResult: JSLinterAnnotationResult?, holder: AnnotationHolder) {
@@ -72,4 +72,4 @@ class TemplateLintExternalAnnotator(onTheFly: Boolean = true) : JSLinterExternal
 
         return null
     }
-}
+}

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

@@ -27,14 +27,15 @@ class TemplateLintExternalRunner(private val myIsOnTheFly: Boolean = false) {
     companion object {
         private val LOG = Logger.getInstance(TemplateLintExternalRunner::class.java)
 
-        private fun templateLint(input: JSLinterInput<TemplateLintState>, sessionData: TemplateLintSessionData): JSLinterAnnotationResult {
+        private fun templateLint(input: JSLinterInput<TemplateLintState>, sessionData: TemplateLintSessionData): JSLinterAnnotationResult? {
             val startNanoTime = System.nanoTime()
             val result = runProcess(input, sessionData)
             logEnd(startNanoTime, result.errors.size)
             return result
         }
 
         private fun runProcess(input: JSLinterInput<TemplateLintState>, sessionData: TemplateLintSessionData): JSLinterAnnotationResult {
+            var result: JSLinterAnnotationResult?
             try {
                 val commandLine = createCommandLine(sessionData)
                 logStart(sessionData, commandLine)
@@ -62,13 +63,14 @@ class TemplateLintExternalRunner(private val myIsOnTheFly: Boolean = false) {
                         }
                         return createFileLevelWarning(stdout, input, commandLine, processHandler, output)
                     }
-                    return JSLinterAnnotationResult.createLinterResult(input, errors, null as VirtualFile?)
+                    result = JSLinterAnnotationResult.createLinterResult(input, errors, null as VirtualFile?)
                 } catch (exception: Exception) {
                     return createFileLevelWarning(exception.message!!, input, commandLine, processHandler, output)
                 }
             } catch (executionException: ExecutionException) {
                 return createFileLevelWarning(executionException.message!!, input)
             }
+            return result!!
         }
 
         @Throws(IOException::class)
@@ -127,10 +129,6 @@ class TemplateLintExternalRunner(private val myIsOnTheFly: Boolean = false) {
             }
             // TODO: else case?
 
-            if (sessionData.fix) {
-                commandLine.addParameter("--fix")
-            }
-
             NodeCommandLineConfigurator
                     .find(sessionData.interpreter)
                     .configure(commandLine)
@@ -172,15 +170,7 @@ class TemplateLintExternalRunner(private val myIsOnTheFly: Boolean = false) {
         }
     }
 
-    fun highlight(input: JSLinterInput<TemplateLintState>): JSLinterAnnotationResult? {
-        return execute(input, false)
-    }
-
-    fun fixFile(input: JSLinterInput<TemplateLintState>) {
-        execute(input, true)
-    }
-
-    private fun execute(input: JSLinterInput<TemplateLintState>, fix: Boolean): JSLinterAnnotationResult? {
+    fun execute(input: JSLinterInput<TemplateLintState>): JSLinterAnnotationResult? {
         val fileToLint = input.virtualFile
         return if (fileToLint.isValid && fileToLint.parent != null) {
             try {
@@ -214,7 +204,7 @@ class TemplateLintExternalRunner(private val myIsOnTheFly: Boolean = false) {
                                 JSLinterAnnotationResult.create(input, error, null as VirtualFile?)
                             } else {
                                 val templateLintPackage = TemplateLintPackage.fromNodePackage(input.project, state.templateLintPackage)
-                                val sessionData = TemplateLintSessionData(interpreter, templateLintPackage, workingDirectory, fileToLint, input.fileContent, fix)
+                                val sessionData = TemplateLintSessionData(interpreter, templateLintPackage, workingDirectory, fileToLint, input.fileContent)
                                 templateLint(input, sessionData)
                             }
                         }
@@ -227,4 +217,4 @@ class TemplateLintExternalRunner(private val myIsOnTheFly: Boolean = false) {
             null
         }
     }
-}
+}