From 887b1357a1e56494c211964d8ba9ffd5ed9bc8ae Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Fri, 30 Aug 2024 13:48:33 +0200 Subject: [PATCH] chore: drop 213: Remove unused BaseSdkCompat --- .../AutoImportProjectOpenProcessor.java | 4 +- .../project/BlazeProjectOpenProcessor.java | 7 +- .../blaze/base/ui/WorkspaceFileTextField.java | 6 +- .../base/wizard2/BlazeProjectCreator.java | 6 +- .../idea/sdkcompat/general/BaseSdkCompat.java | 43 --------- .../idea/sdkcompat/general/BaseSdkCompat.java | 44 --------- .../idea/sdkcompat/general/BaseSdkCompat.java | 44 --------- .../idea/sdkcompat/general/BaseSdkCompat.java | 79 --------------- .../idea/sdkcompat/general/BaseSdkCompat.java | 80 ---------------- .../idea/sdkcompat/general/BaseSdkCompat.java | 80 ---------------- .../idea/sdkcompat/general/BaseSdkCompat.java | 96 ------------------- .../idea/sdkcompat/general/BaseSdkCompat.java | 96 ------------------- 12 files changed, 13 insertions(+), 572 deletions(-) delete mode 100644 sdkcompat/v221/com/google/idea/sdkcompat/general/BaseSdkCompat.java delete mode 100644 sdkcompat/v222/com/google/idea/sdkcompat/general/BaseSdkCompat.java delete mode 100644 sdkcompat/v223/com/google/idea/sdkcompat/general/BaseSdkCompat.java delete mode 100644 sdkcompat/v231/com/google/idea/sdkcompat/general/BaseSdkCompat.java delete mode 100644 sdkcompat/v232/com/google/idea/sdkcompat/general/BaseSdkCompat.java delete mode 100644 sdkcompat/v233/com/google/idea/sdkcompat/general/BaseSdkCompat.java delete mode 100644 sdkcompat/v241/com/google/idea/sdkcompat/general/BaseSdkCompat.java delete mode 100644 sdkcompat/v242/com/google/idea/sdkcompat/general/BaseSdkCompat.java diff --git a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java index 5e60f18d951..6fb6cabd089 100644 --- a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java +++ b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java @@ -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; @@ -126,7 +126,7 @@ Project doOpenProject( ProjectManagerEx.getInstanceEx() .openProject( projectFilePath, - BaseSdkCompat.createOpenProjectTask(newProject) + OpenProjectTask.build().withProject(newProject) ); SaveAndSyncHandler.getInstance().scheduleProjectSave(newProject); return newProject; diff --git a/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java b/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java index fa669760757..365ad43f6a0 100644 --- a/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java +++ b/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java @@ -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; @@ -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 { @@ -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); } } diff --git a/base/src/com/google/idea/blaze/base/ui/WorkspaceFileTextField.java b/base/src/com/google/idea/blaze/base/ui/WorkspaceFileTextField.java index 0f573295dc2..576f55b3566 100644 --- a/base/src/com/google/idea/blaze/base/ui/WorkspaceFileTextField.java +++ b/base/src/com/google/idea/blaze/base/ui/WorkspaceFileTextField.java @@ -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; @@ -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; } diff --git a/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java b/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java index 28549b0dc66..d1d5952effc 100644 --- a/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java +++ b/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java @@ -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; @@ -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); diff --git a/sdkcompat/v221/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v221/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index 8db16ea91fb..00000000000 --- a/sdkcompat/v221/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()), options); - } -} diff --git a/sdkcompat/v222/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v222/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index c0a2c1cd72e..00000000000 --- a/sdkcompat/v222/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import com.intellij.util.indexing.roots.kind.LibraryOrigin; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options); - } -} diff --git a/sdkcompat/v223/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v223/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index c0a2c1cd72e..00000000000 --- a/sdkcompat/v223/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import com.intellij.util.indexing.roots.kind.LibraryOrigin; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options); - } -} diff --git a/sdkcompat/v231/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v231/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index f6e19b0bb79..00000000000 --- a/sdkcompat/v231/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.extensions.ExtensionPoint; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.ui.EditorNotificationProvider; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import com.intellij.util.indexing.roots.kind.LibraryOrigin; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options); - } - - /* #api213: Inline into usages. */ - public static void registerEditorNotificationProvider( - Project project, EditorNotificationProvider provider) { - EditorNotificationProvider.EP_NAME.getPoint(project).registerExtension(provider); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProvider( - Project project, Class providerClass) { - EditorNotificationProvider.EP_NAME.getPoint(project).unregisterExtension(providerClass); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProviders( - Project project, Predicate filter) { - unregisterExtensions(EditorNotificationProvider.EP_NAME.getPoint(project), filter); - } - - private static void unregisterExtensions( - ExtensionPoint extensionPoint, Predicate filter) { - for (T extension : extensionPoint.getExtensions()) { - if (filter.test(extension)) { - extensionPoint.unregisterExtension(extension); - } - } - } - - public static String getX11WindowManagerName() { - // TODO(b/266782325): Investigate if i3 still crashes for system notifications. - return ""; - } -} diff --git a/sdkcompat/v232/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v232/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index 7b8b682a856..00000000000 --- a/sdkcompat/v232/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.extensions.ExtensionPoint; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.ui.EditorNotificationProvider; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import com.intellij.util.indexing.roots.kind.LibraryOrigin; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options); - } - - /* #api213: Inline into usages. */ - public static void registerEditorNotificationProvider( - Project project, EditorNotificationProvider provider) { - EditorNotificationProvider.EP_NAME.getPoint(project).registerExtension(provider); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProvider( - Project project, Class providerClass) { - EditorNotificationProvider.EP_NAME.getPoint(project).unregisterExtension(providerClass); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProviders( - Project project, Predicate filter) { - unregisterExtensions(EditorNotificationProvider.EP_NAME.getPoint(project), filter); - } - - private static void unregisterExtensions( - ExtensionPoint extensionPoint, Predicate filter) { - for (T extension : extensionPoint.getExtensions()) { - if (filter.test(extension)) { - extensionPoint.unregisterExtension(extension); - } - } - } - - public static String getX11WindowManagerName() { - // TODO(b/266782325): Investigate if i3 still crashes for system notifications. - return ""; - } -} diff --git a/sdkcompat/v233/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v233/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index 7b8b682a856..00000000000 --- a/sdkcompat/v233/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.extensions.ExtensionPoint; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.ui.EditorNotificationProvider; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import com.intellij.util.indexing.roots.kind.LibraryOrigin; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options); - } - - /* #api213: Inline into usages. */ - public static void registerEditorNotificationProvider( - Project project, EditorNotificationProvider provider) { - EditorNotificationProvider.EP_NAME.getPoint(project).registerExtension(provider); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProvider( - Project project, Class providerClass) { - EditorNotificationProvider.EP_NAME.getPoint(project).unregisterExtension(providerClass); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProviders( - Project project, Predicate filter) { - unregisterExtensions(EditorNotificationProvider.EP_NAME.getPoint(project), filter); - } - - private static void unregisterExtensions( - ExtensionPoint extensionPoint, Predicate filter) { - for (T extension : extensionPoint.getExtensions()) { - if (filter.test(extension)) { - extensionPoint.unregisterExtension(extension); - } - } - } - - public static String getX11WindowManagerName() { - // TODO(b/266782325): Investigate if i3 still crashes for system notifications. - return ""; - } -} diff --git a/sdkcompat/v241/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v241/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index a236f9fed62..00000000000 --- a/sdkcompat/v241/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2024 The Bazel Authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.extensions.ExtensionPoint; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.ui.EditorNotificationProvider; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import com.intellij.util.indexing.roots.kind.LibraryOrigin; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options); - } - - /* #api213: Inline into usages. */ - public static void registerEditorNotificationProvider( - Project project, EditorNotificationProvider provider) { - EditorNotificationProvider.EP_NAME.getPoint(project).registerExtension(provider); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProvider( - Project project, Class providerClass) { - EditorNotificationProvider.EP_NAME.getPoint(project).unregisterExtension(providerClass); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProviders( - Project project, Predicate filter) { - unregisterExtensions(EditorNotificationProvider.EP_NAME.getPoint(project), filter); - } - - private static void unregisterExtensions( - ExtensionPoint extensionPoint, Predicate filter) { - for (T extension : extensionPoint.getExtensions()) { - if (filter.test(extension)) { - extensionPoint.unregisterExtension(extension); - } - } - } - - public static String getX11WindowManagerName() { - // TODO(b/266782325): Investigate if i3 still crashes for system notifications. - return ""; - } -} diff --git a/sdkcompat/v242/com/google/idea/sdkcompat/general/BaseSdkCompat.java b/sdkcompat/v242/com/google/idea/sdkcompat/general/BaseSdkCompat.java deleted file mode 100644 index a236f9fed62..00000000000 --- a/sdkcompat/v242/com/google/idea/sdkcompat/general/BaseSdkCompat.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2024 The Bazel Authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.idea.sdkcompat.general; - -import com.intellij.ide.impl.OpenProjectTask; -import com.intellij.ide.impl.ProjectUtil; -import com.intellij.openapi.extensions.ExtensionPoint; -import com.intellij.openapi.fileChooser.ex.FileLookup; -import com.intellij.openapi.fileChooser.ex.LocalFsFinder; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; -import com.intellij.refactoring.rename.RenamePsiElementProcessorBase; -import com.intellij.ui.EditorNotificationProvider; -import com.intellij.util.Restarter; -import com.intellij.util.indexing.diagnostic.dto.JsonDuration; -import com.intellij.util.indexing.diagnostic.dto.JsonFileProviderIndexStatistics; -import com.intellij.util.indexing.roots.kind.LibraryOrigin; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.function.Predicate; -import javax.annotation.Nullable; - -/** Provides SDK compatibility shims for base plugin API classes, available to all IDEs. */ -public final class BaseSdkCompat { - private BaseSdkCompat() {} - - /** #api213: Inline into WorkspaceFileTextField . */ - public static LocalFsFinder.VfsFile getVfsFile(VirtualFile file) { - return new LocalFsFinder.VfsFile(file); - } - - /** #api213: Inline into WorkspaceFileTextField . */ - public static FileLookup.LookupFile getIoFile(Path path) { - return new LocalFsFinder.IoFile(path); - } - - /** #api213: Inline into BlazeProjectCreator. */ - public static OpenProjectTask createOpenProjectTask(Project project) { - return OpenProjectTask.build().withProject(project); - } - - - /** #api213 interface is different in 221, inline when 213 support is dropped*/ - public static Project openProject(VirtualFile projectSubdirectory, Project projectToClose, boolean forceOpenInNewFrame) { - OpenProjectTask options = OpenProjectTask.build().withForceOpenInNewFrame(forceOpenInNewFrame).withProjectToClose(projectToClose); - return ProjectUtil.openProject(Paths.get(projectSubdirectory.getPath()),options); - } - - /* #api213: Inline into usages. */ - public static void registerEditorNotificationProvider( - Project project, EditorNotificationProvider provider) { - EditorNotificationProvider.EP_NAME.getPoint(project).registerExtension(provider); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProvider( - Project project, Class providerClass) { - EditorNotificationProvider.EP_NAME.getPoint(project).unregisterExtension(providerClass); - } - - /* #api213: Inline into usages. */ - public static void unregisterEditorNotificationProviders( - Project project, Predicate filter) { - unregisterExtensions(EditorNotificationProvider.EP_NAME.getPoint(project), filter); - } - - private static void unregisterExtensions( - ExtensionPoint extensionPoint, Predicate filter) { - for (T extension : extensionPoint.getExtensions()) { - if (filter.test(extension)) { - extensionPoint.unregisterExtension(extension); - } - } - } - - public static String getX11WindowManagerName() { - // TODO(b/266782325): Investigate if i3 still crashes for system notifications. - return ""; - } -}