Add JSpecify annotations to classpath storage to enable automatic null analysis config for JSpecify

martinlippert · fbricon · commit c57d72c4dd30 · 2025-11-12T17:51:28.000+01:00
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java
@@ -1002,6 +1002,10 @@ private static void initializeNullAnalysisClasspathStorage() {
 
 		nonnullClasspathStorage.put("org.jetbrains.annotations.NotNull", getClasspathSubStringFromArtifact("org.jetbrains:annotations"));
 		nullableClasspathStorage.put("org.jetbrains.annotations.Nullable", getClasspathSubStringFromArtifact("org.jetbrains:annotations"));
+
+		nonnullClasspathStorage.put("org.jspecify.annotations.NonNull", getClasspathSubStringFromArtifact("org.jspecify:jspecify"));
+		nullableClasspathStorage.put("org.jspecify.annotations.Nullable", getClasspathSubStringFromArtifact("org.jspecify:jspecify"));
+		nonnullbydefaultClasspathStorage.put("org.jspecify.annotations.NullMarked", getClasspathSubStringFromArtifact("org.jspecify:jspecify"));
 	}
 
 	private static List<String> getClasspathSubStringFromArtifact(String artifact) {

Original file line number	Diff line number	Diff line change
`@@ -1002,6 +1002,10 @@ private static void initializeNullAnalysisClasspathStorage() {`
`1002`	`1002`
`1003`	`1003`	`nonnullClasspathStorage.put("org.jetbrains.annotations.NotNull", getClasspathSubStringFromArtifact("org.jetbrains:annotations"));`
`1004`	`1004`	`nullableClasspathStorage.put("org.jetbrains.annotations.Nullable", getClasspathSubStringFromArtifact("org.jetbrains:annotations"));`
	`1005`	`+`
	`1006`	`+ nonnullClasspathStorage.put("org.jspecify.annotations.NonNull", getClasspathSubStringFromArtifact("org.jspecify:jspecify"));`
	`1007`	`+ nullableClasspathStorage.put("org.jspecify.annotations.Nullable", getClasspathSubStringFromArtifact("org.jspecify:jspecify"));`
	`1008`	`+ nonnullbydefaultClasspathStorage.put("org.jspecify.annotations.NullMarked", getClasspathSubStringFromArtifact("org.jspecify:jspecify"));`
`1005`	`1009`	`}`
`1006`	`1010`
`1007`	`1011`	`private static List<String> getClasspathSubStringFromArtifact(String artifact) {`