Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 2 commits into from
Apr 18, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ae336
Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virt…
unv-unv Apr 17, 2026
14724a8
Adding imports.
unv-unv Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions java-impl-testing/src/main/java/com/intellij/codeInsight/CodeInsightTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@
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;
Comment on lines 61 to 65
Copy link

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 uses AI. Check for mistakes.
import com.intellij.java.language.psi.PsiClass;
import consulo.language.psi.PsiDocumentManager;
Expand All @@ -77,6 +75,8 @@
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.testFramework.VfsTestUtil;
import consulo.util.collection.ArrayUtil;
import consulo.util.io.FileUtil;
import consulo.virtualFileSystem.util.VirtualFileUtil;
import consulo.ide.impl.idea.util.Function;
import consulo.util.collection.ContainerUtil;
import consulo.fileEditor.text.TextEditorProvider;
Expand Down Expand Up @@ -188,7 +188,7 @@ protected void run(Result result) throws Exception
}
final VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile);
assert vFile != null;
consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(vFile, text);
VirtualFileUtil.saveText(vFile, text);

final VirtualFile vdir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(dir);

Expand Down Expand Up @@ -418,7 +418,7 @@ private void copyFilesFillingEditorInfos(final VirtualFile fromDir, final Virtua
private EditorInfo copyContent(final VirtualFile from, final VirtualFile to, final List<OutputStream> streamsToClose) throws IOException
{
byte[] content = from.getFileType().isBinary() ? from.contentsToByteArray() : null;
final String fileText = from.getFileType().isBinary() ? null : StringUtil.convertLineSeparators(consulo.ide.impl.idea.openapi.vfs.VfsUtil.loadText(from));
final String fileText = from.getFileType().isBinary() ? null : StringUtil.convertLineSeparators(VirtualFileUtil.loadText(from));

EditorInfo editorInfo = fileText != null ? new EditorInfo(fileText) : null;
String newFileText = fileText != null ? editorInfo.getNewFileText() : null;
Expand Down Expand Up @@ -472,7 +472,7 @@ private void doWrite(final String newFileText, final VirtualFile newVFile, final
{
if(newFileText != null)
{
consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(newVFile, newFileText);
VirtualFileUtil.saveText(newVFile, newFileText);
}
else
{
Expand Down Expand Up @@ -603,7 +603,7 @@ public void run()
String ft = null;
try
{
ft = VfsUtil.loadText(vFile);
ft = VirtualFileUtil.loadText(vFile);
}
catch(IOException e)
{
Expand Down
7 changes: 4 additions & 3 deletions java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
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;
Comment on lines 54 to 58
Copy link

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 uses AI. Check for mistakes.
import consulo.language.editor.inspection.scheme.InspectionProjectProfileManager;
Expand All @@ -81,6 +80,8 @@
import consulo.ui.UIAccess;
import consulo.util.collection.primitive.ints.IntList;
import consulo.util.collection.primitive.ints.IntLists;
import consulo.util.io.FileUtil;
import consulo.virtualFileSystem.util.VirtualFileUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import org.junit.Assert;

Expand Down Expand Up @@ -541,7 +542,7 @@ protected void run(Result<PsiClass> result) throws Throwable
File dir;
if(files.length > 0)
{
dir = VfsUtilCore.virtualToIoFile(files[0]);
dir = VirtualFileUtil.virtualToIoFile(files[0]);
}
else
{
Expand All @@ -554,7 +555,7 @@ protected void run(Result<PsiClass> result) throws Throwable
FileUtil.createIfDoesntExist(file);
VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(file.getCanonicalPath().replace(File.separatorChar, '/'));
Assert.assertNotNull(vFile);
consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(vFile, text);
VirtualFileUtil.saveText(vFile, text);
PsiJavaFile psiFile = (PsiJavaFile) myPsiManager.findFile(vFile);
Assert.assertNotNull(psiFile);
PsiClass psiClass = psiFile.getClasses()[0];
Expand Down
2 changes: 1 addition & 1 deletion ...testing/src/main/java/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
import consulo.codeEditor.Editor;
import consulo.project.Project;
import consulo.util.lang.Pair;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.util.lang.StringUtil;
import consulo.util.io.CharsetToolkit;
Copy link

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 uses AI. Check for mistakes.
import consulo.util.io.FileUtil;
import consulo.language.psi.PsiFile;
import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
import com.intellij.testFramework.LightPlatformTestCase;
Expand Down
4 changes: 2 additions & 2 deletions java-impl-testing/src/main/java/com/intellij/testFramework/ModuleTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import consulo.language.editor.WriteCommandAction;
import consulo.module.Module;
import consulo.module.ModuleManager;
Copy link

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 uses AI. Check for mistakes.
import consulo.util.io.FileUtil;
import consulo.util.lang.ref.Ref;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import consulo.virtualFileSystem.VirtualFile;
import consulo.ide.impl.idea.util.Consumer;
Expand Down Expand Up @@ -132,7 +132,7 @@ protected Module loadAllModulesUnder(@Nonnull VirtualFile rootDir, @Nullable fin
{
final Ref<Module> result = Ref.create();

/*VfsUtilCore.visitChildrenRecursively(rootDir, new VirtualFileVisitor()
/*VirtualFileUtil.visitChildrenRecursively(rootDir, new VirtualFileVisitor()
{
@Override
public boolean visitFile(@NotNull VirtualFile file)
Expand Down
8 changes: 4 additions & 4 deletions java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import consulo.ide.impl.idea.openapi.roots.ModuleRootModificationUtil;
import consulo.content.OrderRootType;
import consulo.util.xml.serializer.DefaultJDOMExternalizer;
import consulo.util.io.FileUtil;
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.util.VirtualFileUtil;
import consulo.virtualFileSystem.VirtualFile;
import com.intellij.psi.*;
Comment on lines 27 to 33
Copy link

Copilot AI Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 uses AI. Check for mistakes.
import consulo.language.impl.internal.psi.PsiManagerImpl;
Expand Down Expand Up @@ -98,7 +98,7 @@ protected PsiFile createFile(final Module module, final VirtualFile vDir, final
}

final VirtualFile vFile = vDir.createChildData(vDir, fileName);
VfsUtil.saveText(vFile, text);
VirtualFileUtil.saveText(vFile, text);
Assert.assertNotNull(vFile);
final PsiFile file = myPsiManager.findFile(vFile);
Assert.assertNotNull(file);
Expand All @@ -116,7 +116,7 @@ protected PsiElement configureByFileWithMarker(String filePath, String marker) t
final VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(filePath.replace(File.separatorChar, '/'));
Assert.assertNotNull("file " + filePath + " not found", vFile);

String fileText = VfsUtil.loadText(vFile);
String fileText = VirtualFileUtil.loadText(vFile);
fileText = StringUtil.convertLineSeparators(fileText);

int offset = fileText.indexOf(marker);
Expand Down
2 changes: 1 addition & 1 deletion java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
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.io.FileUtil;
import consulo.util.lang.StringUtil;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...language-impl/src/main/java/com/intellij/java/language/impl/core/CoreJavaFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private List<VirtualFile> findDirectoriesByPackageName(String packageName) {
public PsiJavaPackage getPackage(PsiDirectory dir) {
final VirtualFile file = dir.getVirtualFile();
for (VirtualFile root : myClasspath) {
if (VfsUtilCore.isAncestor(root, file, false)) {
if (VirtualFileUtil.isAncestor(root, file, false)) {
String relativePath = FileUtil.getRelativePath(root.getPath(), file.getPath(), '/');
if (relativePath == null) continue;
return new PsiPackageImpl(myPsiManager, relativePath.replace('/', '.'));
Expand Down
2 changes: 1 addition & 1 deletion plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>consulo</groupId>
<artifactId>consulo-language-editor-impl</artifactId>
<version>${project.version}</version>
Expand Down
1 change: 0 additions & 1 deletion plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.intellij.java.language.psi.util.PsiFormatUtilBase;
import consulo.annotation.access.RequiredReadAction;
import consulo.content.bundle.Sdk;
import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
import consulo.java.language.bundle.JavaSdkTypeUtil;
import consulo.language.LangBundle;
import consulo.language.ast.ASTNode;
Expand Down
6 changes: 4 additions & 2 deletions plugin/src/main/java/com/intellij/java/impl/openapi/vfs/impl/jrt/JrtFileSystemImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import consulo.annotation.component.ExtensionImpl;
import consulo.application.Application;
import consulo.application.ApplicationManager;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.java.execution.projectRoots.OwnJdkUtil;
import consulo.platform.Platform;
import consulo.util.collection.Maps;
import consulo.util.io.FileUtil;
import consulo.util.lang.StringUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import consulo.virtualFileSystem.NewVirtualFile;
Expand Down Expand Up @@ -38,7 +39,8 @@ public String getProtocol() {
@Override
public String normalize(String path) {
int p = path.indexOf(SEPARATOR);
return p > 0 ? FileUtil.normalize(path.substring(0, p)) + path.substring(p) : super.normalize(path);
boolean isWindows = Platform.current().os().isWindows();
return p > 0 ? FileUtil.normalize(path.substring(0, p), isWindows) + path.substring(p) : super.normalize(path);
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions plugin/src/test/java_/com/intellij/codeInsight/AddAnnotationFixTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.intellij.java.language.codeInsight.ExternalAnnotationsListener;
import com.intellij.java.language.codeInsight.ExternalAnnotationsManager;
import com.intellij.java.language.codeInsight.NullableNotNullManager;
import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
import consulo.util.io.FileUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import com.intellij.java.analysis.impl.codeInsight.intention.AddAnnotationPsiFix;
import consulo.language.editor.intention.IntentionAction;
Expand All @@ -38,7 +38,6 @@
import consulo.content.library.Library;
import consulo.content.library.LibraryTable;
import consulo.util.lang.Trinity;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.util.io.StreamUtil;
import consulo.virtualFileSystem.VirtualFile;
import com.intellij.java.language.psi.JavaPsiFacade;
Expand All @@ -59,6 +58,7 @@
import com.intellij.testFramework.fixtures.JavaTestFixtureFactory;
import com.intellij.testFramework.fixtures.TestFixtureBuilder;
import consulo.component.messagebus.MessageBusConnection;
import consulo.virtualFileSystem.util.VirtualFileUtil;

public abstract class AddAnnotationFixTest extends UsefulTestCase {
private CodeInsightTestFixture myFixture;
Expand Down Expand Up @@ -107,9 +107,9 @@ public void run() {
Library library = libraryTable.createLibrary("test");

Library.ModifiableModel libraryModel = library.getModifiableModel();
libraryModel.addRoot(VfsUtil.pathToUrl(myFixture.getTempDirPath() + "/lib"), OrderRootType.SOURCES);
libraryModel.addRoot(VirtualFileUtil.pathToUrl(myFixture.getTempDirPath() + "/lib"), OrderRootType.SOURCES);
for (String annotationsDir : annotationsDirs) {
libraryModel.addRoot(VfsUtil.pathToUrl(myFixture.getTempDirPath() + annotationsDir), AnnotationOrderRootType.getInstance());
libraryModel.addRoot(VirtualFileUtil.pathToUrl(myFixture.getTempDirPath() + annotationsDir), AnnotationOrderRootType.getInstance());
}
libraryModel.commit();
model.commit();
Expand Down Expand Up @@ -409,7 +409,7 @@ protected void run(Result result) throws Throwable {
VirtualFile file = LocalFileSystem.getInstance().findFileByPath(myFixture.getTempDirPath() + "/content/anno/p/annotations.xml");
assert file != null;
String newText = " " + StreamUtil.readText(file.getInputStream()) + " "; // adding newspace to the beginning and end of file
FileUtil.writeToFile(VfsUtil.virtualToIoFile(file), newText); // writing using java.io.File to make this change external
FileUtil.writeToFile(VirtualFileUtil.virtualToIoFile(file), newText); // writing using java.io.File to make this change external
file.refresh(false, false);
}
}.execute();
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/test/java_/com/intellij/codeInsight/SuppressExternalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import consulo.module.Module;
import consulo.module.content.layer.ModifiableRootModel;
import consulo.module.content.ModuleRootManager;
import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
import com.intellij.java.language.LanguageLevel;
import com.intellij.java.language.psi.JavaPsiFacade;
import com.intellij.testFramework.UsefulTestCase;
Expand All @@ -25,6 +24,7 @@
import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
import com.intellij.testFramework.fixtures.JavaTestFixtureFactory;
import com.intellij.testFramework.fixtures.TestFixtureBuilder;
import consulo.virtualFileSystem.util.VirtualFileUtil;

public abstract class SuppressExternalTest extends UsefulTestCase {
protected CodeInsightTestFixture myFixture;
Expand Down Expand Up @@ -59,7 +59,7 @@ private void addAnnotationsModuleRoot() throws IOException {
public void run() {
Module module = myFixture.getModule();
ModifiableRootModel model = ModuleRootManager.getInstance(module).getModifiableModel();
String url = VfsUtilCore.pathToUrl(myFixture.getTempDirPath() + "/content/anno");
String url = VirtualFileUtil.pathToUrl(myFixture.getTempDirPath() + "/content/anno");
//model.getModuleExtensionOld(JavaModuleExternalPaths.class).setExternalAnnotationUrls(new String[]{url});
model.commit();
}
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/test/java_/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.intellij.codeInsight.daemon;

import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
import consulo.language.editor.rawHighlight.HighlightInfo;
import consulo.language.editor.inspection.LocalInspectionTool;
import com.intellij.java.impl.codeInspection.accessStaticViaInstance.AccessStaticViaInstance;
Expand Down Expand Up @@ -48,6 +47,7 @@
import com.intellij.psi.xml.XmlTokenType;
import com.intellij.testFramework.IdeaTestUtil;
import consulo.java.analysis.codeInspection.JavaExtensionPoints;
import consulo.virtualFileSystem.util.VirtualFileUtil;
import org.jdom.Element;

import java.io.IOException;
Expand Down Expand Up @@ -275,7 +275,7 @@ public void run() {
VirtualFile vFile = txt.getVirtualFile();
assertNotNull(txt.toString(), vFile);
try {
VfsUtil.saveText(vFile, "XXX");
VirtualFileUtil.saveText(vFile, "XXX");
}
catch (IOException e) {
throw new RuntimeException(e);
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/test/java_/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.intellij.java.language.JavaLanguage;
import consulo.application.Result;
import consulo.language.editor.WriteCommandAction;
import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
import consulo.virtualFileSystem.VirtualFile;
import consulo.language.codeStyle.CodeStyleSettingsManager;
import consulo.language.codeStyle.CommonCodeStyleSettings;
import consulo.virtualFileSystem.util.VirtualFileUtil;

/**
* @author ven
Expand Down Expand Up @@ -41,7 +41,7 @@ public void testSortByRelevance() throws Exception {
@Override
protected void run(Result result) throws Exception {
VirtualFile foo = getSourceRoot().createChildDirectory(this, "foo").createChildData(this, "Foo.java");
VfsUtil.saveText(foo, "package foo; public class Foo { public void put(Object key, Object value) {} }");
VirtualFileUtil.saveText(foo, "package foo; public class Foo { public void put(Object key, Object value) {} }");
}
}.execute();

Expand Down
7 changes: 3 additions & 4 deletions plugin/src/test/java_/com/intellij/codeInsight/documentation/RefConvertorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@

import com.intellij.JavaTestUtil;
import com.intellij.java.impl.codeInsight.javadoc.JavaDocExternalFilter;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.ide.impl.idea.openapi.util.io.FileUtilRt;
import consulo.util.io.FileUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import com.intellij.testFramework.LightCodeInsightTestCase;

Expand All @@ -43,13 +42,13 @@ public abstract class RefConvertorsTest extends LightCodeInsightTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
String tempDirectory = FileUtilRt.getTempDirectory();
String tempDirectory = FileUtil.getTempDirectory();
myExtractedImagesDir = new File(tempDirectory, "quick_doc_dir");
}

@Override
protected void tearDown() throws Exception {
FileUtilRt.delete(myExtractedImagesDir);
FileUtil.delete(myExtractedImagesDir);
super.tearDown();
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/java_/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.intellij.java.impl.codeInsight.javadoc.JavaDocInfoGenerator;
import com.intellij.java.language.psi.*;
import com.intellij.java.impl.lang.java.JavaDocumentationProvider;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.util.io.FileUtil;
import consulo.util.lang.StringUtil;
import com.intellij.testFramework.PsiTestUtil;

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/java_/com/intellij/codeInsight/psi/ControlFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.intellij.codeInsight.psi;

import com.intellij.java.language.impl.psi.controlFlow.*;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.util.io.FileUtil;
import consulo.util.lang.StringUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import consulo.virtualFileSystem.VirtualFile;
Expand Down
3 changes: 2 additions & 1 deletion plugin/src/test/java_/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.intellij.java.language.psi.javadoc.PsiDocTagValue;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.InspectionTestCase;
import consulo.virtualFileSystem.util.VirtualFileUtil;

public abstract class JavaAPIUsagesInspectionTest extends InspectionTestCase {
@Override
Expand Down Expand Up @@ -94,7 +95,7 @@ public void visitElement(PsiElement element) {
};
VirtualFile srcFile = StandardFileSystems.jar().findFileByPath("c:/program files/java/jdk1.6.0_12/src.zip!/");
assert srcFile != null;
VfsUtilCore.iterateChildrenRecursively(srcFile, VirtualFileFilter.ALL, contentIterator);
VirtualFileUtil.iterateChildrenRecursively(srcFile, VirtualFileFilter.ALL, contentIterator);
}
/*
@Override
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/java_/com/intellij/codeInspection/MagicConstantInspectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import consulo.content.bundle.Sdk;
import consulo.content.bundle.SdkModificator;
import com.intellij.java.language.projectRoots.roots.AnnotationOrderRootType;
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
import consulo.util.io.FileUtil;
import consulo.virtualFileSystem.LocalFileSystem;
import consulo.virtualFileSystem.VirtualFile;
import com.intellij.testFramework.InspectionTestCase;
Expand Down
Loading
Loading