Skip to content

Commit a57c10b

Browse files
mai93copybara-github
authored andcommitted
[2021.1 compat] Compatibility fixes to testing classes
* Remove call to not needed `Extensions.registerAreaClass` API after it was removed in [this commit](JetBrains/intellij-community@cc31a97#diff-5b5191d65df57cc34c25265d1be88fc3daedb8529c3b9c462d29312fd8360941) * Use `ExtensionsArea.registerExtensionPoint(extensionPointName, extensionPointBeanClass, kind)` API that is available for all supported IDE versions after `ExtensionsArea.registerExtensionPoint(extensionPointName, extensionPointBeanClass)` was removed in [this commit](JetBrains/intellij-community@cc31a97#diff-f6d29de2def2588a09dcabf39c8ff1022dd787537bc5f0ed8124e9ed97610112) PiperOrigin-RevId: 374604355
1 parent 75a4121 commit a57c10b

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

testing/src/com/google/idea/testing/ServiceHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static <T> void registerExtensionPoint(
3939
ExtensionPointName<T> name, Class<T> clazz, Disposable parentDisposable) {
4040
ExtensionsArea area = Extensions.getRootArea();
4141
String epName = name.getName();
42-
area.registerExtensionPoint(epName, clazz.getName());
42+
area.registerExtensionPoint(epName, clazz.getName(), ExtensionPoint.Kind.INTERFACE);
4343
Disposer.register(parentDisposable, () -> area.unregisterExtensionPoint(epName));
4444
}
4545

testing/src/com/google/idea/testing/TestUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.intellij.openapi.Disposable;
2323
import com.intellij.openapi.application.Application;
2424
import com.intellij.openapi.application.ApplicationManager;
25-
import com.intellij.openapi.extensions.Extensions;
2625
import com.intellij.openapi.fileTypes.FileTypeManager;
2726
import com.intellij.openapi.util.Disposer;
2827
import com.intellij.openapi.vfs.encoding.EncodingManager;
@@ -150,7 +149,6 @@ static void createMockApplication(Disposable parentDisposable) {
150149
}
151150

152151
static MockProject mockProject(@Nullable PicoContainer container, Disposable parentDisposable) {
153-
Extensions.registerAreaClass("IDEA_PROJECT", null);
154152
container = container != null ? container : new DefaultPicoContainer();
155153
return new MockProject(container, parentDisposable);
156154
}

0 commit comments

Comments
 (0)