From d1acb2ea7a2347bbb5665e8b9019538335b50201 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Tue, 10 Jun 2025 17:29:09 +0300 Subject: [PATCH] PY-79488 Add "Project" prefix for Uv and Poetry project opening extension names GitOrigin-RevId: f54eca61f3458439a25e5bb478e28d4f77096cc6 --- python/pluginResources/intellij.python.community.impl.xml | 4 ++-- .../{PoetryOpenProcessor.kt => PoetryProjectOpenProcessor.kt} | 4 ++-- .../{PoetryOpenProvider.kt => PoetryProjectOpenProvider.kt} | 2 +- .../python/projectModel/poetry/PoetryUnlinkedProjectAware.kt | 2 +- .../uv/{UvOpenProcessor.kt => UvProjectOpenProcessor.kt} | 4 ++-- .../uv/{UvOpenProvider.kt => UvProjectOpenProvider.kt} | 2 +- .../python/projectModel/uv/UvUnlinkedProjectAware.kt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename python/src/com/jetbrains/python/projectModel/poetry/{PoetryOpenProcessor.kt => PoetryProjectOpenProcessor.kt} (94%) rename python/src/com/jetbrains/python/projectModel/poetry/{PoetryOpenProvider.kt => PoetryProjectOpenProvider.kt} (96%) rename python/src/com/jetbrains/python/projectModel/uv/{UvOpenProcessor.kt => UvProjectOpenProcessor.kt} (95%) rename python/src/com/jetbrains/python/projectModel/uv/{UvOpenProvider.kt => UvProjectOpenProvider.kt} (96%) diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml index 8ffc6b6a8194..f316d130fed7 100644 --- a/python/pluginResources/intellij.python.community.impl.xml +++ b/python/pluginResources/intellij.python.community.impl.xml @@ -53,12 +53,12 @@ - + - + diff --git a/python/src/com/jetbrains/python/projectModel/poetry/PoetryOpenProcessor.kt b/python/src/com/jetbrains/python/projectModel/poetry/PoetryProjectOpenProcessor.kt similarity index 94% rename from python/src/com/jetbrains/python/projectModel/poetry/PoetryOpenProcessor.kt rename to python/src/com/jetbrains/python/projectModel/poetry/PoetryProjectOpenProcessor.kt index 7315d3e7cae8..73c070cb20b3 100644 --- a/python/src/com/jetbrains/python/projectModel/poetry/PoetryOpenProcessor.kt +++ b/python/src/com/jetbrains/python/projectModel/poetry/PoetryProjectOpenProcessor.kt @@ -19,8 +19,8 @@ import javax.swing.Icon * - The top-level pyproject.toml is added afterward in a project with existing `.idea/`. * - pyproject.toml files are found in non-top-level directories (requires IJPL-180733). */ -class PoetryOpenProcessor: ProjectOpenProcessor() { - private val importProvider = PoetryOpenProvider() +class PoetryProjectOpenProcessor: ProjectOpenProcessor() { + private val importProvider = PoetryProjectOpenProvider() override val name: @Nls String = PyBundle.message("python.project.model.poetry") diff --git a/python/src/com/jetbrains/python/projectModel/poetry/PoetryOpenProvider.kt b/python/src/com/jetbrains/python/projectModel/poetry/PoetryProjectOpenProvider.kt similarity index 96% rename from python/src/com/jetbrains/python/projectModel/poetry/PoetryOpenProvider.kt rename to python/src/com/jetbrains/python/projectModel/poetry/PoetryProjectOpenProvider.kt index d803998190ad..64e4b063c676 100644 --- a/python/src/com/jetbrains/python/projectModel/poetry/PoetryOpenProvider.kt +++ b/python/src/com/jetbrains/python/projectModel/poetry/PoetryProjectOpenProvider.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.vfs.readText import com.intellij.openapi.vfs.toNioPathOrNull import java.nio.file.Path -class PoetryOpenProvider() : AbstractOpenProjectProvider() { +class PoetryProjectOpenProvider() : AbstractOpenProjectProvider() { override val systemId: ProjectSystemId = PoetryConstants.SYSTEM_ID override fun isProjectFile(file: VirtualFile): Boolean { diff --git a/python/src/com/jetbrains/python/projectModel/poetry/PoetryUnlinkedProjectAware.kt b/python/src/com/jetbrains/python/projectModel/poetry/PoetryUnlinkedProjectAware.kt index 60fd2f8df266..514d3e5bf7ee 100644 --- a/python/src/com/jetbrains/python/projectModel/poetry/PoetryUnlinkedProjectAware.kt +++ b/python/src/com/jetbrains/python/projectModel/poetry/PoetryUnlinkedProjectAware.kt @@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile import java.nio.file.Path class PoetryUnlinkedProjectAware : ExternalSystemUnlinkedProjectAware { - private val openProvider = PoetryOpenProvider() + private val openProvider = PoetryProjectOpenProvider() override val systemId: ProjectSystemId = PoetryConstants.SYSTEM_ID diff --git a/python/src/com/jetbrains/python/projectModel/uv/UvOpenProcessor.kt b/python/src/com/jetbrains/python/projectModel/uv/UvProjectOpenProcessor.kt similarity index 95% rename from python/src/com/jetbrains/python/projectModel/uv/UvOpenProcessor.kt rename to python/src/com/jetbrains/python/projectModel/uv/UvProjectOpenProcessor.kt index e052e40f3014..f170f0785648 100644 --- a/python/src/com/jetbrains/python/projectModel/uv/UvOpenProcessor.kt +++ b/python/src/com/jetbrains/python/projectModel/uv/UvProjectOpenProcessor.kt @@ -19,8 +19,8 @@ import javax.swing.Icon * - The top-level pyproject.toml is added afterward in a project with existing `.idea/`. * - pyproject.toml files are found in non-top-level directories (requires IJPL-180733). */ -class UvOpenProcessor: ProjectOpenProcessor() { - private val importProvider = UvOpenProvider() +class UvProjectOpenProcessor: ProjectOpenProcessor() { + private val importProvider = UvProjectOpenProvider() override val name: @Nls String = PyBundle.message("python.project.model.uv") diff --git a/python/src/com/jetbrains/python/projectModel/uv/UvOpenProvider.kt b/python/src/com/jetbrains/python/projectModel/uv/UvProjectOpenProvider.kt similarity index 96% rename from python/src/com/jetbrains/python/projectModel/uv/UvOpenProvider.kt rename to python/src/com/jetbrains/python/projectModel/uv/UvProjectOpenProvider.kt index 12610c53ffa8..6ff453db7d75 100644 --- a/python/src/com/jetbrains/python/projectModel/uv/UvOpenProvider.kt +++ b/python/src/com/jetbrains/python/projectModel/uv/UvProjectOpenProvider.kt @@ -10,7 +10,7 @@ import com.intellij.openapi.vfs.readText import com.intellij.openapi.vfs.toNioPathOrNull import java.nio.file.Path -class UvOpenProvider() : AbstractOpenProjectProvider() { +class UvProjectOpenProvider() : AbstractOpenProjectProvider() { override val systemId: ProjectSystemId = UvConstants.SYSTEM_ID override fun isProjectFile(file: VirtualFile): Boolean { diff --git a/python/src/com/jetbrains/python/projectModel/uv/UvUnlinkedProjectAware.kt b/python/src/com/jetbrains/python/projectModel/uv/UvUnlinkedProjectAware.kt index eac6c55d781d..561f112578b7 100644 --- a/python/src/com/jetbrains/python/projectModel/uv/UvUnlinkedProjectAware.kt +++ b/python/src/com/jetbrains/python/projectModel/uv/UvUnlinkedProjectAware.kt @@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile import java.nio.file.Path class UvUnlinkedProjectAware : ExternalSystemUnlinkedProjectAware { - private val openProvider = UvOpenProvider() + private val openProvider = UvProjectOpenProvider() override val systemId: ProjectSystemId = UvConstants.SYSTEM_ID