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

update to recent changes in lsp4e around symbol label providers

Browse Source
This commit is contained in:
Martin Lippert
2019-09-12 12:45:09 +02:00
parent eeb8ef4188
commit f7f30ef074
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
View File

@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.gotosymbol;singleton
Bundle-Version: 4.4.0.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.lsp4e;bundle-version="0.9.0",
org.eclipse.lsp4e;bundle-version="0.12.0",
org.eclipse.lsp4j;bundle-version="0.6.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0",
org.eclipse.jface.text;bundle-version="3.12.0",

7
eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java
View File

@@ -24,8 +24,8 @@ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.resource.JFaceColors;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
import org.eclipse.jface.viewers.ISelection;
@@ -55,7 +55,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.TreeItem;
@@ -103,13 +102,13 @@ public class GotoSymbolDialog extends PopupDialog {
private Stylers stylers;
private SymbolsLabelProvider symbolsLabelProvider;
public GotoSymbolsLabelProvider(Font base) {
public GotoSymbolsLabelProvider(Font base) {
stylers = new Stylers(base);
boolean showSymbolsLabelProviderLocation = false; /* dont show full location. we show relative location in our own implementation below */
boolean showKindInformation = false;
symbolsLabelProvider = new SymbolsLabelProvider(showSymbolsLabelProviderLocation , showKindInformation) {
@Override
protected int getMaxSeverity(IResource resource, Range range)
protected int getMaxSeverity(IResource resource, IDocument doc, Range range)
throws CoreException, BadLocationException {
int maxSeverity = -1;
for (IMarker marker : resource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO)) {