mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Python: remove package attr from PythonCore and move its modules into right packages.
PythonCore consists of several v1 modules (they aren't v2 modules in its content, but bare v1 modules to be packed directly in it). They used to have `com.jetbrains` package to match plugin's package. I now removed plugin package and moved modules to the appropriate packages. https://jetbrains.slack.com/archives/CMDBCUBGE/p1738073999835749?thread_ts=1738008244.276339&cid=CMDBCUBGE GitOrigin-RevId: 5702998a23598d4aa363064025afad8951faf7f7
This commit is contained in:
committed by
intellij-monorepo-bot
parent
4678462b27
commit
1b8625925c
+1
-1
@@ -15,12 +15,12 @@ import com.intellij.openapi.ui.ValidationInfo
|
||||
import com.intellij.openapi.vfs.LocalFileSystem
|
||||
import com.intellij.platform.ide.progress.withBackgroundProgress
|
||||
import com.intellij.pycharm.community.ide.impl.PyCharmCommunityCustomizationBundle
|
||||
import com.intellij.python.community.impl.poetry.poetryPath
|
||||
import com.intellij.ui.IdeBorderFactory
|
||||
import com.intellij.ui.components.JBLabel
|
||||
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
|
||||
import com.intellij.util.ui.JBUI
|
||||
import com.jetbrains.python.PyBundle
|
||||
import com.jetbrains.python.poetry.poetryPath
|
||||
import com.jetbrains.python.sdk.*
|
||||
import com.jetbrains.python.sdk.configuration.PyProjectSdkConfigurationExtension
|
||||
import com.jetbrains.python.sdk.poetry.*
|
||||
|
||||
+4
-3
@@ -1,5 +1,5 @@
|
||||
// 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.sdk.installer
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.python.community.impl.installer
|
||||
|
||||
import com.intellij.internal.statistic.eventLog.EventLogGroup
|
||||
import com.intellij.internal.statistic.eventLog.events.EventField
|
||||
@@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project
|
||||
import com.intellij.util.system.CpuArch
|
||||
import com.jetbrains.python.sdk.Product
|
||||
import com.jetbrains.python.sdk.Release
|
||||
import com.jetbrains.python.sdk.installer.*
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
|
||||
@ApiStatus.Internal
|
||||
@@ -62,7 +63,7 @@ object BinaryInstallerUsagesCollector : CounterUsagesCollector() {
|
||||
/**
|
||||
* regexp: non-empty value consists of digits-dots-dashes in various combinations (like 1, 1.2, 1.2.3-456)
|
||||
* Can't use EventFields.Version because of dashes
|
||||
* @see com.intellij.internal.statistic.eventLog.events.EventFields.Version
|
||||
* @see EventFields.Version
|
||||
*/
|
||||
private val version = EventFields.StringValidatedByInlineRegexp("version", """^[\d\-.]+$""")
|
||||
|
||||
+6
-2
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.sdk.installer
|
||||
package com.intellij.python.community.impl.installer
|
||||
|
||||
import com.intellij.execution.configurations.GeneralCommandLine
|
||||
import com.intellij.openapi.project.Project
|
||||
@@ -9,12 +9,16 @@ import com.jetbrains.python.sdk.Product
|
||||
import com.jetbrains.python.sdk.Resource
|
||||
import com.jetbrains.python.sdk.ResourceType
|
||||
import com.jetbrains.python.sdk.SdksKeeper
|
||||
import com.jetbrains.python.sdk.installer.MakeShellScriptExecutableException
|
||||
import com.jetbrains.python.sdk.installer.installBinary
|
||||
import com.jetbrains.python.sdk.installer.selectInstallations
|
||||
import java.nio.file.Path
|
||||
import kotlin.io.path.absolutePathString
|
||||
|
||||
object CondaInstallManager {
|
||||
|
||||
internal class WindowsInstaller(private val installPath: String) : ResourceTypeBinaryInstaller(ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) {
|
||||
internal class WindowsInstaller(private val installPath: String) : ResourceTypeBinaryInstaller(
|
||||
ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) {
|
||||
/**
|
||||
* Miniconda3-{version}-Windows-x86_64.exe {options}
|
||||
*
|
||||
+3
-2
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.sdk.installer
|
||||
package com.intellij.python.community.impl.installer
|
||||
|
||||
import com.google.common.hash.Hashing
|
||||
import com.google.common.io.Files
|
||||
@@ -12,6 +12,7 @@ import com.intellij.util.io.HttpRequests
|
||||
import com.jetbrains.python.PySdkBundle
|
||||
import com.jetbrains.python.sdk.Binary
|
||||
import com.jetbrains.python.sdk.Resource
|
||||
import com.jetbrains.python.sdk.installer.*
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.Paths
|
||||
import kotlin.io.path.fileSize
|
||||
@@ -100,6 +101,6 @@ internal abstract class DownloadableBinaryInstaller : BinaryInstaller {
|
||||
}
|
||||
|
||||
override fun getPreview(binary: Binary): ResourcePreview {
|
||||
return ResourcePreview.of(getResourcesToDownload(binary).firstOrNull())
|
||||
return ResourcePreview.Companion.of(getResourcesToDownload(binary).firstOrNull())
|
||||
}
|
||||
}
|
||||
+4
-6
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.sdk.installer
|
||||
package com.intellij.python.community.impl.installer
|
||||
|
||||
import com.intellij.DynamicBundle
|
||||
import org.jetbrains.annotations.Nls
|
||||
@@ -7,23 +7,21 @@ import org.jetbrains.annotations.NonNls
|
||||
import org.jetbrains.annotations.PropertyKey
|
||||
import java.util.function.Supplier
|
||||
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
|
||||
internal object PyInstallerBundle {
|
||||
private const val BUNDLE_FQN: @NonNls String = "messages.PyInstaller"
|
||||
private val BUNDLE = DynamicBundle(PyInstallerBundle::class.java, BUNDLE_FQN)
|
||||
|
||||
fun message(
|
||||
key: @PropertyKey(resourceBundle = BUNDLE_FQN) String,
|
||||
vararg params: Any
|
||||
vararg params: Any,
|
||||
): @Nls String {
|
||||
return BUNDLE.getMessage(key, *params)
|
||||
}
|
||||
|
||||
fun messagePointer(
|
||||
key: @PropertyKey(resourceBundle = BUNDLE_FQN) String,
|
||||
vararg params: Any
|
||||
vararg params: Any,
|
||||
): Supplier<String> {
|
||||
return BUNDLE.getLazyMessage(key, *params)
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.sdk.installer
|
||||
package com.intellij.python.community.impl.installer
|
||||
|
||||
import com.intellij.execution.configurations.GeneralCommandLine
|
||||
import com.intellij.execution.util.ExecUtil
|
||||
@@ -9,6 +9,7 @@ import com.jetbrains.python.sdk.Product
|
||||
import com.jetbrains.python.sdk.Resource
|
||||
import com.jetbrains.python.sdk.ResourceType
|
||||
import com.jetbrains.python.sdk.SdksKeeper
|
||||
import com.jetbrains.python.sdk.installer.BinaryInstallation
|
||||
import java.nio.file.Path
|
||||
import kotlin.io.path.absolutePathString
|
||||
|
||||
@@ -28,7 +29,7 @@ object PySdkToInstallManager {
|
||||
/**
|
||||
* Software Release Installer for Microsoft Window Executable (exe) files
|
||||
*/
|
||||
internal class ExeBinaryInstaller : ResourceTypeBinaryInstaller(ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) {
|
||||
internal class ExeBinaryInstaller : ResourceTypeBinaryInstaller(ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) {
|
||||
override fun buildCommandLine(resource: Resource, path: Path): GeneralCommandLine {
|
||||
return GeneralCommandLine(path.absolutePathString(), "/repair", "/quiet", "InstallAllUsers=0")
|
||||
}
|
||||
+2
-1
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.sdk.installer
|
||||
package com.intellij.python.community.impl.installer
|
||||
|
||||
import com.intellij.execution.configurations.GeneralCommandLine
|
||||
import com.intellij.execution.process.CapturingProcessHandler
|
||||
@@ -9,6 +9,7 @@ import com.jetbrains.python.PySdkBundle
|
||||
import com.jetbrains.python.sdk.Binary
|
||||
import com.jetbrains.python.sdk.Resource
|
||||
import com.jetbrains.python.sdk.ResourceType
|
||||
import com.jetbrains.python.sdk.installer.*
|
||||
import java.nio.file.Path
|
||||
|
||||
/**
|
||||
@@ -0,0 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
@ApiStatus.Internal
|
||||
package com.intellij.python.community.impl.installer;
|
||||
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
@@ -8,8 +8,14 @@ import com.intellij.openapi.progress.ProgressManager
|
||||
import com.intellij.openapi.progress.Task
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.ui.Messages
|
||||
import com.intellij.python.community.impl.installer.BinaryInstallerUsagesCollector
|
||||
import com.intellij.python.community.impl.installer.PyInstallerBundle
|
||||
import com.intellij.util.concurrency.annotations.RequiresEdt
|
||||
import com.jetbrains.python.sdk.*
|
||||
import com.jetbrains.python.sdk.Binary
|
||||
import com.jetbrains.python.sdk.Release
|
||||
import com.jetbrains.python.sdk.Resource
|
||||
|
||||
// Symbols in this class aren't public API, do not use them!
|
||||
|
||||
internal val LOGGER: Logger = logger<BinaryInstaller>()
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@ import com.intellij.openapi.progress.ProcessCanceledException
|
||||
import java.io.IOException
|
||||
import java.nio.file.Path
|
||||
|
||||
// Symbols in this class aren't public API, do not use them!
|
||||
|
||||
/**
|
||||
* Base Exception for the Software Release Installer.
|
||||
*/
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
/**
|
||||
* Symbols in this class aren't public API, do not use them!
|
||||
*/
|
||||
@ApiStatus.Internal
|
||||
package com.jetbrains.python.sdk.installer;
|
||||
|
||||
|
||||
+1
-1
@@ -5,9 +5,9 @@ import com.intellij.execution.configurations.GeneralCommandLine
|
||||
import com.intellij.execution.process.CapturingProcessHandler
|
||||
import com.intellij.ide.util.PropertiesComponent
|
||||
import com.intellij.openapi.util.SystemInfoRt
|
||||
import com.intellij.python.community.impl.poetry.poetryPath
|
||||
import com.intellij.python.junit5Tests.framework.env.PythonBinaryPath
|
||||
import com.jetbrains.python.PythonBinary
|
||||
import com.jetbrains.python.poetry.poetryPath
|
||||
import com.jetbrains.python.tools.PythonType
|
||||
import java.nio.file.Path
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://www.jetbrains.com/pycharm/"
|
||||
package="com.jetbrains.python">
|
||||
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://www.jetbrains.com/pycharm/">
|
||||
<!--Python community support for Pycharm, DS and IC.-->
|
||||
<!--Include core Python functionality-->
|
||||
|
||||
@@ -526,7 +525,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
|
||||
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.sdk.add.collector.PythonNewInterpreterAddedCollector"/>
|
||||
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.run.runAnything.PyRunAnythingCollector"/>
|
||||
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.debugger.statistics.PyDataViewerCollector"/>
|
||||
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.sdk.installer.BinaryInstallerUsagesCollector"/>
|
||||
<statistics.counterUsagesCollector implementationClass="com.intellij.python.community.impl.installer.BinaryInstallerUsagesCollector"/>
|
||||
|
||||
<!-- Code-insight IDE bridge -->
|
||||
<applicationService serviceInterface="com.jetbrains.python.PythonRuntimeService"
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
@ApiStatus.Internal
|
||||
package com.jetbrains.python.poetry;
|
||||
package com.intellij.python.community.impl.poetry;
|
||||
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.poetry
|
||||
package com.intellij.python.community.impl.poetry
|
||||
|
||||
import com.intellij.ide.util.PropertiesComponent
|
||||
import org.jetbrains.annotations.SystemDependent
|
||||
+1
-1
@@ -9,12 +9,12 @@ import com.intellij.openapi.diagnostic.fileLogger
|
||||
import com.intellij.platform.eel.EelApi
|
||||
import com.intellij.platform.eel.provider.getEelDescriptor
|
||||
import com.intellij.platform.eel.provider.localEel
|
||||
import com.intellij.python.community.impl.installer.PySdkToInstallManager
|
||||
import com.intellij.python.community.services.internal.impl.PythonWithLanguageLevelImpl
|
||||
import com.intellij.python.community.services.systemPython.SystemPythonServiceImpl.MyServiceState
|
||||
import com.intellij.python.community.services.systemPython.spi.SystemPythonProvider
|
||||
import com.jetbrains.python.PythonBinary
|
||||
import com.jetbrains.python.Result
|
||||
import com.jetbrains.python.sdk.installer.PySdkToInstallManager
|
||||
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor
|
||||
import com.jetbrains.python.sdk.installer.installBinary
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2020 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.
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.jetbrains.python.sdk
|
||||
|
||||
import com.intellij.icons.AllIcons
|
||||
@@ -14,14 +14,17 @@ import com.intellij.openapi.util.Version
|
||||
import com.intellij.openapi.util.text.HtmlBuilder
|
||||
import com.intellij.openapi.util.text.HtmlChunk
|
||||
import com.intellij.openapi.util.text.StringUtil
|
||||
import com.intellij.python.community.impl.installer.BinaryInstallerUsagesCollector
|
||||
import com.intellij.python.community.impl.installer.PySdkToInstallManager
|
||||
import com.intellij.ui.SimpleColoredComponent
|
||||
import com.intellij.ui.SimpleTextAttributes
|
||||
import com.intellij.util.concurrency.annotations.RequiresEdt
|
||||
import com.jetbrains.python.PyBundle
|
||||
import com.jetbrains.python.psi.LanguageLevel
|
||||
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor
|
||||
import com.jetbrains.python.sdk.installer.*
|
||||
import com.jetbrains.python.sdk.installer.PySdkToInstallManager
|
||||
import com.jetbrains.python.sdk.installer.BinaryInstallation
|
||||
import com.jetbrains.python.sdk.installer.installBinary
|
||||
import com.jetbrains.python.sdk.installer.toResourcePreview
|
||||
import org.jetbrains.annotations.ApiStatus.Internal
|
||||
import org.jetbrains.annotations.CalledInAny
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@ import com.intellij.openapi.observable.properties.ObservableMutableProperty
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.projectRoots.Sdk
|
||||
import com.intellij.openapi.ui.validation.DialogValidationRequestor
|
||||
import com.intellij.python.community.impl.poetry.poetryPath
|
||||
import com.intellij.ui.dsl.builder.Panel
|
||||
import com.intellij.ui.dsl.builder.bindSelected
|
||||
import com.intellij.util.text.nullize
|
||||
import com.intellij.util.xmlb.XmlSerializerUtil
|
||||
import com.jetbrains.python.PyBundle
|
||||
import com.jetbrains.python.poetry.poetryPath
|
||||
import com.jetbrains.python.errorProcessing.ErrorSink
|
||||
import com.jetbrains.python.sdk.ModuleOrProject
|
||||
import com.jetbrains.python.sdk.baseDir
|
||||
import com.jetbrains.python.sdk.basePath
|
||||
import com.jetbrains.python.sdk.poetry.*
|
||||
import com.jetbrains.python.statistics.InterpreterType
|
||||
import com.jetbrains.python.errorProcessing.ErrorSink
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@@ -18,6 +18,7 @@ import com.intellij.openapi.ui.validation.WHEN_PROPERTY_CHANGED
|
||||
import com.intellij.openapi.ui.validation.and
|
||||
import com.intellij.openapi.util.IconLoader
|
||||
import com.intellij.openapi.util.NlsSafe
|
||||
import com.intellij.python.community.impl.installer.CondaInstallManager
|
||||
import com.intellij.ui.AnimatedIcon
|
||||
import com.intellij.ui.ColoredListCellRenderer
|
||||
import com.intellij.ui.SimpleColoredComponent
|
||||
@@ -31,16 +32,15 @@ import com.intellij.ui.dsl.builder.components.validationTooltip
|
||||
import com.intellij.ui.util.preferredHeight
|
||||
import com.intellij.util.SystemProperties
|
||||
import com.jetbrains.python.PyBundle.message
|
||||
import com.jetbrains.python.errorProcessing.ErrorSink
|
||||
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
|
||||
import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMethod.CREATE_NEW
|
||||
import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMethod.SELECT_EXISTING
|
||||
import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMode.CUSTOM
|
||||
import com.jetbrains.python.sdk.add.v2.PythonSupportedEnvironmentManagers.VIRTUALENV
|
||||
import com.jetbrains.python.sdk.installer.CondaInstallManager
|
||||
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor
|
||||
import com.jetbrains.python.sdk.flavors.conda.PyCondaEnv
|
||||
import com.jetbrains.python.sdk.flavors.conda.PyCondaEnvIdentity
|
||||
import com.jetbrains.python.errorProcessing.ErrorSink
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.CoroutineStart
|
||||
import kotlinx.coroutines.flow.SharedFlow
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.intellij.openapi.util.NlsSafe
|
||||
import com.intellij.openapi.util.SystemInfo
|
||||
import com.intellij.openapi.util.io.FileUtil
|
||||
import com.intellij.platform.ide.progress.withBackgroundProgress
|
||||
import com.intellij.python.community.impl.poetry.poetryPath
|
||||
import com.intellij.util.SystemProperties
|
||||
import com.jetbrains.python.PyBundle
|
||||
import com.jetbrains.python.packaging.PyPackage
|
||||
@@ -25,7 +26,6 @@ import com.jetbrains.python.packaging.management.PythonPackageManager
|
||||
import com.jetbrains.python.pathValidation.PlatformAndRoot
|
||||
import com.jetbrains.python.pathValidation.ValidationRequest
|
||||
import com.jetbrains.python.pathValidation.validateExecutableFile
|
||||
import com.jetbrains.python.poetry.poetryPath
|
||||
import com.jetbrains.python.sdk.*
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton
|
||||
import com.intellij.openapi.ui.ValidationInfo
|
||||
import com.intellij.openapi.util.UserDataHolder
|
||||
import com.intellij.openapi.vfs.StandardFileSystems
|
||||
import com.intellij.python.community.impl.poetry.poetryPath
|
||||
import com.intellij.ui.DocumentAdapter
|
||||
import com.intellij.ui.components.JBCheckBox
|
||||
import com.intellij.ui.components.JBTextField
|
||||
@@ -23,7 +24,6 @@ import com.intellij.util.ui.FormBuilder
|
||||
import com.jetbrains.python.PyBundle
|
||||
import com.jetbrains.python.PySdkBundle
|
||||
import com.jetbrains.python.newProject.collector.InterpreterStatisticsInfo
|
||||
import com.jetbrains.python.poetry.poetryPath
|
||||
import com.jetbrains.python.sdk.PySdkSettings
|
||||
import com.jetbrains.python.sdk.PythonSdkCoroutineService
|
||||
import com.jetbrains.python.sdk.add.PyAddNewEnvPanel
|
||||
|
||||
Reference in New Issue
Block a user