chore: drop 222: Inline ProjectRootManagerExWrapper (#6723)

bazelbuild · Sep 5, 2024 · 78fa3ee · 78fa3ee
1 parent 5f64df8
commit 78fa3ee
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 218 deletions.
diff --git a/aswb/tests/unittests/com/google/idea/blaze/android/sync/BlazeAndroidSyncPluginTest.java b/aswb/tests/unittests/com/google/idea/blaze/android/sync/BlazeAndroidSyncPluginTest.java
@@ -46,9 +46,9 @@
 import com.google.idea.blaze.java.sync.model.BlazeJavaSyncData;
 import com.google.idea.common.experiments.ExperimentService;
 import com.google.idea.common.experiments.MockExperimentService;
-import com.google.idea.sdkcompat.roots.ex.ProjectRootManagerExWrapper;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.RootsChangeRescanningInfo;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.roots.OrderEnumerator;
@@ -231,9 +231,22 @@ public void setLanguageLevel(@NotNull LanguageLevel languageLevel) {
   }
 
   /** Stores a project sdk so that it can be obtained later for verification. */
-  private static class MockProjectRootManagerEx extends ProjectRootManagerExWrapper {
+  private static class MockProjectRootManagerEx extends ProjectRootManagerEx {
     Sdk projectSdk;
 
+    @Override
+    public void makeRootsChange(
+        @NotNull Runnable runnable, @NotNull RootsChangeRescanningInfo rootsChangeRescanningInfo) {}
+
+    @Override
+    public @NotNull AutoCloseable withRootsChange(
+        @NotNull RootsChangeRescanningInfo rootsChangeRescanningInfo) {
+      return new AutoCloseable() {
+        @Override
+        public void close() throws Exception {}
+      };
+    }    
+
     @Nullable
     @Override
     public Sdk getProjectSdk() {

diff --git a/testing/testcompat/v223/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java b/testing/testcompat/v223/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java
diff --git a/testing/testcompat/v231/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java b/testing/testcompat/v231/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java
diff --git a/testing/testcompat/v232/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java b/testing/testcompat/v232/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java
diff --git a/testing/testcompat/v233/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java b/testing/testcompat/v233/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java
diff --git a/testing/testcompat/v241/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java b/testing/testcompat/v241/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java
diff --git a/testing/testcompat/v242/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java b/testing/testcompat/v242/com/google/idea/sdkcompat/roots/ex/ProjectRootManagerExWrapper.java