Add Quickfix 'UninitializedBlankFinalField'

Signed-off-by: Snjezana Peco <[email protected]>
snjeza · Jan 18, 2024 · 52e0de5 · 52e0de5
1 parent 8f0f822
commit 52e0de5
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 4 deletions.
diff --git a/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/QuickFixProcessor.java b/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/QuickFixProcessor.java
@@ -37,11 +37,16 @@
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.core.dom.IVariableBinding;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.manipulation.CUCorrectionProposalCore;
 import org.eclipse.jdt.core.manipulation.ChangeCorrectionProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.IInvocationContextCore;
 import org.eclipse.jdt.internal.ui.text.correction.IProblemLocationCore;
 import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
+import org.eclipse.jdt.internal.ui.text.correction.UnInitializedFinalFieldBaseSubProcessor;
+import org.eclipse.jdt.internal.ui.text.correction.proposals.InitializeFinalFieldProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.ReplaceCorrectionProposalCore;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
 import org.eclipse.jdt.ls.core.internal.corrections.proposals.AddImportCorrectionProposal;
@@ -158,6 +163,36 @@ private void process(CodeActionParams params, IInvocationContextCore context, IP
 			case IProblem.UnresolvedVariable:
 				UnresolvedElementsSubProcessor.getVariableProposals(context, problem, null, proposals);
 				break;
+			case IProblem.UninitializedBlankFinalField:
+				UnInitializedFinalFieldBaseSubProcessor<ProposalKindWrapper> processor = new UnInitializedFinalFieldBaseSubProcessor<>() {
+
+					@Override
+					protected ProposalKindWrapper createInitializeFinalFieldProposal(IProblemLocationCore problem, ICompilationUnit targetCU, SimpleName node, IVariableBinding targetBinding, int createConstructor) {
+						InitializeFinalFieldProposalCore proposal = new InitializeFinalFieldProposalCore(problem, targetCU, node, targetBinding, IProposalRelevance.CREATE_CONSTRUCTOR);
+						return CodeActionHandler.wrap(proposal, CodeActionKind.QuickFix);
+					}
+
+					@Override
+					protected ProposalKindWrapper createInitializeFinalFieldProposal(IProblemLocationCore problem, ICompilationUnit targetCU, MethodDeclaration node, int createConstructor, int updateAtConstructor) {
+						InitializeFinalFieldProposalCore proposal = new InitializeFinalFieldProposalCore(problem, targetCU, node, IProposalRelevance.CREATE_CONSTRUCTOR, InitializeFinalFieldProposalCore.UPDATE_AT_CONSTRUCTOR);
+						return CodeActionHandler.wrap(proposal, CodeActionKind.QuickFix);
+					}
+
+					@Override
+					protected ProposalKindWrapper conditionallyCreateInitializeFinalFieldProposal(IProblemLocationCore problem, ICompilationUnit targetCU, MethodDeclaration node, int createConstructor, int updateAtConstructor) {
+						InitializeFinalFieldProposalCore initializeFinalFieldProposal = new InitializeFinalFieldProposalCore(problem, targetCU, node, IProposalRelevance.CREATE_CONSTRUCTOR,
+								InitializeFinalFieldProposalCore.UPDATE_CONSTRUCTOR_NEW_PARAMETER);
+						try {
+							if (initializeFinalFieldProposal.hasProposal()) {
+								return CodeActionHandler.wrap(initializeFinalFieldProposal, CodeActionKind.QuickFix);
+							}
+						} catch (CoreException ce) {
+						}
+						return null;
+					}
+				};
+				processor.addProposals(context, problem, proposals);
+				break;
 			case IProblem.AmbiguousType:
 			case IProblem.JavadocAmbiguousType:
 				UnresolvedElementsSubProcessor.getAmbiguousTypeReferenceProposals(context, problem, proposals);

diff --git a/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDiagnosticsHandler.java b/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDiagnosticsHandler.java
@@ -206,7 +206,7 @@ public static List<Diagnostic> toDiagnosticsArray(IOpenable openable, List<IProb
 			diag.setCode(Integer.toString(problem.getID()));
 			diag.setSeverity(convertSeverity(problem));
 			diag.setRange(convertRange(openable, problem));
-			if (problem.getID() == IProblem.UndefinedName || problem.getID() == IProblem.UndefinedType) {
+			if (problem.getID() == IProblem.UndefinedName || problem.getID() == IProblem.UndefinedType || problem.getID() == IProblem.UninitializedBlankFinalField) {
 				diag.setData(problem.getArguments());
 			}
 			if (isDiagnosticTagSupported) {

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java
@@ -332,10 +332,14 @@ public static IProblemLocationCore[] getProblemLocationCores(ICompilationUnit un
 					arguments.add(e.getAsString());
 				}
 			}
+			if (diagnostic.getData() instanceof String[] data) {
+				for (String s : data) {
+					arguments.add(s);
+				}
+			}
 			locations[i] = new ProblemLocationCore(start, end - start, problemId, arguments.toArray(new String[0]), isError, IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
 		}
-		return locations;
-	}
+		return locations;	}
 
 	private static int getProblemId(Diagnostic diagnostic) {
 		int $ = 0;

diff --git a/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target b/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
@@ -25,7 +25,7 @@
             <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
             <unit id="org.mockito.mockito-core" version="0.0.0"/>
             <unit id="org.apache.commons.commons-io" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240112-1800/"/>
+            <repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240117-1800/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>