Code action for "The left-hand side of an assginment must be a variable"

- Add testcase and fix a disabled testcase
- Update jakarta.servlet-api

Signed-off-by: Roland Grunberg <rgrunber@redhat.com>

Author: rgrunber

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

@@ -166,6 +166,8 @@ private void process(CodeActionParams params, IInvocationContext context, IProbl
 			case IProblem.UnresolvedVariable:
 				UnresolvedElementsSubProcessor.getVariableProposals(context, problem, null, proposals);
 				break;
+			case IProblem.ExpressionShouldBeAVariable:
+				LocalCorrectionsSubProcessor.addExpressionShouldBeAVariableProposals(context, problem, proposals);
 			case IProblem.UninitializedBlankFinalField:
 				UnInitializedFinalFieldBaseSubProcessor<ProposalKindWrapper> processor = new UnInitializedFinalFieldSubProcessor();
 				processor.addProposals(context, problem, proposals);

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

@@ -89,6 +89,7 @@
 import org.eclipse.jdt.internal.ui.text.correction.proposals.LinkedCorrectionProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.MissingAnnotationAttributesProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.ModifierChangeCorrectionProposalCore;
+import org.eclipse.jdt.internal.ui.text.correction.proposals.NewLocalVariableCorrectionProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.NewMethodCorrectionProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.NewVariableCorrectionProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.RefactoringCorrectionProposalCore;
@@ -837,6 +838,10 @@ public static void addValueForAnnotationProposals(IInvocationContext context, IP
 		new LocalCorrectionsSubProcessor().getValueForAnnotationProposals(context, problem, proposals);
 	}
 
+	public static void addExpressionShouldBeAVariableProposals(IInvocationContext context, IProblemLocation problem, Collection<ProposalKindWrapper> proposals) {
+		new LocalCorrectionsSubProcessor().getExpressionShouldBeAVariableProposalsBase(context, problem, proposals);
+	}
+
 	@Override
 	protected ProposalKindWrapper refactoringCorrectionProposalToT(RefactoringCorrectionProposalCore core, int uid) {
 		return CodeActionHandler.wrap(core, CodeActionKind.QuickFix);
@@ -912,4 +917,9 @@ protected ProposalKindWrapper modifierChangeCorrectionProposalToT(ModifierChange
 		return CodeActionHandler.wrap(core, CodeActionKind.QuickFix);
 	}
 
+	@Override
+	protected ProposalKindWrapper newLocalVariableCorrectionProposalToT(NewLocalVariableCorrectionProposalCore core, int uid) {
+		return CodeActionHandler.wrap(core, CodeActionKind.QuickFix);
+	}
+
 }

org.eclipse.jdt.ls.product/languageServer.product

@@ -23,7 +23,7 @@
    <plugins>
       <plugin id="ch.qos.logback.classic"/>
       <plugin id="ch.qos.logback.core"/>
-      <plugin id="jakarta.servlet-api" version="5.0.0"/>
+      <plugin id="jakarta.servlet-api"/>
       <plugin id="org.apache.commons.commons-codec"/>
       <plugin id="org.apache.felix.scr"/>
       <plugin id="org.eclipse.ant.core"/>

org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target

@@ -66,11 +66,11 @@
 			    <dependency>
 				    <groupId>jakarta.servlet</groupId>
 				    <artifactId>jakarta.servlet-api</artifactId>
-				    <version>5.0.0</version>
+				    <version>6.1.0</version>
 				    <type>jar</type>
 			    </dependency>
 		    </dependencies>
 	    </location>
     </locations>
     <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-24"/>
-</target>
+</target>

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/correction/LocalCorrectionQuickFixTest.java

@@ -2720,16 +2720,16 @@ public void testRemoveUnreachableCodeMultiStatementsSwitch() throws Exception {
 		buf.append("public class E {\n");
 		buf.append("    public void foo() {\n");
 		buf.append("        switch (1) {\n");
-		buf.append("            case 1:\n");
-		buf.append("                foo();\n");
-		buf.append("                break;\n");
-		buf.append("                foo();\n");
-		buf.append("                new Object();\n");
-		buf.append("            case 2:\n");
-		buf.append("                foo();\n");
-		buf.append("                break;\n");
-		buf.append("            default:\n");
-		buf.append("                break;\n");
+		buf.append("        case 1:\n");
+		buf.append("            foo();\n");
+		buf.append("            break;\n");
+		buf.append("            foo();\n");
+		buf.append("            new Object();\n");
+		buf.append("        case 2:\n");
+		buf.append("            foo();\n");
+		buf.append("            break;\n");
+		buf.append("        default:\n");
+		buf.append("            break;\n");
 		buf.append("        };\n");
 		buf.append("    }\n");
 		buf.append("}\n");
@@ -2740,18 +2740,42 @@ public void testRemoveUnreachableCodeMultiStatementsSwitch() throws Exception {
 		buf.append("public class E {\n");
 		buf.append("    public void foo() {\n");
 		buf.append("        switch (1) {\n");
-		buf.append("            case 1:\n");
-		buf.append("                foo();\n");
-		buf.append("                break;\n");
-		buf.append("            case 2:\n");
-		buf.append("                foo();\n");
-		buf.append("                break;\n");
-		buf.append("            default:\n");
-		buf.append("                break;\n");
+		buf.append("        case 1:\n");
+		buf.append("            foo();\n");
+		buf.append("            break;\n");
+		buf.append("        case 2:\n");
+		buf.append("            foo();\n");
+		buf.append("            break;\n");
+		buf.append("        default:\n");
+		buf.append("            break;\n");
 		buf.append("        };\n");
 		buf.append("    }\n");
 		buf.append("}\n");
 		Expected e1 = new Expected("Remove", buf.toString());
+		assertCodeActionExists(cu, e1);
+	}
+
+	@Test
+	public void testExpressionShouldBeVariable() throws Exception {
+		IPackageFragment pack1 = fSourceFolder.createPackageFragment("test1", false, null);
+		StringBuilder buf = new StringBuilder();
+		buf.append("package test1;\n"
+				+ "public class E {\n"
+				+ "    public static void foo (String input) {\n"
+				+ "        ((String)input);\n"
+				+ "    }\n"
+				+ "}");
+		ICompilationUnit cu = pack1.createCompilationUnit("E.java", buf.toString(), false, null);
+
+		buf = new StringBuilder();
+		buf.append("package test1;\n"
+				+ "public class E {\n"
+				+ "    public static void foo (String input) {\n"
+				+ "        String string = (String)input;\n"
+				+ "    }\n"
+				+ "}");
+		Expected e1 = new Expected("Create local variable using expression", buf.toString());
+		assertCodeActionExists(cu, e1);
 	}
 
 }