Merge pull request #8146 from matthiasblaesing/csl-fix-3

csl.api: Fix wrong @nonnull annotation in methods of Language
apache · Jan 15, 2025 · 6a4ee5a · 6a4ee5a
2 parents e2bcf50 + ee838a7
commit 6a4ee5a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/ide/csl.api/src/org/netbeans/modules/csl/core/Language.java b/ide/csl.api/src/org/netbeans/modules/csl/core/Language.java
@@ -610,7 +610,7 @@ public boolean hasHints() {
     /**
      * Return the occurrences finder for this language
      */
-    @NonNull
+    @CheckForNull
     public OccurrencesFinder getOccurrencesFinder() {
         if (occurrences == null) {
             if (occurrencesFile != null) {
@@ -653,7 +653,7 @@ public boolean hasOccurrencesFinder() {
     /**
      * Return the semantic analyzer for this language
      */
-    @NonNull
+    @CheckForNull
     public SemanticAnalyzer getSemanticAnalyzer() {
         if (semantic == null) {
             if (semanticFile != null) {
@@ -679,7 +679,7 @@ void setSemanticAnalyzer(FileObject semanticFile) {
     /**
      * Return the semantic analyzer for this language
      */
-    @NonNull
+    @CheckForNull
     public IndexSearcher getIndexSearcher() {
         if (indexSearcher == null) {
             if (indexSearcherFile != null) {
@@ -735,7 +735,7 @@ public Set<String> getBinaryLibraryPathIds() {
     /**
      * Return the overriding methods computer for this language
      */
-    @NonNull
+    @CheckForNull
     public OverridingMethods getOverridingMethods() {
         if (overridingMethods == null) {
             if (overridingMethodsFile != null) {

diff --git a/ide/csl.api/src/org/netbeans/modules/csl/editor/semantic/MarkOccurrencesHighlighter.java b/ide/csl.api/src/org/netbeans/modules/csl/editor/semantic/MarkOccurrencesHighlighter.java
@@ -135,8 +135,10 @@ public void run(ParserResult info, SchedulerEvent event) {
     @NonNull
     List<OffsetRange> processImpl(ParserResult info, Document doc, int caretPosition) {
         OccurrencesFinder finder = language.getOccurrencesFinder();
-        assert finder != null;
-
+        if(finder == null) {
+            return List.of();
+        }
+
         finder.setCaretPosition(caretPosition);
         try {
             finder.run(info, null);

diff --git a/ide/csl.api/src/org/netbeans/modules/csl/editor/semantic/SemanticHighlighter.java b/ide/csl.api/src/org/netbeans/modules/csl/editor/semantic/SemanticHighlighter.java
@@ -142,7 +142,11 @@ private void process(Language language, ParserResult result, Set<SequenceElement
 
         ColoringManager manager = language.getColoringManager();
         SemanticAnalyzer task = language.getSemanticAnalyzer();
-
+
+        if (task == null) {
+            return;
+        }
+
         // Allow language plugins to do their own analysis too
         try {
             task.run(result, null);