MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

sourcemaps: ability to resolve sources relative to generated file

Browse Source
This commit is contained in:
Vladimir Krivosheev
2013-11-06 18:04:41 +01:00
parent 6c84d334a6
commit 4d9e68668c
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/ide/browsers/UrlImpl.java
+3
View File
@@ -169,6 +169,9 @@ public final class UrlImpl implements Url {
return true;
}
if (!(o instanceof UrlImpl)) {
if (o instanceof LocalFileUrl && isInLocalFileSystem()) {
return o.getPath().equals(path);
}
return false;
}
xml/impl/src/com/intellij/ide/browsers/Urls.java
+13 -2
View File
@@ -120,12 +120,23 @@ public final class Urls {
// must not be used in NodeJS
public static Url newFromVirtualFile(@NotNull VirtualFile file) {
String path = file.getPath();
if (file.isInLocalFileSystem()) {
return new UrlImpl(file.getFileSystem().getProtocol(), null, path);
return new UrlImpl(file.getFileSystem().getProtocol(), null, file.getPath());
}
else {
return parseUrl(file.getUrl(), false);
}
}
public static boolean equalsIgnoreParameters(@NotNull Url url, @NotNull VirtualFile file) {
if (file.isInLocalFileSystem()) {
return url.isInLocalFileSystem() && url.getPath().equals(file.getPath());
}
else if (url.isInLocalFileSystem()) {
return false;
}
Url fileUrl = parseUrl(file.getUrl(), false);
return fileUrl != null && fileUrl.equalsIgnoreParameters(url);
}
}