revert "vfs: support uri with custom protocol, like temp://, in VfsUtilCore#findRelat...

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 975495669f9a2ddeeffbd2a2fe01485510ddaec5..539a8da7341c38750423adc65553063c02bf101a 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,18 +584,11 @@ public class VfsUtilCore {
     }
 
     if (file == 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);
-      }
+      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;
     }
 
     return file;

diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
index 0fc518d12b0ae51fc6d2fa56e07709600eb719de..037a397decdb0db696e62c5434d483469bb5221d 100644 (file)
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
@@ -86,11 +86,6 @@ public class VfsUtilTest extends BareTestFixtureTestCase {
 
   @Test
   public void testFindRelativeFile() throws Exception {
-    VirtualFile root = VirtualFileManager.getInstance().findFileByUrl("temp:///");
-    assertNotNull(root);
-    VirtualFile file = VfsUtilCore.findRelativeFile(root.getUrl(), null);
-    assertEquals(root, file);
-
     File ioTestDataDir = new File(PathManagerEx.getTestDataPath());
     VirtualFile testDataDir = LocalFileSystem.getInstance().findFileByIoFile(ioTestDataDir);
     assertNotNull(testDataDir);