java.import.exclusions preference is ignored during server startup

Signed-off-by: Snjezana Peco <[email protected]>
eclipse-jdtls · Feb 20, 2018 · 073a701 · 073a701
1 parent 4b332de
commit 073a701
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandler.java
@@ -17,6 +17,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -54,6 +55,7 @@
  */
 final public class InitHandler {
 
+	public static final String JAVA_IMPORT_EXCLUSIONS = "javaImportExclusions";
 	public static final String JAVA_LS_INITIALIZATION_JOBS = "java-ls-initialization-jobs";
 	private static final String BUNDLES_KEY = "bundles";
 
@@ -108,6 +110,10 @@ InitializeResult initialize(InitializeParams param) {
 			logInfo("No workspace folders or root uri was defined. Falling back on " + workspaceLocation);
 			rootPaths.add(workspaceLocation);
 		}
+		List<String> javaImportExclusions = getJavaImportExclusions(initializationOptions);
+		if (javaImportExclusions != null) {
+			preferenceManager.getPreferences().setJavaImportExclusions(javaImportExclusions);
+		}
 		triggerInitialization(rootPaths);
 		addWorkspaceDiagnosticsHandler();
 		Integer processId = param.getProcessId();
@@ -224,6 +230,16 @@ public boolean belongsTo(Object family) {
 		return null;
 	}
 
+	private List<String> getJavaImportExclusions(Map<?, ?> initializationOptions) {
+		if (initializationOptions != null) {
+			Object javaImportExclusions = initializationOptions.get(JAVA_IMPORT_EXCLUSIONS);
+			if (javaImportExclusions instanceof List<?>) {
+				return (List<String>) javaImportExclusions;
+			}
+		}
+		return null;
+	}
+
 	private Collection<String> getWorkspaceFolders(Map<?, ?> initializationOptions) {
 		if (initializationOptions != null) {
 			Object folders = initializationOptions.get("workspaceFolders");
@@ -233,7 +249,6 @@ private Collection<String> getWorkspaceFolders(Map<?, ?> initializationOptions)
 		}
 		return null;
 	}
-
 	private Collection<String> getBundleList(Map<?, ?> initializationOptions) {
 		if (initializationOptions != null) {
 			Object bundleObject = initializationOptions.get(BUNDLES_KEY);

diff --git a/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandlerTest.java b/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandlerTest.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.ls.core.internal.handlers;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -19,7 +20,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -54,6 +58,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class InitHandlerTest extends AbstractProjectsManagerBasedTest {
 
+	private static final String TEST_EXCLUSIONS = "**/test/**";
 	protected JDTLanguageServer server;
 	protected JDTLanguageServer protocol;
 
@@ -131,8 +136,25 @@ public void testRegisterDelayedCapability() throws Exception {
 		verify(client, times(7)).registerCapability(any());
 	}
 
-	private InitializeResult initialize(boolean dynamicRegistration) throws InterruptedException, ExecutionException {
+	@Test
+	public void testJavaImportExclusions() throws Exception {
+		ClientPreferences mockCapabilies = mock(ClientPreferences.class);
+		when(preferenceManager.getClientPreferences()).thenReturn(mockCapabilies);
 		InitializeParams params = new InitializeParams();
+		Map<String, Object> map = new HashMap<>();
+		List<String> javaImportExclusions = new ArrayList<>();
+		javaImportExclusions.add(TEST_EXCLUSIONS);
+		map.put(InitHandler.JAVA_IMPORT_EXCLUSIONS, javaImportExclusions);
+		params.setInitializationOptions(map);
+		initialize(true, params);
+		assertEquals(TEST_EXCLUSIONS, preferenceManager.getPreferences().getJavaImportExclusions().get(0));
+	}
+
+	private InitializeResult initialize(boolean dynamicRegistration) throws InterruptedException, ExecutionException {
+		return initialize(dynamicRegistration, new InitializeParams());
+	}
+
+	private InitializeResult initialize(boolean dynamicRegistration, InitializeParams params) throws InterruptedException, ExecutionException {
 		ClientCapabilities capabilities = new ClientCapabilities();
 		WorkspaceClientCapabilities workspaceCapabilities = new WorkspaceClientCapabilities();
 		workspaceCapabilities.setDidChangeConfiguration(new DidChangeConfigurationCapabilities(dynamicRegistration));