Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virtualFileSystem.util.VirtualFileUtil. Replacing consulo.ide.impl.idea.openapi.util.io.FileUtil with consulo.util.io.FileUtil by unv-unv · Pull Request #293 · consulo/consulo-java

unv-unv · 2026-04-17T21:47:35Z

No description provided.

…ualFileSystem.util.VirtualFileUtil. Replacing consulo.ide.impl.idea.openapi.util.io.FileUtil with consulo.util.io.FileUtil.

Copilot

Pull request overview

This PR migrates file/VFS utility usage away from consulo.ide.impl.idea.openapi.* helpers to the public consulo.util.io.FileUtil and consulo.virtualFileSystem.util.VirtualFileUtil APIs across plugin tests and Java test-framework code, plus a small runtime normalization adjustment in JrtFileSystemImpl.

Changes:

Replace VfsUtil/VfsUtilCore usages with VirtualFileUtil in tests and test framework utilities.
Replace consulo.ide.impl.idea.openapi.util.io.FileUtil / FileUtilRt usages with consulo.util.io.FileUtil.
Adjust JRT FS path normalization to pass an OS-dependent flag.

Reviewed changes

Copilot reviewed 42 out of 43 changed files in this pull request and generated 14 comments.

Show a summary per file

File	Description
plugin/src/test/java_/com/intellij/unscramble/UnscrambleDialogTest.java	Removes old FileUtil import (needs replacement import for continued usage).
plugin/src/test/java_/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java	Removes old FileUtil import (needs replacement import for continued usage).
plugin/src/test/java_/com/intellij/testFramework/TestSourceBasedTestCase.java	Removes old FileUtil import (needs replacement import for continued usage).
plugin/src/test/java_/com/intellij/testFramework/ResolveTestCase.java	Switches `loadText` from `VfsUtil` to `VirtualFileUtil`.
plugin/src/test/java_/com/intellij/testFramework/InspectionTestCase.java	Switches `isAncestor` from `VfsUtilCore` to `VirtualFileUtil` (missing import).
plugin/src/test/java_/com/intellij/testFramework/CompilerTester.java_	Switches VFS helpers from `VfsUtil` to `VirtualFileUtil` (missing import).
plugin/src/test/java_/com/intellij/refactoring/TypeCookTest.java	Replaces old FileUtil import with `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java	Replaces `VfsUtil` usage with `VirtualFileUtil` and updates header comment to Javadoc.
plugin/src/test/java_/com/intellij/psi/impl/file/impl/PsiEventsTest.java	Replaces `VfsUtil.saveText` with `VirtualFileUtil.saveText` and updates FileUtil import.
plugin/src/test/java_/com/intellij/psi/impl/file/impl/InvalidateClassFileTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java	Replaces `VfsUtil.saveText` with `VirtualFileUtil.saveText` and updates FileUtil import.
plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR19174Test.java	Replaces `VfsUtil.saveText` with `VirtualFileUtil.saveText` and updates FileUtil import.
plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR17650Test.java	Replaces `VfsUtil/VfsUtilCore` operations with `VirtualFileUtil` and updates FileUtil import.
plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR14423Test.java	Replaces VFS helpers with `VirtualFileUtil` and updates FileUtil import.
plugin/src/test/java_/com/intellij/psi/impl/cache/impl/IdCacheTest.java	Replaces `VfsUtil.saveText` with `VirtualFileUtil.saveText` and updates FileUtil import.
plugin/src/test/java_/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java	Replaces `VfsUtilCore.isAncestor` with `VirtualFileUtil.isAncestor` (missing import).
plugin/src/test/java_/com/intellij/psi/SmartPsiElementPointersTest.java	Replaces `VfsUtil.saveText` with `VirtualFileUtil.saveText`.
plugin/src/test/java_/com/intellij/psi/JavaStubBuilderTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/psi/ClsRepositoryUseTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/psi/ClsBuilderTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/psi/ArrayIndexOutOfBoundsTest.java	Updates FileUtil import and switches `virtualToIoFile` to `VirtualFileUtil`.
plugin/src/test/java_/com/intellij/openapi/roots/impl/DirectoryIndexTest.java_	Replaces `VfsUtilCore.pathToUrl` with `VirtualFileUtil.pathToUrl` (missing import).
plugin/src/test/java_/com/intellij/ide/fileTemplates/FileTemplatesTest.java	Removes old FileUtil import (needs replacement import for continued usage).
plugin/src/test/java_/com/intellij/codeInspection/MagicConstantInspectionTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java	Replaces `iterateChildrenRecursively` call with `VirtualFileUtil`.
plugin/src/test/java_/com/intellij/codeInsight/psi/ControlFlowTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java	Updates FileUtil import to `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/codeInsight/documentation/RefConvertorsTest.java	Replaces `FileUtilRt` usages with `consulo.util.io.FileUtil`.
plugin/src/test/java_/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java	Replaces `VfsUtil.saveText` with `VirtualFileUtil.saveText`.
plugin/src/test/java_/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java	Replaces `VfsUtil.saveText` with `VirtualFileUtil.saveText`.
plugin/src/test/java_/com/intellij/codeInsight/SuppressExternalTest.java	Replaces `VfsUtilCore.pathToUrl` with `VirtualFileUtil.pathToUrl`.
plugin/src/test/java_/com/intellij/codeInsight/AddAnnotationFixTest.java	Replaces `VfsUtil` usage with `VirtualFileUtil` and updates FileUtil import.
plugin/src/main/java/com/intellij/java/impl/openapi/vfs/impl/jrt/JrtFileSystemImpl.java	Switches to `consulo.util.io.FileUtil` and changes `normalize()` to pass OS flag.
plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java	Removes unused `VfsUtilCore` import.
plugin/pom.xml	Fixes indentation of a dependency tag.
java-language-impl/src/main/java/com/intellij/java/language/impl/core/CoreJavaFileManager.java	Replaces `VfsUtilCore.isAncestor` with `VirtualFileUtil.isAncestor` in commented code.
java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestData.java	Removes old FileUtil import (needs replacement import for continued usage).
java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestCase.java	Switches to `VirtualFileUtil` for text I/O (missing imports for `VirtualFileUtil` and `FileUtil`).
java-impl-testing/src/main/java/com/intellij/testFramework/ModuleTestCase.java	Removes old FileUtil import (needs replacement import for continued usage).
java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java	Removes old FileUtil import (needs replacement import for continued usage).
java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java	Switches to `VirtualFileUtil` (missing imports for `VirtualFileUtil` and `FileUtil`).
java-impl-testing/src/main/java/com/intellij/codeInsight/CodeInsightTestCase.java	Switches `saveText/loadText` to `VirtualFileUtil` (missing imports for `VirtualFileUtil` and `FileUtil`).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-18T06:50:18Z

