Protect against NPE on Semantic Highlighting.

robocorp · Apr 14, 2021 · b6b0b71 · b6b0b71
1 parent a9656c1
commit b6b0b71
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/robotframework-intellij/src/main/java/robocorp/lsp/intellij/FeatureSemanticHighlighting.java b/robotframework-intellij/src/main/java/robocorp/lsp/intellij/FeatureSemanticHighlighting.java
@@ -60,7 +60,11 @@ public void beforeDocumentChange(@NotNull DocumentEvent event) {
  document.addDocumentListener(listener);
  }
  try {
- return Pair.create(semanticTokens.get(Timeouts.getSemanticHighlightingTimeout(), TimeUnit.SECONDS), connection);
+ SemanticTokens tokens = semanticTokens.get(Timeouts.getSemanticHighlightingTimeout(), TimeUnit.SECONDS);
+ if (tokens == null) {
+ return null;
+ }
+ return Pair.create(tokens, connection);
  } catch (ProcessCanceledException | CompletionException | CancellationException | InterruptedException ignored) {
  // Cancelled (InterruptedException is thrown when completion.cancel(true) is called from another thread).
  return null;
@@ -78,6 +82,9 @@ public void beforeDocumentChange(@NotNull DocumentEvent event) {
  @Override
  public void apply(@NotNull PsiFile
  file, Pair<SemanticTokens, EditorLanguageServerConnection> pair, @NotNull AnnotationHolder holder) {
+ if (pair == null) {
+ return;
+ }
  ILSPEditor editor = pair.second.getEditor();
  if (editor == null) {
  return;