From a584d49f438353201dd78531cbbf8180efdafb30 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 13 Jun 2019 18:42:25 +0300
Subject: [PATCH] clarify deprecation status of findChildById method

GitOrigin-RevId: ca07f24e722abfbd18a78dbcc8286f1a48bc40ee
---
 .../com/intellij/openapi/vfs/newvfs/NewVirtualFile.java    | 1 +
 .../openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java      | 7 ++-----
 .../intellij/openapi/vfs/newvfs/persistent/FSRecords.java  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java
index 30e0bab524f5..fb1c6e19136c 100644
--- a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java
+++ b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java
@@ -76,6 +76,7 @@ public abstract class NewVirtualFile extends VirtualFile implements VirtualFileW
   public abstract int getId();
 
   @Nullable @Deprecated
+  @ApiStatus.ScheduledForRemoval
   public NewVirtualFile findChildById(int id) {return null;}
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
index 47f3a3122d30..f3083aac6d52 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
@@ -7,7 +7,6 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileAttributes;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.InvalidVirtualFileAccessException;
@@ -34,7 +33,6 @@ import gnu.trove.TIntArrayList;
 import gnu.trove.TIntHashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -453,9 +451,8 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
     return findChild(name, false, true, getFileSystem());
   }
 
-  @SuppressWarnings("deprecation")
-  @Override
-  public VirtualFileSystemEntry findChildById(int id) {
+
+  public VirtualFileSystemEntry doFindChildById(int id) {
     int i = ArrayUtil.indexOf(myData.myChildrenIds, id);
     if (i >= 0) {
       return mySegment.vfsData.getFileById(id, this);
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
index 444943aa055e..77b8ae649042 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
@@ -1100,7 +1100,7 @@ public class FSRecords {
         if (!(parent instanceof VirtualDirectoryImpl)) {
           return null;
         }
-        VirtualFileSystemEntry child = ((VirtualDirectoryImpl)parent).findChildById(childId);
+        VirtualFileSystemEntry child = ((VirtualDirectoryImpl)parent).doFindChildById(childId);
         if (child instanceof VirtualDirectoryImpl) {
           VirtualFileSystemEntry old = idToDirCache.putIfAbsent(childId, child);
           if (old != null) child = old;