-
Notifications
You must be signed in to change notification settings - Fork 406
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improvements to code action performance (#3322)
- React to cancellation requests while computing code actions - Avoid expensive calls for "Inline" & "Change Signature" refactorings - Ensure the active source file is updated when between multiple opened files Signed-off-by: Snjezana Peco <[email protected]>
- Loading branch information
Showing
11 changed files
with
355 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/ChangeSignatureInfoHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2016-2024 Red Hat Inc. and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Red Hat Inc. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.jdt.ls.core.internal.handlers; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.core.runtime.CoreException; | ||
| import org.eclipse.core.runtime.IProgressMonitor; | ||
| import org.eclipse.core.runtime.NullProgressMonitor; | ||
| import org.eclipse.jdt.core.ICompilationUnit; | ||
| import org.eclipse.jdt.core.IJavaElement; | ||
| import org.eclipse.jdt.core.IMethod; | ||
| import org.eclipse.jdt.core.dom.ASTNode; | ||
| import org.eclipse.jdt.core.dom.CompilationUnit; | ||
| import org.eclipse.jdt.core.dom.IMethodBinding; | ||
| import org.eclipse.jdt.core.dom.MethodDeclaration; | ||
| import org.eclipse.jdt.core.manipulation.CoreASTProvider; | ||
| import org.eclipse.jdt.internal.corext.refactoring.ExceptionInfo; | ||
| import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo; | ||
| import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTesterCore; | ||
| import org.eclipse.jdt.internal.corext.refactoring.structure.ChangeSignatureProcessor; | ||
| import org.eclipse.jdt.internal.corext.util.JdtFlags; | ||
| import org.eclipse.jdt.ls.core.internal.JDTUtils; | ||
| import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin; | ||
| import org.eclipse.jdt.ls.core.internal.handlers.ChangeSignatureHandler.MethodException; | ||
| import org.eclipse.jdt.ls.core.internal.handlers.ChangeSignatureHandler.MethodParameter; | ||
| import org.eclipse.jdt.ls.core.internal.text.correction.ChangeSignatureInfo; | ||
| import org.eclipse.jdt.ls.core.internal.text.correction.CodeActionUtility; | ||
| import org.eclipse.jdt.ui.text.java.IInvocationContext; | ||
| import org.eclipse.lsp4j.CodeActionParams; | ||
| import org.eclipse.ltk.core.refactoring.RefactoringStatus; | ||
|
|
||
| public class ChangeSignatureInfoHandler { | ||
|
|
||
| private static final String CANNOT_CHANGE_SIGNATURE = "Cannot change signature."; | ||
|
|
||
| public static ChangeSignatureInfo getChangeSignatureInfo(CodeActionParams params, IProgressMonitor monitor) { | ||
| if (monitor.isCanceled()) { | ||
| return null; | ||
| } | ||
| final ICompilationUnit unit = JDTUtils.resolveCompilationUnit(params.getTextDocument().getUri()); | ||
| if (unit == null || monitor.isCanceled()) { | ||
| return null; | ||
| } | ||
| CompilationUnit astRoot = CoreASTProvider.getInstance().getAST(unit, CoreASTProvider.WAIT_YES, monitor); | ||
| if (astRoot == null) { | ||
| return null; | ||
| } | ||
| IInvocationContext context = CodeActionHandler.getContext(unit, astRoot, params.getRange()); | ||
| ASTNode methodNode = CodeActionUtility.inferASTNode(context.getCoveringNode(), MethodDeclaration.class); | ||
| if (methodNode == null) { | ||
| return null; | ||
| } | ||
| IMethodBinding methodBinding = ((MethodDeclaration) methodNode).resolveBinding(); | ||
| if (methodBinding == null) { | ||
| return null; | ||
| } | ||
| IJavaElement element = methodBinding.getJavaElement(); | ||
| if (element instanceof IMethod method) { | ||
| try { | ||
| ChangeSignatureProcessor processor = new ChangeSignatureProcessor(method); | ||
| if (RefactoringAvailabilityTesterCore.isChangeSignatureAvailable(method)) { | ||
| RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor()); | ||
| if (status.isOK()) { | ||
| List<MethodParameter> parameters = new ArrayList<>(); | ||
| for (ParameterInfo info : processor.getParameterInfos()) { | ||
| parameters.add(new MethodParameter(info.getOldTypeName(), info.getOldName(), info.getDefaultValue() == null ? "null" : info.getDefaultValue(), info.getOldIndex())); | ||
| } | ||
| List<MethodException> exceptions = new ArrayList<>(); | ||
| for (ExceptionInfo info : processor.getExceptionInfos()) { | ||
| exceptions.add(new MethodException(info.getFullyQualifiedName(), info.getElement().getHandleIdentifier())); | ||
| } | ||
| return new ChangeSignatureInfo(method.getHandleIdentifier(), JdtFlags.getVisibilityString(processor.getVisibility()), processor.getReturnTypeString(), method.getElementName(), | ||
| parameters.toArray(MethodParameter[]::new), exceptions.toArray(MethodException[]::new)); | ||
| } else { | ||
| return new ChangeSignatureInfo(CANNOT_CHANGE_SIGNATURE + status.getMessageMatchingSeverity(status.getSeverity())); | ||
| } | ||
| } | ||
| } catch (CoreException e) { | ||
| JavaLanguageServerPlugin.logException(e); | ||
| } | ||
| } | ||
| return new ChangeSignatureInfo(CANNOT_CHANGE_SIGNATURE); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.