Skip to content

fix: decode file URIs in document hyperlink labels for non file URIs #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rubenporras wants to merge 1 commit into from
Closed

fix: decode file URIs in document hyperlink labels for non file URIs #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/documentLink/DocumentLinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.io.File;
import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.resources.IFile;
Expand Down Expand Up @@ -78,20 +79,27 @@ public void testDocumentLinkExternalFile() throws Exception {
assertEquals("file://test0", hyperlinks[0].getHyperlinkText());
}

@Test
public void testDocumentLinkWithEncodedUri() throws Exception {
final var links = new ArrayList<DocumentLink>();
links.add(new DocumentLink(new Range(new Position(0, 9), new Position(0, 15)), "file:///tmp/fi%C3%A9le.ts"));
private void assertDocumentLinkWithEncodedUri(String encoded, String decoded) throws Exception{
final var links = List.of(new DocumentLink(new Range(new Position(0, 9), new Position(0, 15)), encoded));
MockLanguageServer.INSTANCE.setDocumentLinks(links);

IFile file = TestUtils.createUniqueTestFile(project, "not_link <link>");
ITextViewer viewer = TestUtils.openTextViewer(file);

IHyperlink[] hyperlinks = documentLinkDetector.detectHyperlinks(viewer, new Region(13, 0), true);
assertEquals(1, hyperlinks.length);
assertEquals("/tmp/fiéle.ts", hyperlinks[0].getHyperlinkText());
assertEquals(decoded, hyperlinks[0].getHyperlinkText());
}
@Test
public void testDocumentLinkWithFileEncodedUri() throws Exception {
assertDocumentLinkWithEncodedUri("file:///tmp/fi%C3%A9le.ts", "/tmp/fiéle.ts");
}

@Test
public void testDocumentLinkWithEncodedUri() throws Exception {
assertDocumentLinkWithEncodedUri("http://abc.com/fi%C3%A9le.html", "http://abc.com/fiéle.html");
}

@Test
public void testDocumentLinkWrongRegion() throws Exception {
final var links = new ArrayList<DocumentLink>();
Expand Down
4 changes: 4 additions & 0 deletions org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/documentLink/DocumentLinkDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
package org.eclipse.lsp4e.operations.documentLink;

import java.net.URI;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -81,6 +83,8 @@ private static String toLabel(final String uri) {
} catch (final IllegalArgumentException ex) {
LanguageServerPlugin.logError(ex);
}
} else {
return URLDecoder.decode(uri, StandardCharsets.UTF_8);
}
return uri;
}
Expand Down
Loading