wip: only scan one project

Author: acke

plugin/src/main/java/io/snyk/eclipse/plugin/views/MenuHandler.java

@@ -3,16 +3,36 @@
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.internal.core.JavaProject;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
 
+import io.snyk.languageserver.LsCommandID;
 import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
 
 public class MenuHandler extends AbstractHandler {
 
-  public Object execute(ExecutionEvent event) throws ExecutionException {
-    IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-    SnykExtendedLanguageClient.getInstance().triggerScan(window);
-    return null;
-  }
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
+
+		ISelectionService service = window.getSelectionService();
+		IStructuredSelection structured = (IStructuredSelection) service.getSelection();
+
+		Object firstElement = structured.getFirstElement();
+		IProject project = null;
+		
+		if (firstElement instanceof JavaProject) {
+			project = ((JavaProject) firstElement).getProject();
+		}
+
+		if (firstElement instanceof IProject) {
+			project = (IProject) firstElement;
+		}
+
+		SnykExtendedLanguageClient.getInstance().triggerScan(project);
+		return null;
+	}
 }

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

@@ -5,6 +5,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -286,19 +288,20 @@ public void enableDelta() {
 				TreeItem[] rootItems = getTreeViewer().getTree().getItems();
 				for (TreeItem item : rootItems) {
 					ContentRootNode node = (ContentRootNode) item.getData();
-					String project = node.getText().toString();
+					String projectName = node.getText().toString();
 					String projectPath = node.getPath().toString();
 					String baseBranch = preferenceState.getBaseBranch(projectPath);
+					IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
 					String[] localBranches = preferenceState.getLocalBranches(projectPath).toArray(String[]::new);
 
 					item.setText(
-							String.format("Click to choose base branch for: %s [ current: %s ]", project, baseBranch));
+							String.format("%s - Click here choose base branch [ current: %s ]", projectName, baseBranch));
 
 					Listener selectionListener = new Listener() {
 						@Override
 						public void handleEvent(Event event) {
 							if (event.item == item) {
-								baseBranchDialog(event.display, projectPath, localBranches);
+								baseBranchDialog(event.display, projectPath, project, localBranches);
 							}
 						}
 					};
@@ -313,7 +316,7 @@ public void handleEvent(Event event) {
 		});
 	}
 
-	private void baseBranchDialog(Display display, String projectPath, String[] localBranches) {
+	private void baseBranchDialog(Display display, String projectPath, IProject project, String[] localBranches) {
 		Shell shell = new Shell(display, SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
 		shell.setText("Choose base branch for net-new issues scanning");
 		shell.setLayout(new GridLayout(1, false));
@@ -337,7 +340,7 @@ public void widgetSelected(SelectionEvent e) {
 				if (Arrays.asList(localBranches).contains(selectedBranch)) {
 					preferenceState.setBaseBranch(projectPath, selectedBranch);
 					shell.close();
-					SnykExtendedLanguageClient.getInstance().triggerScan(null);
+					SnykExtendedLanguageClient.getInstance().triggerScan(project);
 				} else {
 					SnykLogger.logInfo("Branch is not a valid local branch for repository: " + projectPath);
 				}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableAllSeveritiesHandler.java

@@ -1,18 +1,32 @@
 package io.snyk.eclipse.plugin.views.snyktoolview.handlers;
 
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.commands.IElementUpdater;
 
 import io.snyk.eclipse.plugin.properties.preferences.Preferences;
 import io.snyk.eclipse.plugin.utils.SnykIcons;
+import io.snyk.eclipse.plugin.views.snyktoolview.TreeFilterManager;
+import io.snyk.eclipse.plugin.views.snyktoolview.filters.SeverityCriticalFilter;
 
 public class EnableAllSeveritiesHandler extends BaseHandler implements IElementUpdater {
-
+	
 	public EnableAllSeveritiesHandler() {
 		super();
 
 		iconEnabled = SnykIcons.ENABLED;
 		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.ACTIVATE_SNYK_CODE_QUALITY;
+
+	}
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		super.execute(event);
+
+		TreeFilterManager.getInstance().removeTreeFilter(this.preferenceKey);
+
+		return null;
 	}
 
 }

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

@@ -176,7 +176,7 @@ public LanguageServer getConnectedLanguageServer() {
 		return super.getLanguageServer();
 	}
 
-	public void triggerScan(IWorkbenchWindow window) {
+	public void triggerScan(IProject project) {
 		CompletableFuture.runAsync(() -> {
 			if (Preferences.getInstance().getAuthToken().isBlank()) {
 				runSnykWizard();
@@ -188,14 +188,13 @@ public void triggerScan(IWorkbenchWindow window) {
 					this.toolView.enableDelta();
 
 				try {
-					this.toolView.resetNode(this.toolView.getRoot());
-					if (window == null) {
+					if (project == null) {
 						executeCommand(LsCommandID.COMMAND_WORKSPACE_SCAN, new ArrayList<>());
 						return;
 					}
 
-					ISelectionService service = window.getSelectionService();
-					IStructuredSelection structured = (IStructuredSelection) service.getSelection();
+					executeCommand(LsCommandID.COMMAND_WORKSPACE_FOLDER_SCAN,
+							List.of(project.getLocation().toOSString()));
 
 					Object firstElement = structured.getFirstElement();
 					IProject project = null;
@@ -631,13 +630,6 @@ private void enableSnykViewRunActions() {
 		});
 	}
 
-	private void runForProject(String projectName) {
-		SnykView snykView = SnykStartup.getSnykView();
-		if (snykView != null) {
-			snykView.testProject(projectName);
-		}
-	}
-
 	private CompletableFuture<Object> executeCommand(@NonNull String command, List<Object> arguments) {
 		ensureLanguageServerRunning();
 		ExecuteCommandParams params = new ExecuteCommandParams(command, arguments);