Skip to content

Commit c522c2c

Browse files
rgrunberrgrunber
committed
Use CodeGeneration and GetterSetterUtil from o.e.jdt.core.manipulation.
- With http://eclip.se/539200 complete, we can can reduce copies for classes like CodeGeneration and GetterSetterUtil. - This change brings JDT-LS back in line with JDT Core with respect to some differences that occured during copying of these classes - JDT-LS hard codes StubUtility.useIsForBooleanGetters(..) and StubUtility.useThisForFieldAccess(..) . Now the default JDT Core values will be used - An additional line delimeter is added after the auto-generated setter method's comment stub. Although this required adjusting some test cases, it doesn't seem to affect "real" usage because the code formatter is applied to the resulting stub. Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
1 parent 11c903c commit c522c2c

14 files changed

+15
-748
lines changed

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/contentassist/GetterSetterCompletionProposal.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.eclipse.jdt.core.formatter.CodeFormatter;
2828
import org.eclipse.jdt.internal.codeassist.InternalCompletionProposal;
2929
import org.eclipse.jdt.internal.core.manipulation.util.Strings;
30+
import org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil;
3031
import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
3132
import org.eclipse.jdt.internal.corext.util.JdtFlags;
32-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.GetterSetterUtil;
3333
import org.eclipse.jface.text.BadLocationException;
3434
import org.eclipse.jface.text.IDocument;
3535
import org.eclipse.jface.text.TextUtilities;

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/contentassist/JavadocCompletionProposal.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import org.eclipse.jdt.core.ISourceRange;
3030
import org.eclipse.jdt.core.IType;
3131
import org.eclipse.jdt.core.JavaModelException;
32+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
3233
import org.eclipse.jdt.internal.core.manipulation.StubUtility;
3334
import org.eclipse.jdt.internal.corext.util.MethodOverrideTester;
3435
import org.eclipse.jdt.internal.corext.util.SuperTypeHierarchyCache;
3536
import org.eclipse.jdt.ls.core.internal.JDTUtils;
3637
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
37-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
3838
import org.eclipse.jdt.ls.core.internal.handlers.CompletionResolveHandler;
3939
import org.eclipse.jdt.ls.core.internal.handlers.JsonRpcHelpers;
4040
import org.eclipse.jface.text.BadLocationException;

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/codemanipulation/CodeGeneration.java

-340
This file was deleted.

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/codemanipulation/GetterSetterUtil.java

-393
This file was deleted.

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/fix/AbstractSerialVersionOperation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import org.eclipse.jdt.core.dom.PrimitiveType;
2828
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
2929
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
30+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
3031
import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
3132
import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation;
3233
import org.eclipse.jdt.internal.corext.fix.FixMessages;
3334
import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore;
3435
import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
35-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
3636
import org.eclipse.text.edits.TextEditGroup;
3737

