From f96aaf9a33a47eb1a4d9d03300c5e548e5d84fee Mon Sep 17 00:00:00 2001
From: Yuriy Artamonov <yuriy.artamonov@jetbrains.com>
Date: Sun, 23 Feb 2025 14:45:32 +0100
Subject: [PATCH] [vfs] VfsUtilCore .pathEqualsTo and .isAncestorOrSelf are not
 experimental anymore

GitOrigin-RevId: 779fe9073b1ecd87930e9391302d8a0f8339f63c
---
 platform/core-api/api-dump-experimental.txt                   | 3 ---
 platform/core-api/api-dump-unreviewed.txt                     | 4 +++-
 .../core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java    | 2 --
 .../src/com/intellij/openapi/vfs/VirtualFileVisitor.java      | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/platform/core-api/api-dump-experimental.txt b/platform/core-api/api-dump-experimental.txt
index 2b788d9f89ba..dbbab8f28218 100644
--- a/platform/core-api/api-dump-experimental.txt
+++ b/platform/core-api/api-dump-experimental.txt
@@ -270,9 +270,6 @@ a:com.intellij.openapi.project.DumbService
 - com.intellij.openapi.roots.ContentIterator
 - processFile(com.intellij.openapi.vfs.VirtualFile):Z
 - a:processFileEx(com.intellij.openapi.vfs.VirtualFile):com.intellij.util.containers.TreeNodeProcessingResult
-c:com.intellij.openapi.vfs.VfsUtilCore
-- *s:isAncestorOrSelf(java.lang.String,com.intellij.openapi.vfs.VirtualFile):Z
-- *s:pathEqualsTo(com.intellij.openapi.vfs.VirtualFile,java.lang.String):Z
 a:com.intellij.openapi.vfs.VirtualFile
 - com.intellij.openapi.util.UserDataHolderBase
 - com.intellij.openapi.util.ModificationTracker
diff --git a/platform/core-api/api-dump-unreviewed.txt b/platform/core-api/api-dump-unreviewed.txt
index 56c3ab65c1b7..e47e3d58d2fc 100644
--- a/platform/core-api/api-dump-unreviewed.txt
+++ b/platform/core-api/api-dump-unreviewed.txt
@@ -2591,6 +2591,7 @@ c:com.intellij.openapi.vfs.VfsUtilCore
 - s:inputStreamSkippingBOM(java.io.InputStream,com.intellij.openapi.vfs.VirtualFile):java.io.InputStream
 - s:isAncestor(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.vfs.VirtualFile,Z):Z
 - s:isAncestor(java.io.File,java.io.File,Z):Z
+- s:isAncestorOrSelf(java.lang.String,com.intellij.openapi.vfs.VirtualFile):Z
 - s:isBrokenLink(com.intellij.openapi.vfs.VirtualFile):Z
 - s:isEqualOrAncestor(java.lang.String,java.lang.String):Z
 - s:isInvalidLink(com.intellij.openapi.vfs.VirtualFile):Z
@@ -2604,6 +2605,7 @@ c:com.intellij.openapi.vfs.VfsUtilCore
 - s:loadText(com.intellij.openapi.vfs.VirtualFile):java.lang.String
 - s:loadText(com.intellij.openapi.vfs.VirtualFile,I):java.lang.String
 - s:outputStreamAddingBOM(java.io.OutputStream,com.intellij.openapi.vfs.VirtualFile):java.io.OutputStream
+- s:pathEqualsTo(com.intellij.openapi.vfs.VirtualFile,java.lang.String):Z
 - s:pathToUrl(java.lang.String):java.lang.String
 - s:processFilesRecursively(com.intellij.openapi.vfs.VirtualFile,com.intellij.util.Processor):Z
 - s:saveText(com.intellij.openapi.vfs.VirtualFile,java.lang.String):V
@@ -2853,7 +2855,7 @@ c:com.intellij.openapi.vfs.VirtualFileVisitor$Option
 f:com.intellij.openapi.vfs.VirtualFileVisitor$Result
 - f:skipChildren:Z
 - f:skipToParent:com.intellij.openapi.vfs.VirtualFile
-pc:com.intellij.openapi.vfs.VirtualFileVisitor$VisitorException
+c:com.intellij.openapi.vfs.VirtualFileVisitor$VisitorException
 - java.lang.RuntimeException
 - <init>(java.lang.Throwable):V
 com.intellij.openapi.vfs.VirtualFileWithId
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 7fec8150acb4..897706912a67 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
@@ -820,7 +820,6 @@ public class VfsUtilCore {
    * @return true if the {@code file} path is equal to the {@code path},
    * according to the file's parent directories case sensitivity.
    */
-  @ApiStatus.Experimental
   public static boolean pathEqualsTo(@NotNull VirtualFile file, @NotNull @SystemIndependent String path) {
     path = FileUtil.toCanonicalPath(path);
     int li = path.length();
@@ -853,7 +852,6 @@ public class VfsUtilCore {
    * @return true if the {@code ancestorPath} is equal one of {@code file}'s parents.
    * Corresponding directories case sensitivities are taken into account automatically.
    */
-  @ApiStatus.Experimental
   public static boolean isAncestorOrSelf(@NotNull @SystemIndependent String ancestorPath, @NotNull VirtualFile file) {
     ancestorPath = FileUtil.toCanonicalPath(ancestorPath);
     if (ancestorPath.isEmpty()) {
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileVisitor.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileVisitor.java
index 507b84002f4e..826049c37131 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileVisitor.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileVisitor.java
@@ -77,7 +77,7 @@ public abstract class VirtualFileVisitor<T> {
     return new Result(true, parentToSkipTo);
   }
 
-  protected static class VisitorException extends RuntimeException {
+  public static class VisitorException extends RuntimeException {
     public VisitorException(@NotNull Throwable cause) {
       super(cause);
     }