vfs: support uri with custom protocol, like temp://, in VfsUtilCore#findRelativeFile...

diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
index 539a8da7341c38750423adc65553063c02bf101a..975495669f9a2ddeeffbd2a2fe01485510ddaec5 100644 (file)
--- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
@@ -584,11 +584,18 @@ public class VfsUtilCore {
     }
 
     if (file == null) {
-      if (base == null) return StandardFileSystems.local().findFileByPath(uri);
-      if (!base.isDirectory()) base = base.getParent();
-      if (base == null) return StandardFileSystems.local().findFileByPath(uri);
-      file = VirtualFileManager.getInstance().findFileByUrl(base.getUrl() + "/" + uri);
-      if (file == null) return null;
+      if (base != null && !base.isDirectory()) {
+        base = base.getParent();
+      }
+      if (base == null) {
+        file = StandardFileSystems.local().findFileByPath(uri);
+        if (file == null) {
+          file = VirtualFileManager.getInstance().findFileByUrl(uri);
+        }
+      }
+      else {
+        file = VirtualFileManager.getInstance().findFileByUrl(base.getUrl() + "/" + uri);
+      }
     }
 
     return file;