Skip to content

Commit

Permalink
Fix rebase error
Browse files Browse the repository at this point in the history
Signed-off-by: Rob Stryker <[email protected]>
  • Loading branch information
robstryker committed Nov 7, 2023
1 parent 640b0f1 commit 07291af
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
import org.eclipse.jdt.internal.corext.refactoring.code.InlineMethodRefactoring;
import org.eclipse.jdt.internal.corext.refactoring.code.InlineTempRefactoring;
import org.eclipse.jdt.internal.corext.refactoring.structure.ImportRemover;
import org.eclipse.jdt.internal.corext.refactoring.surround.SurroundWithTryCatchRefactoring;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.corext.util.Messages;
import org.eclipse.jdt.internal.ui.fix.AbstractCleanUpCore;
Expand Down Expand Up @@ -1027,7 +1028,7 @@ private boolean getChangeSignatureProposal(CodeActionParams params, IInvocationC
return true;
}

private boolean getSurroundWithTryCatchProposal(IInvocationContext context, Collection<ChangeCorrectionProposal> proposals) {
private boolean getSurroundWithTryCatchProposal(IInvocationContextCore context, Collection<ProposalKindWrapper> proposals) {
if (proposals == null) {
return false;
}
Expand Down Expand Up @@ -1071,10 +1072,9 @@ private boolean getSurroundWithTryCatchProposal(IInvocationContext context, Coll
refactoring.setLeaveDirty(true);

String label = CorrectionMessages.LocalCorrectionsSubProcessor_surroundwith_trycatch_description;
RefactoringCorrectionProposal proposal = new RefactoringCorrectionProposal(label, CodeActionKind.Refactor, cu, refactoring, IProposalRelevance.SURROUND_WITH_TRY_CATCH);
RefactoringCorrectionProposalCore proposal = new RefactoringCorrectionProposalCore(label, cu, refactoring, IProposalRelevance.SURROUND_WITH_TRY_CATCH);
proposal.setLinkedProposalModel(refactoring.getLinkedProposalModel());

proposals.add(proposal);
proposals.add(CodeActionHandler.wrap(proposal, CodeActionKind.Refactor));
return true;
} catch (CoreException e) {
JavaLanguageServerPlugin.log(e);
Expand Down

0 comments on commit 07291af

Please sign in to comment.