Update the outdated diagnostics when the code action for creating a missing element is invoked

Author: testforstephen

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JDTDelegateCommandHandler.java

@@ -99,7 +99,10 @@ public Object executeCommand(String commandId, List<Object> arguments, IProgress
 				case "java.project.getAll":
 					return ProjectCommand.getAllJavaProjects();
 				case "java.project.refreshDiagnostics":
-					return DiagnosticsCommand.refreshDiagnostics((String) arguments.get(0), (String) arguments.get(1), (boolean) arguments.get(2));
+					if (arguments.size() < 4) {
+						return DiagnosticsCommand.refreshDiagnostics((String) arguments.get(0), (String) arguments.get(1), (boolean) arguments.get(2));
+					}
+					return DiagnosticsCommand.refreshDiagnostics((String) arguments.get(0), (String) arguments.get(1), (boolean) arguments.get(2), (boolean) arguments.get(3));
 				case "java.project.import":
 					ProjectCommand.importProject(monitor);
 					return null;

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/commands/DiagnosticsCommand.java

@@ -38,11 +38,21 @@
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.JavaClientConnection;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ls.core.internal.JobHelpers;
 import org.eclipse.jdt.ls.core.internal.handlers.DiagnosticsHandler;
+import org.eclipse.jdt.ls.core.internal.handlers.DocumentLifeCycleHandler;
 
 public class DiagnosticsCommand {
 
 	public static Object refreshDiagnostics(String uri, String scope, boolean syntaxOnly) {
+		return refreshDiagnostics(uri, scope, syntaxOnly, false);
+	}
+
+	public static Object refreshDiagnostics(String uri, String scope, boolean syntaxOnly, boolean waitForLifecycleJob) {
+		if (waitForLifecycleJob) {
+			JobHelpers.waitForJobs(DocumentLifeCycleHandler.DOCUMENT_LIFE_CYCLE_JOBS, new NullProgressMonitor());
+		}
+
 		DiagnosticsState state = JavaLanguageServerPlugin.getNonProjectDiagnosticsState();
 		boolean refreshAll = false;
 		if (Objects.equals(scope, "thisFile")) {

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CodeActionHandler.java

@@ -46,6 +46,10 @@
 import org.eclipse.jdt.ls.core.internal.corrections.QuickFixProcessor;
 import org.eclipse.jdt.ls.core.internal.corrections.RefactorProcessor;
 import org.eclipse.jdt.ls.core.internal.corrections.proposals.ChangeCorrectionProposal;
+import org.eclipse.jdt.ls.core.internal.corrections.proposals.NewAnnotationMemberProposal;
+import org.eclipse.jdt.ls.core.internal.corrections.proposals.NewCUProposal;
+import org.eclipse.jdt.ls.core.internal.corrections.proposals.NewMethodCorrectionProposal;
+import org.eclipse.jdt.ls.core.internal.corrections.proposals.NewVariableCorrectionProposal;
 import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
 import org.eclipse.jdt.ls.core.internal.preferences.Preferences;
 import org.eclipse.jdt.ls.core.internal.text.correction.AssignToVariableAssistCommandProposal;
@@ -198,7 +202,7 @@ public List<Either<Command, CodeAction>> getCodeActionCommands(CodeActionParams
 		}
 		try {
 			for (ChangeCorrectionProposal proposal : proposals) {
-				Optional<Either<Command, CodeAction>> codeActionFromProposal = getCodeActionFromProposal(proposal, params.getContext());
+				Optional<Either<Command, CodeAction>> codeActionFromProposal = getCodeActionFromProposal(params.getTextDocument().getUri(), proposal, params.getContext());
 				if (codeActionFromProposal.isPresent() && !codeActions.contains(codeActionFromProposal.get())) {
 					codeActions.add(codeActionFromProposal.get());
 				}
@@ -256,7 +260,7 @@ private void populateDataFields(List<Either<Command, CodeAction>> codeActions) {
 		}
 	}
 
-	private Optional<Either<Command, CodeAction>> getCodeActionFromProposal(ChangeCorrectionProposal proposal, CodeActionContext context) throws CoreException {
+	private Optional<Either<Command, CodeAction>> getCodeActionFromProposal(String uri, ChangeCorrectionProposal proposal, CodeActionContext context) throws CoreException {
 		String name = proposal.getName();
 
 		Command command = null;
@@ -281,6 +285,18 @@ private Optional<Either<Command, CodeAction>> getCodeActionFromProposal(ChangeCo
 			CodeAction codeAction = new CodeAction(name);
 			codeAction.setKind(proposal.getKind());
 			if (command == null) { // lazy resolve the edit.
+				if (!preferenceManager.getPreferences().isValidateAllOpenBuffersOnChanges()) {
+					if (proposal instanceof NewCUProposal
+						|| proposal instanceof NewMethodCorrectionProposal
+						|| proposal instanceof NewAnnotationMemberProposal
+						|| proposal instanceof NewVariableCorrectionProposal
+					) {
+						codeAction.setCommand(new Command("refresh Diagnostics", "java.project.refreshDiagnostics", Arrays.asList(
+							uri, "thisFile", false, true
+						)));
+					}
+				}
+
 				// The relevance is in descending order while CodeActionComparator sorts in ascending order
 				codeAction.setData(new CodeActionData(proposal, -proposal.getRelevance()));
 			} else {

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

@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.handlers;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
@@ -344,6 +345,37 @@ public void testCodeAction_NPEInNewCUProposal() throws Exception {
 		Assert.assertNotNull(codeActions);
 	}
 
+	@Test
+	public void testCodeAction_refreshDiagnosticsCommandInNewCUProposal() throws Exception {
+		when(clientPreferences.isResolveCodeActionSupported()).thenReturn(true);
+		preferences.setValidateAllOpenBuffersOnChanges(false);
+		ICompilationUnit unit = getWorkingCopy(
+		//@formatter:off
+				"src/org/sample/Foo.java",
+				"package org.sample;\n"+
+				"public class Foo {\n"+
+				"	public static void main(String[] args) {\n"+
+				"		CU obj;\n"+
+				"	}\n"+
+				"}\n");
+		//@formatter:off
+		CodeActionParams params = new CodeActionParams();
+		params.setTextDocument(new TextDocumentIdentifier(JDTUtils.toURI(unit)));
+		final Range range = CodeActionUtil.getRange(unit, "CU");
+		params.setRange(range);
+		CodeActionContext context = new CodeActionContext(
+			Arrays.asList(getDiagnostic(Integer.toString(IProblem.UndefinedType), range))
+		);
+		params.setContext(context);
+		List<Either<Command, CodeAction>> codeActions = getCodeActions(params);
+		Assert.assertNotNull(codeActions);
+		Optional<Either<Command, CodeAction>> newCUProposal = codeActions.stream().filter(action -> action.isRight() && Objects.equals(action.getRight().getTitle(), "Create class 'CU'")).findFirst();
+		assertTrue(newCUProposal.isPresent());
+		assertNotNull(newCUProposal.get().getRight());
+		assertNotNull(newCUProposal.get().getRight().getCommand());
+		assertEquals("java.project.refreshDiagnostics", newCUProposal.get().getRight().getCommand().getCommand());
+	}
+
 	private static String getBaseKind(String codeActionKind) {
 		if (codeActionKind.contains(".")) {
 			return codeActionKind.substring(0, codeActionKind.indexOf('.'));