Merge pull request #8046 from junichi11/php-fix-npe

Prevent NPE
apache · Dec 13, 2024 · f00c1a4 · f00c1a4
2 parents 7d38f33 + a3f691c
commit f00c1a4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/csl/OccurrencesFinderImpl.java b/php/php.editor/src/org/netbeans/modules/php/editor/csl/OccurrencesFinderImpl.java
@@ -68,7 +68,8 @@ public void setCaretPosition(int position) {
 
     @Override
     public Map<OffsetRange, ColoringAttributes> getOccurrences() {
-        return range2Attribs;
+        // must not return null
+        return Collections.unmodifiableMap(range2Attribs);
     }
 
     @Override
@@ -99,9 +100,11 @@ public void run(Result result, SchedulerEvent event) {
             return;
         }
 
-        if (!node.getBoolean(MarkOccurencesSettings.KEEP_MARKS, true) || localRange2Attribs.size() > 0) {
-            //store the occurrences if not empty, return null in getOccurrences() otherwise
+        if (!node.getBoolean(MarkOccurencesSettings.KEEP_MARKS, true) || !localRange2Attribs.isEmpty()) {
+            //store the occurrences if not empty
             range2Attribs = localRange2Attribs;
+        } else {
+            range2Attribs = Collections.emptyMap();
         }
     }