From b933605721d2ace731fffb208a55441f64e6f234 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 29 Nov 2018 18:02:02 -0500 Subject: [PATCH] Fix navigating to java element in an editor for Eclipse client --- .../boot/ls/commands/OpenJavaElementInEditor.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/OpenJavaElementInEditor.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/OpenJavaElementInEditor.java index 296700c1b..ad6dd2115 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/OpenJavaElementInEditor.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/OpenJavaElementInEditor.java @@ -19,11 +19,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.JavaUI; -import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.springframework.tooling.boot.ls.BootLanguageServerPlugin; import org.springframework.tooling.ls.eclipse.commons.Utils; @@ -52,12 +50,9 @@ public class OpenJavaElementInEditor extends AbstractHandler { IJavaElement element = Utils.findElement(javaProject, bindingKey); if (element == null) { BootLanguageServerPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, BootLanguageServerPlugin.ID, "Cannot find element: " + bindingKey)); - } - if (element instanceof IMember) { - IMember member = (IMember) element; + } else { try { - IEditorPart editorPart = JavaUI.openInEditor(member.getDeclaringType()); - JavaUI.revealInEditor(editorPart, (IJavaElement)member); + JavaUI.openInEditor(element); } catch (PartInitException | JavaModelException e) { throw new ExecutionException("Error opening java element in editor", e); }