Skip to content
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.

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

chore: drop 213: Remove unused BaseSdkCompat #6694

Merged
merged 1 commit into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import com.google.idea.blaze.base.wizard2.BlazeProjectImportBuilder;
import com.google.idea.blaze.base.wizard2.CreateFromScratchProjectViewOption;
import com.google.idea.blaze.base.wizard2.WorkspaceTypeData;
import com.google.idea.sdkcompat.general.BaseSdkCompat;
import com.intellij.ide.SaveAndSyncHandler;
import com.intellij.ide.impl.OpenProjectTask;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
Expand Down Expand Up @@ -126,7 +126,7 @@ Project doOpenProject(
ProjectManagerEx.getInstanceEx()
.openProject(
projectFilePath,
BaseSdkCompat.createOpenProjectTask(newProject)
OpenProjectTask.build().withProject(newProject)
);
SaveAndSyncHandler.getInstance().scheduleProjectSave(newProject);
return newProject;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

import com.google.idea.blaze.base.settings.Blaze;
import com.google.idea.blaze.base.sync.data.BlazeDataStorage;
import com.google.idea.sdkcompat.general.BaseSdkCompat;
import com.intellij.ide.impl.OpenProjectTask;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
Expand All @@ -26,6 +27,7 @@

import javax.annotation.Nullable;
import javax.swing.Icon;
import java.nio.file.Paths;

/** Allows directly opening a project with project data directory embedded within the project. */
public class BlazeProjectOpenProcessor extends ProjectOpenProcessor {
Expand Down Expand Up @@ -86,6 +88,7 @@ public Project doOpenProject(
return null;
}
VirtualFile projectSubdirectory = ideaSubdirectory.getParent();
return BaseSdkCompat.openProject(projectSubdirectory,projectToClose, forceOpenInNewFrame);
OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose);
return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
import com.google.common.collect.ImmutableMap;
import com.google.idea.blaze.base.model.primitives.WorkspacePath;
import com.google.idea.blaze.base.sync.workspace.WorkspacePathResolver;
import com.google.idea.sdkcompat.general.BaseSdkCompat;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.ex.FileLookup.Finder;
import com.intellij.openapi.fileChooser.ex.FileLookup.LookupFile;
import com.intellij.openapi.fileChooser.ex.FileLookup.LookupFilter;
import com.intellij.openapi.fileChooser.ex.FileTextFieldImpl;
import com.intellij.openapi.fileChooser.ex.LocalFsFinder;
import com.intellij.openapi.fileChooser.ex.LocalFsFinder.FileChooserFilter;
import com.intellij.openapi.fileChooser.ex.LocalFsFinder.VfsFile;
import com.intellij.openapi.vfs.LocalFileSystem;
Expand Down Expand Up @@ -89,9 +89,9 @@ public LookupFile find(String filePath) {
Path path = Paths.get(normalize(filePath));
VirtualFile vFile = LocalFileSystem.getInstance().findFileByNioFile(path);
if (vFile != null) {
return BaseSdkCompat.getVfsFile(vFile);
return new VfsFile(vFile);
} else if (path.isAbsolute()) {
return BaseSdkCompat.getIoFile(path);
return new LocalFsFinder.IoFile(path);
}
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package com.google.idea.blaze.base.wizard2;

import com.google.idea.blaze.base.project.ExtendableBazelProjectCreator;
import com.google.idea.sdkcompat.general.BaseSdkCompat;
import com.intellij.ide.SaveAndSyncHandler;
import com.intellij.ide.impl.OpenProjectTask;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.ide.util.projectWizard.ProjectBuilder;
import com.intellij.openapi.application.ApplicationManager;
Expand Down Expand Up @@ -65,8 +65,8 @@ public CreatedProjectDescriptor(Path ideaProjectPath, Project project) {

@VisibleForTesting
public void openProject() {
ProjectManagerEx.getInstanceEx()
.openProject(ideaProjectPath, BaseSdkCompat.createOpenProjectTask(project));
ProjectManagerEx.getInstanceEx()
.openProject(ideaProjectPath, OpenProjectTask.build().withProject(project));

if (!ApplicationManager.getApplication().isUnitTestMode()) {
SaveAndSyncHandler.getInstance().scheduleProjectSave(project);
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading