11
11
import org .eclipse .core .runtime .Assert ;
12
12
import org .eclipse .jdt .core .ICompilationUnit ;
13
13
import org .eclipse .jdt .core .IJavaProject ;
14
- import org .eclipse .jdt .core .IType ;
15
14
import org .eclipse .jdt .core .JavaModelException ;
16
15
import org .eclipse .jdt .core .dom .AST ;
17
16
import org .eclipse .jdt .core .dom .AbstractTypeDeclaration ;
18
17
import org .eclipse .jdt .core .dom .Assignment ;
19
18
import org .eclipse .jdt .core .dom .Block ;
20
- import org .eclipse .jdt .core .dom .ChildListPropertyDescriptor ;
21
19
import org .eclipse .jdt .core .dom .CompilationUnit ;
22
20
import org .eclipse .jdt .core .dom .FieldAccess ;
23
21
import org .eclipse .jdt .core .dom .FieldDeclaration ;
35
33
import org .eclipse .jdt .internal .corext .refactoring .structure .CompilationUnitRewrite ;
36
34
import org .eclipse .jdt .internal .corext .refactoring .util .RefactoringASTParser ;
37
35
import org .eclipse .jdt .internal .ui .JavaPlugin ;
38
- import org .eclipse .jdt .internal .ui .text .java .MethodDeclarationCompletionProposal ;
39
36
import org .eclipse .lsp4e .LSPEclipseUtils ;
40
37
import org .eclipse .lsp4j .Position ;
41
38
import org .eclipse .lsp4j .Range ;
@@ -62,7 +59,7 @@ public InjectBean(Logger logger) {
62
59
this .logger = logger ;
63
60
}
64
61
65
- private void createFieldDeclaration (IJavaProject project , CompilationUnitRewrite cuRewrite , CompilationUnit domCu ,
62
+ private void createFieldDeclaration (CompilationUnitRewrite cuRewrite , CompilationUnit domCu ,
66
63
String typeName , String fieldType , String fieldName ) throws JavaModelException {
67
64
AST ast = cuRewrite .getAST ();
68
65
VariableDeclarationFragment variableDeclarationFragment = ast .newVariableDeclarationFragment ();
@@ -73,10 +70,8 @@ private void createFieldDeclaration(IJavaProject project, CompilationUnitRewrite
73
70
fieldDeclaration .modifiers ().add (ast .newModifier (Modifier .ModifierKeyword .PRIVATE_KEYWORD ));
74
71
fieldDeclaration .modifiers ().add (ast .newModifier (Modifier .ModifierKeyword .FINAL_KEYWORD ));
75
72
76
- IType itype = project .findType (fieldType );
77
- String fqn = itype .getFullyQualifiedName ();
78
73
ImportRewrite importRewrite = cuRewrite .getImportRewrite ();
79
- fieldTypeDeclarationName = importRewrite .addImport (fqn );
74
+ fieldTypeDeclarationName = importRewrite .addImport (fieldType );
80
75
fieldDeclaration .setType (ast .newSimpleType (ast .newName (fieldTypeDeclarationName )));
81
76
82
77
AbstractTypeDeclaration parent = ((Stream <AbstractTypeDeclaration >) domCu .types ().stream ()
@@ -91,7 +86,7 @@ private void createFieldDeclaration(IJavaProject project, CompilationUnitRewrite
91
86
listRewrite .insertFirst (fieldDeclaration , msg );
92
87
}
93
88
94
- private void maybeAddConstructor (IJavaProject project , CompilationUnitRewrite cuRewrite , CompilationUnit domCu ,
89
+ private void maybeAddConstructor (CompilationUnitRewrite cuRewrite , CompilationUnit domCu ,
95
90
String typeName , String fieldType , String fieldName ) {
96
91
TypeDeclaration typeDom = (TypeDeclaration ) ((Stream <AbstractTypeDeclaration >) domCu .types ().stream ()
97
92
.filter (TypeDeclaration .class ::isInstance )
@@ -194,9 +189,9 @@ public TextDocumentEdit computeEdits(String docUri, String typeName, String fiel
194
189
195
190
CompilationUnitRewrite cuRewrite = new CompilationUnitRewrite (null , cu , domCu , Map .of ());
196
191
197
- createFieldDeclaration (project , cuRewrite , domCu , typeName , fieldType , fieldName );
192
+ createFieldDeclaration (cuRewrite , domCu , typeName , fieldType , fieldName );
198
193
199
- maybeAddConstructor (project , cuRewrite , domCu , typeName , fieldType , fieldName );
194
+ maybeAddConstructor (cuRewrite , domCu , typeName , fieldType , fieldName );
200
195
201
196
// TextEdit edit = cuRewrite.getASTRewrite().rewriteAST();
202
197
0 commit comments