fix: use getAccessibleTopLevelProjects

Author: acke

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

@@ -80,7 +80,7 @@ public void addAll(List<FolderConfig> folderConfigs) {
 	}
 
 	public FolderConfigsParam updateFolderConfigs() {
-		List<IProject> openProjects = ResourceUtils.getOpenProjects();
+		List<IProject> openProjects = ResourceUtils.getAccessibleTopLevelProjects();
 
 		List<String> projectPaths = openProjects.stream().map(project -> project.getLocation().toOSString())
 				.collect(Collectors.toList());

plugin/src/main/java/io/snyk/eclipse/plugin/utils/ResourceUtils.java

@@ -22,7 +22,7 @@
 
 public class ResourceUtils {
 
-	private static final Comparator<IProject> projectByPathComparator = new Comparator<IProject>() {		
+	private static final Comparator<IProject> projectByPathComparator = new Comparator<IProject>() {
 		@Override
 		public int compare(IProject o1, IProject o2) {
 			Path fullPath = ResourceUtils.getFullPath(o1);
@@ -68,7 +68,7 @@ public static Path getFullPath(IResource resource) {
 
 	public static IProject getProjectByPath(Path path) {
 		var projects = getAccessibleTopLevelProjects();
-		
+
 		for (IProject iProject : projects) {
 			Path projectPath = ResourceUtils.getFullPath(iProject);
 			if (path.normalize().startsWith(projectPath)) {
@@ -79,15 +79,10 @@ public static IProject getProjectByPath(Path path) {
 	}
 
 	public static List<IProject> getAccessibleTopLevelProjects() {
-		var projects = Arrays.stream(ResourcesPlugin.getWorkspace().getRoot().getProjects())
-				.filter((project) -> {
-					return project.isAccessible() 
-							&& !project.isDerived() 
-							&& !project.isHidden();
-				})
-				.sorted(projectByPathComparator)
-				.collect(Collectors.toList());
-		
+		var projects = Arrays.stream(ResourcesPlugin.getWorkspace().getRoot().getProjects()).filter((project) -> {
+			return project.isAccessible() && !project.isDerived() && !project.isHidden();
+		}).sorted(projectByPathComparator).collect(Collectors.toList());
+
 		Set<IProject> topLevel = new TreeSet<>(projectByPathComparator);
 		boolean add = true;
 		for (IProject iProject : projects) {
@@ -103,6 +98,7 @@ public static List<IProject> getAccessibleTopLevelProjects() {
 				topLevel.add(iProject);
 			}
 		}
-		
+
 		return new ArrayList<>(topLevel);
 	}
+}

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

@@ -41,9 +41,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.internal.core.JavaProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4e.LanguageClientImpl;
@@ -682,7 +679,7 @@ public void setToolWindow(ISnykToolView toolView) {
 	}
 
 	public void clearCache() {
-		List<IProject> openProjects = ResourceUtils.getOpenProjects();
+		List<IProject> openProjects = ResourceUtils.getAccessibleTopLevelProjects();
 		for (IProject iProject : openProjects) {
 			IssueCacheHolder.getInstance().getCacheInstance(iProject).clearAll();
 		}

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

@@ -77,7 +77,7 @@ 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());
+			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 +114,7 @@ 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.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");