Skip to content

Commit c59069c

Browse files
SougandhSSougandhS
committed
Review changes
1 parent ca876df commit c59069c

8 files changed

Lines changed: 23 additions & 21 deletions

File tree

‎org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,5 +515,5 @@ private CorrectionMessages() {
515515
public static String PreviewFeaturesSubProcessor_open_compliance_page_enable_preview_features_info;
516516
public static String PreviewFeaturesSubProcessor_open_compliance_properties_page_enable_preview_features;
517517
public static String PreviewFeaturesSubProcessor_open_compliance_properties_page_enable_preview_features_info;
518-
public static String DuplicateLocal_ShowExisting;
518+
public static String OpenExistingDeclaration;
519519
}

‎org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ TypeMismatchSubProcessor_insertnullcheck_description=Insert '!= null' check
157157
TypeMismatchSubProcessor_changetooptionalempty_description=Change to empty Optional
158158
TypeMismatchSubProcessor_changetooptionalof_description=Wrap with Optional
159159
TypeMismatchSubProcessor_changetooptionalofnullable_description=Wrap with nullable Optional
160-
DuplicateLocal_ShowExisting=Navigate to declared variable
160+
OpenExistingDeclaration=Open Declaration
161161

162162
RemoveDeclarationCorrectionProposal_removeunusedfield_description=Remove declaration of ''{0}'' and assignments without possible side effects
163163
RemoveDeclarationCorrectionProposal_removeunusedmethod_description=Remove method ''{0}''

