fix: race-conditions during startup, bugfixes (#269)

* fix: race-conditions during startup

* fix: tests and tool view

* fix: don't wait for download if testing

* chore: fix a few pmd violations

* fix: a few more PMD issues

* fix: a download bug

* fix: select issue from cache for ai fix

* fix: more linting fixes

* fix: even more linting

* fix: pmd found even more! we fixed it!

* fix: test failure

* fix: NPE

---------

Co-authored-by: Abdelrahman Shawki Hassan <[email protected]>

Author: bastiandoetsch

plugin/src/main/java/io/snyk/eclipse/plugin/SnykStartup.java

@@ -38,20 +38,42 @@ public class SnykStartup implements IStartup {
 	private static SnykToolView snykToolView;
 	private static boolean downloading = true;
 	private static ILog logger;
-
+	
 	@Override
 	public void earlyStartup() {
 		if (logger == null) {
 			logger = Platform.getLog(getClass());
 		}
 		runtimeEnvironment = new LsRuntimeEnvironment();
-		Job initJob = new Job("Downloading latest CLI release...") {
+		Job initJob = new Job("Initializing Snyk...") {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
+				monitor.beginTask("Initializing...", 100);
+				downloadIfNeeded(monitor);
+				monitor.subTask("Starting Language Server...");
+
+				try {
+					SnykLanguageServer.startSnykLanguageServer();
+
+					PlatformUI.getWorkbench().getDisplay().syncExec(() -> {
+						Preferences prefs = Preferences.getInstance();
+						if (prefs.getAuthToken().isBlank() && !prefs.isTest()) {
+							monitor.subTask("Starting Snyk Wizard to configure initial settings...");
+							SnykWizard.createAndLaunch();
+						}
+					});
+				} catch (RuntimeException e) {
+					SnykLogger.logError(e);
+				}
+				monitor.done();
+				return Status.OK_STATUS;
+			}
+
+			private void downloadIfNeeded(IProgressMonitor monitor) {
 				try {
 					logger.info("LS: Checking for needed download");
 					if (downloadLS()) {
-						monitor.beginTask("Downloading CLI", 100);
+						monitor.subTask("Downloading CLI");
 						logger.info("LS: Need to download");
 						downloading = true;
 						download(monitor);
@@ -60,27 +82,6 @@ protected IStatus run(IProgressMonitor monitor) {
 					logError(exception);
 				}
 				downloading = false;
-				monitor.subTask("Starting Snyk CLI in Language Server mode...");
-				startLanguageServer();
-
-				PlatformUI.getWorkbench().getDisplay().syncExec(() -> {
-					Preferences prefs = Preferences.getInstance();
-					if (prefs.getAuthToken().isBlank() && !prefs.isTest()) {
-						monitor.subTask("Starting Snyk Wizard to configure initial settings...");
-						SnykWizard.createAndLaunch();
-					}
-				});
-				monitor.done();
-
-				return Status.OK_STATUS;
-			}
-
-			private void startLanguageServer() {
-				try {
-					SnykLanguageServer.startSnykLanguageServer();
-				} catch (RuntimeException e) {
-					logError(e);
-				}
 			}
 		};
 		initJob.setPriority(Job.LONG);

plugin/src/main/java/io/snyk/eclipse/plugin/analytics/TaskProcessor.java

@@ -18,7 +18,7 @@
  */
 public class TaskProcessor {
 	// left = taskToExecute, right = callback function
-	private final Queue<Pair<Consumer<SnykExtendedLanguageClient>, Consumer<Void>>> taskQueue = new ConcurrentLinkedQueue<>();
+	private static final Queue<Pair<Consumer<SnykExtendedLanguageClient>, Consumer<Void>>> taskQueue = new ConcurrentLinkedQueue<>();
 
 	private TaskProcessor() {
 		CompletableFuture.runAsync(() -> {
@@ -29,11 +29,9 @@ private TaskProcessor() {
 	private static TaskProcessor instance;
 
 	public static TaskProcessor getInstance() {
-		synchronized (TaskProcessor.class) {
+		synchronized (taskQueue) {
 			if (instance == null) {
-				if (instance == null) {
-					instance = new TaskProcessor();
-				}
+				instance = new TaskProcessor();
 			}
 		}
 		return instance;