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 #40

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 1 commit 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 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions plugin/src/test1/java/git4idea/history/GitAnnotationsClosedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@
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;
import consulo.versionControlSystem.change.Change;
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;
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test1/java/git4idea/history/GitHistoryUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions plugin/src/test1/java/git4idea/history/GitLogParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test1/java/git4idea/repo/GitConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions plugin/src/test1/java/git4idea/repo/GitRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions plugin/src/test1/java/git4idea/test/GitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/test1/java/git4idea/test/GitTestImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/test1/java/git4idea/test/GitTestRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 3 additions & 4 deletions plugin/src/test1/java/git4idea/test/GitTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
12 changes: 5 additions & 7 deletions plugin/src/test1/java/git4idea/tests/GitChangeProviderVersionedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
}
});
}
Expand Down
10 changes: 5 additions & 5 deletions plugin/src/test1/java/git4idea/tests/GitUpperDirectorySearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading