SLLS-109 Fix duplicate publication of hotspots with semantically equi…

…valent file URIs
SonarSource · Jan 30, 2023 · ae9f8bf · ae9f8bf
1 parent 0283c59
commit ae9f8bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/org/sonarsource/sonarlint/ls/connected/ProjectBindingManager.java b/src/main/java/org/sonarsource/sonarlint/ls/connected/ProjectBindingManager.java
@@ -545,7 +545,8 @@ public Optional<URI> serverPathToFileUri(String serverPath) {
       .filter(e -> e.getValue().isPresent())
       .map(e -> tryResolveLocalFile(serverPath, e.getKey(), e.getValue().get()))
       .flatMap(Optional::stream)
-      .map(File::toURI)
+      .map(File::toPath)
+      .map(Path::toUri)
       .findFirst();
   }
 

diff --git a/src/test/java/org/sonarsource/sonarlint/ls/connected/ProjectBindingManagerTests.java b/src/test/java/org/sonarsource/sonarlint/ls/connected/ProjectBindingManagerTests.java
@@ -555,7 +555,9 @@ void should_return_optional_on_valid_path() {
     var uri = underTest.serverPathToFileUri(serverPath);
 
     assertThat(uri).isNotEmpty();
-    assertThat(uri.get().toString()).contains("src/test/resources/sample-folder/Test.java");
+    assertThat(uri.get().toString())
+      .startsWith("file:///")
+      .contains("src/test/resources/sample-folder/Test.java");
   }
 
   @Test