From 2835925e8d765c93d7cc400d34ac079960d1b82c Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 31 Aug 2018 12:11:41 -0700 Subject: [PATCH] Fix Goto Symbols Dialog Was broken due to evolution in lsp4j api types. --- .../ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java index 1b34aa788..95e748b42 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java @@ -41,6 +41,7 @@ import org.eclipse.lsp4e.outline.SymbolsLabelProvider; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.SymbolInformation; +import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; @@ -241,6 +242,14 @@ public class GotoSymbolDialog extends PopupDialog { Object selected = ss.getFirstElement(); if (selected instanceof Match) { selected = ((Match)selected).value; + if (selected instanceof Either) { + Either either = (Either)selected; + if (either.isLeft()) { + selected = either.getLeft(); + } else { + selected = either.getRight(); + } + } if (selected instanceof SymbolInformation) { return (SymbolInformation)selected; }