Fix bad .git resourceFilter

javaConfig.json

@@ -1,12 +1,11 @@
 {
     "projects": [
         "org.eclipse.jdt.ls.core",
+		"org.eclipse.jdt.ls.logback.appender",
         "org.eclipse.jdt.ls.target",
         "org.eclipse.jdt.ls.tests",
         "org.eclipse.jdt.ls.tests.syntaxserver"
     ],
 
    "targetPlatform": "org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target"
-
-
 }

org.eclipse.jdt.ls.core/.settings/org.eclipse.jdt.core.prefs

@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java

@@ -503,8 +503,8 @@ public class Preferences {
 	private static final int DEFAULT_TAB_SIZE = 4;
 
 	// <typeName, subString of classpath>
-	private static Map<String, List<String>> nonnullClasspathStorage = new HashMap<String, List<String>>();
-	private static Map<String, List<String>> nullableClasspathStorage = new HashMap<String, List<String>>();
+	private static Map<String, List<String>> nonnullClasspathStorage = new HashMap<>();
+	private static Map<String, List<String>> nullableClasspathStorage = new HashMap<>();
 
 	private Map<String, Object> configuration;
 	private Severity incompleteClasspathSeverity;
@@ -625,7 +625,7 @@ public class Preferences {
 		JAVA_COMPLETION_FILTERED_TYPES_DEFAULT.add("org.graalvm.*");
 		JAVA_COMPLETION_FILTERED_TYPES_DEFAULT.add("sun.*");
 
-		JAVA_RESOURCE_FILTERS_DEFAULT = Arrays.asList("node_modules", ".git");
+		JAVA_RESOURCE_FILTERS_DEFAULT = Arrays.asList("node_modules", "\\.git");
 		initializeNullAnalysisClasspathStorage();
 	}
 
@@ -1039,7 +1039,7 @@ public static Preferences createFrom(Map<String, Object> configuration) {
 		String settingsUrl = getString(configuration, JAVA_SETTINGS_URL);
 		prefs.setSettingsUrl(settingsUrl);
 
-		List<String> resourceFilters = getList(configuration, JAVA_RESOURCE_FILTERS);
+		List<String> resourceFilters = getList(configuration, JAVA_RESOURCE_FILTERS, JAVA_RESOURCE_FILTERS_DEFAULT);
 		prefs.setResourceFilters(resourceFilters);
 
 		String formatterProfileName = getString(configuration, JAVA_FORMATTER_PROFILE_NAME);

org.eclipse.jdt.ls.logback.appender/.classpath

@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.eclipse.jdt.ls.logback.appender/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

org.eclipse.jdt.ls.logback.appender/.settings/org.eclipse.jdt.core.prefs

@@ -1,15 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

org.eclipse.jdt.ls.tests.syntaxserver/.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17

org.eclipse.jdt.ls.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

org.eclipse.jdt.ls.tests/projects/eclipse/gitfilter/.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

org.eclipse.jdt.ls.tests/projects/eclipse/gitfilter/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gitfilter</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

org.eclipse.jdt.ls.tests/projects/eclipse/gitfilter/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

org.eclipse.jdt.ls.tests/projects/eclipse/gitfilter/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17

org.eclipse.jdt.ls.tests/projects/eclipse/gitfilter/src/demo/Foo.java

@@ -0,0 +1,7 @@
+package demo;
+
+import demo.egit.internal.Base;
+
+public class Foo extends Base {
+
+}

org.eclipse.jdt.ls.tests/projects/eclipse/gitfilter/src/demo/egit/internal/Base.java

@@ -0,0 +1,5 @@
+package demo.egit.internal;
+
+public abstract class Base {
+
+}

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/ProjectsManagerTest.java

@@ -169,7 +169,7 @@ public void testResourceFilters() throws Exception {
 			assertFalse(git.isFiltered());
 			Resource src = (Resource) project.getFolder("/src");
 			assertFalse(src.isFiltered());
-			preferenceManager.getPreferences().setResourceFilters(Arrays.asList("node_modules", ".git"));
+			preferenceManager.getPreferences().setResourceFilters(Arrays.asList("node_modules", "\\.git"));
 			projectsManager.configureFilters(new NullProgressMonitor());
 			waitForJobsToComplete();
 			nodeModules = (Resource) project.getFolder("/node_modules");
@@ -192,6 +192,19 @@ public void testResourceFilters() throws Exception {
 		}
 	}
 
+	@Test
+	public void dontFilterGitLikePackages() throws Exception {
+		//See https://github.com/eclipse/eclipse.jdt.ls/issues/2244
+		String name = "gitfilter";
+		importProjects("eclipse/" + name);
+		projectsManager.configureFilters(monitor);
+		Thread.sleep(300);//FIXME waitForJobsToComplete is ineffective on its own O_o
+		waitForJobsToComplete(monitor);
+		IProject project = getProject(name);
+		assertIsJavaProject(project);
+		assertNoErrors(project);
+	}
+
 	@Test
 	public void testImportMavenSubModule() throws IOException, OperationCanceledException, CoreException {
 		Path projectDir = copyFiles("maven/multimodule", true).toPath();