-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add quick assist for splitting try-with-resources (#1226)
- add new SplitTryResourceFixCore.java - add new logic to QuickAssistProcessor - add new tests to AssistQuickFixTest1d8 - fixes #1220
- Loading branch information
Showing
5 changed files
with
248 additions
and
0 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
113 changes: 113 additions & 0 deletions
113
...ipulation/core extension/org/eclipse/jdt/internal/corext/fix/SplitTryResourceFixCore.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,113 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Red Hat Inc. and others. | ||
| * | ||
| * 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.internal.corext.fix; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.eclipse.core.runtime.CoreException; | ||
|
|
||
| import org.eclipse.text.edits.TextEditGroup; | ||
|
|
||
| import org.eclipse.jdt.core.ICompilationUnit; | ||
| import org.eclipse.jdt.core.dom.AST; | ||
| import org.eclipse.jdt.core.dom.ASTNode; | ||
| import org.eclipse.jdt.core.dom.Block; | ||
| import org.eclipse.jdt.core.dom.CompilationUnit; | ||
| import org.eclipse.jdt.core.dom.Statement; | ||
| import org.eclipse.jdt.core.dom.TryStatement; | ||
| import org.eclipse.jdt.core.dom.VariableDeclarationExpression; | ||
| import org.eclipse.jdt.core.dom.rewrite.ASTRewrite; | ||
| import org.eclipse.jdt.core.dom.rewrite.ListRewrite; | ||
|
|
||
| import org.eclipse.jdt.internal.corext.dom.ASTNodes; | ||
| import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; | ||
| import org.eclipse.jdt.internal.corext.util.JavaModelUtil; | ||
|
|
||
| import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages; | ||
|
|
||
| public final class SplitTryResourceFixCore extends CompilationUnitRewriteOperationsFixCore { | ||
|
|
||
| public SplitTryResourceFixCore(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperation[] operations) { | ||
| super(name, compilationUnit, operations); | ||
| } | ||
|
|
||
| public static boolean initialConditionsCheck(ICompilationUnit compilationUnit, ASTNode node) { | ||
| if (!JavaModelUtil.is1d8OrHigher(compilationUnit.getJavaProject())) | ||
| return false; | ||
| ASTNode foundNode= ASTNodes.getFirstAncestorOrNull(node, VariableDeclarationExpression.class, Statement.class); | ||
| if (!(foundNode instanceof VariableDeclarationExpression varDeclExp) || varDeclExp.getLocationInParent() != TryStatement.RESOURCES2_PROPERTY) { | ||
| return false; | ||
| } | ||
| ASTNode parent= foundNode.getParent(); | ||
| if (!(parent instanceof TryStatement tryStatement) || tryStatement.resources().size() < 2) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| public static SplitTryResourceFixCore createSplitVariableFix(CompilationUnit compilationUnit, ASTNode node) { | ||
| ASTNode foundNode= ASTNodes.getFirstAncestorOrNull(node, VariableDeclarationExpression.class, Statement.class); | ||
| if (!(foundNode instanceof VariableDeclarationExpression varDeclExp) || varDeclExp.getLocationInParent() != TryStatement.RESOURCES2_PROPERTY) { | ||
| return null; | ||
| } | ||
| ASTNode parent= foundNode.getParent(); | ||
| if (!(parent instanceof TryStatement tryStatement) || tryStatement.resources().size() < 2) { | ||
| return null; | ||
| } | ||
| return new SplitTryResourceFixCore(CorrectionMessages.QuickAssistProcessor_splittryresource_description, compilationUnit, | ||
| new CompilationUnitRewriteOperation[] { new SplitTryResourceProposalOperation(tryStatement, varDeclExp) }); | ||
| } | ||
|
|
||
| private static class SplitTryResourceProposalOperation extends CompilationUnitRewriteOperation { | ||
|
|
||
| private final TryStatement tryStatement; | ||
|
|
||
| private final VariableDeclarationExpression expression; | ||
|
|
||
| public SplitTryResourceProposalOperation(TryStatement statement, VariableDeclarationExpression expression) { | ||
| this.tryStatement= statement; | ||
| this.expression= expression; | ||
| } | ||
|
|
||
| @Override | ||
| public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore linkedModel) throws CoreException { | ||
| TextEditGroup group= new TextEditGroup("abc"); //$NON-NLS-1$ | ||
| final ASTRewrite rewrite= cuRewrite.getASTRewrite(); | ||
| final AST ast= cuRewrite.getAST(); | ||
|
|
||
|
|
||
| List<VariableDeclarationExpression> resources= tryStatement.resources(); | ||
| int expIndex; | ||
| for (expIndex= 0; expIndex < resources.size(); ++expIndex) { | ||
| if (resources.get(expIndex) == expression) { | ||
| break; | ||
| } | ||
| } | ||
| TryStatement newTryStatement= ast.newTryStatement(); | ||
| Block newBlock= ast.newBlock(); | ||
| newTryStatement.setBody(newBlock); | ||
| ListRewrite listRewrite= rewrite.getListRewrite(newTryStatement, TryStatement.RESOURCES2_PROPERTY); | ||
| ListRewrite oldResourcesListRewrite= rewrite.getListRewrite(tryStatement, TryStatement.RESOURCES2_PROPERTY); | ||
| listRewrite.insertFirst(oldResourcesListRewrite.createMoveTarget(expression, (ASTNode)oldResourcesListRewrite.getOriginalList().get(resources.size() - 1)), group); | ||
| Block originalBlock= tryStatement.getBody(); | ||
| List<Statement> originalStatements= originalBlock.statements(); | ||
| int size= originalStatements.size(); | ||
| ListRewrite originalBlockListRewrite= rewrite.getListRewrite(originalBlock, Block.STATEMENTS_PROPERTY); | ||
| originalBlockListRewrite.insertFirst(newTryStatement, group); | ||
| ListRewrite newBlockListRewrite= rewrite.getListRewrite(newBlock, Block.STATEMENTS_PROPERTY); | ||
| newBlockListRewrite.insertLast(originalBlockListRewrite.createMoveTarget(originalStatements.get(0), originalStatements.get(size - 1)), group); | ||
| } | ||
| } | ||
|
|
||
| } |
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