Use ProgressReporter to monitor initialization jobs

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

@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.handlers;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -48,7 +50,9 @@ public ProgressReporterManager(JavaLanguageClient client, PreferenceManager pref
 	@Override
 	public IProgressMonitor createMonitor(Job job) {
 		if (job.belongsTo(InitHandler.JAVA_LS_INITIALIZATION_JOBS)) {
-			return new ServerStatusMonitor();
+			// for backward compatibility
+			List<IProgressMonitor> monitors = Arrays.asList(new ServerStatusMonitor(), createJobMonitor(job));
+			return new MulticastProgressReporter(monitors);
 		}
 		IProgressMonitor monitor = createJobMonitor(job);
 		return monitor;
@@ -77,6 +81,74 @@ public void setReportThrottle(long delay) {
 		this.delay = delay;
 	}
 
+	private class MulticastProgressReporter implements IProgressMonitor {
+		protected List<IProgressMonitor> monitors;
+
+		public MulticastProgressReporter(List<IProgressMonitor> monitors) {
+			this.monitors = monitors;
+		}
+
+		@Override
+		public void done() {
+			for (IProgressMonitor monitor : monitors) {
+				monitor.done();
+			}
+		}
+
+		@Override
+		public boolean isCanceled() {
+			for (IProgressMonitor monitor : monitors) {
+				if (!monitor.isCanceled()) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		@Override
+		public void beginTask(String name, int totalWork) {
+			for (IProgressMonitor monitor : monitors) {
+				monitor.beginTask(name, totalWork);
+			}
+		}
+
+		@Override
+		public void internalWorked(double work) {
+			for (IProgressMonitor monitor : monitors) {
+				monitor.internalWorked(work);
+			}
+		}
+
+		@Override
+		public void setCanceled(boolean cancelled) {
+			for (IProgressMonitor monitor : monitors) {
+				monitor.setCanceled(cancelled);
+			}
+		}
+
+		@Override
+		public void setTaskName(String name) {
+			for (IProgressMonitor monitor : monitors) {
+				monitor.setTaskName(name);
+			}
+		}
+
+		@Override
+		public void subTask(String name) {
+			for (IProgressMonitor monitor : monitors) {
+				monitor.subTask(name);
+			}
+		}
+
+		@Override
+		public void worked(int work) {
+			for (IProgressMonitor monitor : monitors) {
+				monitor.worked(work);
+			}
+		}
+	}
+
 	private class ProgressReporter extends CancellableProgressMonitor {
 
 		protected static final String SEPARATOR = " - ";

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

@@ -103,6 +103,40 @@ protected IStatus run(IProgressMonitor monitor) {
 		assertTrue(report.isComplete());
 	}
 
+	@Test
+	public void testMulticastJobReporting() throws InterruptedException {
+		manager.setReportThrottle(275);
+		Job job = new Job("Test Job") {
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				return null;
+			}
+			@Override
+			public boolean belongsTo(Object family) {
+				return family == InitHandler.JAVA_LS_INITIALIZATION_JOBS;
+			}
+		};
+
+		IProgressMonitor monitor = manager.createMonitor(job);
+		monitor.done();
+
+		ArgumentCaptor<StatusReport> captorStatus = ArgumentCaptor.forClass(StatusReport.class);
+		verify(client, times(1)).sendStatusReport(captorStatus.capture());
+		List<StatusReport> statusReports = captorStatus.getAllValues();
+		assertEquals(1, statusReports.size());
+		StatusReport statusReport = statusReports.get(0);
+		assertEquals(ServiceStatus.Starting.name(), statusReport.getType());
+
+		ArgumentCaptor<ProgressReport> captorProgress = ArgumentCaptor.forClass(ProgressReport.class);
+		verify(client, times(1)).sendProgressReport(captorProgress.capture());
+		List<ProgressReport> progressReports = captorProgress.getAllValues();
+		assertEquals(1, progressReports.size());
+		ProgressReport progressReport = progressReports.get(0);
+		assertEquals(job.getName(), progressReport.getStatus());
+		assertEquals(job.getName(), progressReport.getTask());
+		assertTrue(progressReport.isComplete());
+	}
+
 	@Test
 	public void testStartupJobReporting() throws InterruptedException {
 		manager.setReportThrottle(0);