@@ -28,7 +28,6 @@
 import consulo.module.Module;
 import consulo.module.ModuleManager;


FileUtil.copyDir(...) is used later in this class, but the FileUtil import was removed, so it won't compile. Import the replacement consulo.util.io.FileUtil (or qualify the reference).

Suggested change

import consulo.module.ModuleManager;

import consulo.module.ModuleManager;

import consulo.util.io.FileUtil;

Copilot · 2026-04-18T06:50:18Z

 import consulo.util.lang.Pair;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
 import consulo.util.io.CharsetToolkit;


FileUtil.loadFile(...) is used here, but the FileUtil import was removed, so this test base won't compile. Add an import for consulo.util.io.FileUtil (or qualify the call).

Suggested change

import consulo.util.io.CharsetToolkit;

import consulo.util.io.CharsetToolkit;

import consulo.util.io.FileUtil;

Copilot · 2026-04-18T06:50:19Z

 import consulo.util.xml.serializer.DefaultJDOMExternalizer;
 import consulo.util.jdom.JDOMUtil;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import com.intellij.psi.*;


This file now calls VirtualFileUtil.saveText(...) / VirtualFileUtil.loadText(...) and also still uses FileUtil later (FileUtil.loadFile(...)), but neither VirtualFileUtil nor the new consulo.util.io.FileUtil are imported after removing the old IDEA imports. Add the missing imports (or qualify the usages) to restore compilation.

Copilot · 2026-04-18T06:50:19Z

 import consulo.project.startup.StartupManager;
 import consulo.util.lang.Pair;
 import consulo.document.util.TextRange;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.*;
 import consulo.language.editor.inspection.scheme.InspectionProfileManager;


This file now uses VirtualFileUtil.virtualToIoFile(...) / VirtualFileUtil.saveText(...) and also calls FileUtil.createIfDoesntExist(...), but there are no imports for consulo.virtualFileSystem.util.VirtualFileUtil or consulo.util.io.FileUtil after removing the old IDEA FileUtil import. Add the missing imports (or qualify the usages) to fix compilation.

Copilot · 2026-04-18T06:50:19Z

+          .addExcludeFolder(VirtualFileUtil.pathToUrl(FileUtil.toSystemIndependentName(f.getParentFile().getParent())));
        rootModel.commit();

        rootModel = ModuleRootManager.getInstance(myModule2).getModifiableModel();
-        rootModel.addContentEntry(VfsUtilCore.pathToUrl(FileUtil.toSystemIndependentName(f.getPath())));
+        rootModel.addContentEntry(VirtualFileUtil.pathToUrl(FileUtil.toSystemIndependentName(f.getPath())));


