From 19817e2b061e24a25d5d376bac06c408c0af8dff Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 16 Mar 2026 10:10:32 +0100 Subject: [PATCH] IJPL-233553 remove suppressions IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 GitOrigin-RevId: f51da747cff577ec999a0c41612e55328fb72eb9 --- RegExpSupport/resources/intellij.regexp.xml | 1 + .../resources/intellij.java.compiler.impl.xml | 7 +-- .../resources/intellij.java.debugger.xml | 7 +-- .../intellij.java.execution.impl.xml | 1 - .../intellij.java.impl.inspections.xml | 1 - .../resources/intellij.java.promo.xml | 1 - java/jsp-spi/resources/intellij.jsp.spi.xml | 7 +-- java/openapi/resources/intellij.java.xml | 7 +-- .../resources/intellij.java.testFramework.xml | 1 + .../resources/intellij.java.typeMigration.xml | 1 - .../resources/intellij.platform.jps.build.xml | 1 - .../resources/intellij.jvm.analysis.xml | 7 +-- .../resources/intellij.jvm.analysis.impl.xml | 18 +++--- .../intellij.jvm.analysis.refactoring.xml | 7 +-- .../intellij.libraries.http.client.xml | 2 +- .../ContentModuleDependencyGenerator.kt | 8 +-- .../src/generator/EmbeddedModuleUtils.kt | 23 +++---- .../generator/PluginXmlDependencyGenerator.kt | 6 +- .../generator/TestPluginDependencyPlanner.kt | 62 +++++++++---------- .../intellij.platform.completion.common.xml | 1 + .../resources/intellij.platform.compose.xml | 1 + .../intellij.platform.vcs.dvcs.impl.xml | 1 + .../intellij.platform.inline.completion.xml | 1 + .../resources/intellij.platform.inspect.xml | 1 + .../resources/intellij.platform.lvcs.impl.xml | 1 + .../resources/intellij.platform.ml.impl.xml | 2 + .../intellij.platform.navbar.backend.xml | 1 + .../intellij.platform.navbar.frontend.xml | 1 + .../intellij.platform.ide.newUiOnboarding.xml | 1 + ...tellij.platform.ide.newUsersOnboarding.xml | 1 + ...orm.ide.nonModalWelcomeScreen.frontend.xml | 1 + ...lij.platform.ide.nonModalWelcomeScreen.xml | 1 + .../intellij.platform.polySymbols.backend.xml | 1 + .../intellij.platform.project.backend.xml | 1 + .../intellij.platform.recentFiles.backend.xml | 1 + ...intellij.platform.recentFiles.frontend.xml | 1 + .../intellij.platform.recentFiles.xml | 1 + .../intellij.platform.scopes.backend.xml | 1 + ...tellij.platform.scriptDebugger.backend.xml | 1 + .../intellij.platform.scriptDebugger.ui.xml | 1 + ...m.scriptDebugger.protocolReaderRuntime.xml | 1 + ...lij.platform.searchEverywhere.frontend.xml | 1 + .../intellij.platform.smRunner.vcs.xml | 1 + .../intellij.platform.structuralSearch.xml | 1 + .../intellij.platform.tasks.impl.xml | 2 + ...intellij.platform.testFramework.common.xml | 1 + ....testFramework.junit5.projectStructure.xml | 1 + ...intellij.platform.testFramework.junit5.xml | 1 + ...ij.platform.testFramework.junit5._test.xml | 1 + .../intellij.platform.testFramework.xml | 1 + .../resources/intellij.platform.tips.xml | 1 + .../resources/intellij.platform.vcs.xml | 1 + .../intellij.platform.vcs.shared.xml | 1 + .../intellij.platform.vcs.impl.frontend.xml | 1 + .../intellij.platform.vcs.impl.lang.xml | 1 + .../resources/intellij.platform.vcs.impl.xml | 2 + .../intellij.platform.vcs.log.impl.xml | 2 + .../resources/intellij.platform.warmup.xml | 1 + .../resources/intellij.platform.whatsNew.xml | 1 + .../intellij.platform.langInjection.xml | 1 + .../resources/intellij.platform.coverage.xml | 1 + .../intellij.featuresTrainer._test.xml | 1 + .../kotlin.code-insight.intentions.shared.xml | 3 - .../jira/resources/intellij.tasks.jira.xml | 3 +- ...ellij.pycharm.community.ide.impl._test.xml | 1 + ....community.junit5Tests.framework._test.xml | 1 + .../intellij.python.community._test.xml | 1 + .../intellij.python.featuresTrainer._test.xml | 1 + .../intellij.python.sdk._test.xml | 2 + .../intellij.python.test.env.conda.xml | 1 + .../intellij.python.test.env.core.xml | 1 + .../intellij.python.test.env.plain.xml | 1 + .../resources/intellij.python.test.env.uv.xml | 1 + ...ntellij.python.community.testFramework.xml | 1 + .../resources/intellij.spellchecker.xml | 1 + .../resources/intellij.spellchecker.xml.xml | 1 + .../resources/intellij.tools.ide.starter.xml | 1 + xml/impl/resources/intellij.xml.impl.xml | 1 + .../resources/intellij.xml.langInjection.xml | 1 + xml/relaxng/resources/intellij.relaxng.xml | 1 + 80 files changed, 141 insertions(+), 97 deletions(-) diff --git a/RegExpSupport/resources/intellij.regexp.xml b/RegExpSupport/resources/intellij.regexp.xml index a3c509ba18d2..2984eb7ce2cc 100644 --- a/RegExpSupport/resources/intellij.regexp.xml +++ b/RegExpSupport/resources/intellij.regexp.xml @@ -3,6 +3,7 @@ + diff --git a/java/compiler/impl/resources/intellij.java.compiler.impl.xml b/java/compiler/impl/resources/intellij.java.compiler.impl.xml index 64c0eace332a..805471bc1d4a 100644 --- a/java/compiler/impl/resources/intellij.java.compiler.impl.xml +++ b/java/compiler/impl/resources/intellij.java.compiler.impl.xml @@ -1,7 +1,8 @@ + - + @@ -9,8 +10,6 @@ - - @@ -19,8 +18,8 @@ - + + + - - - - + diff --git a/java/execution/impl/resources/intellij.java.execution.impl.xml b/java/execution/impl/resources/intellij.java.execution.impl.xml index 902b0de81893..dd1029e951a1 100644 --- a/java/execution/impl/resources/intellij.java.execution.impl.xml +++ b/java/execution/impl/resources/intellij.java.execution.impl.xml @@ -3,7 +3,6 @@ - diff --git a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml index 51f9ebd9c208..9e74a1035e86 100644 --- a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml +++ b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml @@ -3,7 +3,6 @@ - diff --git a/java/java-promo/resources/intellij.java.promo.xml b/java/java-promo/resources/intellij.java.promo.xml index 25f92b52a90f..ff91df91b7ce 100644 --- a/java/java-promo/resources/intellij.java.promo.xml +++ b/java/java-promo/resources/intellij.java.promo.xml @@ -3,7 +3,6 @@ - diff --git a/java/jsp-spi/resources/intellij.jsp.spi.xml b/java/jsp-spi/resources/intellij.jsp.spi.xml index 343d6b13d503..f7116aab2716 100644 --- a/java/jsp-spi/resources/intellij.jsp.spi.xml +++ b/java/jsp-spi/resources/intellij.jsp.spi.xml @@ -1,13 +1,12 @@ + - - - + - + diff --git a/java/openapi/resources/intellij.java.xml b/java/openapi/resources/intellij.java.xml index d6fc863ce5e0..c6655abd16d9 100644 --- a/java/openapi/resources/intellij.java.xml +++ b/java/openapi/resources/intellij.java.xml @@ -1,18 +1,17 @@ + - + - - - + diff --git a/java/testFramework/resources/intellij.java.testFramework.xml b/java/testFramework/resources/intellij.java.testFramework.xml index 9424ad7616bd..156f5c62a74a 100644 --- a/java/testFramework/resources/intellij.java.testFramework.xml +++ b/java/testFramework/resources/intellij.java.testFramework.xml @@ -6,6 +6,7 @@ + diff --git a/java/typeMigration/resources/intellij.java.typeMigration.xml b/java/typeMigration/resources/intellij.java.typeMigration.xml index 0b6173939f03..a562fc4c48b5 100644 --- a/java/typeMigration/resources/intellij.java.typeMigration.xml +++ b/java/typeMigration/resources/intellij.java.typeMigration.xml @@ -3,7 +3,6 @@ - diff --git a/jps/jps-builders/resources/intellij.platform.jps.build.xml b/jps/jps-builders/resources/intellij.platform.jps.build.xml index 921bccce316f..8f3e0b33d34c 100644 --- a/jps/jps-builders/resources/intellij.platform.jps.build.xml +++ b/jps/jps-builders/resources/intellij.platform.jps.build.xml @@ -6,7 +6,6 @@ - diff --git a/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml b/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml index 624ba2f407f1..42f60dd5f407 100644 --- a/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml +++ b/jvm/jvm-analysis-api/resources/intellij.jvm.analysis.xml @@ -1,13 +1,12 @@ + - - - + - + diff --git a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml index 6c1550ffae60..2f99606fe31d 100644 --- a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml +++ b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml @@ -1,18 +1,16 @@ + + + + + + - - - - - - - - - - + + diff --git a/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml b/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml index 268d85cda1ec..0ecc22943fda 100644 --- a/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml +++ b/jvm/jvm-analysis-refactoring/resources/intellij.jvm.analysis.refactoring.xml @@ -1,11 +1,10 @@ + - - - + - + diff --git a/libraries/http-client/resources/intellij.libraries.http.client.xml b/libraries/http-client/resources/intellij.libraries.http.client.xml index 6fb76a66265d..bf03841e6f89 100644 --- a/libraries/http-client/resources/intellij.libraries.http.client.xml +++ b/libraries/http-client/resources/intellij.libraries.http.client.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/platform/build-scripts/product-dsl/src/generator/ContentModuleDependencyGenerator.kt b/platform/build-scripts/product-dsl/src/generator/ContentModuleDependencyGenerator.kt index dbc19507ede8..e7bc8cf5c238 100644 --- a/platform/build-scripts/product-dsl/src/generator/ContentModuleDependencyGenerator.kt +++ b/platform/build-scripts/product-dsl/src/generator/ContentModuleDependencyGenerator.kt @@ -572,11 +572,9 @@ private fun computeJpsDeps( if (c.moduleName.value.startsWith(LIB_MODULE_PREFIX) && !libraryModuleFilter(c.moduleName.value)) { return@dependsOn } - // Skip globally embedded modules for plugin-only source modules. - val depModuleId = contentModule(c.moduleName)?.id ?: -1 - if (depModuleId >= 0 && - isPluginOnlySource && - shouldSkipEmbeddedPluginDependency(depModuleId, embeddedCheckProductNames)) { + // skip globally embedded modules for plugin-only source modules + val depModuleId = contentModule(c.moduleName) + if (depModuleId != null && isPluginOnlySource && shouldSkipEmbeddedPluginDependency(depModuleId, embeddedCheckProductNames)) { filteredEmbeddedModuleDeps.add(c.moduleName) debug("missingDeps") { "embeddedSkip source=${moduleName.value} dep=${c.moduleName.value} includeTestScope=$includeTestScope" diff --git a/platform/build-scripts/product-dsl/src/generator/EmbeddedModuleUtils.kt b/platform/build-scripts/product-dsl/src/generator/EmbeddedModuleUtils.kt index d131ac52dde4..21c2ce25ef45 100644 --- a/platform/build-scripts/product-dsl/src/generator/EmbeddedModuleUtils.kt +++ b/platform/build-scripts/product-dsl/src/generator/EmbeddedModuleUtils.kt @@ -48,8 +48,7 @@ internal fun GraphScope.hasPluginSource(moduleId: Int): Boolean { * Returns true only if the module has at least one source reachable from this product * (product/module-set or bundled plugin content) and every such source has EMBEDDED loading. */ -internal fun GraphScope.isEmbeddedInProduct(moduleId: Int, productName: String): Boolean { - val module = ContentModuleNode(moduleId) +internal fun GraphScope.isEmbeddedInProduct(module: ContentModuleNode, productName: String): Boolean { val product = product(productName) ?: return false var hasSourceInProduct = false var allEmbedded = true @@ -72,7 +71,7 @@ internal fun GraphScope.isEmbeddedInProduct(moduleId: Int, productName: String): hasSourceInProduct = true var loading: ModuleLoadingRuleValue? = null sourcePlugin.containsContent { contentModule, mode -> - if (contentModule.id == moduleId) { + if (contentModule == module) { loading = mode } } @@ -87,7 +86,7 @@ internal fun GraphScope.isEmbeddedInProduct(moduleId: Int, productName: String): hasSourceInProduct = true var loading: ModuleLoadingRuleValue? = null sourceProduct.containsContent { contentModule, mode -> - if (contentModule.id == moduleId) { + if (contentModule == module) { loading = mode } } @@ -102,7 +101,7 @@ internal fun GraphScope.isEmbeddedInProduct(moduleId: Int, productName: String): hasSourceInProduct = true var loading: ModuleLoadingRuleValue? = null sourceModuleSet.containsModule { contentModule, mode -> - if (contentModule.id == moduleId) { + if (contentModule == module) { loading = mode } } @@ -115,7 +114,11 @@ internal fun GraphScope.isEmbeddedInProduct(moduleId: Int, productName: String): return hasSourceInProduct && allEmbedded } -internal fun GraphScope.isGloballyEmbeddedInAllProducts(moduleId: Int, allRealProductNames: Set): Boolean { +/** + * Returns true when a plugin.xml module dependency should be skipped + * because the target module is globally embedded in the provided product scope. + */ +internal fun GraphScope.shouldSkipEmbeddedPluginDependency(moduleId: ContentModuleNode, allRealProductNames: Set): Boolean { if (allRealProductNames.isEmpty()) { return false } @@ -129,14 +132,6 @@ internal fun GraphScope.isGloballyEmbeddedInAllProducts(moduleId: Int, allRealPr return true } -/** - * Returns true when a plugin.xml module dependency should be skipped - * because the target module is globally embedded in the provided product scope. - */ -internal fun GraphScope.shouldSkipEmbeddedPluginDependency(depModuleId: Int, allRealProductNames: Set): Boolean { - return isGloballyEmbeddedInAllProducts(depModuleId, allRealProductNames) -} - /** * Returns products where the plugin is bundled (restricted to discovered real products). * Falls back to [allRealProductNames] for non-bundled plugins. diff --git a/platform/build-scripts/product-dsl/src/generator/PluginXmlDependencyGenerator.kt b/platform/build-scripts/product-dsl/src/generator/PluginXmlDependencyGenerator.kt index 1d5bab3b4277..fa5a60d8e0ce 100644 --- a/platform/build-scripts/product-dsl/src/generator/PluginXmlDependencyGenerator.kt +++ b/platform/build-scripts/product-dsl/src/generator/PluginXmlDependencyGenerator.kt @@ -138,8 +138,8 @@ internal fun collectPluginGraphDeps( filteredModuleDeps.add(classification.moduleName) return@dependsOn } - val depModuleId = contentModule(classification.moduleName)?.id ?: -1 - if (depModuleId >= 0 && shouldSkipEmbeddedPluginDependency(depModuleId, embeddedCheckProductNames)) { + val depModuleId = contentModule(classification.moduleName) + if (depModuleId != null && shouldSkipEmbeddedPluginDependency(depModuleId, embeddedCheckProductNames)) { filteredModuleDeps.add(classification.moduleName) return@dependsOn } @@ -247,7 +247,7 @@ private suspend fun buildPluginDependencyPlan( suppressedPlugins = pluginHandling.effectiveSuppressedDeps, ) - // Remove duplicate legacy only when modern deps are present or we are generating a section. + // Remove duplicate legacy only when modern deps are present, or we are generating a section. val hasDependenciesSection = extractDependenciesEntries(info.pluginXmlContent) != null val hasModernDepsInXIncludes = info.depsByFile.drop(1).any { it.pluginDependencies.isNotEmpty() || it.moduleDependencies.isNotEmpty() } val legacyPluginIds = info.legacyDepends.map { it.pluginId.value }.sorted() diff --git a/platform/build-scripts/product-dsl/src/generator/TestPluginDependencyPlanner.kt b/platform/build-scripts/product-dsl/src/generator/TestPluginDependencyPlanner.kt index ad9bf5abcfdc..5e13c321da25 100644 --- a/platform/build-scripts/product-dsl/src/generator/TestPluginDependencyPlanner.kt +++ b/platform/build-scripts/product-dsl/src/generator/TestPluginDependencyPlanner.kt @@ -1,5 +1,5 @@ // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -@file:Suppress("ReplaceGetOrSet") +@file:Suppress("ReplaceGetOrSet", "ReplacePutWithAssignment") package org.jetbrains.intellij.build.productLayout.generator @@ -98,6 +98,7 @@ private fun buildTestPluginDependencyPlan( val embeddedCheckProductNames = if (productName in allRealProductNames) setOf(productName) else allRealProductNames val contentData = buildContentBlocksAndChainMapping(spec.spec, collectModuleSetAliases = false) val contentModules = contentData.contentBlocks + .asSequence() .flatMap { it.modules } .mapTo(LinkedHashSet()) { it.name } val allowedMissingByModule = buildAllowedMissingByModule(contentData) @@ -112,14 +113,12 @@ private fun buildTestPluginDependencyPlan( val unresolvedPluginsFromContent = LinkedHashMap>() for (moduleName in contentModules) { val moduleDeps = depsByModule.get(moduleName)?.testDependencies ?: continue - if (moduleDeps.isEmpty()) continue + if (moduleDeps.isEmpty()) { + continue + } for (dependency in moduleDeps) { - if (dependency in contentModules) continue - if (dependency.value.startsWith(LIB_MODULE_PREFIX)) { - if (!shouldSkipEmbeddedDependency(graph, dependency, embeddedCheckProductNames)) { - moduleDepsFromContent.add(dependency) - } + if (dependency in contentModules) { continue } @@ -132,16 +131,20 @@ private fun buildTestPluginDependencyPlan( globalAllowedMissing = globalAllowedMissing, ) if (owningProdPlugins.isEmpty()) { - val pluginId = pluginIdByTargetName[TargetName(dependency.value)] + val pluginId = pluginIdByTargetName.get(TargetName(dependency.value)) if (pluginId != null) { - if (pluginId == spec.pluginId) continue - if (pluginId in moduleAllowedMissing) continue + if (pluginId == spec.pluginId) { + continue + } + if (pluginId in moduleAllowedMissing) { + continue + } if (TargetName(dependency.value) in resolvableOwners) { requiredByPlugin.computeIfAbsent(pluginId) { LinkedHashSet() }.add(moduleName) } else { val targets = unresolvedPluginsFromContent.computeIfAbsent(pluginId) { LinkedHashSet() } - val names = pluginTargetNamesByPluginId[pluginId].orEmpty() + val names = pluginTargetNamesByPluginId.get(pluginId).orEmpty() if (names.isEmpty()) { targets.add(TargetName(dependency.value)) } @@ -151,10 +154,10 @@ private fun buildTestPluginDependencyPlan( } continue } - if (dependency in resolvableModules) continue - if (!shouldSkipEmbeddedDependency(graph, dependency, embeddedCheckProductNames)) { - moduleDepsFromContent.add(dependency) + if (dependency in resolvableModules) { + continue } + moduleDepsFromContent.add(dependency) continue } @@ -164,8 +167,12 @@ private fun buildTestPluginDependencyPlan( } for (owner in resolvableProdOwners) { - if (owner.pluginId == spec.pluginId) continue - if (owner.pluginId in moduleAllowedMissing) continue + if (owner.pluginId == spec.pluginId) { + continue + } + if (owner.pluginId in moduleAllowedMissing) { + continue + } requiredByPlugin.computeIfAbsent(owner.pluginId) { LinkedHashSet() }.add(moduleName) } } @@ -301,8 +308,10 @@ private fun collectTargetDependencies( } return@dependsOn } - val depModuleId = contentModule(classification.moduleName)?.id ?: -1 - if (depModuleId >= 0 && shouldSkipEmbeddedPluginDependency(depModuleId, embeddedCheckProductNames)) return@dependsOn + val depModuleId = contentModule(classification.moduleName) + if (depModuleId != null && shouldSkipEmbeddedPluginDependency(depModuleId, embeddedCheckProductNames)) { + return@dependsOn + } moduleDeps.add(classification.moduleName) } is DependencyClassification.PluginDep -> { @@ -354,22 +363,13 @@ private fun buildPluginIdByTargetName(graph: PluginGraph): Map() graph.query { plugins { plugin -> - if (plugin.isTest) return@plugins + if (plugin.isTest) { + return@plugins + } val pluginId = plugin.pluginIdOrNull ?: return@plugins - result[plugin.name()] = pluginId + result.put(plugin.name(), pluginId) } } return result } - -private fun shouldSkipEmbeddedDependency( - graph: PluginGraph, - moduleName: ContentModuleName, - allRealProductNames: Set, -): Boolean { - return graph.query { - val depModuleId = contentModule(moduleName)?.id ?: return@query false - shouldSkipEmbeddedPluginDependency(depModuleId, allRealProductNames) - } -} diff --git a/platform/completion/common/resources/intellij.platform.completion.common.xml b/platform/completion/common/resources/intellij.platform.completion.common.xml index 8ce024faa44f..7d32c27c3cca 100644 --- a/platform/completion/common/resources/intellij.platform.completion.common.xml +++ b/platform/completion/common/resources/intellij.platform.completion.common.xml @@ -2,6 +2,7 @@ + diff --git a/platform/compose/resources/intellij.platform.compose.xml b/platform/compose/resources/intellij.platform.compose.xml index 42b117a74e2d..bf99a57a69fb 100644 --- a/platform/compose/resources/intellij.platform.compose.xml +++ b/platform/compose/resources/intellij.platform.compose.xml @@ -14,6 +14,7 @@ + diff --git a/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml b/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml index b635fdf0af66..82bc7211c32c 100644 --- a/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml +++ b/platform/dvcs-impl/resources/intellij.platform.vcs.dvcs.impl.xml @@ -1,6 +1,7 @@ + diff --git a/platform/inline-completion/shared/resources/intellij.platform.inline.completion.xml b/platform/inline-completion/shared/resources/intellij.platform.inline.completion.xml index 2c5bbccb05d3..52b91ebb50c0 100644 --- a/platform/inline-completion/shared/resources/intellij.platform.inline.completion.xml +++ b/platform/inline-completion/shared/resources/intellij.platform.inline.completion.xml @@ -1,6 +1,7 @@ + diff --git a/platform/inspect/resources/intellij.platform.inspect.xml b/platform/inspect/resources/intellij.platform.inspect.xml index 777294c31ac5..c1c5ca8478e5 100644 --- a/platform/inspect/resources/intellij.platform.inspect.xml +++ b/platform/inspect/resources/intellij.platform.inspect.xml @@ -6,6 +6,7 @@ + diff --git a/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml b/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml index 330a91250e9b..fbbc9f4ac01f 100644 --- a/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml +++ b/platform/lvcs-impl/resources/intellij.platform.lvcs.impl.xml @@ -2,6 +2,7 @@ + diff --git a/platform/ml-impl/resources/intellij.platform.ml.impl.xml b/platform/ml-impl/resources/intellij.platform.ml.impl.xml index a18c07598a53..5b2f8b1a8acb 100644 --- a/platform/ml-impl/resources/intellij.platform.ml.impl.xml +++ b/platform/ml-impl/resources/intellij.platform.ml.impl.xml @@ -1,7 +1,9 @@ + + diff --git a/platform/navbar/backend/resources/intellij.platform.navbar.backend.xml b/platform/navbar/backend/resources/intellij.platform.navbar.backend.xml index 7d8767978abf..1a15eda0a83e 100644 --- a/platform/navbar/backend/resources/intellij.platform.navbar.backend.xml +++ b/platform/navbar/backend/resources/intellij.platform.navbar.backend.xml @@ -1,6 +1,7 @@ + diff --git a/platform/navbar/frontend/resources/intellij.platform.navbar.frontend.xml b/platform/navbar/frontend/resources/intellij.platform.navbar.frontend.xml index 3ee8f37f6ee2..9021e1f095ec 100644 --- a/platform/navbar/frontend/resources/intellij.platform.navbar.frontend.xml +++ b/platform/navbar/frontend/resources/intellij.platform.navbar.frontend.xml @@ -1,6 +1,7 @@ + diff --git a/platform/new-ui-onboarding/resources/intellij.platform.ide.newUiOnboarding.xml b/platform/new-ui-onboarding/resources/intellij.platform.ide.newUiOnboarding.xml index e50a9fdb3923..c9b8e79c6eb1 100644 --- a/platform/new-ui-onboarding/resources/intellij.platform.ide.newUiOnboarding.xml +++ b/platform/new-ui-onboarding/resources/intellij.platform.ide.newUiOnboarding.xml @@ -3,6 +3,7 @@ + diff --git a/platform/new-users-onboarding/resources/intellij.platform.ide.newUsersOnboarding.xml b/platform/new-users-onboarding/resources/intellij.platform.ide.newUsersOnboarding.xml index 257cda39e79e..f3181e5192bf 100644 --- a/platform/new-users-onboarding/resources/intellij.platform.ide.newUsersOnboarding.xml +++ b/platform/new-users-onboarding/resources/intellij.platform.ide.newUsersOnboarding.xml @@ -1,6 +1,7 @@ + diff --git a/platform/non-modal-welcome-screen/frontend/resources/intellij.platform.ide.nonModalWelcomeScreen.frontend.xml b/platform/non-modal-welcome-screen/frontend/resources/intellij.platform.ide.nonModalWelcomeScreen.frontend.xml index 256fee661f82..98b4fdb37bc9 100644 --- a/platform/non-modal-welcome-screen/frontend/resources/intellij.platform.ide.nonModalWelcomeScreen.frontend.xml +++ b/platform/non-modal-welcome-screen/frontend/resources/intellij.platform.ide.nonModalWelcomeScreen.frontend.xml @@ -2,6 +2,7 @@ + diff --git a/platform/non-modal-welcome-screen/resources/intellij.platform.ide.nonModalWelcomeScreen.xml b/platform/non-modal-welcome-screen/resources/intellij.platform.ide.nonModalWelcomeScreen.xml index 2762339ac63f..e9bd00b32bf1 100644 --- a/platform/non-modal-welcome-screen/resources/intellij.platform.ide.nonModalWelcomeScreen.xml +++ b/platform/non-modal-welcome-screen/resources/intellij.platform.ide.nonModalWelcomeScreen.xml @@ -4,6 +4,7 @@ + diff --git a/platform/polySymbols/backend/resources/intellij.platform.polySymbols.backend.xml b/platform/polySymbols/backend/resources/intellij.platform.polySymbols.backend.xml index 62ad5a6eedae..3e4c32daf563 100644 --- a/platform/polySymbols/backend/resources/intellij.platform.polySymbols.backend.xml +++ b/platform/polySymbols/backend/resources/intellij.platform.polySymbols.backend.xml @@ -3,6 +3,7 @@ + diff --git a/platform/project/backend/resources/intellij.platform.project.backend.xml b/platform/project/backend/resources/intellij.platform.project.backend.xml index 775255913d43..9e65ad409662 100644 --- a/platform/project/backend/resources/intellij.platform.project.backend.xml +++ b/platform/project/backend/resources/intellij.platform.project.backend.xml @@ -1,6 +1,7 @@ + diff --git a/platform/recentFiles/backend/resources/intellij.platform.recentFiles.backend.xml b/platform/recentFiles/backend/resources/intellij.platform.recentFiles.backend.xml index 5d094fd7be07..83841744c661 100644 --- a/platform/recentFiles/backend/resources/intellij.platform.recentFiles.backend.xml +++ b/platform/recentFiles/backend/resources/intellij.platform.recentFiles.backend.xml @@ -1,6 +1,7 @@ + diff --git a/platform/recentFiles/frontend/resources/intellij.platform.recentFiles.frontend.xml b/platform/recentFiles/frontend/resources/intellij.platform.recentFiles.frontend.xml index 3b73bad51ffb..7f8d07dcff64 100644 --- a/platform/recentFiles/frontend/resources/intellij.platform.recentFiles.frontend.xml +++ b/platform/recentFiles/frontend/resources/intellij.platform.recentFiles.frontend.xml @@ -2,6 +2,7 @@ + diff --git a/platform/recentFiles/shared/resources/intellij.platform.recentFiles.xml b/platform/recentFiles/shared/resources/intellij.platform.recentFiles.xml index 8fb0a08f90f5..0a446796c348 100644 --- a/platform/recentFiles/shared/resources/intellij.platform.recentFiles.xml +++ b/platform/recentFiles/shared/resources/intellij.platform.recentFiles.xml @@ -4,6 +4,7 @@ + diff --git a/platform/scopes/backend/resources/intellij.platform.scopes.backend.xml b/platform/scopes/backend/resources/intellij.platform.scopes.backend.xml index 645df597096a..4ba854250b03 100644 --- a/platform/scopes/backend/resources/intellij.platform.scopes.backend.xml +++ b/platform/scopes/backend/resources/intellij.platform.scopes.backend.xml @@ -1,6 +1,7 @@ + diff --git a/platform/script-debugger/backend/resources/intellij.platform.scriptDebugger.backend.xml b/platform/script-debugger/backend/resources/intellij.platform.scriptDebugger.backend.xml index 38dbb6ccba38..c774a26fefbd 100644 --- a/platform/script-debugger/backend/resources/intellij.platform.scriptDebugger.backend.xml +++ b/platform/script-debugger/backend/resources/intellij.platform.scriptDebugger.backend.xml @@ -4,6 +4,7 @@ + diff --git a/platform/script-debugger/debugger-ui/resources/intellij.platform.scriptDebugger.ui.xml b/platform/script-debugger/debugger-ui/resources/intellij.platform.scriptDebugger.ui.xml index 7f7ba68e9995..20480b336eae 100644 --- a/platform/script-debugger/debugger-ui/resources/intellij.platform.scriptDebugger.ui.xml +++ b/platform/script-debugger/debugger-ui/resources/intellij.platform.scriptDebugger.ui.xml @@ -4,6 +4,7 @@ + diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/resources/intellij.platform.scriptDebugger.protocolReaderRuntime.xml b/platform/script-debugger/protocol/protocol-reader-runtime/resources/intellij.platform.scriptDebugger.protocolReaderRuntime.xml index 148c78367342..9c6ede9e3031 100644 --- a/platform/script-debugger/protocol/protocol-reader-runtime/resources/intellij.platform.scriptDebugger.protocolReaderRuntime.xml +++ b/platform/script-debugger/protocol/protocol-reader-runtime/resources/intellij.platform.scriptDebugger.protocolReaderRuntime.xml @@ -3,6 +3,7 @@ + diff --git a/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml b/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml index 4062482dc148..71ed3c1077ae 100644 --- a/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml +++ b/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml @@ -3,6 +3,7 @@ + diff --git a/platform/smRunner/vcs/resources/intellij.platform.smRunner.vcs.xml b/platform/smRunner/vcs/resources/intellij.platform.smRunner.vcs.xml index 5ca4c8cd86a6..da58ea84c04f 100644 --- a/platform/smRunner/vcs/resources/intellij.platform.smRunner.vcs.xml +++ b/platform/smRunner/vcs/resources/intellij.platform.smRunner.vcs.xml @@ -2,6 +2,7 @@ + diff --git a/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml b/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml index 34e669a5c2da..b998c67670a9 100644 --- a/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml +++ b/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml @@ -3,6 +3,7 @@ + diff --git a/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml b/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml index dd63b006fbd1..fde624141058 100644 --- a/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml +++ b/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml @@ -3,7 +3,9 @@ + + diff --git a/platform/testFramework/common/resources/intellij.platform.testFramework.common.xml b/platform/testFramework/common/resources/intellij.platform.testFramework.common.xml index b5ddcdd481de..7e7af157cae0 100644 --- a/platform/testFramework/common/resources/intellij.platform.testFramework.common.xml +++ b/platform/testFramework/common/resources/intellij.platform.testFramework.common.xml @@ -2,6 +2,7 @@ + diff --git a/platform/testFramework/junit5/projectStructure/resources/intellij.platform.testFramework.junit5.projectStructure.xml b/platform/testFramework/junit5/projectStructure/resources/intellij.platform.testFramework.junit5.projectStructure.xml index 39a505d043e9..5e3893c3e0a0 100644 --- a/platform/testFramework/junit5/projectStructure/resources/intellij.platform.testFramework.junit5.projectStructure.xml +++ b/platform/testFramework/junit5/projectStructure/resources/intellij.platform.testFramework.junit5.projectStructure.xml @@ -1,6 +1,7 @@ + diff --git a/platform/testFramework/junit5/resources/intellij.platform.testFramework.junit5.xml b/platform/testFramework/junit5/resources/intellij.platform.testFramework.junit5.xml index 7821732e786c..02567af99277 100644 --- a/platform/testFramework/junit5/resources/intellij.platform.testFramework.junit5.xml +++ b/platform/testFramework/junit5/resources/intellij.platform.testFramework.junit5.xml @@ -4,6 +4,7 @@ + diff --git a/platform/testFramework/junit5/test-resources/intellij.platform.testFramework.junit5._test.xml b/platform/testFramework/junit5/test-resources/intellij.platform.testFramework.junit5._test.xml index 37712b999165..f48b19abbada 100644 --- a/platform/testFramework/junit5/test-resources/intellij.platform.testFramework.junit5._test.xml +++ b/platform/testFramework/junit5/test-resources/intellij.platform.testFramework.junit5._test.xml @@ -8,6 +8,7 @@ + diff --git a/platform/testFramework/resources/intellij.platform.testFramework.xml b/platform/testFramework/resources/intellij.platform.testFramework.xml index bf1bdb96665b..95ee552bc8b1 100644 --- a/platform/testFramework/resources/intellij.platform.testFramework.xml +++ b/platform/testFramework/resources/intellij.platform.testFramework.xml @@ -7,6 +7,7 @@ + diff --git a/platform/tips-of-the-day/resources/intellij.platform.tips.xml b/platform/tips-of-the-day/resources/intellij.platform.tips.xml index 912603cee1c3..20c3ce5541a4 100644 --- a/platform/tips-of-the-day/resources/intellij.platform.tips.xml +++ b/platform/tips-of-the-day/resources/intellij.platform.tips.xml @@ -5,6 +5,7 @@ + diff --git a/platform/vcs-api/resources/intellij.platform.vcs.xml b/platform/vcs-api/resources/intellij.platform.vcs.xml index 1ebf553c03e1..c50dd6d227bd 100644 --- a/platform/vcs-api/resources/intellij.platform.vcs.xml +++ b/platform/vcs-api/resources/intellij.platform.vcs.xml @@ -2,6 +2,7 @@ + diff --git a/platform/vcs-api/shared/resources/intellij.platform.vcs.shared.xml b/platform/vcs-api/shared/resources/intellij.platform.vcs.shared.xml index cdf70e1d9e5a..5e1e721f9dd3 100644 --- a/platform/vcs-api/shared/resources/intellij.platform.vcs.shared.xml +++ b/platform/vcs-api/shared/resources/intellij.platform.vcs.shared.xml @@ -3,6 +3,7 @@ + diff --git a/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml b/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml index b120c9b764f1..f6a9b7ea5b98 100644 --- a/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml +++ b/platform/vcs-impl/frontend/resources/intellij.platform.vcs.impl.frontend.xml @@ -7,6 +7,7 @@ + diff --git a/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml b/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml index c6bb6afc58a9..6c9869602763 100644 --- a/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml +++ b/platform/vcs-impl/lang/resources/intellij.platform.vcs.impl.lang.xml @@ -4,6 +4,7 @@ + diff --git a/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml b/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml index aee5c2028dcc..0b7d9a0f39ff 100644 --- a/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml +++ b/platform/vcs-impl/resources/intellij.platform.vcs.impl.xml @@ -7,11 +7,13 @@ + + diff --git a/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml b/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml index 49976cc21332..e6afbb0c7f32 100644 --- a/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml +++ b/platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml @@ -2,10 +2,12 @@ + + diff --git a/platform/warmup/resources/intellij.platform.warmup.xml b/platform/warmup/resources/intellij.platform.warmup.xml index 6b7137d4c4f6..6cfb4c2f6c6c 100644 --- a/platform/warmup/resources/intellij.platform.warmup.xml +++ b/platform/warmup/resources/intellij.platform.warmup.xml @@ -2,6 +2,7 @@ + diff --git a/platform/whatsNew/resources/intellij.platform.whatsNew.xml b/platform/whatsNew/resources/intellij.platform.whatsNew.xml index b384f567042f..d57e5780ccfe 100644 --- a/platform/whatsNew/resources/intellij.platform.whatsNew.xml +++ b/platform/whatsNew/resources/intellij.platform.whatsNew.xml @@ -3,6 +3,7 @@ + diff --git a/plugins/IntelliLang/resources/intellij.platform.langInjection.xml b/plugins/IntelliLang/resources/intellij.platform.langInjection.xml index ca796b197f33..678ffbd8b5e3 100644 --- a/plugins/IntelliLang/resources/intellij.platform.langInjection.xml +++ b/plugins/IntelliLang/resources/intellij.platform.langInjection.xml @@ -5,6 +5,7 @@ + diff --git a/plugins/coverage-common/resources/intellij.platform.coverage.xml b/plugins/coverage-common/resources/intellij.platform.coverage.xml index ccf06e2a2105..c2ab99ca4897 100644 --- a/plugins/coverage-common/resources/intellij.platform.coverage.xml +++ b/plugins/coverage-common/resources/intellij.platform.coverage.xml @@ -4,6 +4,7 @@ + diff --git a/plugins/ide-features-trainer/testResources/intellij.featuresTrainer._test.xml b/plugins/ide-features-trainer/testResources/intellij.featuresTrainer._test.xml index cb76b90322dc..49b6abb7fb6c 100644 --- a/plugins/ide-features-trainer/testResources/intellij.featuresTrainer._test.xml +++ b/plugins/ide-features-trainer/testResources/intellij.featuresTrainer._test.xml @@ -6,6 +6,7 @@ + diff --git a/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml b/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml index 70ce43c0b520..244934fc09a9 100644 --- a/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml +++ b/plugins/kotlin/code-insight/intentions-shared/resources/kotlin.code-insight.intentions.shared.xml @@ -1,7 +1,4 @@ - - - diff --git a/plugins/tasks/tasks-core/jira/resources/intellij.tasks.jira.xml b/plugins/tasks/tasks-core/jira/resources/intellij.tasks.jira.xml index 9c63b9056305..ac53962b7baa 100644 --- a/plugins/tasks/tasks-core/jira/resources/intellij.tasks.jira.xml +++ b/plugins/tasks/tasks-core/jira/resources/intellij.tasks.jira.xml @@ -1,8 +1,9 @@ - + + diff --git a/python/ide/impl/testResources/intellij.pycharm.community.ide.impl._test.xml b/python/ide/impl/testResources/intellij.pycharm.community.ide.impl._test.xml index d4a9c0133735..363c6b3257dc 100644 --- a/python/ide/impl/testResources/intellij.pycharm.community.ide.impl._test.xml +++ b/python/ide/impl/testResources/intellij.pycharm.community.ide.impl._test.xml @@ -6,6 +6,7 @@ + diff --git a/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml b/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml index 936a961b4c7a..4ba6abc196ff 100644 --- a/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml +++ b/python/junit5Tests-framework/testResources/intellij.python.community.junit5Tests.framework._test.xml @@ -10,6 +10,7 @@ + diff --git a/python/openapi/testResources/intellij.python.community._test.xml b/python/openapi/testResources/intellij.python.community._test.xml index a0ecc7317445..818a260eeaef 100644 --- a/python/openapi/testResources/intellij.python.community._test.xml +++ b/python/openapi/testResources/intellij.python.community._test.xml @@ -4,6 +4,7 @@ + diff --git a/python/python-features-trainer/testResources/intellij.python.featuresTrainer._test.xml b/python/python-features-trainer/testResources/intellij.python.featuresTrainer._test.xml index 234b1c4448ea..8d8a212aa780 100644 --- a/python/python-features-trainer/testResources/intellij.python.featuresTrainer._test.xml +++ b/python/python-features-trainer/testResources/intellij.python.featuresTrainer._test.xml @@ -7,6 +7,7 @@ + diff --git a/python/python-sdk/testResources/intellij.python.sdk._test.xml b/python/python-sdk/testResources/intellij.python.sdk._test.xml index 7c28bd15f466..9f090f07d0ea 100644 --- a/python/python-sdk/testResources/intellij.python.sdk._test.xml +++ b/python/python-sdk/testResources/intellij.python.sdk._test.xml @@ -3,8 +3,10 @@ + + diff --git a/python/python-test-env/conda/resources/intellij.python.test.env.conda.xml b/python/python-test-env/conda/resources/intellij.python.test.env.conda.xml index 36842b893c67..2be9bc842369 100644 --- a/python/python-test-env/conda/resources/intellij.python.test.env.conda.xml +++ b/python/python-test-env/conda/resources/intellij.python.test.env.conda.xml @@ -3,6 +3,7 @@ + diff --git a/python/python-test-env/core/resources/intellij.python.test.env.core.xml b/python/python-test-env/core/resources/intellij.python.test.env.core.xml index ecc6b52c0780..3aebad32902c 100644 --- a/python/python-test-env/core/resources/intellij.python.test.env.core.xml +++ b/python/python-test-env/core/resources/intellij.python.test.env.core.xml @@ -4,6 +4,7 @@ + diff --git a/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml b/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml index 92976732e9e0..47518a886397 100644 --- a/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml +++ b/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml @@ -1,6 +1,7 @@ + diff --git a/python/python-test-env/uv/resources/intellij.python.test.env.uv.xml b/python/python-test-env/uv/resources/intellij.python.test.env.uv.xml index 29dca4a72967..24f8e40b9459 100644 --- a/python/python-test-env/uv/resources/intellij.python.test.env.uv.xml +++ b/python/python-test-env/uv/resources/intellij.python.test.env.uv.xml @@ -2,6 +2,7 @@ + diff --git a/python/testFramework/resources/intellij.python.community.testFramework.xml b/python/testFramework/resources/intellij.python.community.testFramework.xml index 5cfbfc213044..062c6e20b1e1 100644 --- a/python/testFramework/resources/intellij.python.community.testFramework.xml +++ b/python/testFramework/resources/intellij.python.community.testFramework.xml @@ -2,6 +2,7 @@ + diff --git a/spellchecker/resources/intellij.spellchecker.xml b/spellchecker/resources/intellij.spellchecker.xml index 93c352d58ec9..ed72f1bac7c4 100644 --- a/spellchecker/resources/intellij.spellchecker.xml +++ b/spellchecker/resources/intellij.spellchecker.xml @@ -7,6 +7,7 @@ + diff --git a/spellchecker/xml/resources/intellij.spellchecker.xml.xml b/spellchecker/xml/resources/intellij.spellchecker.xml.xml index c09a6eebf38f..9654757dd247 100644 --- a/spellchecker/xml/resources/intellij.spellchecker.xml.xml +++ b/spellchecker/xml/resources/intellij.spellchecker.xml.xml @@ -3,6 +3,7 @@ + diff --git a/tools/intellij.tools.ide.starter/resources/intellij.tools.ide.starter.xml b/tools/intellij.tools.ide.starter/resources/intellij.tools.ide.starter.xml index 895024b0917a..51f3738c68f5 100644 --- a/tools/intellij.tools.ide.starter/resources/intellij.tools.ide.starter.xml +++ b/tools/intellij.tools.ide.starter/resources/intellij.tools.ide.starter.xml @@ -3,6 +3,7 @@ + diff --git a/xml/impl/resources/intellij.xml.impl.xml b/xml/impl/resources/intellij.xml.impl.xml index 198d7327ad22..ad750e923d5b 100644 --- a/xml/impl/resources/intellij.xml.impl.xml +++ b/xml/impl/resources/intellij.xml.impl.xml @@ -4,6 +4,7 @@ + diff --git a/xml/langInjection/resources/intellij.xml.langInjection.xml b/xml/langInjection/resources/intellij.xml.langInjection.xml index 1021f58b3da0..a8f353c90e48 100644 --- a/xml/langInjection/resources/intellij.xml.langInjection.xml +++ b/xml/langInjection/resources/intellij.xml.langInjection.xml @@ -3,6 +3,7 @@ + diff --git a/xml/relaxng/resources/intellij.relaxng.xml b/xml/relaxng/resources/intellij.relaxng.xml index 64891c7c7949..822806193147 100644 --- a/xml/relaxng/resources/intellij.relaxng.xml +++ b/xml/relaxng/resources/intellij.relaxng.xml @@ -4,6 +4,7 @@ +