diff --git a/java-impl-testing/src/main/java/com/intellij/codeInsight/CodeInsightTestCase.java b/java-impl-testing/src/main/java/com/intellij/codeInsight/CodeInsightTestCase.java index 79de67982..951f4fe7a 100644 --- a/java-impl-testing/src/main/java/com/intellij/codeInsight/CodeInsightTestCase.java +++ b/java-impl-testing/src/main/java/com/intellij/codeInsight/CodeInsightTestCase.java @@ -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; import com.intellij.java.language.psi.PsiClass; import consulo.language.psi.PsiDocumentManager; @@ -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; @@ -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); @@ -418,7 +418,7 @@ private void copyFilesFillingEditorInfos(final VirtualFile fromDir, final Virtua private EditorInfo copyContent(final VirtualFile from, final VirtualFile to, final List 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; @@ -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 { @@ -603,7 +603,7 @@ public void run() String ft = null; try { - ft = VfsUtil.loadText(vFile); + ft = VirtualFileUtil.loadText(vFile); } catch(IOException e) { diff --git a/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java b/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java index bf848255e..9fe7c78ce 100644 --- a/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java +++ b/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java @@ -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; import consulo.language.editor.inspection.scheme.InspectionProjectProfileManager; @@ -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; @@ -541,7 +542,7 @@ protected void run(Result result) throws Throwable File dir; if(files.length > 0) { - dir = VfsUtilCore.virtualToIoFile(files[0]); + dir = VirtualFileUtil.virtualToIoFile(files[0]); } else { @@ -554,7 +555,7 @@ protected void run(Result 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]; diff --git a/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java b/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java index 9e5438ae4..7ccc2cf91 100644 --- a/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java +++ b/java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java @@ -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; +import consulo.util.io.FileUtil; import consulo.language.psi.PsiFile; import com.intellij.testFramework.LightPlatformCodeInsightTestCase; import com.intellij.testFramework.LightPlatformTestCase; diff --git a/java-impl-testing/src/main/java/com/intellij/testFramework/ModuleTestCase.java b/java-impl-testing/src/main/java/com/intellij/testFramework/ModuleTestCase.java index a2a29d570..f92ccd6af 100644 --- a/java-impl-testing/src/main/java/com/intellij/testFramework/ModuleTestCase.java +++ b/java-impl-testing/src/main/java/com/intellij/testFramework/ModuleTestCase.java @@ -27,8 +27,8 @@ import consulo.language.editor.WriteCommandAction; import consulo.module.Module; import consulo.module.ModuleManager; +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; @@ -132,7 +132,7 @@ protected Module loadAllModulesUnder(@Nonnull VirtualFile rootDir, @Nullable fin { final Ref result = Ref.create(); - /*VfsUtilCore.visitChildrenRecursively(rootDir, new VirtualFileVisitor() + /*VirtualFileUtil.visitChildrenRecursively(rootDir, new VirtualFileVisitor() { @Override public boolean visitFile(@NotNull VirtualFile file) diff --git a/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestCase.java b/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestCase.java index 9a5f27602..538977708 100644 --- a/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestCase.java +++ b/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestCase.java @@ -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.*; import consulo.language.impl.internal.psi.PsiManagerImpl; @@ -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); @@ -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); diff --git a/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestData.java b/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestData.java index 4f6e7daaa..03ee36109 100644 --- a/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestData.java +++ b/java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestData.java @@ -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; /** diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/core/CoreJavaFileManager.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/core/CoreJavaFileManager.java index b404af35b..cb21fd4ef 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/core/CoreJavaFileManager.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/core/CoreJavaFileManager.java @@ -77,7 +77,7 @@ private List 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('/', '.')); diff --git a/plugin/pom.xml b/plugin/pom.xml index 742802807..cd25ed6ef 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -248,7 +248,7 @@ ${project.version} provided - + consulo consulo-language-editor-impl ${project.version} diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java index da4044a13..708797fb3 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -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; diff --git a/plugin/src/main/java/com/intellij/java/impl/openapi/vfs/impl/jrt/JrtFileSystemImpl.java b/plugin/src/main/java/com/intellij/java/impl/openapi/vfs/impl/jrt/JrtFileSystemImpl.java index 8bf146302..2eee3d674 100644 --- a/plugin/src/main/java/com/intellij/java/impl/openapi/vfs/impl/jrt/JrtFileSystemImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/openapi/vfs/impl/jrt/JrtFileSystemImpl.java @@ -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; @@ -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 diff --git a/plugin/src/test/java_/com/intellij/codeInsight/AddAnnotationFixTest.java b/plugin/src/test/java_/com/intellij/codeInsight/AddAnnotationFixTest.java index 64a36df93..bcd58db9a 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/AddAnnotationFixTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/AddAnnotationFixTest.java @@ -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; @@ -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; @@ -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; @@ -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(); @@ -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(); diff --git a/plugin/src/test/java_/com/intellij/codeInsight/SuppressExternalTest.java b/plugin/src/test/java_/com/intellij/codeInsight/SuppressExternalTest.java index 5f268bd7f..997c4330c 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/SuppressExternalTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/SuppressExternalTest.java @@ -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; @@ -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; @@ -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(); } diff --git a/plugin/src/test/java_/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java b/plugin/src/test/java_/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java index 9b0902f9a..edc4de648 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java @@ -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; @@ -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; @@ -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); diff --git a/plugin/src/test/java_/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java b/plugin/src/test/java_/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java index 9b054493a..3a99ef796 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java @@ -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 @@ -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(); diff --git a/plugin/src/test/java_/com/intellij/codeInsight/documentation/RefConvertorsTest.java b/plugin/src/test/java_/com/intellij/codeInsight/documentation/RefConvertorsTest.java index ac5f864dc..560384417 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/documentation/RefConvertorsTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/documentation/RefConvertorsTest.java @@ -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; @@ -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(); } diff --git a/plugin/src/test/java_/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java b/plugin/src/test/java_/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java index 04e3fc01a..0d565b32b 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java @@ -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; diff --git a/plugin/src/test/java_/com/intellij/codeInsight/psi/ControlFlowTest.java b/plugin/src/test/java_/com/intellij/codeInsight/psi/ControlFlowTest.java index 8e3e877b0..2aa3c719e 100644 --- a/plugin/src/test/java_/com/intellij/codeInsight/psi/ControlFlowTest.java +++ b/plugin/src/test/java_/com/intellij/codeInsight/psi/ControlFlowTest.java @@ -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; diff --git a/plugin/src/test/java_/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java b/plugin/src/test/java_/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java index 31c1af6a1..7023bdf27 100644 --- a/plugin/src/test/java_/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java +++ b/plugin/src/test/java_/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java @@ -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 @@ -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 diff --git a/plugin/src/test/java_/com/intellij/codeInspection/MagicConstantInspectionTest.java b/plugin/src/test/java_/com/intellij/codeInspection/MagicConstantInspectionTest.java index df0a39f06..d498fb5c7 100644 --- a/plugin/src/test/java_/com/intellij/codeInspection/MagicConstantInspectionTest.java +++ b/plugin/src/test/java_/com/intellij/codeInspection/MagicConstantInspectionTest.java @@ -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; diff --git a/plugin/src/test/java_/com/intellij/ide/fileTemplates/FileTemplatesTest.java b/plugin/src/test/java_/com/intellij/ide/fileTemplates/FileTemplatesTest.java index 6c1b17dbe..a91750064 100644 --- a/plugin/src/test/java_/com/intellij/ide/fileTemplates/FileTemplatesTest.java +++ b/plugin/src/test/java_/com/intellij/ide/fileTemplates/FileTemplatesTest.java @@ -16,7 +16,6 @@ import consulo.fileTemplate.impl.internal.CustomFileTemplate; import com.intellij.java.language.impl.codeInsight.template.JavaTemplateUtil; import consulo.module.content.ModuleRootManager; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import consulo.util.lang.StringUtil; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; @@ -24,6 +23,7 @@ import com.intellij.java.language.psi.PsiClass; import consulo.language.psi.PsiDirectory; import consulo.language.psi.PsiManager; +import consulo.util.io.FileUtil; import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.PsiTestUtil; import consulo.ide.impl.idea.util.properties.EncodingAwareProperties; diff --git a/plugin/src/test/java_/com/intellij/openapi/roots/impl/DirectoryIndexTest.java_ b/plugin/src/test/java_/com/intellij/openapi/roots/impl/DirectoryIndexTest.java_ index 2ee1422d7..ff740bb50 100644 --- a/plugin/src/test/java_/com/intellij/openapi/roots/impl/DirectoryIndexTest.java_ +++ b/plugin/src/test/java_/com/intellij/openapi/roots/impl/DirectoryIndexTest.java_ @@ -25,12 +25,13 @@ import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.ex.ProjectRootManagerEx; import com.intellij.openapi.util.EmptyRunnable; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.*; import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PsiTestUtil; import com.intellij.util.containers.ContainerUtil; +import consulo.util.io.FileUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -448,11 +449,11 @@ public class DirectoryIndexTest extends IdeaTestCase { public void run() { ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel(); rootModel.getContentEntries()[0] - .addExcludeFolder(VfsUtilCore.pathToUrl(FileUtil.toSystemIndependentName(f.getParentFile().getParent()))); + .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()))); rootModel.commit(); assertTrue(f.getPath(), f.exists() || f.mkdirs()); diff --git a/plugin/src/test/java_/com/intellij/psi/ArrayIndexOutOfBoundsTest.java b/plugin/src/test/java_/com/intellij/psi/ArrayIndexOutOfBoundsTest.java index 439fe4988..d1e8af3e5 100644 --- a/plugin/src/test/java_/com/intellij/psi/ArrayIndexOutOfBoundsTest.java +++ b/plugin/src/test/java_/com/intellij/psi/ArrayIndexOutOfBoundsTest.java @@ -23,7 +23,6 @@ import consulo.application.ApplicationManager; import consulo.undoRedo.CommandProcessor; import consulo.document.FileDocumentManager; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import consulo.language.impl.psi.SourceTreeToPsiMap; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.editor.refactoring.rename.RenameProcessor; @@ -31,6 +30,8 @@ import com.intellij.testFramework.PsiTestCase; import com.intellij.testFramework.PsiTestUtil; import consulo.logging.Logger; +import consulo.util.io.FileUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; import java.io.File; import java.io.IOException; @@ -81,8 +82,10 @@ private void restoreSources() { @Override public void run() { try { - FileUtil.copyDir(new File(JavaTestUtil.getJavaTestDataPath() + "/psi/arrayIndexOutOfBounds/src"), - VfsUtilCore.virtualToIoFile(myProjectRoot)); + FileUtil.copyDir( + new File(JavaTestUtil.getJavaTestDataPath() + "/psi/arrayIndexOutOfBounds/src"), + VirtualFileUtil.virtualToIoFile(myProjectRoot) + ); } catch (IOException e) { LOG.error(e); diff --git a/plugin/src/test/java_/com/intellij/psi/ClsBuilderTest.java b/plugin/src/test/java_/com/intellij/psi/ClsBuilderTest.java index f8632cab1..6cd438fc5 100644 --- a/plugin/src/test/java_/com/intellij/psi/ClsBuilderTest.java +++ b/plugin/src/test/java_/com/intellij/psi/ClsBuilderTest.java @@ -10,7 +10,7 @@ import com.intellij.JavaTestUtil; import consulo.content.OrderRootType; -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; diff --git a/plugin/src/test/java_/com/intellij/psi/ClsRepositoryUseTest.java b/plugin/src/test/java_/com/intellij/psi/ClsRepositoryUseTest.java index d9ff9d34b..ce4ecdf3b 100644 --- a/plugin/src/test/java_/com/intellij/psi/ClsRepositoryUseTest.java +++ b/plugin/src/test/java_/com/intellij/psi/ClsRepositoryUseTest.java @@ -25,13 +25,13 @@ import com.intellij.testFramework.PsiTestUtil; import consulo.application.ApplicationManager; import consulo.content.OrderRootType; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import consulo.java.impl.module.extension.JavaModuleExtensionImpl; import consulo.java.impl.module.extension.JavaMutableModuleExtensionImpl; import consulo.language.psi.scope.GlobalSearchScope; import consulo.logging.Logger; import consulo.module.content.ModuleRootManager; import consulo.module.content.layer.ModifiableRootModel; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.VirtualFileFilter; diff --git a/plugin/src/test/java_/com/intellij/psi/JavaStubBuilderTest.java b/plugin/src/test/java_/com/intellij/psi/JavaStubBuilderTest.java index 9dfa4db38..9673bf5e3 100644 --- a/plugin/src/test/java_/com/intellij/psi/JavaStubBuilderTest.java +++ b/plugin/src/test/java_/com/intellij/psi/JavaStubBuilderTest.java @@ -25,7 +25,7 @@ import com.intellij.java.language.psi.PsiJavaFile; import org.jspecify.annotations.Nullable; import consulo.language.ast.FileASTNode; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.language.impl.DebugUtil; import com.intellij.java.language.impl.psi.impl.source.JavaLightStubBuilder; import consulo.language.psi.stub.StubElement; diff --git a/plugin/src/test/java_/com/intellij/psi/SmartPsiElementPointersTest.java b/plugin/src/test/java_/com/intellij/psi/SmartPsiElementPointersTest.java index d230d6cc6..3843ae5ce 100644 --- a/plugin/src/test/java_/com/intellij/psi/SmartPsiElementPointersTest.java +++ b/plugin/src/test/java_/com/intellij/psi/SmartPsiElementPointersTest.java @@ -25,7 +25,6 @@ import consulo.document.event.DocumentListener; import consulo.codeEditor.event.EditorEventMulticaster; import consulo.document.FileDocumentManager; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; import consulo.virtualFileSystem.VirtualFile; import consulo.language.impl.psi.PsiFileImpl; import consulo.language.impl.ast.FileElement; @@ -38,6 +37,7 @@ import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PsiTestUtil; import consulo.ide.impl.idea.util.FileContentUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; import java.io.IOException; import java.util.Collections; @@ -271,7 +271,7 @@ public void testCreatePointerWhenNoPsiFile() { public void testReplaceFile() throws IOException { VirtualFile vfile = myRoot.createChildData(this, "X.java"); - VfsUtil.saveText(vfile, "public class X { public int X; }"); + VirtualFileUtil.saveText(vfile, "public class X { public int X; }"); PsiClass aClass = myJavaFacade.findClass("X", GlobalSearchScope.allScope(getProject())); assertNotNull(aClass); @@ -299,7 +299,7 @@ public void testReplaceFile() throws IOException { public void testCreatePointerDoesNotLoadPsiTree() throws IOException { VirtualFile vfile = myRoot.createChildData(this, "X.java"); - VfsUtil.saveText(vfile, "public class X { public int X; }"); + VirtualFileUtil.saveText(vfile, "public class X { public int X; }"); PsiClass aClass = myJavaFacade.findClass("X", GlobalSearchScope.allScope(getProject())); assertNotNull(aClass); diff --git a/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java b/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java index 63543417e..d8031eca5 100644 --- a/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java +++ b/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java @@ -26,8 +26,6 @@ import consulo.application.ApplicationManager; import consulo.document.FileDocumentManager; import consulo.document.util.TextRange; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; -import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore; import consulo.language.editor.refactoring.rename.RenameProcessor; import consulo.language.impl.ast.CompositeElement; import consulo.language.impl.internal.psi.diff.BlockSupport; @@ -41,6 +39,7 @@ import consulo.roots.ContentFolderScopes; import consulo.roots.impl.ProductionContentFolderTypeProvider; import consulo.util.dataholder.Key; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.VirtualFileFilter; @@ -733,7 +732,7 @@ public void run() { contentEntry.removeFolder(sourceFolder); } VirtualFile contentRoot = contentEntry.getFile(); - if (contentRoot != null && VfsUtilCore.isAncestor(contentRoot, newSourceRoot, false)) { + if (contentRoot != null && VirtualFileUtil.isAncestor(contentRoot, newSourceRoot, false)) { contentEntry.addFolder(newSourceRoot, ProductionContentFolderTypeProvider.getInstance()); contentToChangeFound = true; } diff --git a/plugin/src/test/java_/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java b/plugin/src/test/java_/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java index 5ba648641..0acbedbee 100644 --- a/plugin/src/test/java_/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java +++ b/plugin/src/test/java_/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java @@ -35,7 +35,7 @@ import consulo.document.Document; import consulo.document.impl.DocumentImpl; import consulo.document.util.TextRange; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.util.lang.StringUtil; import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiFile; diff --git a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/IdCacheTest.java b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/IdCacheTest.java index 5a829b675..640249acd 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/IdCacheTest.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/IdCacheTest.java @@ -26,8 +26,7 @@ import consulo.ide.impl.idea.ide.todo.TodoConfiguration; import consulo.ide.impl.idea.ide.todo.TodoIndexPatternProvider; import consulo.document.FileDocumentManager; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.VirtualFile; import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiFile; @@ -43,6 +42,7 @@ import com.intellij.testFramework.PsiTestUtil; import consulo.util.collection.ArrayUtil; import consulo.language.psi.stub.FileBasedIndex; +import consulo.virtualFileSystem.util.VirtualFileUtil; public abstract class IdCacheTest extends CodeInsightTestCase{ @@ -85,7 +85,7 @@ public void testUpdateCache1() throws Exception { public void testUpdateCache2() throws Exception { VirtualFile child = myRootDir.findChild("1.java"); - VfsUtil.saveText(child, "xxx"); + VirtualFileUtil.saveText(child, "xxx"); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); FileDocumentManager.getInstance().saveAllDocuments(); @@ -158,7 +158,7 @@ public void testFileModification() throws Exception { checkCache(cache, todocache); - VfsUtil.saveText(child, "xxx"); + VirtualFileUtil.saveText(child, "xxx"); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject); @@ -202,7 +202,7 @@ public void testFileCreation() throws Exception { checkCache(cache, todocache); VirtualFile child = myRootDir.createChildData(null, "4.java"); - VfsUtil.saveText(child, "xxx //todo"); + VirtualFileUtil.saveText(child, "xxx //todo"); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject); diff --git a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR14423Test.java b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR14423Test.java index 082301417..a4830662d 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR14423Test.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR14423Test.java @@ -14,9 +14,8 @@ import consulo.module.content.layer.ContentEntry; import consulo.module.content.layer.ModifiableRootModel; import consulo.module.content.ModuleRootManager; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; import consulo.virtualFileSystem.VirtualFile; import com.intellij.java.language.psi.PsiClass; import consulo.language.psi.scope.GlobalSearchScope; @@ -25,6 +24,7 @@ import consulo.java.impl.module.extension.JavaModuleExtensionImpl; import consulo.java.impl.module.extension.JavaMutableModuleExtensionImpl; import consulo.roots.ContentFolderScopes; +import consulo.virtualFileSystem.util.VirtualFileUtil; /** * @author max @@ -55,7 +55,7 @@ public void run() { myPackDir = mySrcDir1.createChildDirectory(null, "p"); VirtualFile file1 = myPackDir.createChildData(null, "A.java"); - VfsUtil.saveText(file1, "package p; public class A{ public void foo(); }"); + VirtualFileUtil.saveText(file1, "package p; public class A{ public void foo(); }"); PsiTestUtil.addContentRoot(myModule, myPrjDir1); PsiTestUtil.addSourceRoot(myModule, mySrcDir1); @@ -122,7 +122,7 @@ public void run() { FileDocumentManager.getInstance().saveAllDocuments(); PsiClass psiClass = myJavaFacade.findClass("p.A"); VirtualFile vFile = psiClass.getContainingFile().getVirtualFile(); - File ioFile = VfsUtil.virtualToIoFile(vFile); + File ioFile = VirtualFileUtil.virtualToIoFile(vFile); ioFile.setLastModified(5); LocalFileSystem.getInstance().refresh(false); diff --git a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR17650Test.java b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR17650Test.java index a75050ed8..a294b9d59 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR17650Test.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR17650Test.java @@ -7,13 +7,12 @@ import consulo.application.ApplicationManager; import consulo.ide.impl.idea.openapi.roots.ModuleRootModificationUtil; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; -import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore; import consulo.virtualFileSystem.VirtualFile; import com.intellij.testFramework.PsiTestCase; import com.intellij.testFramework.PsiTestUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; /** * @author max @@ -41,8 +40,8 @@ public void run() { myDir = rootVFile.createChildDirectory(null, "contentAndLibrary"); VirtualFile file1 = myDir.createChildData(null, "A.java"); - VfsUtil.saveText(file1, "package p; public class A{ public void foo(); }"); - VfsUtilCore.copyFile(null, getClassFile(), myDir); + VirtualFileUtil.saveText(file1, "package p; public class A{ public void foo(); }"); + VirtualFileUtil.copyFile(null, getClassFile(), myDir); PsiTestUtil.addSourceRoot(myModule, myDir); ModuleRootModificationUtil.addModuleLibrary(myModule, myDir.getUrl()); diff --git a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR19174Test.java b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR19174Test.java index a4754cc49..caa153c55 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR19174Test.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR19174Test.java @@ -5,13 +5,13 @@ import consulo.application.ApplicationManager; import consulo.ide.impl.idea.openapi.roots.ModuleRootModificationUtil; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; import consulo.virtualFileSystem.VirtualFile; import consulo.language.psi.PsiFile; import com.intellij.testFramework.PsiTestCase; import com.intellij.testFramework.PsiTestUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; /** * @author max @@ -65,6 +65,6 @@ public void testBug() throws Exception { private void touchFileSync() throws IOException { myVFile = myDir.createChildData(null, "A.java"); - VfsUtil.saveText(myVFile, "package p; public class A{ public void foo(); }"); + VirtualFileUtil.saveText(myVFile, "package p; public class A{ public void foo(); }"); } } diff --git a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java index 777ad3281..b90d058a0 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/cache/impl/SCR20733Test.java @@ -9,14 +9,14 @@ import consulo.logging.Logger; import consulo.module.Module; import consulo.ide.impl.idea.openapi.module.ModuleUtil; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; import consulo.virtualFileSystem.VirtualFile; import com.intellij.java.language.psi.PsiClass; import consulo.language.psi.PsiFile; import com.intellij.testFramework.PsiTestCase; import com.intellij.testFramework.PsiTestUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; /** * @author max @@ -53,7 +53,7 @@ public void run() myPackDir = mySrcDir1.createChildDirectory(null, "p"); VirtualFile file1 = myPackDir.createChildData(null, "A.java"); - VfsUtil.saveText(file1, "package p; public class A{ public void foo(); }"); + VirtualFileUtil.saveText(file1, "package p; public class A{ public void foo(); }"); PsiTestUtil.addContentRoot(myModule, myPrjDir1); PsiTestUtil.addSourceRoot(myModule, mySrcDir1); diff --git a/plugin/src/test/java_/com/intellij/psi/impl/file/impl/InvalidateClassFileTest.java b/plugin/src/test/java_/com/intellij/psi/impl/file/impl/InvalidateClassFileTest.java index 1cccc2d6c..3ebdcd04c 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/file/impl/InvalidateClassFileTest.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/file/impl/InvalidateClassFileTest.java @@ -17,7 +17,7 @@ import com.intellij.JavaTestUtil; import consulo.ide.impl.idea.openapi.roots.ModuleRootModificationUtil; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.VirtualFileManager; diff --git a/plugin/src/test/java_/com/intellij/psi/impl/file/impl/PsiEventsTest.java b/plugin/src/test/java_/com/intellij/psi/impl/file/impl/PsiEventsTest.java index 3ffea2536..a8a190bbd 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/file/impl/PsiEventsTest.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/file/impl/PsiEventsTest.java @@ -6,9 +6,8 @@ import consulo.language.file.FileTypeManager; import consulo.ide.impl.idea.openapi.fileTypes.ex.FileTypeManagerEx; import consulo.ide.impl.idea.openapi.roots.ModuleRootModificationUtil; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; import consulo.virtualFileSystem.VirtualFile; import consulo.language.impl.internal.psi.PsiTreeChangeEventImpl; import consulo.language.psi.scope.GlobalSearchScope; @@ -17,6 +16,7 @@ import consulo.ide.impl.idea.util.WaitFor; import consulo.ide.impl.idea.util.io.ReadOnlyAttributeUtil; import consulo.logging.Logger; +import consulo.virtualFileSystem.util.VirtualFileUtil; import java.io.File; @@ -425,14 +425,14 @@ public void testMoveDirectory4() throws Exception { public void testChangeFile() throws Exception { FileManager fileManager = myPsiManager.getFileManager(); VirtualFile file = myPrjDir1.createChildData(null, "a.txt"); - VfsUtil.saveText(file, "aaa"); + VirtualFileUtil.saveText(file, "aaa"); PsiFile psiFile = fileManager.findFile(file); psiFile.getText(); EventsTestListener listener = new EventsTestListener(); myPsiManager.addPsiTreeChangeListener(listener,getTestRootDisposable()); - VfsUtil.saveText(file, "bbb"); + VirtualFileUtil.saveText(file, "bbb"); PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); /* diff --git a/plugin/src/test/java_/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java b/plugin/src/test/java_/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java index f747aa1b2..2965fbf09 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/IntroduceFieldWitSetUpInitializationTest.java @@ -1,21 +1,16 @@ /* * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. */ - -/* - * User: anna - * Date: 17-Oct-2007 - */ package com.intellij.refactoring; import java.io.File; +import consulo.virtualFileSystem.util.VirtualFileUtil; import org.junit.Before; import com.intellij.JavaTestUtil; import com.intellij.codeInsight.CodeInsightTestCase; import consulo.module.Module; import consulo.ide.impl.idea.openapi.roots.ModuleRootModificationUtil; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiExpression; import com.intellij.java.language.psi.PsiLocalVariable; @@ -25,6 +20,10 @@ import com.intellij.java.impl.refactoring.introduceField.LocalToFieldHandler; import com.intellij.util.PathUtil; +/** + * @author anna + * @since 2007-10-17 + */ public abstract class IntroduceFieldWitSetUpInitializationTest extends CodeInsightTestCase { @Override protected String getTestDataPath() { @@ -34,7 +33,7 @@ protected String getTestDataPath() { @Override protected Module createModule(String name) { Module module = super.createModule(name); - String url = VfsUtil.getUrlForLibraryRoot(new File(PathUtil.getJarPathForClass(Before.class))); + String url = VirtualFileUtil.getUrlForLibraryRoot(new File(PathUtil.getJarPathForClass(Before.class))); ModuleRootModificationUtil.addModuleLibrary(module, url); return module; } diff --git a/plugin/src/test/java_/com/intellij/refactoring/TypeCookTest.java b/plugin/src/test/java_/com/intellij/refactoring/TypeCookTest.java index 82fff2b60..8209bdedc 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/TypeCookTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/TypeCookTest.java @@ -17,7 +17,7 @@ import com.intellij.JavaTestUtil; import consulo.document.FileDocumentManager; -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.java.language.psi.PsiClass; diff --git a/plugin/src/test/java_/com/intellij/testFramework/CompilerTester.java_ b/plugin/src/test/java_/com/intellij/testFramework/CompilerTester.java_ index 2fdb17429..6c4915d84 100644 --- a/plugin/src/test/java_/com/intellij/testFramework/CompilerTester.java_ +++ b/plugin/src/test/java_/com/intellij/testFramework/CompilerTester.java_ @@ -28,7 +28,6 @@ import com.intellij.openapi.roots.CompilerModuleExtension; import com.intellij.openapi.roots.CompilerProjectExtension; 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; @@ -39,6 +38,7 @@ import com.intellij.util.Consumer; import com.intellij.util.ObjectUtils; import com.intellij.util.concurrency.Semaphore; import com.intellij.util.ui.UIUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; import org.jetbrains.annotations.Nullable; import org.junit.Assert; @@ -128,7 +128,7 @@ public class CompilerTester { public void touch(VirtualFile file) throws IOException { file.setBinaryContent(file.contentsToByteArray(), -1, file.getTimeStamp() + 1); - File ioFile = VfsUtil.virtualToIoFile(file); + File ioFile = VirtualFileUtil.virtualToIoFile(file); assert ioFile.setLastModified(ioFile.lastModified() - 100000); file.refresh(false, false); } @@ -139,7 +139,7 @@ public class CompilerTester { public void run() { try { final VirtualFile virtualFile = file.getVirtualFile(); - VfsUtil.saveText(ObjectUtils.assertNotNull(virtualFile), text); + VirtualFileUtil.saveText(ObjectUtils.assertNotNull(virtualFile), text); } catch (IOException e) { throw new RuntimeException(e); @@ -206,7 +206,7 @@ public class CompilerTester { if (myExternalMake) { getProject().save(); CompilerTestUtil.saveApplicationSettings(); - File ioFile = VfsUtil.virtualToIoFile(myModule.getModuleFile()); + File ioFile = VirtualFileUtil.virtualToIoFile(myModule.getModuleFile()); if (!ioFile.exists()) { getProject().save(); assert ioFile.exists() : "File does not exist: " + ioFile.getPath(); diff --git a/plugin/src/test/java_/com/intellij/testFramework/InspectionTestCase.java b/plugin/src/test/java_/com/intellij/testFramework/InspectionTestCase.java index cb85368d7..911f7405d 100644 --- a/plugin/src/test/java_/com/intellij/testFramework/InspectionTestCase.java +++ b/plugin/src/test/java_/com/intellij/testFramework/InspectionTestCase.java @@ -31,13 +31,13 @@ import consulo.component.extension.ExtensionPoint; import consulo.content.bundle.Sdk; import consulo.virtualFileSystem.LocalFileSystem; -import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore; import consulo.virtualFileSystem.VirtualFile; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; import consulo.language.psi.PsiUtilCore; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import consulo.util.collection.ArrayUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; import consulo.java.analysis.codeInspection.JavaExtensionPoints; import org.jdom.Element; @@ -189,7 +189,7 @@ public boolean isEntryPoint(RefElement refElement, PsiElement psiElement) { @Override public boolean isEntryPoint(PsiElement psiElement) { - return ext_src != null && VfsUtilCore.isAncestor(ext_src, PsiUtilCore.getVirtualFile(psiElement), false); + return ext_src != null && VirtualFileUtil.isAncestor(ext_src, PsiUtilCore.getVirtualFile(psiElement), false); } @Override diff --git a/plugin/src/test/java_/com/intellij/testFramework/ResolveTestCase.java b/plugin/src/test/java_/com/intellij/testFramework/ResolveTestCase.java index 748fd5a23..d908a6d89 100644 --- a/plugin/src/test/java_/com/intellij/testFramework/ResolveTestCase.java +++ b/plugin/src/test/java_/com/intellij/testFramework/ResolveTestCase.java @@ -22,9 +22,9 @@ import java.io.File; import consulo.virtualFileSystem.LocalFileSystem; +import consulo.virtualFileSystem.util.VirtualFileUtil; import org.jspecify.annotations.Nullable; import consulo.util.lang.StringUtil; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; import consulo.virtualFileSystem.VirtualFile; import consulo.language.psi.PsiReference; @@ -40,7 +40,7 @@ protected PsiReference configureByFile(@TestDataFile String filePath, @Nullable VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(fullPath.replace(File.separatorChar, '/')); assertNotNull("file " + filePath + " not found", vFile); - String fileText = StringUtil.convertLineSeparators(VfsUtil.loadText(vFile)); + String fileText = StringUtil.convertLineSeparators(VirtualFileUtil.loadText(vFile)); String fileName = vFile.getName(); diff --git a/plugin/src/test/java_/com/intellij/testFramework/TestSourceBasedTestCase.java b/plugin/src/test/java_/com/intellij/testFramework/TestSourceBasedTestCase.java index 68eae6a7e..f21718c99 100644 --- a/plugin/src/test/java_/com/intellij/testFramework/TestSourceBasedTestCase.java +++ b/plugin/src/test/java_/com/intellij/testFramework/TestSourceBasedTestCase.java @@ -20,7 +20,6 @@ import java.io.File; import consulo.application.ApplicationManager; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; import consulo.language.psi.PsiDirectory; diff --git a/plugin/src/test/java_/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java b/plugin/src/test/java_/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java index d59fdd966..d3e01d885 100644 --- a/plugin/src/test/java_/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java +++ b/plugin/src/test/java_/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java @@ -19,7 +19,6 @@ import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure; import consulo.application.util.function.Computable; import consulo.util.jdom.JDOMUtil; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; /** * Checks tree structure for Type Hierarchy (Ctrl+H), Call Hierarchy (Ctrl+Alt+H), Method Hierarchy (Ctrl+Shift+H). diff --git a/plugin/src/test/java_/com/intellij/unscramble/UnscrambleDialogTest.java b/plugin/src/test/java_/com/intellij/unscramble/UnscrambleDialogTest.java index e534a5ebc..134559756 100644 --- a/plugin/src/test/java_/com/intellij/unscramble/UnscrambleDialogTest.java +++ b/plugin/src/test/java_/com/intellij/unscramble/UnscrambleDialogTest.java @@ -17,7 +17,6 @@ import com.intellij.JavaTestUtil; import consulo.execution.ui.RunContentDescriptor; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase; import consulo.ui.image.Image;