Skip to content

Commit 2e0a58e

Browse files
committed
fix: Handle Diagnostic with null severity as error
1 parent d47112f commit 2e0a58e

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

org.eclipse.lsp4e/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation)
44
Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true
5-
Bundle-Version: 0.19.6.qualifier
5+
Bundle-Version: 0.19.7.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-21
77
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
88
org.eclipse.equinox.common;bundle-version="3.8.0",

org.eclipse.lsp4e/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<artifactId>org.eclipse.lsp4e</artifactId>
1212
<packaging>eclipse-plugin</packaging>
13-
<version>0.19.6-SNAPSHOT</version>
13+
<version>0.19.7-SNAPSHOT</version>
1414

1515
<build>
1616
<plugins>

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/diagnostics/DiagnosticAnnotation.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919

2020
class DiagnosticAnnotation extends Annotation {
2121

22+
private static final String TYPE_INFO = "org.eclipse.ui.workbench.texteditor.info"; //$NON-NLS-1$
23+
private static final String TYPE_WARNING = "org.eclipse.ui.workbench.texteditor.warning"; //$NON-NLS-1$
24+
private static final String TYPE_ERROR = "org.eclipse.ui.workbench.texteditor.error"; //$NON-NLS-1$
2225
private final Diagnostic diagnostic;
2326
private final Function<Diagnostic, String> textComputer;
2427

@@ -30,10 +33,11 @@ public DiagnosticAnnotation(Diagnostic diagnostic, Function<Diagnostic, String>
3033
@Override
3134
public String getType() {
3235
return switch (diagnostic.getSeverity()) {
33-
case Error -> "org.eclipse.ui.workbench.texteditor.error"; //$NON-NLS-1$
34-
case Warning -> "org.eclipse.ui.workbench.texteditor.warning"; //$NON-NLS-1$
35-
case Information -> "org.eclipse.ui.workbench.texteditor.info"; //$NON-NLS-1$
36-
case Hint -> "org.eclipse.ui.workbench.texteditor.info"; //$NON-NLS-1$
36+
case Error -> TYPE_ERROR;
37+
case Warning -> TYPE_WARNING;
38+
case Information -> TYPE_INFO;
39+
case Hint -> TYPE_INFO;
40+
case null -> TYPE_ERROR;
3741
};
3842
}
3943

0 commit comments

Comments
 (0)