From 56241ab394e9985464f64d383d4d5894d360ce18 Mon Sep 17 00:00:00 2001
From: "Egor.Eliseev" <egor.eliseev@jetbrains.com>
Date: Thu, 20 Jun 2024 21:51:17 +0000
Subject: [PATCH] PY-73411 Pycharm performance tests failed

Merge-request: IJ-MR-137368
Merged-by: Egor Eliseev <Egor.Eliseev@jetbrains.com>

GitOrigin-RevId: 23a7e9d443606b1a9a028c5e3275c6c408c0d796
---
 .../src/intellij.python.community.communityOnly.xml        | 5 ++---
 python/pluginCore/resources/META-INF/plugin.xml            | 3 +++
 .../python/console/PythonConsoleRunnerFactory.java         | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/python/intellij.python.community.communityOnly/src/intellij.python.community.communityOnly.xml b/python/intellij.python.community.communityOnly/src/intellij.python.community.communityOnly.xml
index ffccc57afe21..29b08d66b793 100644
--- a/python/intellij.python.community.communityOnly/src/intellij.python.community.communityOnly.xml
+++ b/python/intellij.python.community.communityOnly/src/intellij.python.community.communityOnly.xml
@@ -1,8 +1,7 @@
 <!-- Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
 <idea-plugin package="com.intellij.python.community.communityOnly">
   <!--Community only, never professional: both plugin and DS -->
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceInterface="com.jetbrains.python.console.PythonConsoleRunnerFactory"
-                        serviceImplementation="com.intellij.python.community.communityOnly.CommunityPydevConsoleRunnerFactory"/>
+  <extensions defaultExtensionNs="com.jetbrains.python.console">
+    <runnerFactory implementation="com.intellij.python.community.communityOnly.CommunityPydevConsoleRunnerFactory"/>
   </extensions>
 </idea-plugin>
diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml
index 62d6ff577925..8fbb08790df6 100644
--- a/python/pluginCore/resources/META-INF/plugin.xml
+++ b/python/pluginCore/resources/META-INF/plugin.xml
@@ -625,6 +625,9 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
   </extensions>
 
   <extensionPoints>
+    <extensionPoint qualifiedName="com.jetbrains.python.console.runnerFactory"
+                    interface="com.jetbrains.python.console.PythonConsoleRunnerFactory"
+                    dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.remoteSdkValidator" interface="com.jetbrains.python.sdk.PyRemoteSdkValidator" dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.pyTestFixtureExtension"
                     interface="com.jetbrains.python.testing.pyTestFixtures.PyTestFixtureExtension" dynamic="true"/>
diff --git a/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java b/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java
index d6912f7b7062..03bc38316d9b 100644
--- a/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java
+++ b/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java
@@ -1,7 +1,7 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.jetbrains.python.console;
 
-import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.jetbrains.python.run.PythonRunConfiguration;
@@ -9,8 +9,11 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class PythonConsoleRunnerFactory {
+  private static final ExtensionPointName<PythonConsoleRunnerFactory> EP_NAME =
+    ExtensionPointName.create("com.jetbrains.python.console.runnerFactory");
+
   public static @NotNull PythonConsoleRunnerFactory getInstance() {
-    return ApplicationManager.getApplication().getService(PythonConsoleRunnerFactory.class);
+    return EP_NAME.getExtensionList().get(0);
   }
 
   public abstract @NotNull PydevConsoleRunner createConsoleRunner(@NotNull Project project, @Nullable Module contextModule);