Return null semantic tokens by default rather than empty list

spring-projects · May 9, 2024 · 8f691f3 · 8f691f3
1 parent 5385c5f
commit 8f691f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ingframework/ide/vscode/commons/languageserver/semantic/tokens/SemanticTokensHandler.java b/...ingframework/ide/vscode/commons/languageserver/semantic/tokens/SemanticTokensHandler.java
@@ -24,15 +24,15 @@ public interface SemanticTokensHandler {
 	SemanticTokensWithRegistrationOptions getCapability();
 
 	default SemanticTokens semanticTokensFull(SemanticTokensParams params, CancelChecker cancelChecker) {
-		return new SemanticTokens();
+		return null;
 	}
 
 	default Either<SemanticTokens, SemanticTokensDelta> semanticTokensFullDelta(SemanticTokensDeltaParams params, CancelChecker cancelChecker) {
-		return Either.forLeft(new SemanticTokens());
+		return null;
 	}
 
 	default SemanticTokens semanticTokensRange(SemanticTokensRangeParams params, CancelChecker cancelChecker) {
-		return new SemanticTokens();
+		return null;
 	}
 
 }
diff --git a/...rver/src/main/java/org/springframework/ide/vscode/boot/java/JdtSemanticTokensHandler.java b/...rver/src/main/java/org/springframework/ide/vscode/boot/java/JdtSemanticTokensHandler.java
@@ -69,15 +69,16 @@ public SemanticTokens semanticTokensFull(SemanticTokensParams params, CancelChec
 				return cuCache.withCompilationUnit(jp, URI.create(params.getTextDocument().getUri()), cu -> computeTokens(applicableTokenProviders, jp, cu));
 			}
 		}
-		return new SemanticTokens();
+		return null;
 	}
 
 	private SemanticTokens computeTokens(List<JdtSemanticTokensProvider> applicableTokenProviders, IJavaProject jp, CompilationUnit cu) {
 		if (cu == null) {
-			return new SemanticTokens();
+			return null;
 		}
 		List<SemanticTokenData> tokensData = applicableTokenProviders.stream().map(tp -> tp.computeTokens(jp, cu)).flatMap(t -> t.stream()).collect(Collectors.toList());
-		return new SemanticTokens(SemanticTokensUtils.mapTokensDataToLsp(tokensData, legend, offset -> cu.getLineNumber(offset) - 1, cu::getColumnNumber));
+		List<Integer> toLsp = SemanticTokensUtils.mapTokensDataToLsp(tokensData, legend, offset -> cu.getLineNumber(offset) - 1, cu::getColumnNumber);
+		return toLsp.isEmpty() ? null : new SemanticTokens(toLsp);
 	}
 
 }