Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not update CodeMinings in Eclipse if Live Bean CodeLens off

Browse Source
This commit is contained in:
BoykoAlex
2019-05-17 18:18:31 -04:00
parent a247958351
commit e05f66d5b7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Pivotal, Inc.
* Copyright (c) 2018, 2019 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
package org.springframework.tooling.ls.eclipse.commons;
import java.net.URL;
import java.time.Duration;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -59,7 +58,7 @@ public class LanguageServerCommonsActivator extends AbstractUIPlugin {
colorRegistry.put(PreferenceConstants.HIGHLIGHT_RANGE_COLOR_PREFS, derivedColor);
// No break - need to update highlights for the new color to take effect
case PreferenceConstants.HIGHLIGHT_CODELENS_PREFS:
new UpdateHighlights(null);
new UpdateHighlights(null, true);
break;
default:
}

17
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
View File

@@ -179,10 +179,12 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
static class UpdateHighlights extends UIJob {
private String target;
private boolean updateCodeMinings;
UpdateHighlights(String target) {
UpdateHighlights(String target, boolean updateCodeMinings) {
super("Update highlights");
this.target = target;
this.updateCodeMinings = updateCodeMinings;
setSystem(true);
schedule();
}
@@ -204,12 +206,12 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
if (target != null) {
HighlightParams highlightParams = currentHighlights.get(target);
if (Utils.isProperDocumentIdFor(doc, highlightParams.getDoc())) {
updateHighlightAnnotations(editor, sourceViewer, annotationModel, target);
updateHighlightAnnotations(editor, sourceViewer, annotationModel, target, updateCodeMinings);
}
} else {
URI uri = Utils.findDocUri(doc);
if (uri != null) {
updateHighlightAnnotations(editor, sourceViewer, annotationModel, uri.toString());
updateHighlightAnnotations(editor, sourceViewer, annotationModel, uri.toString(), updateCodeMinings);
}
}
}
@@ -220,14 +222,15 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
};
private static void updateHighlightAnnotations(IEditorPart editor, ISourceViewer sourceViewer,
IAnnotationModel annotationModel, String docUri) {
IAnnotationModel annotationModel, String docUri, boolean updateCodeMinings) {
boolean codeLensHighlightOn = isCodeLensHighlightOn();
if (annotationModel instanceof IAnnotationModelExtension) {
if (isCodeLensHighlightOn()) {
if (codeLensHighlightOn) {
addBootRangeHighlightSupport(editor, sourceViewer);
}
updateAnnotations(docUri, sourceViewer, (IAnnotationModelExtension) annotationModel);
}
if (sourceViewer instanceof ISourceViewerExtension5) {
if (updateCodeMinings && sourceViewer instanceof ISourceViewerExtension5) {
if (sourceViewer instanceof JavaSourceViewer) {
// JavaSourceViewer#updateCodeMinings() is overridden and doesn't do anything
try {
@@ -323,7 +326,7 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
List<CodeLens> oldCodelenses = oldHighligts==null ? ImmutableList.of() : oldHighligts.getCodeLenses();
if (!oldCodelenses.equals(highlights.getCodeLenses())) {
currentHighlights.put(target, highlights);
new UpdateHighlights(target);
new UpdateHighlights(target, isCodeLensHighlightOn());
}
}
}