Skip to content

Commit bfb5350

Browse files
robstrykerrgrunber
robstryker
authored and
rgrunber
committed
Consume jdt.ui interface deletion Part 1
Signed-off-by: Rob Stryker <rob@oxbeef.net>
1 parent 522b56b commit bfb5350

25 files changed

+262
-262
lines changed

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/InnovationContext.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import org.eclipse.jdt.core.dom.CompilationUnit;
1818
import org.eclipse.jdt.core.dom.NodeFinder;
1919
import org.eclipse.jdt.internal.core.manipulation.dom.ASTResolving;
20-
import org.eclipse.jdt.internal.ui.text.correction.IInvocationContextCore;
20+
import org.eclipse.jdt.ui.text.java.IInvocationContext;
2121

22-
public class InnovationContext implements IInvocationContextCore {
22+
public class InnovationContext implements IInvocationContext {
2323

2424
private final ICompilationUnit fCompilationUnit;
2525
private CompilationUnit fASTRoot;

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/InvertBooleanUtility.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import org.eclipse.jdt.internal.core.manipulation.dom.OperatorPrecedence;
6767
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
6868
import org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder;
69-
import org.eclipse.jdt.internal.ui.text.correction.IInvocationContextCore;
69+
import org.eclipse.jdt.ui.text.java.IInvocationContext;
7070
import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
7171
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedCorrectionProposalCore;
7272
import org.eclipse.jdt.ls.core.internal.Messages;
@@ -84,7 +84,7 @@
8484
public class InvertBooleanUtility {
8585
public static final String INVERT_VARIABLE_COMMAND = "invertVariable";
8686

87-
public static ProposalKindWrapper getInvertVariableProposal(CodeActionParams params, IInvocationContextCore context, ASTNode covering, boolean returnAsCommand) {
87+
public static ProposalKindWrapper getInvertVariableProposal(CodeActionParams params, IInvocationContext context, ASTNode covering, boolean returnAsCommand) {
8888
// cursor should be placed on variable name
8989
if (!(covering instanceof SimpleName)) {
9090
return null;
@@ -232,13 +232,13 @@ public SimpleName getRenamed(SimpleName simpleName) {
232232
return CodeActionHandler.wrap(proposal, CodeActionKind.Refactor);
233233
}
234234

235-
public static boolean getInverseConditionProposals(CodeActionParams params, IInvocationContextCore context, ASTNode covering, Collection<ProposalKindWrapper> proposals) {
235+
public static boolean getInverseConditionProposals(CodeActionParams params, IInvocationContext context, ASTNode covering, Collection<ProposalKindWrapper> proposals) {
236236
ArrayList<ASTNode> coveredNodes = QuickAssistProcessor.getFullyCoveredNodes(context, covering);
237237
return getInverseConditionProposals(params, context, covering, coveredNodes, proposals);
238238

239239
}
240240

241-
private static boolean getInverseConditionProposals(CodeActionParams params, IInvocationContextCore context, ASTNode covering, ArrayList<ASTNode> coveredNodes, Collection<ProposalKindWrapper> proposals) {
241+
private static boolean getInverseConditionProposals(CodeActionParams params, IInvocationContext context, ASTNode covering, ArrayList<ASTNode> coveredNodes, Collection<ProposalKindWrapper> proposals) {
242242
if (proposals == null) {
243243
return false;
244244
}
@@ -491,7 +491,7 @@ private static Expression getInversedExpression(ASTRewrite rewrite, Expression e
491491
return prefixExpression;
492492
}
493493

494-
public static boolean getSplitAndConditionProposals(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
494+
public static boolean getSplitAndConditionProposals(IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
495495
Operator andOperator = InfixExpression.Operator.CONDITIONAL_AND;
496496
// check that user invokes quick assist on infix expression
497497
if (!(node instanceof InfixExpression)) {
@@ -561,7 +561,7 @@ public static boolean getSplitAndConditionProposals(IInvocationContextCore conte
561561
return true;
562562
}
563563

564-
public static boolean getSplitOrConditionProposals(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
564+
public static boolean getSplitOrConditionProposals(IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
565565
Operator orOperator = InfixExpression.Operator.CONDITIONAL_OR;
566566
// check that user invokes quick assist on infix expression
567567
if (!(node instanceof InfixExpression)) {

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/QuickFixProcessor.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import org.eclipse.jdt.core.manipulation.CUCorrectionProposalCore;
4242
import org.eclipse.jdt.core.manipulation.ChangeCorrectionProposalCore;
4343
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
44-
import org.eclipse.jdt.internal.ui.text.correction.IInvocationContextCore;
45-
import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
4644
import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
4745
import org.eclipse.jdt.internal.ui.text.correction.UnInitializedFinalFieldBaseSubProcessor;
4846
import org.eclipse.jdt.internal.ui.text.correction.proposals.AddImportCorrectionProposalCore;
@@ -58,6 +56,8 @@
5856
import org.eclipse.jdt.ls.core.internal.handlers.CodeActionHandler;
5957
import org.eclipse.jdt.ls.core.internal.handlers.OrganizeImportsHandler;
6058
import org.eclipse.jdt.ls.core.internal.text.correction.ModifierCorrectionSubProcessor;
59+
import org.eclipse.jdt.ui.text.java.IInvocationContext;
60+
import org.eclipse.jdt.ui.text.java.IProblemLocation;
6161
import org.eclipse.lsp4j.CodeActionKind;
6262
import org.eclipse.lsp4j.CodeActionParams;
6363

@@ -80,29 +80,29 @@ private static int moveBack(int offset, int start, String ignoreCharacters, ICom
8080
return start;
8181
}
8282

83-
public List<ProposalKindWrapper> getCorrections(CodeActionParams params, IInvocationContextCore context, IProblemLocationCore[] locations) throws CoreException {
83+
public List<ProposalKindWrapper> getCorrections(CodeActionParams params, IInvocationContext context, IProblemLocation[] locations) throws CoreException {
8484
if (locations == null || locations.length == 0) {
8585
return Collections.emptyList();
8686
}
8787
ArrayList<ProposalKindWrapper> resultingCollections = new ArrayList<>();
8888
Set<Integer> handledProblems = new HashSet<>(locations.length);
8989
for (int i = 0; i < locations.length; i++) {
90-
IProblemLocationCore curr = locations[i];
90+
IProblemLocation curr = locations[i];
9191
if (handledProblems(curr, locations, handledProblems)) {
9292
process(params, context, curr, resultingCollections);
9393
}
9494
}
9595
return resultingCollections;
9696
}
9797

98-
private static boolean handledProblems(IProblemLocationCore location, IProblemLocationCore[] locations, Set<Integer> handledProblems) {
98+
private static boolean handledProblems(IProblemLocation location, IProblemLocation[] locations, Set<Integer> handledProblems) {
9999
int problemId = location.getProblemId();
100100
if (handledProblems.contains(problemId)) {
101101
return false;
102102
}
103103
if (problemId == IProblem.UndefinedName) {
104104
// skip different problems with the same resolution
105-
for (IProblemLocationCore l : locations) {
105+
for (IProblemLocation l : locations) {
106106
if (l.getProblemId() == IProblem.UndefinedType && Arrays.deepEquals(l.getProblemArguments(), location.getProblemArguments())) {
107107
handledProblems.add(problemId);
108108
return false;
@@ -112,7 +112,7 @@ private static boolean handledProblems(IProblemLocationCore location, IProblemLo
112112
return handledProblems.add(problemId);
113113
}
114114

115-
private void process(CodeActionParams params, IInvocationContextCore context, IProblemLocationCore problem, Collection<ProposalKindWrapper> proposals) throws CoreException {
115+
private void process(CodeActionParams params, IInvocationContext context, IProblemLocation problem, Collection<ProposalKindWrapper> proposals) throws CoreException {
116116
int id = problem.getProblemId();
117117
if (id == 0) { // no proposals for none-problem locations
118118
return;
@@ -686,7 +686,7 @@ private void process(CodeActionParams params, IInvocationContextCore context, IP
686686
// problem, proposals);
687687
}
688688

689-
public void addAddAllMissingImportsProposal(IInvocationContextCore context, Collection<ProposalKindWrapper> proposals) {
689+
public void addAddAllMissingImportsProposal(IInvocationContext context, Collection<ProposalKindWrapper> proposals) {
690690
if (proposals.size() == 0) {
691691
return;
692692
}

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/RefactorProcessor.java

+24-24
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
import org.eclipse.jdt.internal.ui.fix.AbstractCleanUpCore;
9595
import org.eclipse.jdt.internal.ui.fix.LambdaExpressionsCleanUpCore;
9696
import org.eclipse.jdt.internal.ui.fix.MultiFixMessages;
97-
import org.eclipse.jdt.internal.ui.text.correction.IInvocationContextCore;
98-
import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
97+
import org.eclipse.jdt.ui.text.java.IInvocationContext;
98+
import org.eclipse.jdt.ui.text.java.IProblemLocation;
9999
import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
100100
import org.eclipse.jdt.internal.ui.text.correction.proposals.ASTRewriteRemoveImportsCorrectionProposalCore;
101101
import org.eclipse.jdt.internal.ui.text.correction.proposals.FixCorrectionProposalCore;
@@ -125,7 +125,7 @@ public RefactorProcessor(PreferenceManager preferenceManager) {
125125
this.preferenceManager = preferenceManager;
126126
}
127127

128-
public List<ProposalKindWrapper> getProposals(CodeActionParams params, IInvocationContextCore context, IProblemLocationCore[] locations) throws CoreException {
128+
public List<ProposalKindWrapper> getProposals(CodeActionParams params, IInvocationContext context, IProblemLocation[] locations) throws CoreException {
129129
ASTNode coveringNode = context.getCoveringNode();
130130
if (coveringNode != null) {
131131
ArrayList<ProposalKindWrapper> proposals = new ArrayList<>();
@@ -164,7 +164,7 @@ public List<ProposalKindWrapper> getProposals(CodeActionParams params, IInvocati
164164
return Collections.emptyList();
165165
}
166166

167-
private boolean getIntroduceParameterProposals(CodeActionParams params, IInvocationContextCore context, ASTNode coveringNode, IProblemLocationCore[] locations, ArrayList<ProposalKindWrapper> resultingCollections) throws CoreException {
167+
private boolean getIntroduceParameterProposals(CodeActionParams params, IInvocationContext context, ASTNode coveringNode, IProblemLocation[] locations, ArrayList<ProposalKindWrapper> resultingCollections) throws CoreException {
168168
if (resultingCollections == null) {
169169
return false;
170170
}
@@ -176,7 +176,7 @@ private boolean getIntroduceParameterProposals(CodeActionParams params, IInvocat
176176
return false;
177177
}
178178

179-
private boolean getInverseLocalVariableProposals(CodeActionParams params, IInvocationContextCore context, ASTNode covering, Collection<ProposalKindWrapper> proposals) {
179+
private boolean getInverseLocalVariableProposals(CodeActionParams params, IInvocationContext context, ASTNode covering, Collection<ProposalKindWrapper> proposals) {
180180
if (proposals == null) {
181181
return false;
182182
}
@@ -196,7 +196,7 @@ private boolean getInverseLocalVariableProposals(CodeActionParams params, IInvoc
196196
return true;
197197
}
198198

199-
private boolean getMoveRefactoringProposals(CodeActionParams params, IInvocationContextCore context, ASTNode coveringNode, ArrayList<ProposalKindWrapper> resultingCollections) {
199+
private boolean getMoveRefactoringProposals(CodeActionParams params, IInvocationContext context, ASTNode coveringNode, ArrayList<ProposalKindWrapper> resultingCollections) {
200200
if (resultingCollections == null) {
201201
return false;
202202
}
@@ -213,12 +213,12 @@ private boolean getMoveRefactoringProposals(CodeActionParams params, IInvocation
213213

214214
}
215215

216-
static boolean noErrorsAtLocation(IProblemLocationCore[] locations, ASTNode coveringNode) {
216+
static boolean noErrorsAtLocation(IProblemLocation[] locations, ASTNode coveringNode) {
217217
if (locations != null) {
218218
int start = coveringNode.getStartPosition();
219219
int length = coveringNode.getLength();
220220
for (int i = 0; i < locations.length; i++) {
221-
IProblemLocationCore location = locations[i];
221+
IProblemLocation location = locations[i];
222222
if (location.getOffset() > start + length || (location.getOffset() + location.getLength()) < start) {
223223
continue;
224224
}
@@ -235,7 +235,7 @@ static boolean noErrorsAtLocation(IProblemLocationCore[] locations, ASTNode cove
235235
}
236236

237237

238-
private boolean getExtractVariableProposal(CodeActionParams params, IInvocationContextCore context, boolean problemsAtLocation, Collection<ProposalKindWrapper> proposals) throws CoreException {
238+
private boolean getExtractVariableProposal(CodeActionParams params, IInvocationContext context, boolean problemsAtLocation, Collection<ProposalKindWrapper> proposals) throws CoreException {
239239
if (proposals == null) {
240240
return false;
241241
}
@@ -255,7 +255,7 @@ private boolean getExtractVariableProposal(CodeActionParams params, IInvocationC
255255
return true;
256256
}
257257

258-
private boolean getAssignToVariableProposals(IInvocationContextCore context, ASTNode node, IProblemLocationCore[] locations, Collection<ProposalKindWrapper> resultingCollections, CodeActionParams params) {
258+
private boolean getAssignToVariableProposals(IInvocationContext context, ASTNode node, IProblemLocation[] locations, Collection<ProposalKindWrapper> resultingCollections, CodeActionParams params) {
259259
try {
260260
Map formatterOptions = null;
261261
ProposalKindWrapper proposal = RefactorProposalUtility.getAssignVariableProposal(params, context, locations != null && locations.length != 0, formatterOptions,
@@ -274,7 +274,7 @@ private boolean getAssignToVariableProposals(IInvocationContextCore context, AST
274274
return true;
275275
}
276276

277-
private boolean getExtractMethodProposal(CodeActionParams params, IInvocationContextCore context, ASTNode coveringNode, boolean problemsAtLocation, Collection<ProposalKindWrapper> proposals) throws CoreException {
277+
private boolean getExtractMethodProposal(CodeActionParams params, IInvocationContext context, ASTNode coveringNode, boolean problemsAtLocation, Collection<ProposalKindWrapper> proposals) throws CoreException {
278278
if (proposals == null) {
279279
return false;
280280
}
@@ -294,7 +294,7 @@ private boolean getExtractMethodProposal(CodeActionParams params, IInvocationCon
294294
return true;
295295
}
296296

297-
private boolean getExtractFieldProposal(CodeActionParams params, IInvocationContextCore context, boolean problemsAtLocation, Collection<ProposalKindWrapper> proposals) throws CoreException {
297+
private boolean getExtractFieldProposal(CodeActionParams params, IInvocationContext context, boolean problemsAtLocation, Collection<ProposalKindWrapper> proposals) throws CoreException {
298298
if (proposals == null) {
299299
return false;
300300
}
@@ -311,7 +311,7 @@ private boolean getExtractFieldProposal(CodeActionParams params, IInvocationCont
311311
}
312312

313313

314-
private boolean getInlineProposal(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
314+
private boolean getInlineProposal(IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
315315
if (resultingCollections == null) {
316316
return false;
317317
}
@@ -396,7 +396,7 @@ private boolean getInlineProposal(IInvocationContextCore context, ASTNode node,
396396
}
397397

398398

399-
private boolean getConvertAnonymousToNestedProposals(CodeActionParams params, IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> proposals) throws CoreException {
399+
private boolean getConvertAnonymousToNestedProposals(CodeActionParams params, IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> proposals) throws CoreException {
400400
if (proposals == null) {
401401
return false;
402402
}
@@ -416,7 +416,7 @@ private boolean getConvertAnonymousToNestedProposals(CodeActionParams params, II
416416
return true;
417417
}
418418

419-
public static ProposalKindWrapper getConvertAnonymousToNestedProposal(CodeActionParams params, IInvocationContextCore context, final ASTNode node, boolean returnAsCommand) throws CoreException {
419+
public static ProposalKindWrapper getConvertAnonymousToNestedProposal(CodeActionParams params, IInvocationContext context, final ASTNode node, boolean returnAsCommand) throws CoreException {
420420
String label = CorrectionMessages.QuickAssistProcessor_convert_anonym_to_nested;
421421
ClassInstanceCreation cic = getClassInstanceCreation(node);
422422
if (cic == null) {
@@ -478,7 +478,7 @@ private static ClassInstanceCreation getClassInstanceCreation(ASTNode node) {
478478
}
479479
}
480480

481-
private static boolean getConvertAnonymousClassCreationsToLambdaProposals(IInvocationContextCore context, ASTNode covering, Collection<ProposalKindWrapper> resultingCollections) {
481+
private static boolean getConvertAnonymousClassCreationsToLambdaProposals(IInvocationContext context, ASTNode covering, Collection<ProposalKindWrapper> resultingCollections) {
482482
ClassInstanceCreation cic = getClassInstanceCreation(covering);
483483
if (cic == null) {
484484
return false;
@@ -501,7 +501,7 @@ private static boolean getConvertAnonymousClassCreationsToLambdaProposals(IInvoc
501501
return true;
502502
}
503503

504-
private static boolean getConvertLambdaToAnonymousClassCreationsProposals(IInvocationContextCore context, ASTNode covering, Collection<ProposalKindWrapper> resultingCollections) {
504+
private static boolean getConvertLambdaToAnonymousClassCreationsProposals(IInvocationContext context, ASTNode covering, Collection<ProposalKindWrapper> resultingCollections) {
505505
if (resultingCollections == null) {
506506
return true;
507507
}
@@ -529,7 +529,7 @@ private static boolean getConvertLambdaToAnonymousClassCreationsProposals(IInvoc
529529
return true;
530530
}
531531

532-
private static boolean getConvertVarTypeToResolvedTypeProposal(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> proposals) {
532+
private static boolean getConvertVarTypeToResolvedTypeProposal(IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> proposals) {
533533
CompilationUnit astRoot = context.getASTRoot();
534534
IJavaElement root = astRoot.getJavaElement();
535535
if (root == null) {
@@ -607,7 +607,7 @@ private static SimpleName getSimpleNameForVariable(ASTNode node) {
607607
return name;
608608
}
609609

610-
private static boolean getConvertResolvedTypeToVarTypeProposal(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> proposals) {
610+
private static boolean getConvertResolvedTypeToVarTypeProposal(IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> proposals) {
611611
CompilationUnit astRoot = context.getASTRoot();
612612
IJavaElement root = astRoot.getJavaElement();
613613
if (root == null) {
@@ -722,7 +722,7 @@ private static boolean getConvertResolvedTypeToVarTypeProposal(IInvocationContex
722722
* @return {@code true} if the operation could or has been performed,
723723
* {@code false otherwise}
724724
*/
725-
private static boolean getAddStaticImportProposals(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> proposals) {
725+
private static boolean getAddStaticImportProposals(IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> proposals) {
726726
if (!(node instanceof SimpleName)) {
727727
return false;
728728
}
@@ -894,7 +894,7 @@ private static boolean isDirectlyAccessible(ASTNode nameNode, ITypeBinding decla
894894
return false;
895895
}
896896

897-
private static boolean getConvertForLoopProposal(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
897+
private static boolean getConvertForLoopProposal(IInvocationContext context, ASTNode node, Collection<ProposalKindWrapper> resultingCollections) {
898898
ForStatement forStatement = getEnclosingForStatementHeader(node);
899899
if (forStatement == null) {
900900
return false;
@@ -994,7 +994,7 @@ private static <T extends ASTNode> T getEnclosingHeader(ASTNode node, Class<T> h
994994
return null;
995995
}
996996

997-
private boolean getExtractInterfaceProposal(CodeActionParams params, IInvocationContextCore context, Collection<ProposalKindWrapper> proposals) {
997+
private boolean getExtractInterfaceProposal(CodeActionParams params, IInvocationContext context, Collection<ProposalKindWrapper> proposals) {
998998
if (proposals == null) {
999999
return false;
10001000
}
@@ -1013,7 +1013,7 @@ private boolean getExtractInterfaceProposal(CodeActionParams params, IInvocation
10131013
return true;
10141014
}
10151015

1016-
private boolean getChangeSignatureProposal(CodeActionParams params, IInvocationContextCore context, Collection<ProposalKindWrapper> proposals) {
1016+
private boolean getChangeSignatureProposal(CodeActionParams params, IInvocationContext context, Collection<ProposalKindWrapper> proposals) {
10171017
if (proposals == null) {
10181018
return false;
10191019
}
@@ -1028,7 +1028,7 @@ private boolean getChangeSignatureProposal(CodeActionParams params, IInvocationC
10281028
return true;
10291029
}
10301030

1031-
private boolean getSurroundWithTryCatchProposal(IInvocationContextCore context, Collection<ProposalKindWrapper> proposals) {
1031+
private boolean getSurroundWithTryCatchProposal(IInvocationContext context, Collection<ProposalKindWrapper> proposals) {
10321032
if (proposals == null) {
10331033
return false;
10341034
}

0 commit comments

Comments
 (0)