fix: in memory folder config [IDE-668] (#280)

* fix: change folderconfigs to use in-memory store

* refactor: change folder config variable names for readability

* fix: typo in reference folder text

* fix: update content root node label when folder config changes

* refactor: separate name and label for contentrootnode for easier updating

* fix: typo

* chore: bump LS protocol version (#281)

* fix: only send folder config to ls if the ls has snnt them first

* fix: make folder config update tracking folder specific

* fix: allow project-specific additional parameters

* fix: pmd issues

* chore: remove unnecessary imports

---------

Co-authored-by: Bastian Doetsch <[email protected]>

Author: andrewrobinsonhodges-snyk

plugin/src/main/java/io/snyk/eclipse/plugin/preferences/InMemoryPreferenceStore.java

@@ -50,8 +50,7 @@ public void addPropertyChangeListener(IPropertyChangeListener listener) {
 
 	@Override
 	public boolean contains(String name) {
-		// TODO Auto-generated method stub
-		return false;
+		return store.containsKey(name);
 	}
 
 	@Override
@@ -128,8 +127,7 @@ public long getLong(String name) {
 
 	@Override
 	public String getString(String name) {
-		// TODO Auto-generated method stub
-		return null;
+		return store.get(name);
 	}
 
 	@Override
@@ -224,8 +222,7 @@ public void setValue(String name, long value) {
 
 	@Override
 	public void setValue(String name, String value) {
-		// TODO Auto-generated method stub
-
+		this.store.put(name, value);
 	}
 
 	@Override

plugin/src/main/java/io/snyk/eclipse/plugin/properties/FolderConfigs.java

@@ -6,24 +6,26 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-
-import com.google.gson.Gson;
 
 import io.snyk.eclipse.plugin.Activator;
 import io.snyk.eclipse.plugin.utils.ResourceUtils;
 import io.snyk.eclipse.plugin.utils.SnykLogger;
 import io.snyk.languageserver.protocolextension.messageObjects.FolderConfig;
 
 public class FolderConfigs {
+	public static Set<Path> LanguageServerConfigReceived = new ConcurrentSkipListSet<>();
+
 	protected static FolderConfigs instance;
-	private static final IEclipsePreferences instancePreferences = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
-	private static final Gson gson = new Gson();
+	
+	private static Map<Path, FolderConfig> inMemoryConfigs = new ConcurrentHashMap<>();
 
 	private FolderConfigs() {
 	}
@@ -36,22 +38,15 @@ public static synchronized FolderConfigs getInstance() {
 	}
 
 	public void addFolderConfig(FolderConfig folderConfig) {
-		var folderPath = Paths.get(folderConfig.getFolderPath());
-		persist(folderPath, folderConfig);
+		storeInMemory(Paths.get(folderConfig.getFolderPath()), folderConfig);
 	}
 
 	public List<String> getLocalBranches(Path projectPath) {
 		return getFolderConfig(projectPath).getLocalBranches();
 	}
 
-	private void persist(Path path, FolderConfig folderConfig) {
-		String updatedJson = gson.toJson(folderConfig);
-		instancePreferences.put(path.normalize().toString(), updatedJson);
-		try {
-			instancePreferences.flush();
-		} catch (Exception e) {
-			SnykLogger.logError(e);
-		}
+	private void storeInMemory(Path path, FolderConfig folderConfig) {
+		inMemoryConfigs.put(path.normalize(), folderConfig);
 	}
 
 	public String getBaseBranch(Path projectPath) {
@@ -77,10 +72,10 @@ public List<FolderConfig> getAll() {
 			var additionalParamsList = Arrays.asList(additionalParams.split(" "));
 			var folderConfig = getFolderConfig(path);
 			folderConfig.setAdditionalParameters(additionalParamsList);
-			persist(path, folderConfig);
+			storeInMemory(path, folderConfig);
 			folderConfigs.add(folderConfig);
 		}
-		
+
 		return Collections.unmodifiableList(folderConfigs);
 	}
 
@@ -90,18 +85,21 @@ public List<FolderConfig> getAll() {
 	 * @return a folder config (always)
 	 */
 	public FolderConfig getFolderConfig(Path folderPath) {
-		Path path = folderPath.normalize();
-		String json = instancePreferences.get(path.toString(), null);
-		if (json == null) {
-			SnykLogger.logInfo("No valid configuration for path: " + folderPath.toString());
-			FolderConfig folderConfig = new FolderConfig(path.toString());
-			persist(path, folderConfig);
-			return folderConfig;
+		var path = folderPath.normalize();
+
+		FolderConfig folderConfig = inMemoryConfigs.get(path);
+		if (folderConfig == null) {
+			SnykLogger.logInfo("Did not find FolderConfig for path" + path + ", creating new one.");
+			folderConfig = new FolderConfig(path.toString());
 		}
-		return gson.fromJson(json, FolderConfig.class);
+		return folderConfig;
 	}
 
 	public static void setInstance(FolderConfigs folderConfigs) {
 		instance = folderConfigs;
 	}
+
+	public void setLanguageServerConfigReceived(Path path) {
+		LanguageServerConfigReceived.add(path);
+	}
 }

plugin/src/main/java/io/snyk/eclipse/plugin/properties/ProjectPropertyPage.java

@@ -1,18 +1,20 @@
 package io.snyk.eclipse.plugin.properties;
 
+import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.StringFieldEditor;
 import org.eclipse.ui.IWorkbenchPropertyPage;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 
 import io.snyk.eclipse.plugin.Activator;
+import io.snyk.eclipse.plugin.utils.ResourceUtils;
 import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
 
 /**
@@ -21,32 +23,64 @@
 public class ProjectPropertyPage extends FieldEditorPreferencePage implements IWorkbenchPropertyPage {
 	public static final String SNYK_ADDITIONAL_PARAMETERS = "snyk.additionalParameters";
 	private IAdaptable element;
-	IEclipsePreferences projectNode;
+	private IProject project;
+	private StringFieldEditor additionalParamsEditor;
+	private Path projectPath;
 
 	public ProjectPropertyPage() {
 		super(GRID);
 	}
 
 	@Override
 	public void createFieldEditors() {
-		init();
-		addField(new StringFieldEditor(SNYK_ADDITIONAL_PARAMETERS, "Additional Parameters:", getFieldEditorParent()));
+		init();		
+		additionalParamsEditor = new StringFieldEditor(SNYK_ADDITIONAL_PARAMETERS, "Additional Parameters:",
+				getFieldEditorParent());
+
+		addField(additionalParamsEditor);
+		
+		populate();
 	}
 
-	public void init() {
-		IProject project = (IProject) getElement().getAdapter(IProject.class);
-		if (project != null) {
-			IScopeContext projectScope = new ProjectScope(project);
-			projectNode = projectScope.getNode(Activator.PLUGIN_ID);
-			setPreferenceStore(new ScopedPreferenceStore(projectScope, Activator.PLUGIN_ID));
+	private void populate() {
+		if (!FolderConfigs.LanguageServerConfigReceived.contains(projectPath)) {
+			additionalParamsEditor.setEnabled(false, getFieldEditorParent());
+		} else {
+			var folderConfig = FolderConfigs.getInstance().getFolderConfig(projectPath);
+			if (folderConfig.getAdditionalParameters() != null && folderConfig.getAdditionalParameters().size()>0) {				
+				additionalParamsEditor.setEnabled(true, getFieldEditorParent());
+				final var addParams = String.join(" ",  folderConfig.getAdditionalParameters());
+				
+				final var preferenceStore = getPreferenceStore();
+				preferenceStore.setDefault(SNYK_ADDITIONAL_PARAMETERS, addParams);
+				preferenceStore.setValue(SNYK_ADDITIONAL_PARAMETERS, addParams);
+				
+				additionalParamsEditor.setStringValue(addParams);
+			}
 		}
 	}
 
+	public void init() {
+		project = (IProject) getElement().getAdapter(IProject.class);
+		if (project == null)
+			return;
+
+		projectPath = ResourceUtils.getFullPath(project);
+		IScopeContext projectScope = new ProjectScope(project);
+		setPreferenceStore(new ScopedPreferenceStore(projectScope, Activator.PLUGIN_ID));
+	}
+
 	@Override
 	public boolean performOk() {
 		var retValue = super.performOk();
-		CompletableFuture
-				.runAsync(() -> SnykExtendedLanguageClient.getInstance().updateConfiguration());
+		final var addParams = this.additionalParamsEditor.getStringValue().split(" ");
+		CompletableFuture.runAsync(() -> {
+			var folderConfig = FolderConfigs.getInstance().getFolderConfig(projectPath);
+			folderConfig.setAdditionalParameters(Arrays.asList(addParams));
+			FolderConfigs.getInstance().addFolderConfig(folderConfig);
+			SnykExtendedLanguageClient.getInstance().updateConfiguration();
+		});
+
 		return retValue;
 	}
 

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

@@ -14,8 +14,6 @@
 import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 
-import io.snyk.eclipse.plugin.utils.SnykIcons;
-
 public class BaseTreeNode extends TreeNode {
 	private ImageDescriptor imageDescriptor;
 	private String text = "";

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

@@ -15,16 +15,19 @@
 public final class ContentRootNode extends BaseTreeNode {
 	private Path path;
 	private String name;
+	private String label;
 
-	public ContentRootNode(String name, Path value) {
+	public ContentRootNode(String name, String label, Path value) {
 		super(value);
 		this.reset();
 		this.setName(name);
+		this.setLabel(label);
 		this.setPath(value);
 	}
 
 	@Override
 	public ImageDescriptor getImageDescriptor() {
+		if (path == null) return null;
 		var iResource = ResourceUtils.getProjectByPath(path);
 		return getImageDescriptor(iResource);
 	}
@@ -68,7 +71,7 @@ public void reset() {
 
 	@Override
 	public String getText() {
-		return getName();
+		return getName() + getLabel();
 	}
 
 	public Path getPath() {
@@ -85,7 +88,16 @@ public String getName() {
 		return name;
 	}
 
+	public String getLabel() {
+		return label;
+	}
+
+
 	public final void setName(String name) {
 		this.name = name;
 	}
+
+	public final void setLabel(String label) {
+		this.label = label;
+	}
 }

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

@@ -77,6 +77,11 @@ public interface ISnykToolView {
 	 */
 	abstract void refreshTree();
 
+	/**
+	 * Refreshes the delta reference labels
+	 */
+	abstract void refreshDeltaReference();
+
 	/**
 	 * Refreshes the browser
 	 */

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

@@ -17,6 +17,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+import io.snyk.eclipse.plugin.preferences.Preferences;
 import io.snyk.eclipse.plugin.properties.FolderConfigs;
 import io.snyk.eclipse.plugin.wizards.SWTWidgetHelper;
 import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
@@ -103,7 +104,9 @@ public boolean close() {
 		CompletableFuture.runAsync(() -> {
 			final var lc = SnykExtendedLanguageClient.getInstance();
 			lc.updateConfiguration();
-			lc.triggerScan(projectPath);
+			if (Preferences.getInstance().getBooleanPref(Preferences.SCANNING_MODE_AUTOMATIC)) {
+				lc.triggerScan(projectPath);
+			}
 		});
 
 		return super.close();

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

@@ -19,14 +19,14 @@ public void reset() {
 		List<IProject> openProjects = ResourceUtils.getAccessibleTopLevelProjects();
 
 		if (openProjects.isEmpty()) {
-			var contentRoot = new ContentRootNode("No projects in workspace to scan", null);
+			var contentRoot = new ContentRootNode("No projects in workspace to scan", "",  null);
 			this.addChild(contentRoot);
 			return;
 		}
 
 		for (IProject project : openProjects) {
 			Path path = ResourceUtils.getFullPath(project);
-			BaseTreeNode contentRoot = new ContentRootNode(project.getName(), path); // NOPMD by bdoetsch on 3/12/25, 11:48 AM
+			BaseTreeNode contentRoot = new ContentRootNode(project.getName(), "", path); // NOPMD by bdoetsch on 3/12/25, 11:48 AM
 			this.addChild(contentRoot);
 		}
 	}