fix: ClassNotFoundException: kotlin.test.Assertions

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog
 ===============================================================================
+## 2021.3.10
+- fix: ClassNotFoundException: kotlin.test.Assertions
+
 ## 2021.3.9
 - fix: sometimes no autocompletion for data tags (@xxx)
 

build.gradle.kts

@@ -5,15 +5,15 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.6.10"
+    id("org.jetbrains.kotlin.jvm") version "1.6.20"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "1.3.1"
+    id("org.jetbrains.intellij") version "1.5.2"
 }
 
 
 
 group = "com.emberjs"
-version = "2021.3.9"
+version = "2021.3.10"
 
 // Configure project's dependencies
 repositories {

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

@@ -45,7 +45,7 @@ class EmberAttributeDescriptor(val context: XmlTag, value: String, isYield: Bool
         if (ref != null) {
             val type = PsiTreeUtil.collectElementsOfType(ref.element, TypeScriptPropertySignatureImpl::class.java).firstOrNull()
             val types = (type?.jsType?.asRecordType()?.sourceElement as? TypeScriptUnionOrIntersectionTypeImpl?)?.types
-            val typesStr = types?.map { it.castSafelyTo<TypeScriptLiteralType>()?.let { it.innerText } }?.filterNotNull() ?: arrayListOf()
+            val typesStr = types?.map { (it as? TypeScriptLiteralType?)?.let { it.innerText } }?.filterNotNull() ?: arrayListOf()
             val isOptional = (type?.isOptional ?: true) || typesStr.isEmpty() || (typesStr.contains("undefined") || typesStr.contains("null") || typesStr.contains("*"))
             this.isRequired = !isOptional
             this.values = typesStr

src/main/kotlin/com/emberjs/configuration/serve/EmberServeConfigurationFactory.kt

@@ -16,6 +16,10 @@ class EmberServeConfigurationFactory(type: ConfigurationType) : ConfigurationFac
         return FACTORY_NAME
     }
 
+    override fun getId(): String {
+        return "Ember Serve"
+    }
+
     companion object {
         private val FACTORY_NAME = "Ember serve configuration factory"
     }

src/main/kotlin/com/emberjs/configuration/test/EmberTestConfigurationFactory.kt

@@ -12,7 +12,11 @@ class EmberTestConfigurationFactory(type: ConfigurationType) : ConfigurationFact
     }
 
     override fun getName(): String {
-        return FACTORY_NAME;
+        return FACTORY_NAME
+    }
+
+    override fun getId(): String {
+        return "Ember Test"
     }
 
     companion object {

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

@@ -0,0 +1,31 @@
+import com.intellij.ide.actionsOnSave.impl.ActionsOnSaveFileDocumentManagerListener.ActionOnSave
+import com.intellij.lang.javascript.linter.eslint.standardjs.StandardJSConfiguration
+import com.intellij.openapi.editor.Document
+import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.ProjectFileIndex
+
+class TemplateLintActionOnSave : ActionOnSave() {
+    override fun isEnabledForProject(project: Project): Boolean = isFixOnSaveEnabled(project)
+
+    override fun processDocuments(project: Project, documents: Array<out Document>) {
+        if (!this.isEnabledForProject(project)) return
+
+        val manager = FileDocumentManager.getInstance()
+        val fileIndex = ProjectFileIndex.getInstance(project)
+        val files = documents
+                .mapNotNull { manager.getFile(it) }
+                .filter { it.isInLocalFileSystem && fileIndex.isInContent(it) }
+                .toTypedArray()
+        if (files.isNotEmpty()) {
+            TemplateLintFixAction().processFiles(project, files, false, true)
+        }
+    }
+
+    companion object {
+        fun isFixOnSaveEnabled(project: Project): Boolean {
+            val config = TemplateLintConfiguration.getInstance(project)
+            return config.isEnabled && config.extendedState.state.isRunOnSave
+        }
+    }
+}

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

@@ -1,7 +1,10 @@
 
+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>(
@@ -25,4 +28,45 @@ 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/TemplateLintConfiguration.kt

@@ -5,40 +5,53 @@ 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")
 
-        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
+        return state.copy(
+                myInterpreterRef = this.myPackage.interpreter,
+                myTemplateLintPackage = constantPackage
+        )
     }
 
     override fun savePrivateSettings(state: TemplateLintState) {
         this.myPackage.force(state.interpreterRef, state.templateLintPackage)
     }
 
     override fun toXml(state: TemplateLintState): Element? {
-        return null
+        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)
     }
 
     override fun getDefaultState(): TemplateLintState {
-        return DEFAULT_STATE
+        return TemplateLintState.DEFAULT
     }
 
     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/TemplateLintEnabler.kt

@@ -1,6 +1,5 @@
 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
@@ -55,7 +54,7 @@ class TemplateLintEnabler : DirectoryProjectConfigurator {
         }
 
         fun templateLintEnabled(project: Project, enabled: Boolean) {
-            getInstance(project, TemplateLintConfiguration::class.java).isEnabled = enabled
+            TemplateLintConfiguration.getInstance(project).isEnabled = enabled
         }
 
         fun notifyEnabled(project: Project, dependency: String) {
@@ -72,4 +71,4 @@ class TemplateLintEnabler : DirectoryProjectConfigurator {
             }).notify(project)
         }
     }
-}
+}

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

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