Enable NonNullByDefault for lspe4.plugin (#1009)

eclipse · Aug 13, 2024 · 3ed68da · 3ed68da
1 parent cb85702
commit 3ed68da
Show file tree

Hide file tree

Showing 164 changed files with 2,110 additions and 1,586 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,26 @@
-target/
-bin/
-.settings/de.loskutov.anyedit.AnyEditTools.prefs
+# Local work folder that is not checked in
+_LOCAL/
+
+# Eclipse
+/bin/
+/*/bin/
+**/.settings/*
+!**/.settings/org.eclipse.core.resoures.prefs
+!**/.settings/org.eclipse.jdt.core.prefs
+!**/.settings/org.eclipse.pde.core.prefs
+**/.pydevproject
+
+# Maven
+/target/
+/*/target/
 .polyglot.*
 .META-INF_MANIFEST.MF
 dash-licenses/
 *.log
+
+# OSX
+.DS_Store
+
+# Vim
+*.swo
+*.swp
diff --git a/.project b/.project
@@ -5,7 +5,13 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.lsp4e.debug/.gitignore b/org.eclipse.lsp4e.debug/.gitignore
diff --git a/org.eclipse.lsp4e.test/.gitignore b/org.eclipse.lsp4e.test/.gitignore
diff --git a/org.eclipse.lsp4e.tests.mock/.gitignore b/org.eclipse.lsp4e.tests.mock/.gitignore
diff --git a/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mock Language Server to test LSP4E
 Bundle-SymbolicName: org.eclipse.lsp4e.tests.mock
-Bundle-Version: 0.16.9.qualifier
+Bundle-Version: 0.16.10.qualifier
 Bundle-Vendor: Eclipse LSP4E
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.lsp4j;bundle-version="[0.23.0,0.24.0)",

diff --git a/org.eclipse.lsp4e/.classpath b/org.eclipse.lsp4e/.classpath
@@ -1,7 +1,21 @@
 <?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"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<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="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.lsp4e/.gitignore b/org.eclipse.lsp4e/.gitignore
@@ -1,4 +1 @@
-/target/
-/bin/
 /resources/highlight.min.js/
-/.settings/
diff --git a/org.eclipse.lsp4e/.project b/org.eclipse.lsp4e/.project
@@ -21,12 +21,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.ds.core.builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

diff --git a/org.eclipse.lsp4e/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.lsp4e/.settings/org.eclipse.jdt.core.prefs
@@ -1,13 +1,17 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.builder.annotationPath.allLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
 org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=org.eclipse.lsp4j.jsonrpc.validation.NonNull
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
+org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning
+org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
@@ -17,6 +21,7 @@ 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.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -37,10 +42,12 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
@@ -59,7 +66,7 @@ org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=wa
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=error
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=info
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
@@ -68,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
@@ -78,7 +85,8 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

diff --git a/org.eclipse.lsp4e/META-INF/MANIFEST.MF b/org.eclipse.lsp4e/META-INF/MANIFEST.MF
@@ -25,7 +25,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.core.externaltools;bundle-version="1.0.400",
  org.eclipse.debug.ui;bundle-version="3.11.200",
  org.eclipse.swt;bundle-version="3.122.0",
- org.eclipse.jdt.annotation;bundle-version="2.1.0";resolution:=optional,
  org.eclipse.tm4e.languageconfiguration,
  org.eclipse.tm4e.ui,
  org.eclipse.ui.editors,

diff --git a/org.eclipse.lsp4e/build.properties b/org.eclipse.lsp4e/build.properties
@@ -10,3 +10,6 @@ bin.includes = META-INF/,\
                schema/,\
                OSGI-INF/
 src.includes = schema/
+
+# JDT Null Analysis for Eclipse
+additional.bundles = org.eclipse.jdt.annotation
diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ConnectDocumentToLanguageServerSetupParticipant.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ConnectDocumentToLanguageServerSetupParticipant.java
@@ -49,9 +49,6 @@ public void setup(IDocument document) {
 
 	@Override
 	public void setup(final IDocument document, IPath location, LocationKind locationKind) {
-		if (document == null) {
-			return;
-		}
 		// Force document connect
 		CompletableFuture.runAsync(
 				() -> PENDING_CONNECTIONS.add(LanguageServers.forDocument(document).collectAll(ls -> CompletableFuture.completedFuture(null))),

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ContentTypeToLSPLaunchConfigEntry.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ContentTypeToLSPLaunchConfigEntry.java
@@ -21,7 +21,7 @@
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.lsp4e.LanguageServersRegistry.LaunchConfigurationLanguageServerDefinition;
 
 public class ContentTypeToLSPLaunchConfigEntry extends ContentTypeToLanguageServerDefinition {
@@ -31,8 +31,8 @@ public class ContentTypeToLSPLaunchConfigEntry extends ContentTypeToLanguageServ
 	private final ILaunchConfiguration launchConfiguration;
 	private final Set<String> launchModes;
 
-	public ContentTypeToLSPLaunchConfigEntry(@NonNull IContentType contentType, @NonNull ILaunchConfiguration launchConfig,
-			@NonNull Set<String> launchModes) {
+	public ContentTypeToLSPLaunchConfigEntry(IContentType contentType, ILaunchConfiguration launchConfig,
+			Set<String> launchModes) {
 		super(contentType, new LaunchConfigurationLanguageServerDefinition(launchConfig, launchModes), null);
 		this.launchConfiguration = launchConfig;
 		this.launchModes = Collections.unmodifiableSet(launchModes);
@@ -64,7 +64,7 @@ public Set<String> getLaunchModes() {
 		return launchModes;
 	}
 
-	static ContentTypeToLSPLaunchConfigEntry readFromPreference(String preferenceEntry) {
+	static @Nullable ContentTypeToLSPLaunchConfigEntry readFromPreference(String preferenceEntry) {
 		String[] parts = preferenceEntry.split(":"); //$NON-NLS-1$
 		if (parts.length != 2) {
 			return null;

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ContentTypeToLanguageServerDefinition.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ContentTypeToLanguageServerDefinition.java
@@ -16,24 +16,22 @@
 import java.util.AbstractMap.SimpleEntry;
 
 import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition;
 import org.eclipse.lsp4e.enablement.EnablementTester;
 
 public class ContentTypeToLanguageServerDefinition extends SimpleEntry<IContentType, LanguageServerDefinition> {
 
 	private static final long serialVersionUID = 6002703726009331762L;
-	private final EnablementTester enablement;
+	private final @Nullable EnablementTester enablement;
 
-	public ContentTypeToLanguageServerDefinition(@NonNull IContentType contentType,
-			@NonNull LanguageServerDefinition provider,
+	public ContentTypeToLanguageServerDefinition(IContentType contentType, LanguageServerDefinition provider,
 			@Nullable EnablementTester enablement) {
 		super(contentType, provider);
 		this.enablement = enablement;
 	}
 
-	public boolean isEnabled(URI uri) {
+	public boolean isEnabled(@Nullable URI uri) {
 		return isUserEnabled() && isExtensionEnabled(uri);
 	}
 
@@ -48,11 +46,11 @@ public boolean isUserEnabled() {
 		return true;
 	}
 
-	public boolean isExtensionEnabled(URI uri) {
+	public boolean isExtensionEnabled(@Nullable URI uri) {
 		return enablement != null ? enablement.evaluate(uri) : true;
 	}
 
-	public EnablementTester getEnablementCondition() {
+	public @Nullable EnablementTester getEnablementCondition() {
 		return enablement;
 	}