enable glint config and use specified path

Author: patricklx

src/main/kotlin/com/emberjs/glint/GlintLspSupportProvider.kt

@@ -1,6 +1,7 @@
 package com.emberjs.glint
 
 import com.dmarcotte.handlebars.file.HbFileType
+import com.emberjs.gts.GlintConfiguration
 import com.emberjs.gts.GtsFileType
 import com.emberjs.utils.emberRoot
 import com.emberjs.utils.parentEmberModule
@@ -26,20 +27,25 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.NlsSafe
+import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.isFile
 import com.intellij.platform.lsp.api.LspServerDescriptor
 import com.intellij.platform.lsp.api.LspServerManager
 import com.intellij.platform.lsp.api.LspServerSupportProvider
+import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
+import com.intellij.psi.impl.file.impl.FileManager
 import com.intellij.util.FileContentUtil
 import org.eclipse.lsp4j.ServerInfo
 import java.io.File
+import java.net.URL
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 import java.util.*
 import kotlin.concurrent.schedule
+import kotlin.io.path.Path
 
 class GlintLspSupportProvider : LspServerSupportProvider {
     var willStart = false
@@ -93,6 +99,15 @@ class GlintLspServerDescriptor(private val myProject: Project) : LspServerDescri
     }
 
     fun isAvailable(vfile: VirtualFile): Boolean {
+        val config = GlintConfiguration.getInstance(myProject)
+        val pkg = config.getPackage()
+        val path = pkg.`package`.constantPackage?.systemIndependentPath
+        if (path != null && File(path).exists()) {
+            val f = VfsUtil.findFile(Path(path), true)
+            if (f != null) {
+                return true
+            }
+        }
         var f: VirtualFile? = vfile
         while (true) {
             if (f?.isFile == true) {
@@ -133,6 +148,12 @@ class GlintLspServerDescriptor(private val myProject: Project) : LspServerDescri
         val workingDir = lastDir!!
         val workDirectory = VfsUtilCore.virtualToIoFile(workingDir)
         var path = workDirectory.path
+        val config = GlintConfiguration.getInstance(myProject)
+        val pkg = config.getPackage()
+        val pkgPath = pkg.`package`.constantPackage?.systemIndependentPath
+        if (pkgPath != null && File(pkgPath).exists()) {
+            path = File(pkgPath).parentFile.parentFile.path
+        }
         path = path.replace("\\", "/")
         this.isWsl = false
         if (path.startsWith("//wsl.localhost") || path.startsWith("//wsl\$")) {

src/main/kotlin/com/emberjs/gts/GlintExternalAnnotator.kt

@@ -1,11 +1,13 @@
 package com.emberjs.gts
 
+import TemplateLintState
 import com.dmarcotte.handlebars.file.HbFileViewProvider
 import com.emberjs.glint.GlintTypeScriptService
 import com.emberjs.icons.EmberIcons
 import com.intellij.CommonBundle
 import com.intellij.ide.actionsOnSave.ActionOnSaveBackedByOwnConfigurable
 import com.intellij.ide.actionsOnSave.ActionOnSaveContext
+import com.intellij.ide.actionsOnSave.ActionsOnSaveConfigurable
 import com.intellij.javascript.nodejs.interpreter.NodeJsInterpreterField
 import com.intellij.javascript.nodejs.interpreter.NodeJsInterpreterRef
 import com.intellij.javascript.nodejs.util.JSLinterPackage
@@ -27,12 +29,17 @@ import com.intellij.psi.PsiFile
 import com.intellij.reference.SoftReference
 import com.intellij.ui.components.ActionLink
 import com.intellij.util.containers.ContainerUtil
+import com.intellij.util.ui.FormBuilder
+import com.intellij.util.ui.SwingHelper
 import org.jdom.Element
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
+import java.awt.Component
 import java.lang.ref.Reference
 import java.util.*
+import javax.swing.BorderFactory
 import javax.swing.JComponent
+import javax.swing.JPanel
 
 
 class GLintBundle {
@@ -88,7 +95,7 @@ data class GlintState(
     companion object {
         val DEFAULT = GlintState(
             NodeJsInterpreterRef.createProjectRef(),
-            NodePackage("@glint/core"))
+            NodePackage(""))
     }
 }
 
@@ -97,8 +104,13 @@ data class GlintState(
 @State(name = "GlintConfiguration", storages = [Storage("emberLinters/glint.xml")])
 class GlintConfiguration(project: Project) : JSLinterConfiguration<GlintState>(project) {
     private val myPackage: JSLinterPackage = JSLinterPackage(project, "@glint/core")
+
+    public fun getPackage(): JSLinterPackage {
+        return myPackage
+    }
+
     override fun savePrivateSettings(state: GlintState) {
-        this.myPackage.force(NodePackageRef.create(state.interpreterRef.referenceName))
+        this.myPackage.force(NodePackageRef.create(state.templateLintPackage))
     }
 
     override fun loadPrivateSettings(state: GlintState): GlintState {
@@ -135,6 +147,10 @@ class GlintConfiguration(project: Project) : JSLinterConfiguration<GlintState>(p
         return parent
     }
 
+    companion object {
+        fun getInstance(project: Project) = getInstance(project, GlintConfiguration::class.java)
+    }
+
 }
 
 
@@ -152,24 +168,39 @@ class GlintConfigurable(project: Project, fullModeDialog: Boolean = false) :
         return ID
     }
 
-    override fun createView(): JSLinterView<GlintState> {
-        return object : JSLinterView<GlintState> {
+    override fun createView(): JSLinterBaseView<GlintState> {
+        return object : JSLinterBaseView<GlintState>() {
             private val myNodeInterpreterField: NodeJsInterpreterField = NodeJsInterpreterField(project, false)
             private val myTemplateLintPackageField: NodePackageField = NodePackageField(myNodeInterpreterField,
                 "@glint/core"
             )
-            var state: ExtendedLinterState<GlintState> = ExtendedLinterState(false, GlintState(
-                myNodeInterpreterField.interpreterRef, myTemplateLintPackageField.selectedRef.constantPackage!!))
-            override fun getComponent(): JComponent? {
-                return null
+
+            private val panel = FormBuilder.createFormBuilder()
+                .setHorizontalGap(10)
+                .setVerticalGap(4)
+                .setFormLeftIndent(10)
+                .addLabeledComponent(GLintBundle.message("g.lint.node.path.label"), myNodeInterpreterField)
+                .addLabeledComponent(GLintBundle.message("g.lint.package.label"), this.myTemplateLintPackageField)
+                .panel
+
+            private val myCenterPanel: JPanel = SwingHelper.wrapWithHorizontalStretch(panel).apply {
+                this.border = BorderFactory.createEmptyBorder(5, 0, 0, 0)
+            }
+
+            override fun createCenterComponent(): Component {
+                return myCenterPanel
             }
 
-            override fun getExtendedState(): ExtendedLinterState<GlintState> {
-                return state
+            override fun getState(): GlintState {
+                return GlintState(
+                    myNodeInterpreterField.interpreterRef,
+                    myTemplateLintPackageField.selected
+                )
             }
 
-            override fun setExtendedState(p0: ExtendedLinterState<GlintState>) {
-                state = p0
+            override fun setState(state: GlintState) {
+                myNodeInterpreterField.interpreterRef = state.interpreterRef
+                myTemplateLintPackageField.selected = state.nodePackageRef.constantPackage ?: GlintState.DEFAULT.nodePackageRef.constantPackage!!
             }
 
         }