‎org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsBaseSubProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
import org.eclipse.jdt.internal.ui.text.correction.proposals.GenerateForLoopAssistProposalCore;
191191
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedCorrectionProposalCore;
192192
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposalCore;
193-
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistShowDeclarationProposalCore;
193+
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedOpenDeclarationProposalCore;
194194
import org.eclipse.jdt.internal.ui.text.correction.proposals.MissingAnnotationAttributesProposalCore;
195195
import org.eclipse.jdt.internal.ui.text.correction.proposals.ModifierChangeCorrectionProposalCore;
196196
import org.eclipse.jdt.internal.ui.text.correction.proposals.NewLocalVariableCorrectionProposalCore;
@@ -1132,7 +1132,7 @@ public void getInvalidVariableNameProposals(IInvocationContext context, IProblem
11321132
LinkedNamesAssistProposalCore proposalCore= new LinkedNamesAssistProposalCore(name, context, nameNode, valueSuggestion);
11331133
proposals.add(linkedNamesAssistProposalToT(proposalCore));
11341134
if(nameNode.getParent() instanceof VariableDeclaration) {
1135-
LinkedNamesAssistShowDeclarationProposalCore showExisting= new LinkedNamesAssistShowDeclarationProposalCore(CorrectionMessages.DuplicateLocal_ShowExisting,context, nameNode);
1135+
LinkedOpenDeclarationProposalCore showExisting= new LinkedOpenDeclarationProposalCore(CorrectionMessages.OpenExistingDeclaration,context, nameNode);
11361136
proposals.add(LinkedNamesAssistShowDuplicateProposalToT(showExisting));
11371137
}
11381138
}
@@ -3428,7 +3428,7 @@ protected LocalCorrectionsBaseSubProcessor() {
34283428
protected abstract T replaceCorrectionProposalToT(ReplaceCorrectionProposalCore core, int uid);
34293429
protected abstract T cuCorrectionProposalToT(CUCorrectionProposalCore core, int uid);
34303430
protected abstract T linkedNamesAssistProposalToT(LinkedNamesAssistProposalCore core);
3431-
protected abstract T LinkedNamesAssistShowDuplicateProposalToT(LinkedNamesAssistShowDeclarationProposalCore core);
3431+
protected abstract T LinkedNamesAssistShowDuplicateProposalToT(LinkedOpenDeclarationProposalCore core);
34323432
protected abstract T assignToVariableAssistProposalToT(AssignToVariableAssistProposalCore core);
34333433
protected abstract T newVariableCorrectionProposalToT(NewVariableCorrectionProposalCore core, int uid);
34343434
protected abstract T newLocalVariableCorrectionProposalToT(NewLocalVariableCorrectionProposalCore core, int uid);

org.eclipse.jdt.core.manipulation/proposals/org/eclipse/jdt/internal/ui/text/correction/proposals/LinkedNamesAssistShowDeclarationProposalCore.java renamed to org.eclipse.jdt.core.manipulation/proposals/org/eclipse/jdt/internal/ui/text/correction/proposals/LinkedOpenDeclarationProposalCore.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
/**
2525
* A template proposal.
2626
*/
27-
public class LinkedNamesAssistShowDeclarationProposalCore extends CUCorrectionProposalCore {
27+
public class LinkedOpenDeclarationProposalCore extends CUCorrectionProposalCore {
2828

2929
public static final String ASSIST_ID= "org.eclipse.jdt.ui.correction.showOriginalDeclaration.assist"; //$NON-NLS-1$
3030

3131
private SimpleName fNode;
3232
private String fLabel;
3333

34-
public LinkedNamesAssistShowDeclarationProposalCore(String label, IInvocationContext context, SimpleName node) {
34+
public LinkedOpenDeclarationProposalCore(String label, IInvocationContext context, SimpleName node) {
3535
super(label, context.getCompilationUnit(), IProposalRelevance.LINKED_NAMES_ASSIST);
3636
fLabel= label;
3737
fNode= node;

‎org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/LocalCorrectionsQuickFixTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages;
6666
import org.eclipse.jdt.internal.ui.text.correction.JavaCorrectionProcessor;
6767
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal;
68-
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistShowDuplicateProposal;
68+
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedOpenDeclarationProposal;
6969

7070
public class LocalCorrectionsQuickFixTest extends QuickFixTest {
7171

@@ -13620,6 +13620,6 @@ public void foo(int x) {
1362013620
CompilationUnit astRoot= getASTRoot(cu);
1362113621
ArrayList<IJavaCompletionProposal> proposals= collectCorrections(cu, astRoot);
1362213622
assertNumberOfProposals(proposals, 2);
13623-
assertTrue(proposals.get(1) instanceof LinkedNamesAssistShowDuplicateProposal);
13623+
assertTrue(proposals.get(1) instanceof LinkedOpenDeclarationProposal);
1362413624
}
1362513625
}

‎org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/LocalCorrectionsSubProcessor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@
125125
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedCorrectionProposalCore;
126126
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposal;
127127
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistProposalCore;
128-
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistShowDeclarationProposalCore;
129-
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistShowDuplicateProposal;
128+
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedOpenDeclarationProposalCore;
129+
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedOpenDeclarationProposal;
130130
import org.eclipse.jdt.internal.ui.text.correction.proposals.MissingAnnotationAttributesProposal;
131131
import org.eclipse.jdt.internal.ui.text.correction.proposals.MissingAnnotationAttributesProposalCore;
132132
import org.eclipse.jdt.internal.ui.text.correction.proposals.ModifierChangeCorrectionProposal;
@@ -818,7 +818,7 @@ protected ICommandAccess linkedNamesAssistProposalToT(LinkedNamesAssistProposalC
818818
return new LinkedNamesAssistProposal(core.getLabel(), core.getContext(), core.getNode(), core.getValueSuggestion());
819819
}
820820
@Override
821-
protected ICommandAccess LinkedNamesAssistShowDuplicateProposalToT(LinkedNamesAssistShowDeclarationProposalCore core) {
822-
return new LinkedNamesAssistShowDuplicateProposal(core.getLabel(), core.getNode());
821+
protected ICommandAccess LinkedNamesAssistShowDuplicateProposalToT(LinkedOpenDeclarationProposalCore core) {
822+
return new LinkedOpenDeclarationProposal(core.getLabel(), core.getNode());
823823
}
824824
}

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/LinkedNamesAssistShowDuplicateProposal.java renamed to org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/LinkedOpenDeclarationProposal.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.eclipse.jdt.core.dom.SimpleName;
3535
import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
3636
import org.eclipse.jdt.core.dom.TypeDeclaration;
37+
import org.eclipse.jdt.core.dom.VariableDeclaration;
3738
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
3839

3940
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
@@ -46,14 +47,13 @@
4647
/**
4748
* Quick Navigation proposal.
4849
*/
49-
public class LinkedNamesAssistShowDuplicateProposal implements IJavaCompletionProposal, ICompletionProposalExtension2, ICommandAccess {
50+
public class LinkedOpenDeclarationProposal implements IJavaCompletionProposal, ICompletionProposalExtension2, ICommandAccess {
5051

5152
public static final String ASSIST_ID= "org.eclipse.jdt.ui.correction.showOriginalDeclaration.assist"; //$NON-NLS-1$
52-
5353
private SimpleName fNode;
5454
private String fLabel;
5555

56-
public LinkedNamesAssistShowDuplicateProposal(String label, SimpleName node) {
56+
public LinkedOpenDeclarationProposal(String label, SimpleName node) {
5757
fLabel= label;
5858
fNode= node;
5959
}
@@ -71,7 +71,7 @@ public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
7171
while (scopeOwner != null && !(scopeOwner instanceof MethodDeclaration
7272
|| scopeOwner instanceof Initializer
7373
|| scopeOwner instanceof LambdaExpression
74-
|| scopeOwner instanceof TypeDeclaration)) {
74+
|| scopeOwner instanceof TypeDeclaration )) {
7575
scopeOwner = scopeOwner.getParent();
7676
}
7777
if(scopeOwner == null) {
@@ -100,8 +100,10 @@ public boolean visit(SingleVariableDeclaration node) {
100100
return true;
101101
}
102102
});
103-
int start= result[0].getStartPosition();
104-
int length= result[0].getLength();
103+
ASTNode decl = result[0];
104+
SimpleName name = ((VariableDeclaration) decl).getName();
105+
int start = name.getStartPosition();
106+
int length = name.getLength();
105107
textEditor.selectAndReveal(start, length);
106108
}
107109
}

‎org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/AbstractAnnotationHover.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
import org.eclipse.jdt.internal.ui.JavaPluginImages;
9797
import org.eclipse.jdt.internal.ui.javaeditor.JavaAnnotationIterator;
9898
import org.eclipse.jdt.internal.ui.text.correction.proposals.FixCorrectionProposal;
99-
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedNamesAssistShowDeclarationProposalCore;
99+
import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedOpenDeclarationProposal;
100100

101101

102102
/**
@@ -368,7 +368,7 @@ private void createCompletionProposalsControl(Composite parent, ICompletionPropo
368368
layoutData.horizontalIndent= 4;
369369
quickFixLabel.setLayoutData(layoutData);
370370
String text;
371-
Optional<ICompletionProposal> showDeclaration = Arrays.asList(proposals).stream().filter(e -> e instanceof LinkedNamesAssistShowDeclarationProposalCore).findFirst();
371+
Optional<ICompletionProposal> showDeclaration = Arrays.asList(proposals).stream().filter(e -> e instanceof LinkedOpenDeclarationProposal).findFirst();
372372
int proposalsLen = showDeclaration.isPresent() ? proposals.length - 1 : proposals.length;
373373
if (proposalsLen == 1) {
374374
text= JavaHoverMessages.AbstractAnnotationHover_message_singleQuickFix;

0 commit comments

Comments
 (0)