Doc URI changes for Win to revisit. All tests pass

spring-projects · Dec 8, 2024 · 053995f · 053995f
1 parent 5301215
commit 053995f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/...java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java b/...java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
@@ -766,7 +766,7 @@ public String createTempUri(String extension) throws Exception {
 		if (extension == null) {
 			extension = getFileExtension();
 		}
-		return File.createTempFile("workingcopy", extension).toURI().toASCIIString();
+		return File.createTempFile("workingcopy", extension).toPath().toUri().toASCIIString();
 	}
 
 	public void assertCompletion(String textBefore, String expectTextAfter) throws Exception {

diff --git a/...va/org/springframework/ide/vscode/boot/java/links/DefaultJavaElementLocationProvider.java b/...va/org/springframework/ide/vscode/boot/java/links/DefaultJavaElementLocationProvider.java
@@ -12,6 +12,7 @@
 
 import java.net.URI;
 import java.net.URL;
+import java.nio.file.Paths;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -59,7 +60,8 @@ public Location findLocation(IJavaProject project, IMember member) {
 					String memberBindingKey = member.getBindingKey();
 
 					try {
-						URI uri = url.get().toURI();
+						URL sourceUrl = url.get();
+						URI uri = sourceUrl.getProtocol().equals("file") ? Paths.get(sourceUrl.toURI()).toFile().toPath().toUri() : sourceUrl.toURI();
 						Range r = cuCache.withCompilationUnit(project, uri, (cu) -> {
 							AtomicReference<Range> range = new AtomicReference<>(null);
 							if (cu == null) {

diff --git a/...-server/src/test/java/org/springframework/ide/vscode/boot/test/DefinitionLinkAsserts.java b/...-server/src/test/java/org/springframework/ide/vscode/boot/test/DefinitionLinkAsserts.java
@@ -12,6 +12,7 @@
 
 import java.net.URI;
 import java.net.URL;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -266,7 +267,8 @@ public Location getLocation(CompilationUnitCache cuCache, JavaDocumentUriProvide
 				loc.setUri(docUri.toASCIIString());
 
 				String typeName = fqName.substring(fqName.lastIndexOf('.') + 1);
-				URI sourceUri = sourceUrl.get().toURI();
+				URL url = sourceUrl.get();
+				URI sourceUri = url.getProtocol().equals("file") ? Paths.get(sourceUrl.get().toURI()).toFile().toPath().toUri() : url.toURI();
 				Range r = cuCache.withCompilationUnit(project, sourceUri, (cu) -> {
 					try {
 						TextDocument doc = new TextDocument(sourceUrl.get().toString(), LanguageId.JAVA);