add model to args

fix an issue with starting glint

Author: patricklx

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog
 ===============================================================================
+## 2022.2.15
+- improvement: add @model lookup for controllers
+
 ## 2022.2.14
 - improvement: better lookup for related files of templates and controller
 

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 
 
 group = "com.emberjs"
-version = "2022.2.14"
+version = "2022.2.15"
 
 // Configure project's dependencies
 repositories {

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

@@ -8,6 +8,8 @@ import com.intellij.javascript.nodejs.interpreter.NodeJsInterpreterRef
 import com.intellij.javascript.nodejs.reference.NodeModuleManager
 import com.intellij.lsp.*
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.application.Application
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
@@ -59,14 +61,17 @@ class GlintLspServerDescriptor(private val myProject: Project) : LspServerDescri
                 .withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE)
                 .withWorkDirectory(workDirectory)
 
-        val glintPkg = NodeModuleManager.getInstance(project).collectVisibleNodeModules(workingDir).find { it.name == "@glint/core" }?.virtualFile
-                ?: throw RuntimeException("glint is not installed")
-        val file = glintPkg.findFileByRelativePath("bin/glint-language-server.js")
-                ?: throw RuntimeException("glint lsp was not found")
-        //commandLine.addParameter("--inspect")
-        commandLine.addParameter(file.path)
-        commandLine.addParameter("--stdio")
-        commandLine.addParameter("--clientProcessId=" + OSProcessUtil.getCurrentProcessId().toString())
+        ApplicationManager.getApplication().runReadAction {
+            val glintPkg = NodeModuleManager.getInstance(project).collectVisibleNodeModules(workingDir).find { it.name == "@glint/core" }?.virtualFile
+                    ?: throw RuntimeException("glint is not installed")
+            val file = glintPkg.findFileByRelativePath("bin/glint-language-server.js")
+                    ?: throw RuntimeException("glint lsp was not found")
+            //commandLine.addParameter("--inspect")
+            commandLine.addParameter(file.path)
+            commandLine.addParameter("--stdio")
+            commandLine.addParameter("--clientProcessId=" + OSProcessUtil.getCurrentProcessId().toString())
+        }
+
 
         NodeCommandLineConfigurator
                 .find(NodeJsInterpreterRef.createProjectRef().resolve(project)!!)

src/main/kotlin/com/emberjs/hbs/HbsLocalCompletion.kt

@@ -300,6 +300,7 @@ class HbsLocalCompletion : CompletionProvider<CompletionParameters>() {
             resolve(parameters.position.parent.prevSibling?.prevSibling, result)
             val items = languageService.getService(element.originalVirtualFile!!)?.updateAndGetCompletionItems(element.originalVirtualFile!!, parameters)?.get() ?: arrayListOf()
             result.addAllElements(items.map { it.intoLookupElement() })
+            return
         }
 
         if (element.parent is HbData) {