feat: allow users to cancel scans from the browser window

Author: andrewrobinsonhodges-snyk

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/BrowserHandler.java

@@ -5,6 +5,11 @@
 import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.CommandException;
+import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.jface.viewers.TreeNode;
 import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4j.Location;
@@ -18,13 +23,17 @@
 import org.eclipse.swt.browser.ProgressEvent;
 import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.IHandlerService;
+
 import com.google.gson.Gson;
 
 import io.snyk.eclipse.plugin.html.BaseHtmlProvider;
 import io.snyk.eclipse.plugin.html.HtmlProviderFactory;
 import io.snyk.eclipse.plugin.html.StaticPageHtmlProvider;
 import io.snyk.eclipse.plugin.preferences.Preferences;
 import io.snyk.eclipse.plugin.utils.SnykLogger;
+import io.snyk.eclipse.plugin.views.snyktoolview.handlers.IHandlerCommands;
 import io.snyk.eclipse.plugin.wizards.SnykWizard;
 
 @SuppressWarnings("restriction")
@@ -77,7 +86,15 @@ public Object function(Object[] arguments) {
 		new BrowserFunction(browser, "stopScan") {
 			@Override
 			public Object function(Object[] arguments) {
-				//TODO Implement this!
+				
+				IHandlerService handlerService = 
+						(IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
+				try {
+					handlerService.executeCommand(IHandlerCommands.STOP_SCAN, null);
+				} catch (CommandException e) {
+					SnykLogger.logError(e);
+				} 
+				
 				return null;
 			}
 		};

plugin/src/main/java/io/snyk/eclipse/plugin/wizards/SnykWizard.java

@@ -97,7 +97,7 @@ protected IStatus run(IProgressMonitor monitor) {
 
 	public static Object createAndLaunch() {
 		SnykWizard wizard = new SnykWizard();
-		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(),wizard);
+		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);
 		dialog.setBlockOnOpen(true);
 		dialog.open();
 		return null;

plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java

@@ -76,6 +76,7 @@
 import io.snyk.eclipse.plugin.views.snyktoolview.IssueTreeNode;
 import io.snyk.eclipse.plugin.views.snyktoolview.ProductTreeNode;
 import io.snyk.eclipse.plugin.views.snyktoolview.SnykToolView;
+import io.snyk.eclipse.plugin.views.snyktoolview.handlers.IHandlerCommands;
 import io.snyk.eclipse.plugin.wizards.SnykWizard;
 import io.snyk.languageserver.CommandHandler;
 import io.snyk.languageserver.FeatureFlagConstants;
@@ -207,12 +208,6 @@ public void triggerScan(Path projectPath) {
 		});
 	}
 
-	public void stopScan() {
-		CompletableFuture.runAsync(() -> {
-			executeCommand("STOP_SCAN", new ArrayList<>());
-		});
-	}
-
 	private CompletableFuture<Object> executeCommand(String cmd, List<Object> args) {
 		synchronized (chSyncObject) {
 			if (commandHandler == null) {