MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[build] IJI-2993 fix compilation errors in progressive mode

Browse Source 
GitOrigin-RevId: 7cc14b9ab0ccb9e66a74b4c67eccc7b235f2be32
This commit is contained in:
Mikhail Filippov
2026-01-14 11:00:39 +00:00
committed by intellij-monorepo-bot
parent ea41f7932a
commit 500bd97eed
71 changed files with 141 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/jspecify.xml
Generated
+18
View File
@@ -0,0 +1,18 @@
<component name="libraryTable">
<library name="jspecify" type="repository">
<properties include-transitive-deps="false" maven-id="org.jspecify:jspecify:1.0.0">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar">
<sha256sum>1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
fleet/build/codecache/BUILD.bazel
+1
View File
@@ -29,6 +29,7 @@ jvm_library(
"@lib//:slf4j-api",
"@lib//:fleet-jetbrains-intellij-platform-util-zip-squashed",
"@lib//:fleet-jetbrains-intellij-idea-community-build-zip",
"@lib//:jetbrains-annotations",
]
)
### auto-generated section `build fleet.build.codecache` end
fleet/build/codecache/fleet.build.codecache.iml
+1
View File
@@ -32,5 +32,6 @@
<orderEntry type="library" name="slf4j-api" level="project" />
<orderEntry type="library" name="fleet:jetbrains.intellij.platform.util.zip.squashed" level="project" />
<orderEntry type="library" name="fleet:jetbrains.intellij.idea.community.build.zip" level="project" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
</component>
</module>
fleet/build/codecache/gradlebuild/build.gradle.kts
+1
View File
@@ -61,6 +61,7 @@ kotlin {
implementation(jps.com.jetbrains.intellij.idea.idea.community.build.zip464377771.get().let { "${it.group}:${it.name}:${it.version}" }) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
}
implementation(jps.org.jetbrains.annotations1504825916.get())
implementation(project(":fleet.bundles"))
implementation(project(":fleet.codecache"))
implementation(project(":fleet.build.platform"))
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/inferenceResults.kt
+1
View File
@@ -16,6 +16,7 @@ import com.intellij.psi.util.PsiUtil
import com.siyeh.ig.psiutils.ClassUtils
import java.util.*
@ConsistentCopyVisibility
public data class ExpressionRange internal constructor (val startOffset: Int, val endOffset: Int) {
public companion object {
lib/BUILD.bazel
+14 -1
View File
@@ -8135,6 +8135,20 @@ jvm_import(
visibility = ["//visibility:public"]
)
jvm_import(
name = "jspecify",
jar = "@org_jspecify-jspecify-1_0_0_http//file",
source_jar = "@org_jspecify-jspecify-1_0_0-sources_http//file",
visibility = ["//visibility:public"]
)
java_library(
name = "jspecify-provided",
exports = [":jspecify"],
neverlink = True,
visibility = ["//visibility:public"]
)
jvm_import(
name = "jsr305",
jar = "@com_google_code_findbugs-jsr305-3_0_2_http//file",
@@ -10896,7 +10910,6 @@ java_library(
":androidx_lifecycle-lifecycle-runtime-compose-desktop-2_9_4_http_import",
":androidx_lifecycle-lifecycle-runtime-desktop-2_9_4_http_import",
":androidx_lifecycle-lifecycle-common-jvm-2_9_4_http_import",
":org_jspecify-jspecify-1_0_0_http_import",
":androidx_arch_core-core-common-2_2_0_http_import",
":androidx_annotation-annotation-1_1_0_http_import",
],
libraries/compose-runtime-desktop/BUILD.bazel
+1
View File
@@ -21,6 +21,7 @@ jvm_library(
"@lib//:libraries-compose-runtime-desktop-androidx-compose-runtime-desktop",
"@lib//:libraries-compose-runtime-desktop-androidx-compose-runtime-saveable-desktop",
"@lib//:libraries-compose-runtime-desktop-androidx-compose-runtime-retain-desktop",
"@lib//:jspecify",
]
)
### auto-generated section `build intellij.libraries.compose.runtime.desktop` end
libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml
+2 -6
View File
@@ -68,9 +68,6 @@
<artifact url="file://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.9.4/lifecycle-common-jvm-2.9.4.jar">
<sha256sum>37d89b2101f074ac6c260917dabb185607645ee200aa3018c7c5bde70edcf184</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar">
<sha256sum>1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/androidx/arch/core/core-common/2.2.0/core-common-2.2.0.jar">
<sha256sum>65308a06b1c00ee186cb9e19321383f043b993813f1522c47f4a3e3303bdba41</sha256sum>
</artifact>
@@ -85,6 +82,7 @@
<dependency maven-id="org.jetbrains.kotlinx:kotlinx-serialization-core-jvm" />
<dependency maven-id="androidx.annotation:annotation-jvm" />
<dependency maven-id="androidx.collection:collection-jvm" />
<dependency maven-id="org.jspecify:jspecify" />
</exclude>
</properties>
<CLASSES>
@@ -94,12 +92,10 @@
<root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.9.4/lifecycle-runtime-compose-desktop-2.9.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.9.4/lifecycle-runtime-desktop-2.9.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.9.4/lifecycle-common-jvm-2.9.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/arch/core/core-common/2.2.0/core-common-2.2.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.1.0/annotation-1.1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
@@ -109,7 +105,6 @@
<root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.9.4/lifecycle-runtime-compose-desktop-2.9.4-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.9.4/lifecycle-runtime-desktop-2.9.4-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.9.4/lifecycle-common-jvm-2.9.4-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/arch/core/core-common/2.2.0/core-common-2.2.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.1.0/annotation-1.1.0-sources.jar!/" />
</SOURCES>
@@ -133,5 +128,6 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" name="jspecify" level="project" />
</component>
</module>
libraries/dokka/BUILD.bazel
+2 -1
View File
@@ -4,6 +4,7 @@ load("@rules_jvm//:jvm.bzl", "jvm_library")
jvm_library(
name = "dokka",
visibility = ["//visibility:public"],
srcs = glob([], allow_empty = True)
srcs = glob([], allow_empty = True),
exports = ["@lib//:libraries-dokka-jetbrains-dokka-analysis-kotlin-descriptors-provided"]
)
### auto-generated section `build intellij.libraries.dokka` end
libraries/dokka/intellij.libraries.dokka.iml
+1 -1
View File
@@ -75,7 +75,7 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<orderEntry type="module-library" exported="" scope="PROVIDED">
<library name="jetbrains.dokka.analysis.kotlin.descriptors" type="repository">
<properties maven-id="org.jetbrains.dokka:analysis-kotlin-descriptors:2.0.0">
<verification>
platform/bookmarks/src/com/intellij/ide/bookmark/BookmarksManagerImpl.kt
+1 -1
View File
@@ -593,7 +593,7 @@ class BookmarksManagerImpl @ApiStatus.Internal constructor(private val project:
internal fun sortLater(): CancellablePromise<*> = invoker.invokeLater { sort() }
private fun sort() = synchronized(notifier) {
private fun sort(): Unit = synchronized(notifier) {
if (groupBookmarks.isEmpty()) return
if (!contains(this)) return
val list = groupBookmarks.sortedWith(this::compare)
platform/build-scripts/src/org/jetbrains/intellij/build/http2Client/ZstdCompressContextPool.kt
+1 -1
View File
@@ -7,7 +7,7 @@ import io.netty.util.concurrent.FastThreadLocal
// we cannot use Netty Recycler as we must close ZstdCompressCtx after use of pool
internal class ZstdCompressContextPool(private val level: Int = 12) {
private val pool = object : FastThreadLocal<MutableList<ZstdCompressCtx>>() {
private val pool: FastThreadLocal<MutableList<ZstdCompressCtx>> = object : FastThreadLocal<MutableList<ZstdCompressCtx>>() {
override fun initialValue(): MutableList<ZstdCompressCtx> = ArrayList()
override fun onRemoval(value: MutableList<ZstdCompressCtx>) {
platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/NamedCollection.kt
+1
View File
@@ -3,6 +3,7 @@ package com.intellij.collaboration.ui.codereview.list
import org.jetbrains.annotations.Nls
@ConsistentCopyVisibility
data class NamedCollection<T> private constructor(val namePlural: @Nls String, val items: List<T>) {
companion object {
fun <T> create(namePlural: @Nls String, items: List<T>): NamedCollection<T>? =
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerState.kt
+1
View File
@@ -6,6 +6,7 @@ import org.jetbrains.annotations.ApiStatus
// todo merge into PluginSetState?
@ApiStatus.Internal
@ConsistentCopyVisibility
data class PluginManagerState internal constructor(
@JvmField val pluginSet: PluginSet,
@JvmField val pluginIdsToDisable: Set<PluginId>,
platform/editor-ui-api/src/com/intellij/ide/ui/NotRoamableUiSettings.kt
+1
View File
@@ -142,6 +142,7 @@ class NotRoamableUiSettings @Internal constructor(): SerializablePersistentState
}
}
@ConsistentCopyVisibility
data class NotRoamableUiOptions internal constructor(
@JvmField @OptionTag val ideAAType: AntialiasingType = if (AntialiasingType.canUseSubpixelAAForIDE()) AntialiasingType.SUBPIXEL else AntialiasingType.GREYSCALE,
@JvmField @OptionTag val editorAAType: AntialiasingType = if (AntialiasingType.canUseSubpixelAAForEditor()) AntialiasingType.SUBPIXEL else AntialiasingType.GREYSCALE,
platform/execution-process-mediator/client/src/com/intellij/execution/process/mediator/client/launcher/ProcessMediatorConnectionManager.kt
+1 -1
View File
@@ -52,7 +52,7 @@ class ProcessMediatorConnectionManager(private val connectionProvider: () -> Pro
}
}
fun adjustQuota(quotaOptions: QuotaOptions) = synchronized(this) {
fun adjustQuota(quotaOptions: QuotaOptions): Unit = synchronized(this) {
val connection = getActiveConnectionOrNull() ?: return
connection.client.adjustQuotaBlocking(quotaOptions)
}
platform/execution-process-mediator/common/src/com/intellij/execution/process/mediator/common/grpc/ExceptionAsStatus.kt
+2 -1
View File
@@ -13,10 +13,11 @@ import java.io.IOException
import java.util.concurrent.CancellationException
import kotlin.reflect.KClass
@Suppress("DataClassPrivateConstructor")
@ConsistentCopyVisibility
data class ExceptionAsStatus private constructor(val status: Status,
val exceptionDescriptor: ExceptionDescriptor<*>) {
@ConsistentCopyVisibility
data class ExceptionDescriptor<T : Throwable> internal constructor(
val type: KClass<out T>,
val constructor: (String?, Throwable?) -> T
platform/lang-api/src/com/intellij/codeInsight/completion/ml/MLFeatureValue.kt
+5
View File
@@ -61,9 +61,14 @@ sealed class MLFeatureValue : MLFeatureValueBase {
fun version(value: String): MLFeatureValue = VersionValue(value)
}
@ConsistentCopyVisibility
data class BinaryValue internal constructor(override val value: Boolean) : MLFeatureValue()
@ConsistentCopyVisibility
data class FloatValue internal constructor(override val value: Double) : MLFeatureValue()
@ConsistentCopyVisibility
data class CategoricalValue internal constructor(override val value: String) : MLFeatureValue()
@ConsistentCopyVisibility
data class ClassNameValue internal constructor(override val value: Class<*>, val useSimpleName: Boolean) : MLFeatureValue()
@ConsistentCopyVisibility
data class VersionValue internal constructor(override val value: String) : MLFeatureValue()
}
platform/lang-impl/src/com/intellij/codeInsight/navigation/impl/NavigationActionResult.kt
+1
View File
@@ -29,6 +29,7 @@ sealed class NavigationActionResult {
}
@Internal
@ConsistentCopyVisibility
data class LazyTargetWithPresentation internal constructor(
val requestor: NavigationRequestor,
val presentation: TargetPresentation,
platform/lang-impl/src/com/intellij/platform/backend/documentation/DocumentationData.kt
+1
View File
@@ -10,6 +10,7 @@ import java.awt.Image
@Internal
@VisibleForTesting
@ConsistentCopyVisibility
data class DocumentationData internal constructor(
internal val content: DocumentationContentData,
internal val links: LinkData = LinkData(),
platform/lang-impl/src/com/intellij/platform/backend/documentation/classes.kt
+1
View File
@@ -18,6 +18,7 @@ import java.awt.Image
import java.util.function.Supplier
@Internal
@ConsistentCopyVisibility
internal data class DocumentationContentData internal constructor(
val html: @Nls String,
val imageResolver: DocumentationImageResolver?,
platform/ml-api/src/com/intellij/platform/ml/monitoring/MLApproachListener.kt
+1
View File
@@ -32,6 +32,7 @@ interface MLTaskGroupListener {
*
* A proper way to create it is to use [monitoredBy]
*/
@ConsistentCopyVisibility
data class ApproachToListener<M : MLModel<P>, P : Any> internal constructor(
val taskApproachBuilder: Class<out MLTaskApproachBuilder<P>>,
val approachListener: Collection<MLApproachInitializationListener<M, P>>
platform/ml-impl/src/com/intellij/textMatching/PrefixMatchingUtil.kt
+1
View File
@@ -37,6 +37,7 @@ object PrefixMatchingUtil {
features.addFeature("matched_last_word", prefixMatchingScores.exactFinal, false)
}
@ConsistentCopyVisibility
data class PrefixMatchingScores internal constructor(
val exact: Boolean,
val exactFinal: Boolean,
platform/platform-api/src/com/intellij/platform/ide/navigation/NavigationOptions.kt
+1
View File
@@ -74,6 +74,7 @@ interface NavigationOptions {
}
@Internal
@ConsistentCopyVisibility
data class Impl internal constructor(
val requestFocus: Boolean,
val preserveCaret: Boolean,
platform/platform-impl/src/com/intellij/execution/wsl/WslPath.kt
+1
View File
@@ -5,6 +5,7 @@ import com.intellij.openapi.util.io.FileUtil.toSystemDependentName
import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName
import com.intellij.openapi.vfs.impl.wsl.WslConstants
@ConsistentCopyVisibility
data class WslPath internal constructor(private val prefix: String = WslConstants.UNC_PREFIX,
val distributionId: String,
val linuxPath: String) {
platform/polySymbols/src/com/intellij/polySymbols/context/PolyContextSourceProximityProvider.kt
+1
View File
@@ -31,6 +31,7 @@ interface PolyContextSourceProximityProvider {
data object ProjectToolExecutable : SourceKind
@ConsistentCopyVisibility
data class PackageManagerDependency internal constructor(val name: String) : SourceKind
}
platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleDependencyIndexImpl.kt
+1 -1
View File
@@ -129,7 +129,7 @@ open class ModuleDependencyIndexImpl(private val project: Project): ModuleDepend
return jdkChangeListener.hasDependencyOn(sdk)
}
fun workspaceModelChanged(event: VersionedStorageChange) = changedListenerTimeMs.addMeasuredTime {
fun workspaceModelChanged(event: VersionedStorageChange): Unit = changedListenerTimeMs.addMeasuredTime {
if (project.isDisposed) return
// By using set we make sure that we won't add the same library multiple times
platform/workspace/storage/src/com/intellij/platform/workspace/storage/impl/serialization/registration/SerializerRegistrar.kt
+1 -1
View File
@@ -22,7 +22,7 @@ private fun <T : Any> registerSerializer(kryo: Kryo, type: Class<T>, serializer:
kryo.register(type, serializer).apply { instantiator = initializer }
}
private object EmptySerializer : Serializer<Any>(false, true) {
internal object EmptySerializer : Serializer<Any>(false, true) {
override fun write(kryo: Kryo?, output: Output?, `object`: Any?) {}
override fun read(kryo: Kryo, input: Input?, type: Class<out Any>?): Any = kryo.newInstance(type)
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerThreadsList.kt
+1
View File
@@ -162,6 +162,7 @@ class XDebuggerThreadsList(
}
}
@ConsistentCopyVisibility
data class StackInfo internal constructor(
@Nls val displayText: String,
val icon: Icon?,
plugins/editorconfig/frontend/BUILD.bazel
+1
View File
@@ -16,6 +16,7 @@ jvm_library(
deps = [
"//platform/analysis-api:analysis",
"//platform/core-api:core",
"//platform/core-impl",
"//platform/editor-ui-api:editor-ui",
"//platform/lang-api:lang",
"//plugins/editorconfig/common",
plugins/editorconfig/frontend/intellij.editorconfig.frontend.iml
+1
View File
@@ -10,6 +10,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.analysis" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.core.impl" />
<orderEntry type="module" module-name="intellij.platform.editor.ui" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.editorconfig.common" />
plugins/evaluation-plugin/core/src/com/intellij/cce/actions/Actions.kt
+10
View File
@@ -40,58 +40,68 @@ sealed interface Action {
data class FileActions(val path: String, val checksum: String?, val sessionsCount: Int, val actions: List<Action>)
@ConsistentCopyVisibility
data class MoveCaret internal constructor(override val sessionId: SessionId, val offset: Int) : Action {
override val type = Action.ActionType.MOVE_CARET
internal constructor(sessionId: UUID, offset: Int) : this(UUIDBasedSessionId(sessionId), offset)
}
@ConsistentCopyVisibility
data class Rename internal constructor(override val sessionId: SessionId, val offset: Int, val newName: String) : Action {
override val type = Action.ActionType.RENAME
internal constructor(sessionId: UUID, offset: Int, newName: String) : this(UUIDBasedSessionId(sessionId), offset, newName)
}
@ConsistentCopyVisibility
data class CallFeature internal constructor(override val sessionId: SessionId, val expectedText: String, val offset: Int, val nodeProperties: TokenProperties) : Action {
override val type: Action.ActionType = Action.ActionType.CALL_FEATURE
internal constructor(sessionId: UUID, expectedText: String, offset: Int, nodeProperties: TokenProperties) : this(UUIDBasedSessionId(sessionId), expectedText, offset, nodeProperties)
}
@ConsistentCopyVisibility
data class PrintText internal constructor(override val sessionId: SessionId, val text: String) : Action {
override val type: Action.ActionType = Action.ActionType.PRINT_TEXT
internal constructor(sessionId: UUID, text: String) : this(UUIDBasedSessionId(sessionId), text)
}
@ConsistentCopyVisibility
data class DeleteRange internal constructor(override val sessionId: SessionId, val begin: Int, val end: Int) : Action {
override val type: Action.ActionType = Action.ActionType.DELETE_RANGE
internal constructor(sessionId: UUID, begin: Int, end: Int) : this(UUIDBasedSessionId(sessionId), begin, end)
}
@ConsistentCopyVisibility
data class SelectRange internal constructor(override val sessionId: SessionId, val begin: Int, val end: Int) : Action {
override val type: Action.ActionType = Action.ActionType.SELECT_RANGE
internal constructor(sessionId: UUID, begin: Int, end: Int) : this(UUIDBasedSessionId(sessionId), begin, end)
}
@ConsistentCopyVisibility
data class Delay internal constructor(override val sessionId: SessionId, val seconds: Int) : Action {
override val type: Action.ActionType = Action.ActionType.DELAY
internal constructor(sessionId: UUID, seconds: Int) : this(UUIDBasedSessionId(sessionId), seconds)
}
@ConsistentCopyVisibility
data class OpenFileInBackground internal constructor(override val sessionId: SessionId, val file: String) : Action {
override val type: Action.ActionType = Action.ActionType.OPEN_FILE_IN_BACKGROUND
internal constructor(sessionId: UUID, file: String) : this(UUIDBasedSessionId(sessionId), file)
}
@ConsistentCopyVisibility
data class OptimiseImports internal constructor(override val sessionId: SessionId, val file: String) : Action {
override val type: Action.ActionType = Action.ActionType.OPTIMISE_IMPORTS
}
@ConsistentCopyVisibility
data class Rollback internal constructor(override val sessionId: SessionId, val file: String) : Action {
override val type: Action.ActionType = Action.ActionType.ROLLBACK
}
plugins/evaluation-plugin/core/src/com/intellij/cce/workspace/Config.kt
+6
View File
@@ -23,6 +23,7 @@ import java.nio.file.Paths
* @property reorder The configuration for element reordering step.
* @property reports The configuration for report generation step.
*/
@ConsistentCopyVisibility
data class Config private constructor(
val outputDir: String,
val strategy: EvaluationStrategy,
@@ -67,6 +68,7 @@ data class Config private constructor(
val sourceFile: String?
}
@ConsistentCopyVisibility
data class ActionsGenerationIml internal constructor(
override var projectPath: String,
override val projectName: String,
@@ -87,6 +89,7 @@ data class Config private constructor(
val chunkSize: Int?
}
@ConsistentCopyVisibility
data class FileDatasetImpl internal constructor(
override val url: String,
override val chunkSize: Int?,
@@ -109,6 +112,7 @@ data class Config private constructor(
* @property trainTestSplit The train test split for detailed ranking logs.
* @property registry List of registry values to be updated before the evaluation in the format "key1=value1,key2=value2"
*/
@ConsistentCopyVisibility
data class ActionsInterpretation internal constructor(
val experimentGroup: Int?,
val sessionsLimit: Int?,
@@ -134,6 +138,7 @@ data class Config private constructor(
* @property title The title of the reordering in reports.
* @property features The list of ML features to be used for reordering.
*/
@ConsistentCopyVisibility
data class ReorderElements internal constructor(
val useReordering: Boolean,
val title: String,
@@ -149,6 +154,7 @@ data class Config private constructor(
* @property comparisonFilters The list of comparison filters. These filters allow subsetting sessions based on multiple evaluations.
* @property lookupFilters The list of lookup filters. These filters allow filtering out certain lookups from the session.
*/
@ConsistentCopyVisibility
data class ReportGeneration internal constructor(
val evaluationTitle: String,
val defaultMetrics: List<String>?,
plugins/gradle/BUILD.bazel
+1
View File
@@ -46,6 +46,7 @@ jvm_library(
"@lib//:slf4j-jdk14",
"//platform/ide-core-impl",
"@lib//:gradle",
"@lib//:jspecify",
"//libraries/gson",
"//platform/object-serializer:objectSerializer-annotations",
"//libraries/ion",
plugins/gradle/intellij.gradle.iml
+1
View File
@@ -33,6 +33,7 @@
<orderEntry type="library" exported="" name="slf4j-jdk14" level="project" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
<orderEntry type="library" exported="" name="Gradle" level="project" />
<orderEntry type="library" name="jspecify" level="project" />
<orderEntry type="module" module-name="intellij.libraries.gson" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
<orderEntry type="module" module-name="intellij.libraries.ion" />
plugins/gradle/tooling-proxy/BUILD.bazel
+1
View File
@@ -8,6 +8,7 @@ jvm_library(
srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
kotlinc_opts = "@community//:k8",
deps = [
"@lib//:jspecify",
"@lib//:gradle",
"@lib//:kotlin-stdlib",
"@lib//:jetbrains-annotations",
plugins/gradle/tooling-proxy/intellij.gradle.toolingProxy.iml
+1
View File
@@ -23,6 +23,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jspecify" level="project" />
<orderEntry type="library" name="Gradle" level="project" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/GrGeneratedConstructorUtils.kt
+1
View File
@@ -59,6 +59,7 @@ private fun inferStringArrayValueShallow(anno: PsiAnnotation, attributeName: Str
/**
* For specific annotation (@MapConstructor/@TupleConstructor) this class computes all actually affected members
*/
@ConsistentCopyVisibility
data class AffectedMembersCache internal constructor(private val order: List<PsiNamedElement>,
private val hasPropertyOptions: Boolean,
private val referencedFromExcludes: List<PsiNamedElement>) {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/RecordTransformationSupport.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.plugins.groovy.transformations.AstTransformationSupport
import org.jetbrains.plugins.groovy.transformations.TransformationContext
class RecordTransformationSupport : AstTransformationSupport {
override fun applyTransformation(context: TransformationContext) = with(context) {
override fun applyTransformation(context: TransformationContext): Unit = with(context) {
if (codeClass is GrRecordDefinition) {
prepareSyntacticRecord(codeClass as GrRecordDefinition)
}
plugins/groovy/src/org/jetbrains/plugins/groovy/ext/ginq/GinqTransformationPerformer.kt
+1 -1
View File
@@ -126,7 +126,7 @@ class GinqTransformationPerformer(private val root: GinqRootPsiElement) : Groovy
return true
}
override fun computeCompletionVariants(parameters: CompletionParameters, result: CompletionResultSet) = with(GinqCompletionUtils) {
override fun computeCompletionVariants(parameters: CompletionParameters, result: CompletionResultSet): Unit = with(GinqCompletionUtils) {
val position = parameters.position
val tree = position.getClosestGinqTree(root)
if (tree == null) {
plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/moduleInfo/ModuleProductionSourceInfo.kt
+1
View File
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.idea.base.util.K1ModeProjectStructureApi
import org.jetbrains.kotlin.name.Name
@K1ModeProjectStructureApi
@ConsistentCopyVisibility
data class ModuleProductionSourceInfo internal constructor(
override val module: Module
) : ModuleSourceInfoWithExpectedBy(forProduction = true) {
plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/moduleInfo/ModuleTestSourceInfo.kt
+1
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.utils.closure
//TODO: (module refactoring) do not create ModuleTestSourceInfo when there are no test roots for module
@K1ModeProjectStructureApi
@ConsistentCopyVisibility
data class ModuleTestSourceInfo internal constructor(
override val module: Module
) : ModuleSourceInfoWithExpectedBy(forProduction = false), IdeaModuleInfo {
plugins/kotlin/compiler-plugins/allopen/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/gradleJava/AllOpenGradleProjectImportHandler.kt
+1 -1
View File
@@ -14,7 +14,7 @@ class AllOpenGradleProjectImportHandler : AbstractAnnotationBasedCompilerPluginG
override val compilerPluginId = PLUGIN_ID
override val pluginName = "allopen"
override val annotationOptionName = ANNOTATION_OPTION_NAME
override val pluginJarFileFromIdea = KotlinArtifacts.allopenCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val pluginJarFileFromIdea: String = KotlinArtifacts.allopenCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val modelKey = AllOpenProjectResolverExtension.KEY
override fun getAnnotationsForPreset(presetName: String): List<String> {
plugins/kotlin/compiler-plugins/allopen/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/gradleJava/AllOpenProjectResolverExtension.kt
+2 -2
View File
@@ -8,9 +8,9 @@ import org.jetbrains.kotlin.idea.gradleJava.compilerPlugin.AnnotationBasedPlugin
class AllOpenProjectResolverExtension : AnnotationBasedPluginProjectResolverExtension<AllOpenModel>() {
companion object {
val KEY = Key.create(AllOpenModel::class.java, 1)
val KEY: Key<AllOpenModel> = Key.create(AllOpenModel::class.java, 1)
}
override val modelClass get() = AllOpenModel::class.java
override val userDataKey get() = KEY
override val userDataKey: Key<AllOpenModel> get() = KEY
}
plugins/kotlin/compiler-plugins/assignment/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/assignment/gradleJava/AssignmentGradleProjectImportHandler.kt
+1 -1
View File
@@ -16,6 +16,6 @@ class AssignmentGradleProjectImportHandler : AbstractAnnotationBasedCompilerPlug
override val compilerPluginId = PLUGIN_ID
override val pluginName = "assignment"
override val annotationOptionName = ANNOTATION_OPTION_NAME
override val pluginJarFileFromIdea = KotlinArtifacts.assignmentCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val pluginJarFileFromIdea: String = KotlinArtifacts.assignmentCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val modelKey = AssignmentProjectResolverExtension.KEY
}
plugins/kotlin/compiler-plugins/assignment/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/assignment/gradleJava/AssignmentProjectResolverExtension.kt
+2 -2
View File
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.idea.gradleTooling.model.assignment.AssignmentModel
class AssignmentProjectResolverExtension : AnnotationBasedPluginProjectResolverExtension<AssignmentModel>() {
companion object {
val KEY = Key.create(AssignmentModel::class.java, 1)
val KEY: Key<AssignmentModel> = Key.create(AssignmentModel::class.java, 1)
}
override val modelClass get() = AssignmentModel::class.java
override val userDataKey get() = KEY
override val userDataKey: Key<AssignmentModel> get() = KEY
}
plugins/kotlin/compiler-plugins/noarg/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/noarg/gradleJava/NoArgGradleProjectImportHandler.kt
+1 -1
View File
@@ -16,7 +16,7 @@ class NoArgGradleProjectImportHandler : AbstractAnnotationBasedCompilerPluginGra
override val compilerPluginId = PLUGIN_ID
override val pluginName = "noarg"
override val annotationOptionName = ANNOTATION_OPTION_NAME
override val pluginJarFileFromIdea = KotlinArtifacts.noargCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val pluginJarFileFromIdea: String = KotlinArtifacts.noargCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val modelKey = NoArgProjectResolverExtension.KEY
override fun getOptions(model: NoArgModel): List<PluginOption> {
plugins/kotlin/compiler-plugins/noarg/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/noarg/gradleJava/NoArgProjectResolverExtension.kt
+2 -2
View File
@@ -8,9 +8,9 @@ import org.jetbrains.kotlin.idea.gradleTooling.model.noarg.NoArgModel
class NoArgProjectResolverExtension : AnnotationBasedPluginProjectResolverExtension<NoArgModel>() {
companion object {
val KEY = Key.create(NoArgModel::class.java, 1)
val KEY: Key<NoArgModel> = Key.create(NoArgModel::class.java, 1)
}
override val modelClass get() = NoArgModel::class.java
override val userDataKey get() = KEY
override val userDataKey: Key<NoArgModel> get() = KEY
}
plugins/kotlin/compiler-plugins/sam-with-receiver/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/samWithReceiver/gradleJava/SamWithReceiverGradleProjectImportHandler.kt
+1 -1
View File
@@ -12,7 +12,7 @@ class SamWithReceiverGradleProjectImportHandler : AbstractAnnotationBasedCompile
override val compilerPluginId = SamWithReceiverPluginNames.PLUGIN_ID
override val pluginName = "sam-with-receiver"
override val annotationOptionName = SamWithReceiverPluginNames.ANNOTATION_OPTION_NAME
override val pluginJarFileFromIdea = KotlinArtifacts.samWithReceiverCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val pluginJarFileFromIdea: String = KotlinArtifacts.samWithReceiverCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
override val modelKey = SamWithReceiverProjectResolverExtension.KEY
override fun getAnnotationsForPreset(presetName: String): List<String> {
plugins/kotlin/compiler-plugins/sam-with-receiver/gradle/src/org/jetbrains/kotlin/idea/compilerPlugin/samWithReceiver/gradleJava/SamWithReceiverProjectResolverExtension.kt
+2 -2
View File
@@ -8,9 +8,9 @@ import org.jetbrains.kotlin.idea.gradleTooling.model.samWithReceiver.SamWithRece
class SamWithReceiverProjectResolverExtension : AnnotationBasedPluginProjectResolverExtension<SamWithReceiverModel>() {
companion object {
val KEY = Key.create(SamWithReceiverModel::class.java, 1)
val KEY: Key<SamWithReceiverModel> = Key.create(SamWithReceiverModel::class.java, 1)
}
override val modelClass get() = SamWithReceiverModel::class.java
override val userDataKey get() = KEY
override val userDataKey: Key<SamWithReceiverModel> get() = KEY
}
plugins/kotlin/completion/impl-k1/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
+1
View File
@@ -78,6 +78,7 @@ class ReferenceVariantsCollector(
}
}
@ConsistentCopyVisibility
private data class FilterConfiguration internal constructor(
val descriptorKindFilter: DescriptorKindFilter,
val additionalPropertyNameFilter: ((String) -> Boolean)?,
plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesByPlatformPropagation.kt
+1 -1
View File
@@ -31,7 +31,7 @@ private typealias CompilationDependencies = Set<KotlinDependency>
private fun KotlinMppGradleProjectResolver.Companion.populateModuleDependenciesByPlatformPropagation(
context: KotlinMppPopulateModuleDependenciesContext, sourceSet: KotlinSourceSet
) = with(context) {
): Unit = with(context) {
val sourceSetDataNode = getSiblingKotlinModuleData(sourceSet, gradleIdeaModule, ideModule, resolverCtx)?.cast<GradleSourceSetData>()
?: return
plugins/kotlin/gradle/gradle-tooling/impl/BUILD.bazel
+4
View File
@@ -20,6 +20,7 @@ jvm_library(
resources = [":impl_resources"],
kotlinc_opts = "@community//:k8",
deps = [
"@lib//:jetbrains-annotations",
"@lib//:kotlin-stdlib",
"//libraries/kotlin/reflect",
"@lib//:kotlin-tooling-core",
@@ -31,6 +32,7 @@ jvm_library(
"//plugins/gradle/tooling-extension-api:toolingExtension",
"//plugins/gradle/tooling-extension-impl:toolingExtension-impl",
"@lib//:opentelemetry",
"@lib//:jspecify-provided",
":platform_extensions_provided",
]
)
@@ -42,6 +44,7 @@ jvm_library(
kotlinc_opts = "@community//:k8",
associates = [":impl"],
deps = [
"@lib//:jetbrains-annotations",
"@lib//:kotlin-stdlib",
"//libraries/kotlin/reflect",
"@lib//:kotlin-tooling-core",
@@ -56,6 +59,7 @@ jvm_library(
"@lib//:kotlin-test-junit",
"@lib//:kotlin-test",
"@lib//:opentelemetry",
"@lib//:jspecify-provided",
":platform_extensions_provided",
]
)
plugins/kotlin/gradle/gradle-tooling/impl/intellij.kotlin.gradle.tooling.impl.iml
+2
View File
@@ -25,6 +25,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jetbrains-annotations" level="project" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" />
<orderEntry type="library" name="kotlin-tooling-core" level="project" />
@@ -40,5 +41,6 @@
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="module" module-name="intellij.platform.extensions" scope="PROVIDED" />
<orderEntry type="library" name="opentelemetry" level="project" />
<orderEntry type="library" scope="PROVIDED" name="jspecify" level="project" />
</component>
</module>
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/kdoc/KotlinExternalDocs.kt
+2 -2
View File
@@ -359,8 +359,8 @@ private fun Element.findClassMemberElementDescriptionFromAnchor(doIncludeSignatu
private fun Element.findElementDescriptionFromUlBlockList(doIncludeSignature: Boolean = false): String? {
val infoHolder = selectFirst("li.blockList") ?: return null
val description = infoHolder.getElementsByClass("block").first() ?: return null
val signature = description.previousElementSibling()?.takeIf { it.tag().normalName() == "pre" }
val tagsDictionary = description.nextElementSibling()?.takeIf { it.tag().normalName() == "dl" }
val signature: Element? = (description.previousElementSibling() as Element?)?.takeIf { it.tag().normalName() == "pre" }
val tagsDictionary: Element? = (description.nextElementSibling() as Element?)?.takeIf { it.tag().normalName() == "dl" }
return buildString {
if (doIncludeSignature && signature != null) {
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
+1 -1
View File
@@ -51,7 +51,7 @@ class InsertDelegationCallQuickfix(val isThis: Boolean, element: KtSecondaryCons
}
object InsertThisDelegationCallFactory : KotlinSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic) =
override fun createAction(diagnostic: Diagnostic): IntentionAction? =
diagnostic.createIntentionForFirstParentOfType<KtSecondaryConstructor> { secondaryConstructor ->
return if (secondaryConstructor.getContainingClassOrObject().getConstructorsCount() <= 1 ||
!secondaryConstructor.hasImplicitDelegationCall()
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/slicer/ArgumentSliceProducer.kt
+1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
import org.jetbrains.kotlin.resolve.source.getPsi
@Suppress("DataClassPrivateConstructor") // we have modifier data to get equals&hashCode only
@ConsistentCopyVisibility
data class ArgumentSliceProducer private constructor(
private val parameterIndex: Int,
private val isExtension: Boolean
plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/inference/common/collectors/CommonConstraintsCollector.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class CommonConstraintsCollector : ConstraintsCollector() {
boundTypeCalculator: BoundTypeCalculator,
inferenceContext: InferenceContext,
resolutionFacade: ResolutionFacade
) = with(boundTypeCalculator) {
): Unit = with(boundTypeCalculator) {
when {
element is KtBinaryExpressionWithTypeRHS && KtPsiUtil.isUnsafeCast(element) -> {
element.right?.typeElement?.let { inferenceContext.typeElementToTypeVariable[it] }?.also { typeVariable ->
plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/inspectionLikePostProcessing.kt
+2 -1
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project
import com.intellij.profile.codeInspection.InspectionProfileManager
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractApplicabilityBasedInspection
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection
import org.jetbrains.kotlin.idea.codeinsight.api.classic.intentions.SelfTargetingRangeIntention
import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
@@ -54,7 +55,7 @@ internal inline fun <reified E : PsiElement, I : PsiBasedModCommandAction<E>> mo
override val writeActionNeeded = writeActionNeeded
}
internal inline fun <reified E : PsiElement, I : AbstractApplicabilityBasedInspection<E>> inspectionBasedProcessing(
internal inline fun <reified E : KtElement, I : AbstractApplicabilityBasedInspection<E>> inspectionBasedProcessing(
inspection: I,
writeActionNeeded: Boolean = true,
checkInspectionIsEnabled: Boolean = true,
plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
+1 -1
View File
@@ -1342,7 +1342,7 @@ class JavaToJKTreeBuilder(
this@withLineBreaksFrom
}
private fun <O : JKFormattingOwner> O.withCommentsAfterWithParent(psi: PsiElement?) = with(formattingCollector) {
private fun <O : JKFormattingOwner> O.withCommentsAfterWithParent(psi: PsiElement?): O = with(formattingCollector) {
if (psi == null) return@with this@withCommentsAfterWithParent
this@withCommentsAfterWithParent.commentsAfter += psi.commentsAfterWithParent()
return this@withCommentsAfterWithParent
plugins/maven/src/main/java/org/jetbrains/idea/maven/buildtool/MavenSyncConsole.kt
+2 -2
View File
@@ -102,7 +102,7 @@ class MavenSyncConsole(private val myProject: Project) : MavenEventHandler, Mave
}
@Synchronized
private fun addText(parentId: Any, @Nls text: String, stdout: Boolean) = doIfImportInProcess {
private fun addText(parentId: Any, @Nls text: String, stdout: Boolean): Unit = doIfImportInProcess {
if (StringUtil.isEmpty(text)) {
return
}
@@ -132,7 +132,7 @@ class MavenSyncConsole(private val myProject: Project) : MavenEventHandler, Mave
}
@Synchronized
fun addWarning(@Nls text: String, @Nls description: String, filePosition: FilePosition?) = doIfImportInProcess {
fun addWarning(@Nls text: String, @Nls description: String, filePosition: FilePosition?): Unit = doIfImportInProcess {
if (!newIssue(text + description + filePosition)) return
if (filePosition == null) {
mySyncView.onEvent(mySyncId,
plugins/repository-search/src/main/kotlin/org/jetbrains/idea/completion/util/LogExtensions.kt
+2 -2
View File
@@ -129,13 +129,13 @@ private inline fun catchAndSuppress(action: () -> Unit) {
runCatching { action() }
}
internal fun logTrace(message: String) = catchAndSuppress {
internal fun logTrace(message: String): Unit = catchAndSuppress {
if (!Registry.`is`("org.jetbrains.idea.reposearch.log.debug", false)) return
if (!logger.isDebugEnabled && !notificationShown.getAndSet(true)) warnNotLoggable()
logger.trace(message)
}
internal fun logTrace(throwable: Throwable) = catchAndSuppress {
internal fun logTrace(throwable: Throwable): Unit = catchAndSuppress {
if (!Registry.`is`("org.jetbrains.idea.reposearch.log.debug", false)) return
if (!logger.isDebugEnabled && !notificationShown.getAndSet(true)) warnNotLoggable()
logger.trace(throwable)
plugins/settings-repository/src/autoSync.kt
+2 -2
View File
@@ -21,7 +21,7 @@ internal class AutoSyncManager(private val icsManager: IcsManager) {
@Volatile var enabled = true
suspend fun waitAutoSync() = reportRawProgress { reporter ->
suspend fun waitAutoSync(): Unit = reportRawProgress { reporter ->
val autoFuture = autoSyncFuture ?: return
if (autoFuture.isCompleted) {
autoSyncFuture = null
@@ -128,7 +128,7 @@ internal class AutoSyncManager(private val icsManager: IcsManager) {
}
}
internal inline fun catchAndLog(asWarning: Boolean = false, runnable: () -> Unit) {
internal inline fun catchAndLog(asWarning: Boolean = false, runnable: () -> Unit): Unit {
try {
runnable()
}
plugins/toml/json/BUILD.bazel
+1
View File
@@ -17,6 +17,7 @@ jvm_library(
"//platform/analysis-api:analysis",
"//platform/code-style-api:codeStyle",
"//platform/core-api:core",
"//platform/core-impl",
"//platform/editor-ui-api:editor-ui",
"//platform/lang-api:lang",
"//platform/platform-impl:ide-impl",
plugins/toml/json/intellij.toml.json.iml
+1
View File
@@ -11,6 +11,7 @@
<orderEntry type="module" module-name="intellij.platform.analysis" />
<orderEntry type="module" module-name="intellij.platform.codeStyle" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.core.impl" />
<orderEntry type="module" module-name="intellij.platform.editor.ui" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersion.kt
+3
View File
@@ -6,6 +6,7 @@ package com.jetbrains.python.packaging
*
* Instances of this class MUST be obtained from [PyPackageVersionNormalizer.normalize].
*/
@ConsistentCopyVisibility
data class PyPackageVersion internal constructor(
val epoch: String? = null,
val release: String,
@@ -28,4 +29,6 @@ data class PyPackageVersion internal constructor(
private fun postPresentable() = post?.let { ".$it" }
private fun devPresentable() = dev?.let { ".$it" }
private fun localPresentable() = local?.let { "+$it" }
fun withRelease(newRelease: String): PyPackageVersion = PyPackageVersion(epoch, newRelease, pre, post, dev, local)
}
python/python-test-env/core/src/com/intellij/python/test/env/core/DefaultPyEnvironmentFactory.kt
Vendored
+2 -1
View File
@@ -24,7 +24,8 @@ class DefaultPyEnvironmentFactory(
override val cacheDir: Path = PyEnvDownloadCache.cacheDirectory()
}
@Suppress("UNCHECKED_CAST")
return (provider as PyEnvironmentProvider<PyEnvironmentSpec<*>>).setupEnvironment(context, spec)
val setupEnv = provider::setupEnvironment as suspend (PyEnvironmentProvider.Context, PyEnvironmentSpec<*>) -> PyEnvironment
return setupEnv(context, spec)
}
}
error("No provider found for environment specification: $spec")
python/src/com/jetbrains/python/requirements/PackageUtils.kt
+3 -3
View File
@@ -29,10 +29,10 @@ operator fun PyPackageVersion?.compareTo(other: PyPackageVersion?): Int {
if (diff != 0) {
val tail = Array(kotlin.math.abs(diff)) { "0" }
if (diff > 0) {
b = other.copy(release = (partsOther + tail).joinToString("."))
b = other.withRelease((partsOther + tail).joinToString("."))
}
else {
a = this.copy(release = (partsThis + tail).joinToString("."))
a = this.withRelease((partsThis + tail).joinToString("."))
}
}
return PyPackageVersionComparator.compare(a, b)
@@ -58,7 +58,7 @@ fun compareVersions(actual: PyPackageVersion?, operation: String, required: PyPa
val partsAsInt = parts.subList(0, parts.size - 2).map { it.toInt() }
val lastGroup = parts[parts.size - 2].toInt() + 1
val maxRequired = required.copy(release = (partsAsInt + listOf(lastGroup)).joinToString("."))
val maxRequired = required.withRelease((partsAsInt + listOf(lastGroup)).joinToString("."))
return compareVersions(actual, ">=", required) && compareVersions(actual, "<", maxRequired)
}
tools/apiDump/src/impl.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "UnusedReceiverParameter", "DATA_CLASS_INVISIBLE_COPY_USAGE_WARNING")
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "UnusedReceiverParameter", "DATA_CLASS_INVISIBLE_COPY_USAGE_WARNING", "DATA_CLASS_INVISIBLE_COPY_USAGE_ERROR")
package com.intellij.tools.apiDump
tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/metrics/PerformanceMetrics.kt
+2
View File
@@ -20,11 +20,13 @@ data class PerformanceMetrics(
/**
* Metric used to measure duration of events in ms
*/
@ConsistentCopyVisibility
data class Duration internal constructor(override val name: String) : MetricId()
/**
* Metric used to count the number of times an event has occurred
*/
@ConsistentCopyVisibility
data class Counter internal constructor(override val name: String) : MetricId()
}
uast/uast-common-ide/src/org/jetbrains/uast/analysis/DependencyGraphBuilder.kt
+1 -1
View File
@@ -310,7 +310,7 @@ internal class DependencyGraphBuilder private constructor(
return@checkedDepthCall true
}
override fun visitExpressionList(node: UExpressionList) = checkedDepthCall(node) {
override fun visitExpressionList(node: UExpressionList): Boolean = checkedDepthCall(node) {
ProgressManager.checkCanceled()
if (node.kind.name != UAST_KT_ELVIS_NAME) {
return super.visitExpressionList(node)