TokenType is 0 based according to LSP spec (#964)

* TokenType is 0 based according to LSP spec
eclipse-lsp4e · Apr 16, 2024 · d4e5765 · d4e5765
1 parent 7b0c49c
commit d4e5765
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for language server bundle (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e.test;singleton:=true
-Bundle-Version: 0.15.11.qualifier
+Bundle-Version: 0.15.12.qualifier
 Fragment-Host: org.eclipse.lsp4e
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/org.eclipse.lsp4e.test/pom.xml b/org.eclipse.lsp4e.test/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>org.eclipse.lsp4e.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>0.15.11-SNAPSHOT</version>
+	<version>0.15.12-SNAPSHOT</version>
 
 	<properties>
 		<os-jvm-flags /> <!-- for the default case -->

diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/semanticTokens/SemanticTokensTestUtil.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/semanticTokens/SemanticTokensTestUtil.java
@@ -36,9 +36,9 @@ public class SemanticTokensTestUtil {
 
 	public static List<Integer> keywordSemanticTokens() {
 		List<List<Integer>> expectedTokens = new ArrayList<>();
-		expectedTokens.add(Arrays.asList(0,0,4,1,0));
-		expectedTokens.add(Arrays.asList(3,0,4,1,0));
-		expectedTokens.add(Arrays.asList(0,9,7,1,0));
+		expectedTokens.add(Arrays.asList(0,0,4,0,0));
+		expectedTokens.add(Arrays.asList(3,0,4,0,0));
+		expectedTokens.add(Arrays.asList(0,9,7,0,0));
 
 		return expectedTokens.stream().flatMap(List::stream).toList();
 	}

diff --git a/org.eclipse.lsp4e/META-INF/MANIFEST.MF b/org.eclipse.lsp4e/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true
-Bundle-Version: 0.18.7.qualifier
+Bundle-Version: 0.18.8.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.equinox.common;bundle-version="3.8.0",

diff --git a/org.eclipse.lsp4e/pom.xml b/org.eclipse.lsp4e/pom.xml
@@ -7,7 +7,7 @@
 	</parent>
 	<artifactId>org.eclipse.lsp4e</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>0.18.7-SNAPSHOT</version>
+	<version>0.18.8-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/...4e/src/org/eclipse/lsp4e/operations/semanticTokens/SemanticTokensDataStreamProcessor.java b/...4e/src/org/eclipse/lsp4e/operations/semanticTokens/SemanticTokensDataStreamProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 Avaloq Group AG.
+ * Copyright (c) 2022, 2024 Avaloq Group AG.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -106,7 +106,7 @@ public SemanticTokensDataStreamProcessor(@NonNull final Function<String, IToken>
 
 	private String tokenType(final Integer data, final List<String> legend) {
 		try {
-			return legend.get(data - 1);
+			return legend.get(data);
 		} catch (IndexOutOfBoundsException e) {
 			return null; // no match
 		}