Fix URI with query parameter

Signed-off-by: Snjezana Peco <[email protected]>
snjeza · Sep 20, 2023 · d9235ba · d9235ba
1 parent 91ebb5f
commit d9235ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ResourceUtils.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ResourceUtils.java
@@ -19,6 +19,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -221,6 +222,11 @@ public static IPath filePathFromURI(String uriStr) {
 	public static IPath canonicalFilePathFromURI(String uriStr) {
 		URI uri = URI.create(uriStr);
 		if ("file".equals(uri.getScheme())) {
+			try {
+				uri = new URI(uri.getScheme(), null, uri.getPath(), null, null);
+			} catch (URISyntaxException e) {
+				JavaLanguageServerPlugin.logException(e.getMessage(), e);
+			}
 			return FileUtil.canonicalPath(Path.fromOSString(Paths.get(uri).toString()));
 		}
 		return null;

diff --git a/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/ResourceUtilsTest.java b/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/ResourceUtilsTest.java
@@ -60,4 +60,11 @@ public void testGetLongestCommonPath() {
 		assertNotNull(commonPath);
 		assertEquals("/work/src/org/eclipse", commonPath.toPortableString());
 	}
+
+	@Test
+	public void testURIWithQuery() {
+		String uriStr = "file:///home/user/vscode?windowId=_blank";
+		IPath path = ResourceUtils.canonicalFilePathFromURI(uriStr);
+		assertEquals("/home/user/vscode", path.toString());
+	}
 }