3838
/**

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/code/ExtractConstantRefactoring.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.ImportRewriteContext;
6363
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.TypeLocation;
6464
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
65+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
6566
import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
6667
import org.eclipse.jdt.core.refactoring.IJavaRefactorings;
6768
import org.eclipse.jdt.core.refactoring.descriptors.ExtractConstantDescriptor;
@@ -81,7 +82,6 @@
8182
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
8283
import org.eclipse.jdt.ls.core.internal.Messages;
8384
import org.eclipse.jdt.ls.core.internal.corext.SourceRangeFactory;
84-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
8585
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.ContextSensitiveImportRewriteContext;
8686
import org.eclipse.jdt.ls.core.internal.corext.dom.fragments.ASTFragmentFactory;
8787
import org.eclipse.jdt.ls.core.internal.corext.dom.fragments.IASTFragment;

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/code/ExtractMethodRefactoring.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.ImportRewriteContext;
8686
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.TypeLocation;
8787
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
88+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
8889
import org.eclipse.jdt.core.manipulation.CodeStyleConfiguration;
8990
import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
9091
import org.eclipse.jdt.core.refactoring.IJavaRefactorings;
@@ -105,7 +106,6 @@
105106
import org.eclipse.jdt.internal.corext.util.JdtFlags;
106107
import org.eclipse.jdt.ls.core.internal.BindingLabelProvider;
107108
import org.eclipse.jdt.ls.core.internal.Messages;
108-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
109109
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.ContextSensitiveImportRewriteContext;
110110
import org.eclipse.jdt.ls.core.internal.corext.dom.StatementRewrite;
111111
import org.eclipse.jdt.ls.core.internal.corext.refactoring.Checks;

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/rename/RenameFieldProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
import org.eclipse.jdt.core.search.SearchPattern;
4848
import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
4949
import org.eclipse.jdt.internal.core.refactoring.descriptors.RefactoringSignatureDescriptorFactory;
50+
import org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil;
5051
import org.eclipse.jdt.internal.corext.refactoring.changes.TextChangeCompatibility;
5152
import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
5253
import org.eclipse.jdt.internal.corext.refactoring.util.JavaStatusContext;
5354
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
5455
import org.eclipse.jdt.internal.corext.util.JdtFlags;
5556
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
5657
import org.eclipse.jdt.ls.core.internal.Messages;
57-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.GetterSetterUtil;
5858
import org.eclipse.jdt.ls.core.internal.corext.refactoring.Checks;
5959
import org.eclipse.jdt.ls.core.internal.corext.refactoring.CollectingSearchRequestor;
6060
import org.eclipse.jdt.ls.core.internal.corext.refactoring.JDTRefactoringDescriptorComment;

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/refactoring/sef/SelfEncapsulateFieldRefactoring.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
6868
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
6969
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
70+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
7071
import org.eclipse.jdt.core.refactoring.IJavaRefactorings;
7172
import org.eclipse.jdt.core.refactoring.descriptors.EncapsulateFieldDescriptor;
7273
import org.eclipse.jdt.core.refactoring.descriptors.JavaRefactoringDescriptor;
@@ -75,6 +76,7 @@
7576
import org.eclipse.jdt.internal.core.manipulation.StubUtility;
7677
import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
7778
import org.eclipse.jdt.internal.core.refactoring.descriptors.RefactoringSignatureDescriptorFactory;
79+
import org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil;
7880
import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
7981
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
8082
import org.eclipse.jdt.internal.corext.dom.Bindings;
@@ -86,8 +88,6 @@
8688
import org.eclipse.jdt.ls.core.internal.BindingLabelProvider;
8789
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
8890
import org.eclipse.jdt.ls.core.internal.Messages;
89-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
90-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.GetterSetterUtil;
9191
import org.eclipse.jdt.ls.core.internal.corext.dom.DimensionRewrite;
9292
import org.eclipse.jdt.ls.core.internal.corext.dom.VariableDeclarationRewrite;
9393
import org.eclipse.jdt.ls.core.internal.corext.refactoring.Checks;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
4444
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.ImportRewriteContext;
4545
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
46+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
4647
import org.eclipse.jdt.internal.core.manipulation.dom.ASTResolving;
4748
import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
4849
import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
4950
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
5051
import org.eclipse.jdt.internal.corext.dom.Bindings;
51-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
5252
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.ContextSensitiveImportRewriteContext;
5353
import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
5454

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
4141
import org.eclipse.jdt.internal.core.manipulation.dom.ASTResolving;
4242
import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
43+
import org.eclipse.jdt.internal.corext.codemanipulation.GetterSetterUtil;
4344
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
4445
import org.eclipse.jdt.internal.corext.dom.Bindings;
4546
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
4647
import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
4748
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
4849
import org.eclipse.jdt.ls.core.internal.Messages;
49-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.GetterSetterUtil;
5050
import org.eclipse.jdt.ls.core.internal.corext.refactoring.RefactoringAvailabilityTester;
5151
import org.eclipse.jdt.ls.core.internal.corext.refactoring.sef.SelfEncapsulateFieldRefactoring;
5252
import org.eclipse.jdt.ls.core.internal.corrections.CorrectionMessages;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
5353
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
5454
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
55+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
5556
import org.eclipse.jdt.internal.core.manipulation.StubUtility;
5657
import org.eclipse.jdt.internal.core.manipulation.dom.ASTResolving;
5758
import org.eclipse.jdt.internal.core.manipulation.util.Strings;
5859
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
5960
import org.eclipse.jdt.internal.corext.dom.Bindings;
6061
import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
6162
import org.eclipse.jdt.ls.core.internal.StatusFactory;
62-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
6363
import org.eclipse.jdt.ls.core.internal.corrections.CorrectionMessages;
6464
import org.eclipse.jdt.ls.core.internal.corrections.IInvocationContext;
6565
import org.eclipse.jface.text.BadLocationException;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
3333
import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
3434
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
35+
import org.eclipse.jdt.core.manipulation.CodeGeneration;
3536
import org.eclipse.jdt.internal.core.manipulation.dom.ASTResolving;
3637
import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
3738
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
3839
import org.eclipse.jdt.internal.corext.fix.LinkedProposalPositionGroupCore;
3940
import org.eclipse.jdt.internal.corext.fix.LinkedProposalPositionGroupCore.PositionInformation;
40-
import org.eclipse.jdt.ls.core.internal.corext.codemanipulation.CodeGeneration;
4141
import org.eclipse.jdt.ls.core.internal.corext.dom.ModifierRewrite;
4242
import org.eclipse.jdt.ls.core.internal.corext.dom.VariableDeclarationRewrite;
4343

‎org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionHandlerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ public void testCompletion_getter() throws Exception {
12901290
assertNotNull(resolvedItem.getTextEdit());
12911291
assertTextEdit(2, 4, 7, "/**\n" +
12921292
" * @return the strField\n" +
1293-
" */\n" +
1293+
" */\n\n" +
12941294
"public String getStrField() {\n" +
12951295
" return strField;\n" +
12961296
"}", resolvedItem.getTextEdit());
@@ -1325,7 +1325,7 @@ public void testCompletion_booleangetter() throws Exception {
13251325
assertNotNull(resolvedItem.getTextEdit());
13261326
assertTextEdit(2, 4, 6, "/**\n" +
13271327
" * @return the boolField\n" +
1328-
" */\n" +
1328+
" */\n\n" +
13291329
"public boolean isBoolField() {\n" +
13301330
" return boolField;\n" +
13311331
"}", resolvedItem.getTextEdit());
@@ -1359,7 +1359,7 @@ public void testCompletion_setter() throws Exception {
13591359
assertNotNull(resolvedItem.getTextEdit());
13601360
assertTextEdit(2, 4, 7, "/**\n" +
13611361
" * @param strField the strField to set\n" +
1362-
" */\n" +
1362+
" */\n\n" +
13631363
"public void setStrField(String strField) {\n" +
13641364
" this.strField = strField;\n" +
13651365
"}", resolvedItem.getTextEdit());

0 commit comments

Comments
 (0)