Skip to content

Commit f32b934

Browse files
committed
improve glint message
1 parent 8660101 commit f32b934

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
Changelog
44
===============================================================================
5+
## 2023.1.14
6+
- fix: improve glint message
7+
58
## 2023.1.13
69
- fix: null access assertion
710
- fix: gts template parsing issue

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313

1414

1515
group = "com.emberjs"
16-
version = "2023.1.13"
16+
version = "2023.1.14"
1717

1818
// Configure project's dependencies
1919
repositories {
@@ -32,7 +32,7 @@ intellij {
3232

3333
// see https://www.jetbrains.com/intellij-repository/releases/
3434
// and https://www.jetbrains.com/intellij-repository/snapshots/
35-
version.set("2023.1")
35+
version.set("2023.1.1")
3636
type.set("IU")
3737

3838
downloadSources.set(!System.getenv().containsKey("CI"))
@@ -42,7 +42,7 @@ intellij {
4242
// Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
4343
//
4444
// com.dmarcotte.handlebars: see https://plugins.jetbrains.com/plugin/6884-handlebars-mustache/versions
45-
plugins.set(listOf("JavaScript", "com.intellij.css", "org.jetbrains.plugins.yaml", "com.dmarcotte.handlebars:231.8109.91"))
45+
plugins.set(listOf("JavaScript", "com.intellij.css", "org.jetbrains.plugins.yaml", "com.dmarcotte.handlebars:231.8770.3"))
4646

4747
sandboxDir.set(project.rootDir.canonicalPath + "/.sandbox")
4848
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import com.intellij.psi.PsiElement
4242
import com.intellij.psi.PsiFile
4343
import com.intellij.psi.PsiManager
4444
import com.intellij.psi.impl.source.tree.LeafPsiElement
45-
import com.intellij.psi.util.elementType
4645
import com.intellij.psi.xml.XmlElement
4746
import org.eclipse.lsp4j.CompletionItem
4847
import org.eclipse.lsp4j.Diagnostic
@@ -279,7 +278,7 @@ class GlintAnnotationError(val diagnostic: Diagnostic, private val path: String?
279278

280279
override fun getAbsoluteFilePath(): String? = path
281280

282-
override fun getDescription(): String = diagnostic.source + " " + diagnostic.message
281+
override fun getDescription(): String = diagnostic.message + " (${diagnostic.source}:${diagnostic.code.get()})"
283282

284283
override fun getCategory() = when (diagnostic.severity) {
285284
DiagnosticSeverity.Error -> ERROR_CATEGORY

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class GlintLspServerDescriptor(private val myProject: Project) : LspServerDescri
8888
?: throw RuntimeException("glint is not installed")
8989
val file = glintPkg.findFileByRelativePath("bin/glint-language-server.js")
9090
?: throw RuntimeException("glint lsp was not found")
91-
commandLine.addParameter("--inspect")
91+
// commandLine.addParameter("--inspect")
9292
commandLine.addParameter(file.path)
9393
commandLine.addParameter("--stdio")
9494
commandLine.addParameter("--clientProcessId=" + OSProcessUtil.getCurrentProcessId().toString())

0 commit comments

Comments
 (0)