diff --git a/jps/model-impl/intellij.platform.jps.model.tests.iml b/jps/model-impl/intellij.platform.jps.model.tests.iml
index c8aa1602f6dc..f7f159d7a666 100644
--- a/jps/model-impl/intellij.platform.jps.model.tests.iml
+++ b/jps/model-impl/intellij.platform.jps.model.tests.iml
@@ -8,6 +8,7 @@
+
diff --git a/notebooks/notebook-ui/intellij.notebooks.ui.iml b/notebooks/notebook-ui/intellij.notebooks.ui.iml
index 13c5c5d4dc1b..55cdb5120a8d 100644
--- a/notebooks/notebook-ui/intellij.notebooks.ui.iml
+++ b/notebooks/notebook-ui/intellij.notebooks.ui.iml
@@ -34,6 +34,7 @@
+
diff --git a/notebooks/visualization/intellij.notebooks.visualization.iml b/notebooks/visualization/intellij.notebooks.visualization.iml
index bac58c336b8e..1393cf632fb0 100644
--- a/notebooks/visualization/intellij.notebooks.visualization.iml
+++ b/notebooks/visualization/intellij.notebooks.visualization.iml
@@ -42,6 +42,7 @@
+
diff --git a/platform/analysis-impl/intellij.platform.analysis.impl.iml b/platform/analysis-impl/intellij.platform.analysis.impl.iml
index 7125dcdb85f9..154b71e3bd5f 100644
--- a/platform/analysis-impl/intellij.platform.analysis.impl.iml
+++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml
@@ -13,6 +13,7 @@
+
diff --git a/platform/built-in-server/intellij.platform.builtInServer.impl.iml b/platform/built-in-server/intellij.platform.builtInServer.impl.iml
index 41fd88377ce3..7360014b1cec 100644
--- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml
@@ -12,6 +12,7 @@
+
diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
index a78f5b3c0f2b..b775e35b1141 100644
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
@@ -13,6 +13,7 @@
+
diff --git a/platform/diff-impl/tests/intellij.platform.diff.tests.iml b/platform/diff-impl/tests/intellij.platform.diff.tests.iml
index 14508512eeeb..617dd6ce3f8b 100644
--- a/platform/diff-impl/tests/intellij.platform.diff.tests.iml
+++ b/platform/diff-impl/tests/intellij.platform.diff.tests.iml
@@ -17,6 +17,7 @@
+
diff --git a/platform/editor-ui-ex/intellij.platform.editor.ex.iml b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
index fdec9b04ac8c..51c60dd2563e 100644
--- a/platform/editor-ui-ex/intellij.platform.editor.ex.iml
+++ b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
@@ -8,9 +8,9 @@
-
-
-
+
+
+
diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml
index cb0e5fc58593..5c587627c659 100644
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -8,6 +8,8 @@
+
+
diff --git a/platform/execution-impl/src/com/intellij/execution/multilaunch/design/components/UnknownItemLabel.kt b/platform/execution-impl/src/com/intellij/execution/multilaunch/design/components/UnknownItemLabel.kt
index 4ec65fb1e8b7..35bb74f21880 100644
--- a/platform/execution-impl/src/com/intellij/execution/multilaunch/design/components/UnknownItemLabel.kt
+++ b/platform/execution-impl/src/com/intellij/execution/multilaunch/design/components/UnknownItemLabel.kt
@@ -1,14 +1,13 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.execution.multilaunch.design.components
import com.intellij.execution.ExecutionBundle
+import com.intellij.execution.multilaunch.design.tooltips.TooltipProvider
import com.intellij.icons.AllIcons
import com.intellij.ui.SimpleColoredComponent
import com.intellij.ui.SimpleTextAttributes
-import com.intellij.execution.multilaunch.design.tooltips.TooltipProvider
-import org.jetbrains.annotations.ApiStatus
-@ApiStatus.Internal
-class UnknownItemLabel(private val tooltip: String) : SimpleColoredComponent(), TooltipProvider {
+internal class UnknownItemLabel(private val tooltip: String) : SimpleColoredComponent(), TooltipProvider {
constructor() : this(TEXT.replace("<", "<").replace(">", ">"))
companion object {
diff --git a/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml b/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml
index d01a929b6373..9a0638a4387e 100644
--- a/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml
+++ b/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml
@@ -9,6 +9,7 @@
+
diff --git a/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.iml b/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.iml
index ab9608a14b8d..863a4f76ef79 100644
--- a/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.iml
+++ b/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.iml
@@ -13,6 +13,7 @@
+
\ No newline at end of file
diff --git a/platform/indexing-tests/intellij.platform.indexing.tests.iml b/platform/indexing-tests/intellij.platform.indexing.tests.iml
index a1aae9ac3fea..f7efcd33bb17 100644
--- a/platform/indexing-tests/intellij.platform.indexing.tests.iml
+++ b/platform/indexing-tests/intellij.platform.indexing.tests.iml
@@ -7,6 +7,7 @@
+
diff --git a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
index 51d55897b865..6d054143a4e8 100644
--- a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
+++ b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml
@@ -353,6 +353,7 @@
+
\ No newline at end of file
diff --git a/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml b/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml
index 43f2a6e4c292..ba3d6ab34538 100644
--- a/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml
+++ b/platform/lang-impl/testEntities/intellij.platform.lang.testEntities.iml
@@ -8,6 +8,7 @@
+
diff --git a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
index 4dcd2036dd4e..6a8e83d78274 100644
--- a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
+++ b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
@@ -29,6 +29,7 @@
+
diff --git a/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml b/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml
index e7196b9197bd..6b4317d3a4d1 100644
--- a/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml
+++ b/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml
@@ -7,6 +7,8 @@
+
+
diff --git a/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml b/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
index e672d2c0e27e..3fc434b32971 100644
--- a/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
+++ b/platform/platform-impl/codeinsight-inline/intellij.platform.ide.codeinsight.inline.iml
@@ -32,6 +32,7 @@
+
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index 88d4273287df..68ac1ca4ac89 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -38,7 +38,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/platform/platform-impl/remote/intellij.platform.ide.remote.iml b/platform/platform-impl/remote/intellij.platform.ide.remote.iml
index 00b24ade05cf..e4f621ff2993 100644
--- a/platform/platform-impl/remote/intellij.platform.ide.remote.iml
+++ b/platform/platform-impl/remote/intellij.platform.ide.remote.iml
@@ -7,6 +7,7 @@
+
diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml
index 72f28bc7b549..8b36a7cbfae5 100644
--- a/platform/remoteDev-util/intellij.remoteDev.util.iml
+++ b/platform/remoteDev-util/intellij.remoteDev.util.iml
@@ -69,6 +69,7 @@
+
diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
index 735e50882322..493ed547cac6 100644
--- a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
+++ b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
@@ -110,7 +110,9 @@ object CodeWithMeClientDownloader {
}
private val minimumClientBuildWithBundledJre = BuildNumber("", 223, 4374)
- fun isClientWithBundledJre(clientBuildNumber: BuildNumber) = clientBuildNumber.isSnapshot || clientBuildNumber > minimumClientBuildWithBundledJre
+ fun isClientWithBundledJre(clientBuildNumber: BuildNumber): Boolean {
+ return clientBuildNumber.isSnapshot || clientBuildNumber > minimumClientBuildWithBundledJre
+ }
@ApiStatus.Internal
class DownloadableFileData(
diff --git a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
index 2b6491706ff5..b854c0f62252 100644
--- a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
+++ b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
@@ -8,6 +8,7 @@
+
diff --git a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
index 656cfdef3c7e..ba974fd412ae 100644
--- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
+++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
@@ -7,6 +7,8 @@
+
+
diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
index 11cd779e1f84..5401dffd9aa7 100644
--- a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
+++ b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
@@ -7,6 +7,7 @@
+
diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml
index fabd79d0b63c..6f667820381a 100644
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -9,6 +9,8 @@
+
+
diff --git a/platform/starter/intellij.platform.starter.iml b/platform/starter/intellij.platform.starter.iml
index 5a521ffafdd3..f156166ad34d 100644
--- a/platform/starter/intellij.platform.starter.iml
+++ b/platform/starter/intellij.platform.starter.iml
@@ -8,6 +8,7 @@
+
diff --git a/platform/testFramework/extensions/intellij.platform.testExtensions.iml b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
index 08ee4d0f46dd..195430b9f02f 100644
--- a/platform/testFramework/extensions/intellij.platform.testExtensions.iml
+++ b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
@@ -9,6 +9,7 @@
+
diff --git a/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml b/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml
index 36ba410d9d58..18e0cb914407 100644
--- a/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml
+++ b/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml
@@ -10,6 +10,7 @@
+
diff --git a/platform/usageView/intellij.platform.usageView.iml b/platform/usageView/intellij.platform.usageView.iml
index d7c163634140..059525f942ef 100644
--- a/platform/usageView/intellij.platform.usageView.iml
+++ b/platform/usageView/intellij.platform.usageView.iml
@@ -11,6 +11,7 @@
+
diff --git a/platform/util/intellij.platform.util.tests.iml b/platform/util/intellij.platform.util.tests.iml
index 813c420b1171..c5d4218294e5 100644
--- a/platform/util/intellij.platform.util.tests.iml
+++ b/platform/util/intellij.platform.util.tests.iml
@@ -11,6 +11,7 @@
+
diff --git a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
index 913133cb24ab..eb6ed2e1b012 100644
--- a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
+++ b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
@@ -12,6 +12,7 @@
+
diff --git a/platform/vcs-impl/lang/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.kt b/platform/vcs-impl/lang/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.kt
index 68c749bc348a..49219a5c826d 100644
--- a/platform/vcs-impl/lang/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.kt
+++ b/platform/vcs-impl/lang/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.kt
@@ -34,18 +34,15 @@ import com.intellij.util.ui.UIUtil.getWarningIcon
import com.intellij.vcs.commit.isPostCommitCheck
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
-import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.Nls
-@ApiStatus.Internal
-class TodoCheckinHandlerFactory : CheckinHandlerFactory() {
+private class TodoCheckinHandlerFactory : CheckinHandlerFactory() {
override fun createHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler {
return TodoCheckinHandler(panel.project)
}
}
-@ApiStatus.Internal
-class TodoCommitProblem(private val worker: TodoCheckinHandlerWorker,
+internal class TodoCommitProblem(private val worker: TodoCheckinHandlerWorker,
private val isPostCommit: Boolean) : CommitProblemWithDetails {
override val text: String get() = message("label.todo.items.found", worker.inOneList().size)
@@ -61,8 +58,7 @@ class TodoCommitProblem(private val worker: TodoCheckinHandlerWorker,
get() = message("todo.in.new.review.button")
}
-@ApiStatus.Internal
-class TodoCheckinHandler(private val project: Project) : CheckinHandler(), CommitCheck, DumbAware {
+internal class TodoCheckinHandler(private val project: Project) : CheckinHandler(), CommitCheck, DumbAware {
private val settings: VcsConfiguration get() = VcsConfiguration.getInstance(project)
private val todoSettings: TodoPanelSettings get() = settings.myTodoPanelSettings
diff --git a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
index 929f2859d65f..a06e01f05dac 100644
--- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
@@ -7,6 +7,7 @@
+
diff --git a/platform/whatsNew/intellij.platform.whatsNew.iml b/platform/whatsNew/intellij.platform.whatsNew.iml
index 101617dae8c8..fb48a80c2508 100644
--- a/platform/whatsNew/intellij.platform.whatsNew.iml
+++ b/platform/whatsNew/intellij.platform.whatsNew.iml
@@ -32,6 +32,7 @@
+
diff --git a/plugins/changeReminder/intellij.vcs.changeReminder.iml b/plugins/changeReminder/intellij.vcs.changeReminder.iml
index a6fda7c59e04..8af9516c495b 100644
--- a/plugins/changeReminder/intellij.vcs.changeReminder.iml
+++ b/plugins/changeReminder/intellij.vcs.changeReminder.iml
@@ -14,6 +14,7 @@
+
diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml
index 7adeaece27b6..a7975abae2d3 100644
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -82,6 +82,7 @@
+
diff --git a/plugins/devkit/devkit-core/src/actions/ToggleHighlightingMarkupAction.java b/plugins/devkit/devkit-core/src/actions/ToggleHighlightingMarkupAction.java
index 418b736f8b38..fa0b243d04a5 100644
--- a/plugins/devkit/devkit-core/src/actions/ToggleHighlightingMarkupAction.java
+++ b/plugins/devkit/devkit-core/src/actions/ToggleHighlightingMarkupAction.java
@@ -28,10 +28,7 @@ import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/**
- * @author gregsh
- */
-public class ToggleHighlightingMarkupAction extends DumbAwareAction {
+final class ToggleHighlightingMarkupAction extends DumbAwareAction {
@Override
public void update(@NotNull AnActionEvent e) {
Editor editor = e.getData(CommonDataKeys.EDITOR);
diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
index e5588a5f8bf8..99ba9d03c66f 100644
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -52,6 +52,7 @@
+
diff --git a/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml b/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
index 3541d6bca3db..65e716353979 100644
--- a/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
+++ b/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
@@ -29,6 +29,7 @@
+
diff --git a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralReplaceHandler.kt b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralReplaceHandler.kt
index 6e383d6da519..235f622cbb89 100644
--- a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralReplaceHandler.kt
+++ b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralReplaceHandler.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.k2.codeinsight.structuralsearch
import com.intellij.openapi.application.ModalityState
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.psi.typeRefHelpers.setReceiverTypeReference
import java.util.concurrent.Callable
-class KotlinStructuralReplaceHandler(private val project: Project) : StructuralReplaceHandler() {
+internal class KotlinStructuralReplaceHandler(private val project: Project) : StructuralReplaceHandler() {
override fun replace(info: ReplacementInfo, options: ReplaceOptions) {
val searchTemplate = StructuralSearchUtil.getPresentableElement(
PatternCompiler.compilePattern(project, options.matchOptions, true, true).let { it.targetNode ?: it.nodes.current() })
diff --git a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralSearchProfile.kt b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralSearchProfile.kt
index 19049a6755c9..e999e8e2ec5c 100644
--- a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralSearchProfile.kt
+++ b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/KotlinStructuralSearchProfile.kt
@@ -364,8 +364,9 @@ class KotlinStructuralSearchProfile : StructuralSearchProfile() {
return searchElements[0] is KtDeclaration
}
- override fun getReplaceHandler(project: Project, replaceOptions: ReplaceOptions): KotlinStructuralReplaceHandler =
- KotlinStructuralReplaceHandler(project)
+ override fun getReplaceHandler(project: Project, replaceOptions: ReplaceOptions): StructuralReplaceHandler {
+ return KotlinStructuralReplaceHandler(project)
+ }
override fun getPatternContexts(): MutableList = PATTERN_CONTEXTS
diff --git a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/predicates/KotlinExprTypePredicate.kt b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/predicates/KotlinExprTypePredicate.kt
index 90c1b4d911e0..b7eeab329fe9 100644
--- a/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/predicates/KotlinExprTypePredicate.kt
+++ b/plugins/kotlin/code-insight/structural-search-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structuralsearch/predicates/KotlinExprTypePredicate.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.k2.codeinsight.structuralsearch.predicates
import com.intellij.psi.PsiElement
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.isNull
-class KotlinExprTypePredicate(
+internal class KotlinExprTypePredicate(
private val search: String,
private val withinHierarchy: Boolean,
private val ignoreCase: Boolean,
diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
index 95e2975c24d7..de4f6d6b517e 100644
--- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
+++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
@@ -41,6 +41,7 @@
+
diff --git a/plugins/kotlin/onboarding/kotlin.onboarding.iml b/plugins/kotlin/onboarding/kotlin.onboarding.iml
index d7468f3b574b..1abad65a9e66 100644
--- a/plugins/kotlin/onboarding/kotlin.onboarding.iml
+++ b/plugins/kotlin/onboarding/kotlin.onboarding.iml
@@ -33,6 +33,7 @@
+
diff --git a/plugins/kotlin/preferences/kotlin.preferences.iml b/plugins/kotlin/preferences/kotlin.preferences.iml
index 1fe71eff8df4..a90354303c13 100644
--- a/plugins/kotlin/preferences/kotlin.preferences.iml
+++ b/plugins/kotlin/preferences/kotlin.preferences.iml
@@ -10,6 +10,7 @@
+
diff --git a/plugins/markdown/test/intellij.markdown.tests.iml b/plugins/markdown/test/intellij.markdown.tests.iml
index 792db438d757..815dadaa606f 100644
--- a/plugins/markdown/test/intellij.markdown.tests.iml
+++ b/plugins/markdown/test/intellij.markdown.tests.iml
@@ -13,6 +13,7 @@
+
diff --git a/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml b/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml
index 4348426e9c20..0c4169d17cb4 100644
--- a/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml
+++ b/plugins/properties/properties-resource-bundle-editor/intellij.properties.resource.bundle.editor.iml
@@ -15,6 +15,7 @@
+
diff --git a/plugins/repository-search/intellij.repository.search.iml b/plugins/repository-search/intellij.repository.search.iml
index 49acf8ce4548..1b68e938efb1 100644
--- a/plugins/repository-search/intellij.repository.search.iml
+++ b/plugins/repository-search/intellij.repository.search.iml
@@ -33,6 +33,7 @@
+
diff --git a/plugins/restructuredtext/intellij.restructuredtext.iml b/plugins/restructuredtext/intellij.restructuredtext.iml
index 58cd5226b9de..074360240bad 100644
--- a/plugins/restructuredtext/intellij.restructuredtext.iml
+++ b/plugins/restructuredtext/intellij.restructuredtext.iml
@@ -14,6 +14,7 @@
+
diff --git a/plugins/settings-repository/intellij.settingsRepository.iml b/plugins/settings-repository/intellij.settingsRepository.iml
index c7db04defca8..faa88580c4a1 100644
--- a/plugins/settings-repository/intellij.settingsRepository.iml
+++ b/plugins/settings-repository/intellij.settingsRepository.iml
@@ -60,6 +60,7 @@
+
diff --git a/plugins/settings-repository/intellij.settingsRepository.tests.iml b/plugins/settings-repository/intellij.settingsRepository.tests.iml
index 38d8dbe258a0..627449414f6a 100644
--- a/plugins/settings-repository/intellij.settingsRepository.tests.iml
+++ b/plugins/settings-repository/intellij.settingsRepository.tests.iml
@@ -15,6 +15,7 @@
+
diff --git a/plugins/settings-sync/intellij.settingsSync.iml b/plugins/settings-sync/intellij.settingsSync.iml
index 8610435010a7..16f120ffe8df 100644
--- a/plugins/settings-sync/intellij.settingsSync.iml
+++ b/plugins/settings-sync/intellij.settingsSync.iml
@@ -55,6 +55,7 @@
+
diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt
index 30e1247662d4..e9331cea3dbe 100644
--- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt
+++ b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncFiltering.kt
@@ -3,10 +3,12 @@ package com.intellij.settingsSync
import com.intellij.configurationStore.getPerOsSettingsStorageFolderName
import com.intellij.configurationStore.schemeManager.SchemeManagerFactoryBase
import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.*
+import com.intellij.openapi.components.ComponentCategorizer
+import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.SettingsCategory
+import com.intellij.openapi.components.State
import com.intellij.openapi.editor.colors.impl.AppEditorFontOptions
import com.intellij.openapi.options.SchemeManagerFactory
-import com.intellij.openapi.util.text.StringUtil
import com.intellij.serviceContainer.ComponentManagerImpl
import com.intellij.settingsSync.config.EDITOR_FONT_SUBCATEGORY_ID
import java.util.concurrent.ConcurrentHashMap
@@ -30,18 +32,18 @@ internal fun isSyncCategoryEnabled(fileSpec: String): Boolean {
private fun removeOsPrefix(fileSpec: String): String {
val osPrefix = getPerOsSettingsStorageFolderName() + "/"
- return if (fileSpec.startsWith(osPrefix)) StringUtil.trimStart(fileSpec, osPrefix) else fileSpec
+ return if (fileSpec.startsWith(osPrefix)) fileSpec.removePrefix(osPrefix) else fileSpec
}
private fun getRoamableCategory(fileName: String, componentClasses: List>>): Pair {
- componentClasses.forEach {
- val category = ComponentCategorizer.getCategory(it)
- if (category == SettingsCategory.OTHER) return@forEach
+ for (componentClass in componentClasses) {
+ val category = ComponentCategorizer.getCategory(componentClass)
+ if (category == SettingsCategory.OTHER) continue
- val state = it.getAnnotation(State::class.java)
+ val state = componentClass.getAnnotation(State::class.java)
val storage = state.storages.find { it.value == fileName }
if (storage == null || !storage.roamingType.isRoamable) {
- return@forEach
+ continue
}
// Once found, ignore any other possibly conflicting definitions
@@ -87,7 +89,7 @@ private fun getSchemeCategory(fileSpec: String): Pair
return null
}
- return settingsCategory!! to null
+ return settingsCategory to null
}
diff --git a/plugins/svn4idea/intellij.vcs.svn.tests.iml b/plugins/svn4idea/intellij.vcs.svn.tests.iml
index 135199051f9c..a0e26416bc48 100644
--- a/plugins/svn4idea/intellij.vcs.svn.tests.iml
+++ b/plugins/svn4idea/intellij.vcs.svn.tests.iml
@@ -15,6 +15,7 @@
+
diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml
index e65d0111189d..df438a34acce 100644
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -40,6 +40,7 @@
+
diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml
index bc32266129e0..1728fbb628e6 100644
--- a/python/intellij.python.community.tests.iml
+++ b/python/intellij.python.community.tests.iml
@@ -13,6 +13,7 @@
+
diff --git a/uast/uast-common-ide/intellij.platform.uast.ide.iml b/uast/uast-common-ide/intellij.platform.uast.ide.iml
index 32e5749f56bb..5e1c12fc8fde 100644
--- a/uast/uast-common-ide/intellij.platform.uast.ide.iml
+++ b/uast/uast-common-ide/intellij.platform.uast.ide.iml
@@ -7,6 +7,7 @@
+
diff --git a/uast/uast-common-ide/src/com/intellij/psi/UastReferenceByUsageAdapter.kt b/uast/uast-common-ide/src/com/intellij/psi/UastReferenceByUsageAdapter.kt
index 5abf9e0c785a..c50f218e29df 100644
--- a/uast/uast-common-ide/src/com/intellij/psi/UastReferenceByUsageAdapter.kt
+++ b/uast/uast-common-ide/src/com/intellij/psi/UastReferenceByUsageAdapter.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.psi
import com.intellij.codeInsight.completion.CompletionUtilCoreImpl
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.ApiStatus
import org.jetbrains.uast.*
import org.jetbrains.uast.expressions.UInjectionHost
-class UastReferenceByUsageAdapter(
+internal class UastReferenceByUsageAdapter(
val expressionPattern: ElementPattern,
val usagePattern: ElementPattern,
val provider: UastReferenceProvider