From 5c317cbab50815fb35f11f27bb64a8c0225d07f7 Mon Sep 17 00:00:00 2001
From: Andrii Zinchenko <andrii.zinchenko@jetbrains.com>
Date: Tue, 24 Sep 2024 18:51:40 +0200
Subject: [PATCH] [eel] MultiRoutingFileSystemProvider: fix delegate computing

- we should use a full path for backend computing instead of using only a root path

GitOrigin-RevId: 7ce7b8e288a90126fc09a502441f04252a90b71b
---
 .../platform/core/nio/fs/MultiRoutingFileSystem.java   | 10 +++++-----
 .../core/nio/fs/MultiRoutingFileSystemProvider.java    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystem.java b/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystem.java
index 23e6c7b0ac39..9ec7a6f28b7d 100644
--- a/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystem.java
+++ b/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystem.java
@@ -54,7 +54,7 @@ public class MultiRoutingFileSystem extends DelegatingFileSystem<MultiRoutingFil
       return i + 1;
     }
 
-    boolean matchRoot(@NotNull String candidate) {
+    boolean matchPath(@NotNull String candidate) {
       if (candidate.length() < root.length()) return false;
 
       for (int i = 0; i < root.length(); i++) {
@@ -159,7 +159,7 @@ public class MultiRoutingFileSystem extends DelegatingFileSystem<MultiRoutingFil
     // However, it's important to check that they override only the registered paths.
     for (Backend backend : myBackends.get()) {
       for (Path candidate : backend.fileSystem.getRootDirectories()) {
-        if (backend.matchRoot(candidate.toString())) {
+        if (backend.matchPath(candidate.toString())) {
           rootDirectories.put(candidate.toString(), new MultiRoutingFsPath(this, candidate));
           break;
         }
@@ -188,10 +188,10 @@ public class MultiRoutingFileSystem extends DelegatingFileSystem<MultiRoutingFil
   }
 
   @NotNull
-  FileSystem getBackend(@NotNull String root) {
-    // It's important that the backends are sorted by the root length in the reverse order. Otherwise, prefixes won't work correctly.
+  FileSystem getBackend(@NotNull String path) {
+    // It's important that the backends are sorted by the path length in the reverse order. Otherwise, prefixes won't work correctly.
     for (Backend backend : myBackends.get()) {
-      if (backend.matchRoot(root)) {
+      if (backend.matchPath(path)) {
         return backend.fileSystem;
       }
     }
diff --git a/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystemProvider.java b/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystemProvider.java
index b4a03e162b1a..f1bf870b2304 100644
--- a/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystemProvider.java
+++ b/platform/core-nio-fs/src/com/intellij/platform/core/nio/fs/MultiRoutingFileSystemProvider.java
@@ -162,7 +162,7 @@ public final class MultiRoutingFileSystemProvider
       path1 = path1.toAbsolutePath();
     }
 
-    FileSystemProvider provider1 = myFileSystem.getBackend(path1.getRoot().toString()).provider();
+    FileSystemProvider provider1 = myFileSystem.getBackend(path1.toString()).provider();
     if (path2 == null) {
       return provider1;
     }
@@ -171,7 +171,7 @@ public final class MultiRoutingFileSystemProvider
       path2 = path2.toAbsolutePath();
     }
 
-    FileSystemProvider provider2 = myFileSystem.getBackend(path2.getRoot().toString()).provider();
+    FileSystemProvider provider2 = myFileSystem.getBackend(path2.toString()).provider();
 
     if (provider1.equals(provider2)) {
       return provider1;