fix: remove project node before scanning with Delta

Author: acke

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

@@ -22,7 +22,7 @@ public class ContentRootNode extends BaseTreeNode {
 	public ContentRootNode(String name, Path value) {
 		super(value);
 		reset();
-		this.name = name;
+		this.setName(name);
 		this.setPath(value);
 	}
 
@@ -79,7 +79,7 @@ public void reset() {
 
 	@Override
 	public String getText() {
-		return name;
+		return getName();
 	}
 
 	public Path getPath() {
@@ -89,4 +89,12 @@ public Path getPath() {
 	public void setPath(Path path) {
  		this.path = path.normalize();
 	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }

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

@@ -115,4 +115,11 @@ static String getPlural(long count) {
 	 * @return
 	 */
 	abstract void disableDelta();
+
+	/**
+	 * Remove the scan results for the Project from the TreeViewer.
+	 *
+	 * @param project
+	 */
+	abstract void resetContentRootNode(String project);
 }

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

@@ -186,6 +186,22 @@ public ProductTreeNode getProductNode(String product, String folderPath) {
 		return null;
 	}
 
+	@Override
+	public void resetContentRootNode(String project) {
+		if (project == null ) {
+			return;
+		}
+
+		for (TreeNode child : rootObject.getChildren()) {
+			if (child instanceof ContentRootNode) {
+				ContentRootNode contentRoot = (ContentRootNode) child;
+				if (project.startsWith(contentRoot.getName())) {
+					resetNode(contentRoot);
+				}
+			}
+		}
+	}
+
 	@Override
 	public BaseTreeNode getRoot() {
 		return ((RootNode) treeViewer.getInput());
@@ -281,7 +297,7 @@ public void enableDelta() {
 				TreeItem[] rootItems = getTreeViewer().getTree().getItems();
 				for (TreeItem item : rootItems) {
 					ContentRootNode node = (ContentRootNode) item.getData();
-					String projectName = node.getText().toString();
+					String projectName = node.getName();
 					String projectPath = node.getPath().toString();
 					IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
 					String baseBranch = preferenceState.getBaseBranch(projectPath);
@@ -327,7 +343,7 @@ private void clearDeltaNodeListeners() {
 					Listener listener = entry.getValue();
 
 					ContentRootNode node = (ContentRootNode) item.getData();
-					String project = node.getText().toString();
+					String project = node.getName();
 
 					// Revert text to original
 					item.setText(project);

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

@@ -58,9 +58,7 @@
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 
@@ -74,7 +72,6 @@
 import io.snyk.eclipse.plugin.properties.preferences.EclipsePreferenceState;
 import io.snyk.eclipse.plugin.properties.preferences.Preferences;
 import io.snyk.eclipse.plugin.utils.SnykLogger;
-import io.snyk.eclipse.plugin.views.SnykView;
 import io.snyk.eclipse.plugin.views.snyktoolview.FileTreeNode;
 import io.snyk.eclipse.plugin.views.snyktoolview.ISnykToolView;
 import io.snyk.eclipse.plugin.views.snyktoolview.InfoTreeNode;
@@ -182,19 +179,20 @@ public void triggerScan(IProject project) {
 				runSnykWizard();
 			} else {
 				openToolView();
-				this.toolView.resetNode(this.toolView.getRoot());
 
 				if (Preferences.getInstance().getBooleanPref(Preferences.FILTER_DELTA_NEW_ISSUES))
 					this.toolView.enableDelta();
 
 				try {
-					if (project == null) {
-						executeCommand(LsCommandID.COMMAND_WORKSPACE_SCAN, new ArrayList<>());
+					if (project != null) {
+						this.toolView.resetContentRootNode(project.getName());
+						executeCommand(LsCommandID.COMMAND_WORKSPACE_FOLDER_SCAN,
+								List.of(project.getLocation().toOSString()));
 						return;
 					}
 
-					executeCommand(LsCommandID.COMMAND_WORKSPACE_FOLDER_SCAN,
-							List.of(project.getLocation().toOSString()));
+					this.toolView.resetNode(this.toolView.getRoot());
+					executeCommand(LsCommandID.COMMAND_WORKSPACE_SCAN, new ArrayList<>());
 
 					Object firstElement = structured.getFirstElement();
 					IProject project = null;