Diagnostics from changes to build configuration not reflected in open source files (#1964)

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

Author: snjeza

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

@@ -301,7 +301,7 @@ public IStatus run(IProgressMonitor monitor) {
 					JobHelpers.waitForBuildJobs(60 * 60 * 1000); // 1 hour
 					logInfo(">> build jobs finished");
 					client.sendStatus(ServiceStatus.ServiceReady, "ServiceReady");
-					workspaceDiagnosticsHandler = new WorkspaceDiagnosticsHandler(JDTLanguageServer.this.client, pm, preferenceManager.getClientPreferences());
+					workspaceDiagnosticsHandler = new WorkspaceDiagnosticsHandler(JDTLanguageServer.this.client, pm, preferenceManager.getClientPreferences(), documentLifeCycleHandler);
 					workspaceDiagnosticsHandler.publishDiagnostics(monitor);
 					workspaceDiagnosticsHandler.addResourceChangeListener();
 					classpathUpdateHandler = new ClasspathUpdateHandler(JDTLanguageServer.this.client);

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

@@ -70,16 +70,22 @@ public final class WorkspaceDiagnosticsHandler implements IResourceChangeListene
 	private final JavaClientConnection connection;
 	private final ProjectsManager projectsManager;
 	private final boolean isDiagnosticTagSupported;
+	private final DocumentLifeCycleHandler handler;
 
 	@Deprecated
 	public WorkspaceDiagnosticsHandler(JavaClientConnection connection, ProjectsManager projectsManager) {
 		this(connection, projectsManager, null);
 	}
 
 	public WorkspaceDiagnosticsHandler(JavaClientConnection connection, ProjectsManager projectsManager, ClientPreferences prefs) {
+		this(connection, projectsManager, prefs, null);
+	}
+
+	public WorkspaceDiagnosticsHandler(JavaClientConnection connection, ProjectsManager projectsManager, ClientPreferences prefs, DocumentLifeCycleHandler handler) {
 		this.connection = connection;
 		this.projectsManager = projectsManager;
 		this.isDiagnosticTagSupported = prefs != null ? prefs.isDiagnosticTagSupported() : false;
+		this.handler = handler;
 	}
 
 	public void addResourceChangeListener() {
@@ -170,6 +176,8 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 				markers = Arrays.copyOf(javaMarkers, javaMarkers.length + taskMarkers.length);
 				System.arraycopy(taskMarkers, 0, markers, javaMarkers.length, taskMarkers.length);
 				document = JsonRpcHelpers.toDocument(cu.getBuffer());
+			} else if (handler != null) {
+				handler.triggerValidation(cu);
 			}
 		} // or a build file
 		else if (projectsManager.isBuildFile(file)) {

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

@@ -335,6 +335,38 @@ public void testWorkingCopy() throws Exception {
 		}
 	}
 
+	// https://github.com/eclipse/eclipse.jdt.ls/issues/1963
+	@Test
+	public void testWorkingCopy2() throws Exception {
+		ICompilationUnit cu = null;
+		try {
+			DocumentLifeCycleHandler lifeCycleHandler = new DocumentLifeCycleHandler(connection, preferenceManager, projectsManager, false);
+			handler.removeResourceChangeListener();
+			handler = new WorkspaceDiagnosticsHandler(connection, projectsManager, preferenceManager.getClientPreferences(), lifeCycleHandler);
+			handler.addResourceChangeListener();
+			//import project
+			importProjects("eclipse/hello");
+			IProject project = getProject("hello");
+			IFile iFile = project.getFile("/src/test1/A.java");
+
+			cu = JavaCore.createCompilationUnitFrom(iFile);
+			cu.becomeWorkingCopy(null);
+			reset(connection);
+			ResourceUtils.setContent(iFile, "package test1;\npublic class A() {}\n");
+			waitForBackgroundJobs();
+			ArgumentCaptor<PublishDiagnosticsParams> captor = ArgumentCaptor.forClass(PublishDiagnosticsParams.class);
+			verify(connection, atMost(3)).publishDiagnostics(captor.capture());
+		} finally {
+			if (cu != null) {
+				cu.discardWorkingCopy();
+			}
+			handler.removeResourceChangeListener();
+			handler = new WorkspaceDiagnosticsHandler(connection, projectsManager, preferenceManager.getClientPreferences());
+			handler.addResourceChangeListener();
+			connection.disconnect();
+		}
+	}
+
 	// https://github.com/eclipse/eclipse.jdt.ls/issues/1920
 	@Test
 	public void testWithoutWorkingCopy() throws Exception {