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

PT #155474415: Adjust def links for Eclipse client

Browse Source
This commit is contained in:
BoykoAlex
2018-11-08 11:35:40 -05:00
parent ce8baaa80e
commit c884ae6bf7
10 changed files with 275 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
View File

@@ -103,8 +103,8 @@
<extension
point="org.eclipse.ui.handlers">
<handler
class="org.springframework.tooling.boot.ls.commands.OpenFullyQualifiedNameInEditor"
commandId="org.springframework.tooling.boot.ls.OpenJavaType">
class="org.springframework.tooling.boot.ls.commands.OpenJavaElementInEditor"
commandId="org.springframework.tooling.boot.ls.OpenJavaElement">
</handler>
<handler
class="org.springframework.tooling.boot.ls.commands.OpenResourceInEditor"
@@ -132,11 +132,16 @@
name="Spring Generic Text Editor">
</category>
<command
id="org.springframework.tooling.boot.ls.OpenJavaType"
name="Open Java Type in Editor">
id="org.springframework.tooling.boot.ls.OpenJavaElement"
name="Open Java Element in Editor">
<commandParameter
id="fqName"
name="fqName"
id="bindingKey"
name="bindingKey"
optional="false">
</commandParameter>
<commandParameter
id="projectName"
name="projectName"
optional="false">
</commandParameter>
</command>

138
eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/OpenFullyQualifiedNameInEditor.java
View File

@@ -1,138 +0,0 @@
/*******************************************************************************
* Copyright (c) 2018 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
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.tooling.boot.ls.commands;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.WorkingCopyOwner;
import org.eclipse.jdt.core.search.IJavaSearchConstants;
import org.eclipse.jdt.core.search.IJavaSearchScope;
import org.eclipse.jdt.core.search.SearchEngine;
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.core.search.TypeNameMatch;
import org.eclipse.jdt.core.search.TypeNameMatchRequestor;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.springframework.tooling.boot.ls.BootLanguageServerPlugin;
/**
* Command for opening Java type given by its fully qualified name in an editor
*
* @author Alex Boyko
*
*/
public class OpenFullyQualifiedNameInEditor extends AbstractHandler {
private static final String FQ_NAME = "fqName";
private static final String PROJECT_NAME = "projectName";
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
String fqName = event.getParameter(FQ_NAME);
String projectName = event.getParameter(PROJECT_NAME);
String packageName = "";
String typeName = fqName;
int idx = fqName.lastIndexOf('.');
if (idx >= 0) {
packageName = fqName.substring(0, idx);
typeName = idx < fqName.length() - 1 ? fqName.substring(idx + 1) : "";
}
if (!typeName.isEmpty()) {
SearchEngine engine= new SearchEngine((WorkingCopyOwner) null);
List<TypeNameMatch> matches = new ArrayList<>();
String searchedTypeName = getSearchedTypeName(typeName);
final boolean isInnerType = searchedTypeName != typeName;
TypeNameMatchRequestor requestor = new TypeNameMatchRequestor() {
@Override
public void acceptTypeNameMatch(TypeNameMatch match) {
if (isInnerType) {
if (match.getFullyQualifiedName().equals(fqName.replace("$", "."))) {
matches.add(match);
}
} else {
matches.add(match);
}
}
};
try {
IJavaSearchScope searchScope = createSearchScope(projectName);
engine.searchAllTypeNames(packageName.toCharArray(), SearchPattern.R_EXACT_MATCH,
searchedTypeName.toCharArray(), SearchPattern.R_EXACT_MATCH, IJavaSearchConstants.TYPE, searchScope,
requestor, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, new NullProgressMonitor());
if (matches.isEmpty()) {
BootLanguageServerPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, BootLanguageServerPlugin.ID, "Cannot find type: " + fqName));
} else {
if (matches.size() > 1) {
BootLanguageServerPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, BootLanguageServerPlugin.ID, "More than one type is defined for: " + fqName));
}
try {
IType type = matches.get(0).getType();
IEditorPart editorPart= JavaUI.openInEditor(type);
JavaUI.revealInEditor(editorPart, (IJavaElement)type);
} catch (JavaModelException ex) {
throw new ExecutionException("Error opening java element in editor", ex); //$NON-NLS-1$
} catch (PartInitException ex) {
throw new ExecutionException("Error opening java element in editor", ex); //$NON-NLS-1$
}
}
} catch (JavaModelException e) {
BootLanguageServerPlugin.getDefault().getLog().log(e.getStatus());
}
}
return null;
}
private String getSearchedTypeName(String typeName) {
int idx = typeName.lastIndexOf('$');
if (idx >= 0 && idx < typeName.length()) {
return typeName.substring(idx + 1);
}
return typeName;
}
private IJavaSearchScope createSearchScope(String projectName) {
try {
if (projectName != null) {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
if (project != null) {
IJavaProject javaProject = JavaCore.create(project);
if (javaProject != null) {
return SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject });
}
}
}
} catch (Throwable t) {
BootLanguageServerPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, BootLanguageServerPlugin.ID, "Failed creating Java search scope for project: " + projectName));
}
return SearchEngine.createWorkspaceScope();
}
}

73
eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/commands/OpenJavaElementInEditor.java Normal file
View File

@@ -0,0 +1,73 @@
/*******************************************************************************
* Copyright (c) 2018 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
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Pivotal, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.tooling.boot.ls.commands;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
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;
/**
* Command for opening Java type given by its fully qualified name in an editor
*
* @author Alex Boyko
*
*/
public class OpenJavaElementInEditor extends AbstractHandler {
private static final String BINDING_KEY = "bindingKey";
private static final String PROJECT_NAME = "projectName";
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
String bindingKey = event.getParameter(BINDING_KEY);
String projectName = event.getParameter(PROJECT_NAME);
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
if (project != null && bindingKey != null) {
IJavaProject javaProject = JavaCore.create(project);
if (javaProject != null) {
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;
try {
IEditorPart editorPart = JavaUI.openInEditor(member.getDeclaringType());
JavaUI.revealInEditor(editorPart, (IJavaElement)member);
} catch (PartInitException | JavaModelException e) {
throw new ExecutionException("Error opening java element in editor", e);
}
}
} else {
BootLanguageServerPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, BootLanguageServerPlugin.ID, "Cannot find project: " + projectName));
}
}
return null;
}
}