Skip to content

Commit b37f6ac

Browse files
committed
refact: improve null analysis
1 parent 5db1e7b commit b37f6ac

8 files changed

Lines changed: 27 additions & 27 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ _LOCAL/
88
!**/.settings/org.eclipse.core.resoures.prefs
99
!**/.settings/org.eclipse.jdt.core.prefs
1010
!**/.settings/org.eclipse.pde.core.prefs
11-
**/.pydevproject
11+
.pydevproject
12+
.tycho-consumer-pom.xml
1213

1314
# Eclipse GFM Viewer
1415
*.md.html

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
7777
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
7878
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
7979
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
80-
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
81-
org.eclipse.jdt.core.compiler.problem.nullReference=warning
82-
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
80+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
81+
org.eclipse.jdt.core.compiler.problem.nullReference=error
82+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
8383
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=info
8484
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
8585
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
8686
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
8787
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
88-
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
88+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
8989
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
9090
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
9191
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/internal/parser/TMParserTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,15 @@
3939
@TestMethodOrder(MethodOrderer.MethodName.class)
4040
class TMParserTest {
4141

42-
@SuppressWarnings("null")
4342
private void validateCaptures(final RawGrammar grammar) {
4443
assertNotNull(grammar.getPatterns());
45-
assertEquals(1, grammar.getPatterns().size());
46-
final var pattern = grammar.getPatterns().iterator().next();
44+
assertEquals(1, castNonNull(grammar.getPatterns()).size());
45+
final var pattern = castNonNull(grammar.getPatterns()).iterator().next();
4746
assertEquals("THE_PATTERN", pattern.getName());
4847
assertEquals("BEGIN_PATTERN", pattern.getBegin());
4948
assertEquals("END_PATTERN", pattern.getEnd());
50-
final var capures = pattern.getCaptures();
51-
assertEquals("THE_CAPTURE", capures.getCapture("0").getName());
49+
final var capures = castNonNull(pattern.getCaptures());
50+
assertEquals("THE_CAPTURE", castNonNull(capures.getCapture("0")).getName());
5251
}
5352

5453
@Test

org.eclipse.tm4e.languageconfiguration/.settings/org.eclipse.jdt.core.prefs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
7777
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
7878
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
7979
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
80-
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
81-
org.eclipse.jdt.core.compiler.problem.nullReference=warning
82-
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
80+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
81+
org.eclipse.jdt.core.compiler.problem.nullReference=error
82+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
8383
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=info
8484
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
8585
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
8686
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
8787
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
88-
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
88+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
8989
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
9090
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
9191
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

org.eclipse.tm4e.markdown/.settings/org.eclipse.jdt.core.prefs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
7777
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
7878
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
7979
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
80-
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
81-
org.eclipse.jdt.core.compiler.problem.nullReference=warning
82-
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
80+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
81+
org.eclipse.jdt.core.compiler.problem.nullReference=error
82+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
8383
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=info
8484
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
8585
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
8686
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
8787
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
88-
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
88+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
8989
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
9090
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
9191
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

org.eclipse.tm4e.registry/.settings/org.eclipse.jdt.core.prefs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
7777
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
7878
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
7979
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
80-
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
81-
org.eclipse.jdt.core.compiler.problem.nullReference=warning
82-
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
80+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
81+
org.eclipse.jdt.core.compiler.problem.nullReference=error
82+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
8383
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=info
8484
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
8585
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
8686
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
8787
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
88-
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
88+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
8989
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
9090
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
9191
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

org.eclipse.tm4e.ui/.settings/org.eclipse.jdt.core.prefs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
7777
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
7878
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
7979
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
80-
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
81-
org.eclipse.jdt.core.compiler.problem.nullReference=warning
82-
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
80+
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
81+
org.eclipse.jdt.core.compiler.problem.nullReference=error
82+
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
8383
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=info
8484
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
8585
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
8686
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
8787
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
88-
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
88+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
8989
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
9090
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
9191
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>com.vegardit.no-npe</groupId>
6363
<artifactId>no-npe-eea-all</artifactId>
64-
<version>1.0.3</version>
64+
<version>1.0.4</version>
6565
<scope>provided</scope>
6666
</dependency>
6767
</dependencies>

0 commit comments

Comments
 (0)