projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
53f6d25
)
V8 inspector: debug sourcemap-backed files
rubymine/171.1024
author
Vladimir Krivosheev
<vladimir.krivosheev@jetbrains.com>
Wed, 16 Nov 2016 15:29:25 +0000
(16:29 +0100)
committer
Vladimir Krivosheev
<vladimir.krivosheev@jetbrains.com>
Wed, 16 Nov 2016 16:50:55 +0000
(17:50 +0100)
platform/platform-api/src/com/intellij/util/Url.java
patch
|
blob
|
history
platform/platform-impl/src/com/intellij/util/LocalFileUrl.java
patch
|
blob
|
history
platform/platform-impl/src/com/intellij/util/UrlImpl.java
patch
|
blob
|
history
diff --git
a/platform/platform-api/src/com/intellij/util/Url.java
b/platform/platform-api/src/com/intellij/util/Url.java
index bc377945d581264f3a3afac0c2da89891893340a..81b824fbb568896497f02db3e17f426c7eb050ad 100644
(file)
--- a/
platform/platform-api/src/com/intellij/util/Url.java
+++ b/
platform/platform-api/src/com/intellij/util/Url.java
@@
-52,4
+52,6
@@
public interface Url {
Url trimParameters();
int hashCodeCaseInsensitive();
+
+ Url resolve(@NotNull String subPath);
}
diff --git
a/platform/platform-impl/src/com/intellij/util/LocalFileUrl.java
b/platform/platform-impl/src/com/intellij/util/LocalFileUrl.java
index 26cef2d80492c43116386c1df605b56eba45b9ee..a96c338dc30df9a33e1fbd6e06e33e26995bc9fb 100644
(file)
--- a/
platform/platform-impl/src/com/intellij/util/LocalFileUrl.java
+++ b/
platform/platform-impl/src/com/intellij/util/LocalFileUrl.java
@@
-14,6
+14,11
@@
public final class LocalFileUrl implements Url {
this.path = path;
}
+ @Override
+ public Url resolve(@NotNull String subPath) {
+ return new LocalFileUrl(path.isEmpty() ? subPath : (path + "/" + subPath));
+ }
+
@NotNull
@Override
public String getPath() {
diff --git
a/platform/platform-impl/src/com/intellij/util/UrlImpl.java
b/platform/platform-impl/src/com/intellij/util/UrlImpl.java
index 99b6e629415f5aa693e04320968355e78156979e..b4cb5def6eacd5ee246ad23be7601760488f7fe4 100644
(file)
--- a/
platform/platform-impl/src/com/intellij/util/UrlImpl.java
+++ b/
platform/platform-impl/src/com/intellij/util/UrlImpl.java
@@
-47,6
+47,11
@@
public final class UrlImpl implements Url {
this.parameters = StringUtil.nullize(parameters);
}
+ @Override
+ public Url resolve(@NotNull String subPath) {
+ return new UrlImpl(scheme, authority, path.isEmpty() ? subPath : (path + "/" + subPath), parameters);
+ }
+
@NotNull
@Override
public String getPath() {