Squashed commit of the following:

commit ba6787a
Author: Bastian Doetsch <bastian.doetsch@snyk.io>
Date:   Thu Dec 5 09:50:25 2024 +0100

    feat: add ToS and privacy, remove old legacy view [IDE-810] [IDE-713] (#237)

    * feat: add ToS and privacy, remove old legacy view

    * chore: remove legacy view from plugin.xml

    * chore: update theme id for background colors
Merge branch 'main' into feat/IDE-739_branch_selection_node

Author: acke

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

@@ -21,12 +21,12 @@
 import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
 
 public class BaseBranchDialog {
-	private FolderConfigs preferenceState = FolderConfigs.getInstance();
+	private FolderConfigs folderConfigs = FolderConfigs.getInstance();
 
 	public BaseBranchDialog() {
 	}
 
-	public void baseBranchDialog(Display display, Path projectPath, String[] localBranches) {
+	public void open(Display display, Path projectPath, 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));
@@ -37,7 +37,7 @@ public void baseBranchDialog(Display display, Path projectPath, String[] localBr
 		Combo dropdown = new Combo(shell, SWT.DROP_DOWN);
 		dropdown.setItems(localBranches);
 		dropdown.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		dropdown.setText(preferenceState.getBaseBranch(projectPath));
+		dropdown.setText(folderConfigs.getBaseBranch(projectPath));
 
 		Button okButton = new Button(shell, SWT.PUSH);
 		okButton.setText("OK");
@@ -48,7 +48,7 @@ public void widgetSelected(SelectionEvent e) {
 				// Handle OK button press
 				String selectedBranch = dropdown.getText();
 				if (Arrays.asList(localBranches).contains(selectedBranch)) {
-					preferenceState.setBaseBranch(projectPath, selectedBranch);
+					folderConfigs.setBaseBranch(projectPath, selectedBranch);
 					shell.close();
 					CompletableFuture.runAsync(() -> {
 						SnykExtendedLanguageClient.getInstance().triggerScan(projectPath);

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

@@ -98,14 +98,13 @@ public void selectionChanged(SelectionChangedEvent event) {
 						LSPEclipseUtils.open(fileNode.getPath().toUri().toASCIIString(),
 								issueTreeNode.getIssue().getLSP4JRange());
 					}
-					boolean deltaEnabled = Preferences.getInstance()
-							.getBooleanPref(Preferences.FILTER_DELTA_NEW_ISSUES);
+					boolean deltaEnabled = Preferences.isDeltaEnabled();
 					if (node instanceof ContentRootNode && deltaEnabled) {
 						ContentRootNode contentNode = (ContentRootNode) node;
 						String[] localBranches = folderConfigs.getLocalBranches(contentNode.getPath())
 								.toArray(new String[0]);
 
-						new BaseBranchDialog().baseBranchDialog(Display.getDefault(), contentNode.getPath(),
+						new BaseBranchDialog().open(Display.getDefault(), contentNode.getPath(),
 								localBranches);
 					}
 				});

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

@@ -118,7 +118,6 @@ public SnykExtendedLanguageClient() {
 		registerRefreshFeatureFlagsTask();
 	}
 
-
 	public static SnykExtendedLanguageClient getInstance() {
 		return instance; // we leave instantiation to LSP4e, no lazy construction here
 	}
@@ -134,7 +133,6 @@ public LanguageServer getConnectedLanguageServer() {
 	public CompletableFuture<List<WorkspaceFolder>> workspaceFolders() {
 		return CompletableFuture.completedFuture(ResourceUtils.getAccessibleTopLevelProjects().stream()
 				.map(LSPEclipseUtils::toWorkspaceFolder).toList());
-
 	}
 
 	private void registerRefreshFeatureFlagsTask() {
@@ -195,7 +193,7 @@ public void triggerScan(Path projectPath) {
 					}
 
 					executeCommand(LsConstants.COMMAND_WORKSPACE_SCAN, new ArrayList<>());
-
+					
 				} catch (Exception e) {
 					SnykLogger.logError(e);
 				}
@@ -708,7 +706,7 @@ public CompletableFuture<List<LsSdk>> getSdks(WorkspaceFolder workspaceFolder) {
 			return sdks;
 		});
 	}
-
+	
 	public ProgressManager getProgressManager() {
 		return this.progressManager;
 	}

tests/src/test/java/io/snyk/languageserver/LsConfigurationUpdaterTest.java

@@ -77,7 +77,6 @@ void testGetSettings() {
 			assertEquals("false", settings.getActivateSnykCodeQuality());
 			assertEquals("/usr/local/bin/snyk", settings.getCliPath());
 			assertEquals("my-token", settings.getToken());
-			assertArrayEquals(new String[] { "path1", "path2" }, settings.getTrustedFolders());
 			assertEquals("automatic", settings.getScanningMode());
 			assertEquals("token", settings.getAuthenticationMethod());
 			assertEquals(LsBinaries.REQUIRED_LS_PROTOCOL_VERSION, settings.getRequiredProtocolVersion());
@@ -114,7 +113,6 @@ private void setupPreferenceMock() {
 				.thenReturn("false");
 		when(preferenceMock.getPref(Preferences.CLI_PATH, "")).thenReturn("/usr/local/bin/snyk");
 		when(preferenceMock.getPref(Preferences.AUTH_TOKEN_KEY, "")).thenReturn("my-token");
-		when(preferenceMock.getPref(Preferences.TRUSTED_FOLDERS)).thenReturn("path1:path2");
 		when(preferenceMock.getBooleanPref(Preferences.SCANNING_MODE_AUTOMATIC)).thenReturn(true);
 		when(preferenceMock.getBooleanPref(Preferences.USE_TOKEN_AUTH, false)).thenReturn(true);
 		when(preferenceMock.getPref(Preferences.FILTER_DELTA_NEW_ISSUES, Boolean.FALSE.toString())).thenReturn("true");