From 50435821cf096b57dff90b1cb10c292a8173c4f7 Mon Sep 17 00:00:00 2001 From: UNV Date: Sat, 18 Apr 2026 17:45:55 +0300 Subject: [PATCH] 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. --- .../git4idea/history/GitAnnotationsClosedTest.java | 10 +++++----- .../java/git4idea/history/GitHistoryUtilsTest.java | 2 +- .../java/git4idea/history/GitLogParserTest.java | 5 ++--- .../src/test1/java/git4idea/repo/GitConfigTest.java | 2 +- .../test1/java/git4idea/repo/GitRepositoryTest.java | 6 +++--- plugin/src/test1/java/git4idea/test/GitTest.java | 12 ++++++------ plugin/src/test1/java/git4idea/test/GitTestImpl.java | 4 ++-- .../test1/java/git4idea/test/GitTestRepository.java | 4 ++-- plugin/src/test1/java/git4idea/test/GitTestUtil.java | 7 +++---- .../tests/GitChangeProviderVersionedTest.java | 12 +++++------- .../git4idea/tests/GitUpperDirectorySearchTest.java | 10 +++++----- 11 files changed, 35 insertions(+), 39 deletions(-) diff --git a/plugin/src/test1/java/git4idea/history/GitAnnotationsClosedTest.java b/plugin/src/test1/java/git4idea/history/GitAnnotationsClosedTest.java index 6b2c2d1..40c733a 100644 --- a/plugin/src/test1/java/git4idea/history/GitAnnotationsClosedTest.java +++ b/plugin/src/test1/java/git4idea/history/GitAnnotationsClosedTest.java @@ -16,11 +16,14 @@ package git4idea.history; import consulo.dataContext.DataContext; +import consulo.ide.impl.idea.openapi.vcs.ex.ProjectLevelVcsManagerEx; +import consulo.ide.impl.idea.openapi.vcs.update.CommonUpdateProjectAction; import consulo.language.editor.PlatformDataKeys; import consulo.ui.ex.action.AnActionEvent; import consulo.ui.ex.action.Presentation; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.versionControlSystem.ProjectLevelVcsManager; +import consulo.versionControlSystem.VcsConfiguration; import consulo.versionControlSystem.VcsDirectoryMapping; import consulo.versionControlSystem.VcsException; import consulo.versionControlSystem.annotate.FileAnnotation; @@ -28,16 +31,13 @@ import consulo.versionControlSystem.change.ChangeListManager; import consulo.versionControlSystem.change.VcsAnnotationLocalChangesListener; import consulo.versionControlSystem.change.VcsDirtyScopeManager; -import consulo.ide.impl.idea.openapi.vcs.ex.ProjectLevelVcsManagerEx; -import consulo.ide.impl.idea.openapi.vcs.update.CommonUpdateProjectAction; import consulo.virtualFileSystem.VirtualFile; -import consulo.versionControlSystem.VcsConfiguration; import git4idea.GitUtil; import git4idea.GitVcs; import git4idea.repo.GitRepository; import git4idea.test.GitTest; -import org.jetbrains.annotations.NonNls; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/plugin/src/test1/java/git4idea/history/GitHistoryUtilsTest.java b/plugin/src/test1/java/git4idea/history/GitHistoryUtilsTest.java index 2625f37..f0552ef 100644 --- a/plugin/src/test1/java/git4idea/history/GitHistoryUtilsTest.java +++ b/plugin/src/test1/java/git4idea/history/GitHistoryUtilsTest.java @@ -16,11 +16,11 @@ package git4idea.history; import consulo.application.util.function.AsynchConsumer; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import consulo.ide.impl.idea.openapi.vcs.FilePathImpl; import consulo.ide.impl.idea.util.Consumer; import consulo.ide.impl.idea.util.Function; import consulo.util.collection.ArrayUtil; +import consulo.util.io.FileUtil; import consulo.util.lang.Pair; import consulo.versionControlSystem.FilePath; import consulo.versionControlSystem.VcsException; diff --git a/plugin/src/test1/java/git4idea/history/GitLogParserTest.java b/plugin/src/test1/java/git4idea/history/GitLogParserTest.java index 56c7301..3e15387 100644 --- a/plugin/src/test1/java/git4idea/history/GitLogParserTest.java +++ b/plugin/src/test1/java/git4idea/history/GitLogParserTest.java @@ -15,19 +15,18 @@ */ package git4idea.history; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import consulo.language.file.light.LightVirtualFile; +import consulo.util.collection.ContainerUtil; +import consulo.util.io.FileUtil; import consulo.util.lang.StringUtil; import consulo.versionControlSystem.FilePath; import consulo.versionControlSystem.VcsException; import consulo.versionControlSystem.change.Change; import consulo.virtualFileSystem.VirtualFile; -import consulo.util.collection.ContainerUtil; import git4idea.GitUtil; import git4idea.test.GitTest; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; - import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/plugin/src/test1/java/git4idea/repo/GitConfigTest.java b/plugin/src/test1/java/git4idea/repo/GitConfigTest.java index 9c7e77b..be4c3b2 100644 --- a/plugin/src/test1/java/git4idea/repo/GitConfigTest.java +++ b/plugin/src/test1/java/git4idea/repo/GitConfigTest.java @@ -17,7 +17,7 @@ import com.google.common.base.Function; import com.google.common.collect.Collections2; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.util.io.FileUtil; import consulo.util.lang.StringUtil; import git4idea.GitBranch; import git4idea.GitLocalBranch; diff --git a/plugin/src/test1/java/git4idea/repo/GitRepositoryTest.java b/plugin/src/test1/java/git4idea/repo/GitRepositoryTest.java index d908e80..0a4277d 100644 --- a/plugin/src/test1/java/git4idea/repo/GitRepositoryTest.java +++ b/plugin/src/test1/java/git4idea/repo/GitRepositoryTest.java @@ -16,13 +16,13 @@ package git4idea.repo; import consulo.ide.ServiceManager; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; +import consulo.virtualFileSystem.util.VirtualFileUtil; import git4idea.GitBranch; import git4idea.GitPlatformFacade; import git4idea.test.GitLightTest; import git4idea.test.GitTest; -import jakarta.annotation.Nullable; import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -55,7 +55,7 @@ public void setUp(Method testMethod) throws Exception { super.setUp(testMethod); GitPlatformFacade facade = ServiceManager.getService(myProject, GitPlatformFacade.class); myRepository = GitRepositoryImpl.getFullInstance(myRepo.getVFRootDir(), myProject, facade, myProject); - myReader = new GitRepositoryReader(new File(VfsUtil.virtualToIoFile(myRepository.getRoot()), ".git")); + myReader = new GitRepositoryReader(new File(VirtualFileUtil.virtualToIoFile(myRepository.getRoot()), ".git")); } @Test diff --git a/plugin/src/test1/java/git4idea/test/GitTest.java b/plugin/src/test1/java/git4idea/test/GitTest.java index 3f30e11..8946d65 100644 --- a/plugin/src/test1/java/git4idea/test/GitTest.java +++ b/plugin/src/test1/java/git4idea/test/GitTest.java @@ -15,17 +15,17 @@ */ package git4idea.test; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; -import consulo.ui.ex.awt.UIUtil; -import consulo.versionControlSystem.VcsConfiguration; -import consulo.versionControlSystem.VcsShowConfirmationOption; -import consulo.versionControlSystem.change.Change; -import consulo.versionControlSystem.change.ContentRevision; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import com.intellij.testFramework.fixtures.TempDirTestFixture; import com.intellij.testFramework.vcs.AbstractVcsTestCase; +import consulo.ui.ex.awt.UIUtil; import consulo.ui.ex.awt.internal.GuiUtils; +import consulo.util.io.FileUtil; import consulo.versionControlSystem.FilePath; +import consulo.versionControlSystem.VcsConfiguration; +import consulo.versionControlSystem.VcsShowConfirmationOption; +import consulo.versionControlSystem.change.Change; +import consulo.versionControlSystem.change.ContentRevision; import git4idea.GitVcs; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; diff --git a/plugin/src/test1/java/git4idea/test/GitTestImpl.java b/plugin/src/test1/java/git4idea/test/GitTestImpl.java index e7e3324..451ec2d 100644 --- a/plugin/src/test1/java/git4idea/test/GitTestImpl.java +++ b/plugin/src/test1/java/git4idea/test/GitTestImpl.java @@ -18,11 +18,11 @@ import com.google.common.base.Function; import com.google.common.collect.Collections2; import consulo.process.ProcessOutputTypes; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; +import consulo.project.Project; +import consulo.util.io.FileUtil; import consulo.util.lang.StringUtil; import consulo.versionControlSystem.VcsException; import consulo.virtualFileSystem.VirtualFile; -import consulo.project.Project; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; import git4idea.commands.GitImpl; diff --git a/plugin/src/test1/java/git4idea/test/GitTestRepository.java b/plugin/src/test1/java/git4idea/test/GitTestRepository.java index f74e3f6..590d9c0 100644 --- a/plugin/src/test1/java/git4idea/test/GitTestRepository.java +++ b/plugin/src/test1/java/git4idea/test/GitTestRepository.java @@ -15,9 +15,9 @@ */ package git4idea.test; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; -import consulo.virtualFileSystem.VirtualFile; +import consulo.util.io.FileUtil; import consulo.versionControlSystem.util.VcsUtil; +import consulo.virtualFileSystem.VirtualFile; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; diff --git a/plugin/src/test1/java/git4idea/test/GitTestUtil.java b/plugin/src/test1/java/git4idea/test/GitTestUtil.java index 27e38d2..ba994f6 100644 --- a/plugin/src/test1/java/git4idea/test/GitTestUtil.java +++ b/plugin/src/test1/java/git4idea/test/GitTestUtil.java @@ -16,13 +16,12 @@ package git4idea.test; import com.intellij.openapi.application.PluginPathManager; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; -import consulo.util.io.CharsetToolkit; -import consulo.virtualFileSystem.VirtualFile; import consulo.language.editor.WriteCommandAction; import consulo.project.Project; +import consulo.util.io.CharsetToolkit; +import consulo.util.io.FileUtil; import consulo.util.lang.ref.Ref; - +import consulo.virtualFileSystem.VirtualFile; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; diff --git a/plugin/src/test1/java/git4idea/tests/GitChangeProviderVersionedTest.java b/plugin/src/test1/java/git4idea/tests/GitChangeProviderVersionedTest.java index aeb4158..46ff400 100644 --- a/plugin/src/test1/java/git4idea/tests/GitChangeProviderVersionedTest.java +++ b/plugin/src/test1/java/git4idea/tests/GitChangeProviderVersionedTest.java @@ -16,17 +16,15 @@ package git4idea.tests; import consulo.application.ApplicationManager; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; import consulo.ide.impl.idea.openapi.vcs.FilePathImpl; -import consulo.ide.impl.idea.openapi.vfs.VfsUtil; -import consulo.virtualFileSystem.VirtualFile; import consulo.ui.ex.awt.internal.GuiUtils; +import consulo.util.io.FileUtil; +import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.status.FileStatus; +import consulo.virtualFileSystem.util.VirtualFileUtil; import org.testng.annotations.Test; -import static consulo.virtualFileSystem.status.FileStatus.ADDED; -import static consulo.virtualFileSystem.status.FileStatus.DELETED; -import static consulo.virtualFileSystem.status.FileStatus.MODIFIED; +import static consulo.virtualFileSystem.status.FileStatus.*; /** * @author Kirill Likhodedov @@ -70,7 +68,7 @@ public void run() { public void run() { final VirtualFile dir = myRepo.getVFRootDir().findChild("dir"); myDirtyScope.addDirtyDirRecursively(new consulo.ide.impl.idea.openapi.vcs.FilePathImpl(dir)); - FileUtil.delete(VfsUtil.virtualToIoFile(dir)); + FileUtil.delete(VirtualFileUtil.virtualToIoFile(dir)); } }); } diff --git a/plugin/src/test1/java/git4idea/tests/GitUpperDirectorySearchTest.java b/plugin/src/test1/java/git4idea/tests/GitUpperDirectorySearchTest.java index 6b78640..fa030d6 100644 --- a/plugin/src/test1/java/git4idea/tests/GitUpperDirectorySearchTest.java +++ b/plugin/src/test1/java/git4idea/tests/GitUpperDirectorySearchTest.java @@ -15,15 +15,15 @@ */ package git4idea.tests; -import consulo.ide.impl.idea.openapi.util.io.FileUtil; -import consulo.ui.ex.awt.UIUtil; -import consulo.virtualFileSystem.LocalFileSystem; -import consulo.virtualFileSystem.VirtualFile; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import com.intellij.testFramework.fixtures.TestFixtureBuilder; -import consulo.ide.impl.idea.vcsUtil.VcsFileUtil; import consulo.application.util.SystemInfo; +import consulo.ide.impl.idea.vcsUtil.VcsFileUtil; +import consulo.ui.ex.awt.UIUtil; +import consulo.util.io.FileUtil; +import consulo.virtualFileSystem.LocalFileSystem; +import consulo.virtualFileSystem.VirtualFile; import org.junit.After; import org.junit.Before; import org.junit.Test;