Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virtualFileSystem.util.VirtualFileUtil. (#67)

unv-unv · web-flow · commit 8a98c03d5b39 · 2026-04-18T09:48:48.000+03:00
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/codeInspection/resources/TypeCustomizerInspection.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/codeInspection/resources/TypeCustomizerInspection.java
@@ -18,7 +18,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.compiler.resourceCompiler.ResourceCompilerConfiguration;
 import consulo.groovy.impl.localize.GroovyInspectionLocalize;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.language.editor.DaemonCodeAnalyzer;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
@@ -27,6 +26,7 @@
 import consulo.module.content.ProjectRootManager;
 import consulo.project.Project;
 import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.plugins.groovy.impl.codeInspection.BaseInspection;
@@ -131,12 +131,12 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri
             VirtualFile sourceRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(virtualFile);
             VirtualFile projectRoot = project.getBaseDir();
             if (sourceRoot == null) {
-                String path = VfsUtilCore.getRelativePath(virtualFile, projectRoot, '/');
+                String path = VirtualFileUtil.getRelativePath(virtualFile, projectRoot, '/');
                 ResourceCompilerConfiguration.getInstance(project).addResourceFilePattern(path);
             }
             else {
-                String path = VfsUtilCore.getRelativePath(virtualFile, sourceRoot, '/');
-                String sourceRootPath = VfsUtilCore.getRelativePath(sourceRoot, projectRoot, '/');
+                String path = VirtualFileUtil.getRelativePath(virtualFile, sourceRoot, '/');
+                String sourceRootPath = VirtualFileUtil.getRelativePath(sourceRoot, projectRoot, '/');
                 ResourceCompilerConfiguration.getInstance(project).addResourceFilePattern(sourceRootPath + ':' + path);
             }
             DaemonCodeAnalyzer.getInstance(project).restart(myFile);
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/config/GroovyLibraryPresentationProviderBase.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/config/GroovyLibraryPresentationProviderBase.java
@@ -15,19 +15,18 @@
  */
 package org.jetbrains.plugins.groovy.impl.config;
 
-import java.util.List;
-
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
-import consulo.virtualFileSystem.VirtualFile;
-import org.jetbrains.annotations.Nls;
 import consulo.content.library.LibraryKind;
 import consulo.content.library.LibraryPresentationProvider;
 import consulo.content.library.ui.LibraryEditor;
-import consulo.util.lang.StringUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.ui.image.Image;
+import consulo.util.lang.StringUtil;
+import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.Nls;
+
+import java.util.List;
 
 /**
  * @author nik
@@ -45,7 +44,7 @@ public String getDescription(@Nonnull GroovyLibraryProperties properties) {
 
   @Override
   public GroovyLibraryProperties detect(@Nonnull List<VirtualFile> classesRoots) {
-    VirtualFile[] libraryFiles = VfsUtilCore.toVirtualFileArray(classesRoots);
+    VirtualFile[] libraryFiles = VirtualFileUtil.toVirtualFileArray(classesRoots);
     if (managesLibrary(libraryFiles)) {
       String version = getLibraryVersion(libraryFiles);
       return new GroovyLibraryProperties(version);
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonDefaultImportContributor.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonDefaultImportContributor.java
@@ -22,7 +22,6 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.util.CachedValueProvider;
 import consulo.application.util.CachedValuesManager;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.language.psi.PsiDirectory;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.PsiModificationTracker;
@@ -32,10 +31,11 @@
 import consulo.util.lang.Pair;
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.VirtualFile;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 import jakarta.annotation.Nonnull;
+import org.jetbrains.plugins.groovy.impl.mvc.MvcFramework;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.resolve.DefaultImportContributor;
-import org.jetbrains.plugins.groovy.impl.mvc.MvcFramework;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -100,10 +100,10 @@ public List<String> appendImplicitlyImportedPackages(@Nonnull GroovyFile file) {
 
         assert vFile != null;
         assert module != null;
-        if (models != null && VfsUtilCore.isAncestor(models, vFile, true)) {
+        if (models != null && VirtualFileUtil.isAncestor(models, vFile, true)) {
           result.addAll(getDefaultImports(module).first);
         }
-        else if (views != null && VfsUtilCore.isAncestor(views, vFile, true)) {
+        else if (views != null && VirtualFileUtil.isAncestor(views, vFile, true)) {
           result.addAll(getDefaultImports(module).second);
         }
       }
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonFramework.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonFramework.java
@@ -26,8 +26,6 @@
 import consulo.content.bundle.Sdk;
 import consulo.content.library.Library;
 import consulo.content.library.LibraryKind;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.java.execution.configurations.OwnJavaParameters;
 import consulo.java.language.module.extension.JavaModuleExtension;
 import consulo.language.psi.PsiFile;
@@ -48,13 +46,14 @@
 import consulo.versionControlSystem.change.IgnoredBeanFactory;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.archive.ArchiveVfsUtil;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.JetgroovyIcons;
 import org.jetbrains.plugins.groovy.impl.mvc.*;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -180,7 +179,7 @@ public String getInstalledPluginNameByPath(Project project, @Nonnull VirtualFile
       if (separatorIndexes.size() > 0) {
         String json;
         try {
-          json = VfsUtil.loadText(pluginJson);
+          json = VirtualFileUtil.loadText(pluginJson);
         }
         catch (IOException e) {
           return null;
@@ -310,7 +309,7 @@ public OwnJavaParameters createJavaParameters(@Nonnull Module module,
       }
     }
 
-    String workDir = VfsUtilCore.virtualToIoFile(rootFile).getAbsolutePath();
+    String workDir = VirtualFileUtil.virtualToIoFile(rootFile).getAbsolutePath();
 
     if (jvmParams != null) {
       params.getVMParametersList().addParametersString(jvmParams);
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/mvc/MvcFramework.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/mvc/MvcFramework.java
@@ -40,8 +40,6 @@
 import consulo.execution.configuration.ConfigurationFactory;
 import consulo.execution.configuration.ConfigurationType;
 import consulo.execution.configuration.RunConfiguration;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.ide.setting.ShowSettingsUtil;
 import consulo.java.execution.configurations.OwnJavaParameters;
 import consulo.java.language.module.extension.JavaModuleExtension;
@@ -317,7 +315,7 @@ private PathsList removeFrameworkStuff(Module module, List<VirtualFile> rootFile
     eachRoot:
     for (VirtualFile file : rootFiles) {
       for (File excluded : toExclude) {
-        if (VfsUtil.isAncestor(excluded, VirtualFileUtil.virtualToIoFile(file), false)) {
+        if (FileUtil.isAncestor(excluded, VirtualFileUtil.virtualToIoFile(file), false)) {
           continue eachRoot;
         }
       }
@@ -454,7 +452,7 @@ public GeneralCommandLine createCommand(@Nonnull Module module,
 
     VirtualFile root = findAppRoot(module);
     File ioRoot =
-      root != null ? VfsUtilCore.virtualToIoFile(root) : new File(module.getModuleDirPath());
+      root != null ? VirtualFileUtil.virtualToIoFile(root) : new File(module.getModuleDirPath());
     commandLine.setWorkDirectory(forCreation ? ioRoot.getParentFile() : ioRoot);
 
     return commandLine;
diff --git a/test/org/jetbrains/plugins/groovy/GroovyGotoImplementationTest.java b/test/org/jetbrains/plugins/groovy/GroovyGotoImplementationTest.java
@@ -13,21 +13,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.jetbrains.plugins.groovy;
 
-
-import consulo.ide.impl.idea.codeInsight.navigation.GotoImplementationHandler;
+import com.intellij.java.language.psi.PsiElement;
+import com.intellij.java.language.psi.PsiFile;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.java.language.psi.PsiElement;
-import com.intellij.java.language.psi.PsiFile;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.testFramework.fixtures.impl.TempDirTestFixtureImpl;
+import consulo.ide.impl.idea.codeInsight.navigation.GotoImplementationHandler;
 
 /**
  * @author peter
@@ -44,7 +41,7 @@ protected void run(Result result) throws Throwable {
         final VirtualFile outside = dirFixture.getFile("").createChildDirectory(this, "outside");
         PsiTestUtil.addContentRoot(myModule, outside);
         VirtualFile out = outside.createChildData(this, "Outside.groovy");
-        consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(out, "class Bar {}\n class Goo extends Bar {}");
+        VirtualFileUtil.saveText(out, "class Bar {}\n class Goo extends Bar {}");
       }
     }.execute();
 
