fix naming and possible NPE in lsp coverage

JoeCqupt · Nov 22, 2021 · 01f0fdf · 01f0fdf
1 parent e9bddb1
commit 01f0fdf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/CoverageData.java b/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/CoverageData.java
@@ -43,7 +43,7 @@ public MaterializedFrame getFrame() {
         return frame;
     }
 
-    public URI getCovarageUri() {
+    public URI getCoverageUri() {
         return coverageUri;
     }
 

diff --git a/...c/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogate.java b/...c/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogate.java
@@ -148,7 +148,7 @@ public List<CoverageData> getCoverageData(SourceSectionReference section) {
 
     public Set<URI> getCoverageUris(SourceSection section) {
         List<CoverageData> coverageDataObjects = section2coverageData.get(SourceSectionReference.from(section));
-        return coverageDataObjects == null ? null : coverageDataObjects.stream().map(coverageData -> coverageData.getCovarageUri()).collect(Collectors.toSet());
+        return coverageDataObjects == null ? null : coverageDataObjects.stream().map(coverageData -> coverageData.getCoverageUri()).collect(Collectors.toSet());
     }
 
     public void addLocationCoverage(SourceSectionReference section, CoverageData coverageData) {
@@ -175,7 +175,7 @@ public void clearCoverage(URI runScriptUri) {
             Entry<SourceSectionReference, List<CoverageData>> entry = iterator.next();
             for (Iterator<CoverageData> iteratorData = entry.getValue().iterator(); iteratorData.hasNext();) {
                 CoverageData coverageData = iteratorData.next();
-                if (coverageData.getCovarageUri().equals(runScriptUri)) {
+                if (coverageData.getCoverageUri() != null && coverageData.getCoverageUri().equals(runScriptUri)) {
                     iteratorData.remove();
                 }
             }