diff --git a/python/pluginJava/META-INF/python-community-plugin-java.xml b/python/pluginJava/META-INF/python-community-plugin-java.xml index 044e83c55199..2a2e6b8779a5 100644 --- a/python/pluginJava/META-INF/python-community-plugin-java.xml +++ b/python/pluginJava/META-INF/python-community-plugin-java.xml @@ -7,8 +7,8 @@ - - + + diff --git a/python/pluginJava/com/jetbrains/python/facet/PythonFacet.java b/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacet.java similarity index 51% rename from python/pluginJava/com/jetbrains/python/facet/PythonFacet.java rename to python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacet.java index fbd44508296d..c968b6f19015 100644 --- a/python/pluginJava/com/jetbrains/python/facet/PythonFacet.java +++ b/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacet.java @@ -1,22 +1,23 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.jetbrains.python.facet; +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.community.plugin.java.facet; import com.intellij.facet.Facet; import com.intellij.facet.FacetType; import com.intellij.facet.FacetTypeId; import com.intellij.openapi.module.Module; import com.intellij.python.community.plugin.impl.facet.PythonFacetUtil; +import com.jetbrains.python.facet.LibraryContributingFacet; import org.jetbrains.annotations.NotNull; -public class PythonFacet extends LibraryContributingFacet { - public static final FacetTypeId ID = new FacetTypeId<>("python"); +public class JavaPythonFacet extends LibraryContributingFacet { + public static final FacetTypeId ID = new FacetTypeId<>("python"); - public PythonFacet(@NotNull final FacetType facetType, - @NotNull final Module module, - @NotNull final String name, - @NotNull final PythonFacetConfiguration configuration, - Facet underlyingFacet) { + public JavaPythonFacet(@NotNull final FacetType facetType, + @NotNull final Module module, + @NotNull final String name, + @NotNull final JavaPythonFacetConfiguration configuration, + Facet underlyingFacet) { super(facetType, module, name, configuration, underlyingFacet); } diff --git a/python/pluginJava/com/jetbrains/python/facet/PythonFacetConfiguration.java b/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetConfiguration.java similarity index 78% rename from python/pluginJava/com/jetbrains/python/facet/PythonFacetConfiguration.java rename to python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetConfiguration.java index ecf4ea7e31ea..d2ddd520447e 100644 --- a/python/pluginJava/com/jetbrains/python/facet/PythonFacetConfiguration.java +++ b/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetConfiguration.java @@ -1,5 +1,5 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.jetbrains.python.facet; +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.community.plugin.java.facet; import com.intellij.facet.FacetConfiguration; import com.intellij.facet.ui.FacetEditorContext; @@ -9,11 +9,12 @@ import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.text.StringUtil; +import com.jetbrains.python.facet.PythonFacetSettings; import com.jetbrains.python.sdk.PythonSdkType; import org.jdom.Element; -public class PythonFacetConfiguration extends PythonFacetSettings implements FacetConfiguration { +class JavaPythonFacetConfiguration extends PythonFacetSettings implements FacetConfiguration { private static final String SDK_NAME = "sdkName"; @Override diff --git a/python/pluginJava/com/jetbrains/python/facet/PythonFacetType.java b/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetType.java similarity index 58% rename from python/pluginJava/com/jetbrains/python/facet/PythonFacetType.java rename to python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetType.java index 8a39da76359f..5a28fcbc5b05 100644 --- a/python/pluginJava/com/jetbrains/python/facet/PythonFacetType.java +++ b/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetType.java @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.jetbrains.python.facet; +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.community.plugin.java.facet; import com.intellij.facet.Facet; import com.intellij.facet.FacetType; @@ -19,22 +19,22 @@ import javax.swing.*; import java.util.List; -public final class PythonFacetType extends FacetType { +public final class JavaPythonFacetType extends FacetType { @NonNls private static final String ID = "Python"; - public static PythonFacetType getInstance() { - return findInstance(PythonFacetType.class); + public static JavaPythonFacetType getInstance() { + return findInstance(JavaPythonFacetType.class); } - public PythonFacetType() { - super(PythonFacet.ID, ID, PyBundle.message("python.facet.name")); + public JavaPythonFacetType() { + super(JavaPythonFacet.ID, ID, PyBundle.message("python.facet.name")); } @Override - public PythonFacetConfiguration createDefaultConfiguration() { - PythonFacetConfiguration result = new PythonFacetConfiguration(); + public JavaPythonFacetConfiguration createDefaultConfiguration() { + JavaPythonFacetConfiguration result = new JavaPythonFacetConfiguration(); List sdks = ProjectJdkTable.getInstance().getSdksOfType(PythonSdkType.getInstance()); if (sdks.size() > 0) { result.setSdk(sdks.get(0)); @@ -43,8 +43,8 @@ public final class PythonFacetType extends FacetType 0; + return FacetManager.getInstance(module).getFacetsByType(JavaPythonFacetType.getInstance().getId()).size() > 0; } } diff --git a/python/pluginJava/com/jetbrains/python/facet/PythonSdkComboBox.java b/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkComboBox.java similarity index 91% rename from python/pluginJava/com/jetbrains/python/facet/PythonSdkComboBox.java rename to python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkComboBox.java index a6be0a2ddb24..2d52e073eccf 100644 --- a/python/pluginJava/com/jetbrains/python/facet/PythonSdkComboBox.java +++ b/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkComboBox.java @@ -1,5 +1,5 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.jetbrains.python.facet; +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.community.plugin.java.facet; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; diff --git a/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.form b/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.form similarity index 87% rename from python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.form rename to python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.form index add38cd38c91..2b8c4e61b4ee 100644 --- a/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.form +++ b/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.form @@ -1,5 +1,5 @@ -
+ @@ -10,7 +10,7 @@ - + diff --git a/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java b/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.java similarity index 86% rename from python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java rename to python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.java index 1b97d5e67dd0..404ebf5b7f1b 100644 --- a/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java +++ b/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.java @@ -1,5 +1,5 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.jetbrains.python.facet; +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.community.plugin.java.facet; import com.intellij.facet.ui.FacetEditorContext; import com.intellij.facet.ui.FacetEditorTab; @@ -61,8 +61,8 @@ public class PythonSdkEditorTab extends FacetEditorTab { return mySdkComboBox.getSelectedSdk() != getFacetConfiguration().getSdk(); } - private PythonFacetConfiguration getFacetConfiguration() { - return ((PythonFacetConfiguration) myEditorContext.getFacet().getConfiguration()); + private JavaPythonFacetConfiguration getFacetConfiguration() { + return ((JavaPythonFacetConfiguration) myEditorContext.getFacet().getConfiguration()); } @Override diff --git a/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java b/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java index 4bb458f05402..d6e81ce5b8b7 100644 --- a/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java +++ b/python/pluginJava/com/jetbrains/python/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java @@ -15,8 +15,8 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.psi.search.FileTypeIndex; import com.jetbrains.python.PyBundle; import com.jetbrains.python.PythonFileType; -import com.jetbrains.python.facet.PythonFacet; -import com.jetbrains.python.facet.PythonFacetType; +import com.intellij.python.community.plugin.java.facet.JavaPythonFacet; +import com.intellij.python.community.plugin.java.facet.JavaPythonFacetType; import com.jetbrains.python.sdk.PyDetectedSdk; import com.jetbrains.python.sdk.PySdkExtKt; import com.jetbrains.python.sdk.PythonSdkUtil; @@ -117,7 +117,7 @@ public final class PythonPluginCommandLineInspectionProjectConfigurator implemen return; } - final PythonFacetType facetType = PythonFacetType.getInstance(); + final JavaPythonFacetType facetType = JavaPythonFacetType.getInstance(); int skippedModules = 0; for (Module m : ModuleManager.getInstance(project).getModules()) { if (ReadAction.compute(() -> !FileTypeIndex.containsFileOfType(PythonFileType.INSTANCE, m.getModuleContentScope()))) { @@ -133,7 +133,7 @@ public final class PythonPluginCommandLineInspectionProjectConfigurator implemen invokeLaterOnWriteThreadUnderLock( () -> { - final PythonFacet addedFacet = facetManager.addFacet(facetType, facetType.getPresentableName(), null); + final JavaPythonFacet addedFacet = facetManager.addFacet(facetType, facetType.getPresentableName(), null); PySdkExtKt.excludeInnerVirtualEnv(m, addedFacet.getConfiguration().getSdk()); } ); diff --git a/python/pluginMinor/META-INF/python-community-plugin-minor.xml b/python/pluginMinor/META-INF/python-community-plugin-minor.xml index aff171935806..fcaf5832a6a2 100644 --- a/python/pluginMinor/META-INF/python-community-plugin-minor.xml +++ b/python/pluginMinor/META-INF/python-community-plugin-minor.xml @@ -8,10 +8,10 @@ id="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" bundle="messages.PyBundle" key="configurable.PyActiveSdkModuleConfigurable.python.interpreter.display.name" - instance="com.jetbrains.python.minor.sdk.PyPluginSdkModuleConfigurable" + instance="com.intellij.python.community.plugin.minor.facet.PyPluginSdkModuleConfigurable" groupWeight="118"/> - + \ No newline at end of file diff --git a/python/pluginMinor/com/intellij/python/community/plugin/minor/facet/MinorPythonFacet.java b/python/pluginMinor/com/intellij/python/community/plugin/minor/facet/MinorPythonFacet.java new file mode 100644 index 000000000000..d44db75f759c --- /dev/null +++ b/python/pluginMinor/com/intellij/python/community/plugin/minor/facet/MinorPythonFacet.java @@ -0,0 +1,39 @@ +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.community.plugin.minor.facet; + +import com.intellij.facet.Facet; +import com.intellij.facet.FacetType; +import com.intellij.facet.FacetTypeId; +import com.intellij.openapi.module.Module; +import com.jetbrains.python.facet.LibraryContributingFacet; +import com.intellij.python.community.plugin.impl.facet.PythonFacetUtil; +import org.jetbrains.annotations.NotNull; + +/** + * This facet is intended to be used in the python plugin for IDEs other then IntelliJ IDEA + * + * @author traff + */ +class MinorPythonFacet extends LibraryContributingFacet { + public static final FacetTypeId ID = new FacetTypeId<>("python"); + + MinorPythonFacet(@NotNull final FacetType facetType, @NotNull final Module module, @NotNull final String name, @NotNull final MinorPythonFacetType.PythonFacetConfiguration configuration, + Facet underlyingFacet) { + super(facetType, module, name, configuration, underlyingFacet); + } + + @Override + public void updateLibrary() { + PythonFacetUtil.updateLibrary(getModule(), getConfiguration()); + } + + @Override + public void removeLibrary() { + PythonFacetUtil.removeLibrary(getModule()); + } + + @Override + public void initFacet() { + updateLibrary(); + } +} diff --git a/python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java b/python/pluginMinor/com/intellij/python/community/plugin/minor/facet/MinorPythonFacetType.java similarity index 76% rename from python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java rename to python/pluginMinor/com/intellij/python/community/plugin/minor/facet/MinorPythonFacetType.java index 51c63468a198..ac714e5ca925 100644 --- a/python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java +++ b/python/pluginMinor/com/intellij/python/community/plugin/minor/facet/MinorPythonFacetType.java @@ -1,5 +1,5 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.jetbrains.python.minor.facet; +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.community.plugin.minor.facet; import com.intellij.facet.Facet; import com.intellij.facet.FacetConfiguration; @@ -27,16 +27,16 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.util.List; -public final class PythonFacetType extends FacetType { +final class MinorPythonFacetType extends FacetType { @NonNls private static final String ID = "Python"; - public static PythonFacetType getInstance() { - return findInstance(PythonFacetType.class); + public static MinorPythonFacetType getInstance() { + return findInstance(MinorPythonFacetType.class); } - public PythonFacetType() { - super(PythonFacet.ID, ID, PyBundle.message("python.facet.name")); + MinorPythonFacetType() { + super(MinorPythonFacet.ID, ID, PyBundle.message("python.facet.name")); } @Override @@ -50,11 +50,11 @@ public final class PythonFacetType extends FacetType { - public static final FacetTypeId ID = new FacetTypeId<>("python"); - - public PythonFacet(@NotNull final FacetType facetType, @NotNull final Module module, @NotNull final String name, @NotNull final PythonFacetType.PythonFacetConfiguration configuration, - Facet underlyingFacet) { - super(facetType, module, name, configuration, underlyingFacet); - } - - @Override - public void updateLibrary() { - PythonFacetUtil.updateLibrary(getModule(), getConfiguration()); - } - - @Override - public void removeLibrary() { - PythonFacetUtil.removeLibrary(getModule()); - } - - @Override - public void initFacet() { - updateLibrary(); - } -}