Null Analysis does not work for Eclipse/invisible project

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

Author: snjeza

.gitignore

@@ -4,6 +4,7 @@ target/
 bin/
 **/lib/
 !org.eclipse.jdt.ls.tests/projects/singlefile/simple/lib/
+!org.eclipse.jdt.ls.tests/projects/eclipse/testnullable2/lib/
 !org.eclipse.jdt.ls.tests/projects/maven/salut5/node_modules/
 !org.eclipse.jdt.ls.tests/fakejdk2/17a/bin
 !org.eclipse.jdt.ls.tests/fakejdk2/17a/lib

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

@@ -2277,23 +2277,11 @@ private String getAnnotationType(IJavaProject javaProject, List<String> annotati
 								}
 							}
 						}
+						return findTypeInProject(javaProject, annotationType, classpathStorage);
 					} else {
 						// for unknown types, try to find type in the project
 						try {
-							IType type = javaProject.findType(annotationType);
-							if (type != null) {
-								IJavaElement fragmentRoot = type.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
-								IClasspathEntry classpathEntry = javaProject.getClasspathEntryFor(fragmentRoot.getPath());
-								if (classpathEntry == null || !classpathEntry.isTest()) {
-									String classpath = fragmentRoot.getPath().toOSString();
-									if (classpathStorage.containsKey(annotationType)) {
-										classpathStorage.get(annotationType).add(classpath);
-									} else {
-										classpathStorage.put(annotationType, new ArrayList<>(Arrays.asList(classpath)));
-									}
-									return annotationType;
-								}
-							}
+							return findTypeInProject(javaProject, annotationType, classpathStorage);
 						} catch (JavaModelException e) {
 							continue;
 						}
@@ -2306,6 +2294,24 @@ private String getAnnotationType(IJavaProject javaProject, List<String> annotati
 		return null;
 	}
 
+	private String findTypeInProject(IJavaProject javaProject, String annotationType, Map<String, List<String>> classpathStorage) throws JavaModelException {
+		IType type = javaProject.findType(annotationType);
+		if (type != null) {
+			IJavaElement fragmentRoot = type.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
+			IClasspathEntry classpathEntry = javaProject.getClasspathEntryFor(fragmentRoot.getPath());
+			if (classpathEntry == null || !classpathEntry.isTest()) {
+				String classpath = fragmentRoot.getPath().toOSString();
+				if (classpathStorage.containsKey(annotationType)) {
+					classpathStorage.get(annotationType).add(classpath);
+				} else {
+					classpathStorage.put(annotationType, new ArrayList<>(Arrays.asList(classpath)));
+				}
+				return annotationType;
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * generates the null analysis options of the given nonnull type and nullable type
 	 * @param nonnullType the given nonnull type

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="lib/jsr305-3.0.2.jar"/>
+	<classpathentry kind="lib" path="lib/org.eclipse.jdt.annotation-2.2.600.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>testnullable2</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/testnullable2/lib/jsr305-3.0.2.jar

@@ -0,0 +1,10 @@
+package org.sample;
+import javax.annotation.Nonnull;
+public class Main {
+  public static void main(String[] args) {
+    Test.foo(null); 
+  }
+}
+class Test {
+  static void foo(@Nonnull Test a) { }
+}

org.eclipse.jdt.ls.tests/projects/eclipse/testnullable2/lib/org.eclipse.jdt.annotation-2.2.600.jar

@@ -15,6 +15,7 @@
 import static org.eclipse.jdt.ls.core.internal.WorkspaceHelper.getProject;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -24,26 +25,35 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.ls.core.internal.JavaClientConnection;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
 import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 import org.eclipse.jdt.ls.core.internal.ResourceUtils;
+import org.eclipse.jdt.ls.core.internal.handlers.BuildWorkspaceHandler;
 import org.eclipse.jdt.ls.core.internal.preferences.ClientPreferences;
+import org.eclipse.jdt.ls.core.internal.preferences.Preferences.FeatureStatus;
 import org.eclipse.lsp4j.FileSystemWatcher;
 import org.eclipse.lsp4j.RelativePattern;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableList;
 
 public class EclipseProjectImporterTest extends AbstractProjectsManagerBasedTest {
 
@@ -240,6 +250,38 @@ public void importJavaProjectWithRootSource() throws Exception {
 		assertTrue("Unexpected source glob pattern: " + srcGlobPattern, srcGlobPattern.endsWith("projectwithrootsource/**"));
 	}
 
+	@Test
+	public void testNullAnalysis() throws Exception {
+		this.preferenceManager.getPreferences().setNonnullTypes(ImmutableList.of("javax.annotation.Nonnull", "org.eclipse.jdt.annotation.NonNull"));
+		this.preferenceManager.getPreferences().setNullableTypes(ImmutableList.of("org.eclipse.jdt.annotation.Nullable", "javax.annotation.Nonnull"));
+		this.preferenceManager.getPreferences().setNullAnalysisMode(FeatureStatus.automatic);
+		try {
+			String name = "testnullable2";
+			importProjects("eclipse/" + name);
+			IProject project = getProject(name);
+			assertIsJavaProject(project);
+			if (this.preferenceManager.getPreferences().updateAnnotationNullAnalysisOptions()) {
+				BuildWorkspaceHandler buildWorkspaceHandler = new BuildWorkspaceHandler(JavaLanguageServerPlugin.getProjectsManager());
+				buildWorkspaceHandler.buildWorkspace(true, new NullProgressMonitor());
+			}
+			IMarker[] markers = project.findMarkers(null, true, IResource.DEPTH_INFINITE);
+			assertEquals(2, markers.length);
+			IMarker marker = getWarningMarker(project, "Null type mismatch: required '@Nonnull Test' but the provided value is null");
+			assertNotNull(marker);
+			assertTrue(marker.getResource() instanceof IFile);
+			assertEquals("Main.java", ((IFile) marker.getResource()).getFullPath().lastSegment());
+			IJavaProject javaProject = JavaCore.create(project);
+			Map<String, String> options = javaProject.getOptions(true);
+			assertEquals(JavaCore.ENABLED, options.get(JavaCore.COMPILER_ANNOTATION_NULL_ANALYSIS));
+			assertNoErrors(project);
+		} finally {
+			this.preferenceManager.getPreferences().setNonnullTypes(Collections.emptyList());
+			this.preferenceManager.getPreferences().setNullableTypes(Collections.emptyList());
+			this.preferenceManager.getPreferences().setNullAnalysisMode(FeatureStatus.disabled);
+			this.preferenceManager.getPreferences().updateAnnotationNullAnalysisOptions();
+		}
+	}
+
 	@After
 	public void after() {
 		importer = null;