VirtualFileUtil.pathToUrl(...) is used here, but this file doesn't import consulo.virtualFileSystem.util.VirtualFileUtil, so it won't compile. Add the missing import (or switch back to an in-scope utility like VfsUtilCore.pathToUrl if that’s the intended API).

Copilot · 2026-04-18T06:50:20Z

@@ -16,7 +16,6 @@
 import consulo.fileTemplate.impl.internal.CustomFileTemplate;
 import com.intellij.java.language.impl.codeInsight.template.JavaTemplateUtil;
 import consulo.module.content.ModuleRootManager;


FileUtil is used multiple times in this test (loadFile, createTempDirectory), but there is no FileUtil import after the old one was removed, so this file won't compile. Import consulo.util.io.FileUtil (or qualify the calls).

Suggested change

import consulo.module.content.ModuleRootManager;

import consulo.module.content.ModuleRootManager;

import consulo.util.io.FileUtil;

Copilot · 2026-04-18T06:50:21Z

 import consulo.virtualFileSystem.LocalFileSystem;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.language.psi.PsiElement;


VirtualFileUtil is referenced in this file (e.g., VirtualFileUtil.isAncestor(...)) but there's no corresponding import, so the test won't compile. Add the appropriate consulo.virtualFileSystem.util.VirtualFileUtil import (or qualify the reference).

Copilot · 2026-04-18T06:50:21Z

 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiFile;


VirtualFileUtil is used in this class (virtualToIoFile, saveText) but there is no import for it, so this file won't compile. Add an import for consulo.virtualFileSystem.util.VirtualFileUtil (or fully qualify the calls).

Copilot · 2026-04-18T06:50:21Z

 import consulo.module.content.layer.ModifiableRootModel;
 import consulo.module.content.ModuleRootManager;
 import consulo.util.dataholder.Key;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
 import consulo.virtualFileSystem.VirtualFile;


After removing the old FileUtil/VfsUtil imports, this class still uses FileUtil (e.g., createTempFile, toSystemIndependentName) and now uses VirtualFileUtil.saveText/loadText, but neither consulo.util.io.FileUtil nor consulo.virtualFileSystem.util.VirtualFileUtil are imported. Add the missing imports (or qualify the references) so the file compiles.

Copilot · 2026-04-18T06:50:21Z

 import consulo.util.xml.serializer.DefaultJDOMExternalizer;
 import consulo.util.xml.serializer.InvalidDataException;
 import consulo.util.xml.serializer.JDOMExternalizable;
 import consulo.util.xml.serializer.WriteExternalException;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;



FileUtil.loadFile(...) is still used in loadText(), but the FileUtil import was removed, so this file won't compile. Add an import for consulo.util.io.FileUtil (or qualify the reference).

unv-unv force-pushed the eliminating-vfs-util branch from 27f9094 to c2e95e9 Compare April 17, 2026 22:02

Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virt…

c6ae336

…ualFileSystem.util.VirtualFileUtil. Replacing consulo.ide.impl.idea.openapi.util.io.FileUtil with consulo.util.io.FileUtil.

unv-unv force-pushed the eliminating-vfs-util branch from c2e95e9 to c6ae336 Compare April 17, 2026 22:24

VISTALL requested a review from Copilot April 18, 2026 06:42

Copilot started reviewing on behalf of VISTALL April 18, 2026 06:42 View session

Copilot AI reviewed Apr 18, 2026

View reviewed changes

Adding imports.

14724a8

VISTALL merged commit 3db0682 into consulo:master Apr 18, 2026
1 check passed

unv-unv deleted the eliminating-vfs-util branch April 18, 2026 14:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virtualFileSystem.util.VirtualFileUtil. Replacing consulo.ide.impl.idea.openapi.util.io.FileUtil with consulo.util.io.FileUtil#293

Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virtualFileSystem.util.VirtualFileUtil. Replacing consulo.ide.impl.idea.openapi.util.io.FileUtil with consulo.util.io.FileUtil#293
VISTALL merged 2 commits intoconsulo:masterfrom
unv-unv:eliminating-vfs-util

unv-unv commented Apr 17, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Copilot AI Apr 18, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -28,7 +28,6 @@
		import consulo.module.Module;
		import consulo.module.ModuleManager;

	import consulo.module.ModuleManager;
	import consulo.module.ModuleManager;
	import consulo.util.io.FileUtil;

	import consulo.util.io.CharsetToolkit;
	import consulo.util.io.CharsetToolkit;
	import consulo.util.io.FileUtil;

	import consulo.module.content.ModuleRootManager;
	import consulo.module.content.ModuleRootManager;
	import consulo.util.io.FileUtil;

Conversation

unv-unv commented Apr 17, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants