diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml index b69b687f84b5..f6afcd59e7bf 100644 --- a/java/compiler/impl/intellij.java.compiler.impl.iml +++ b/java/compiler/impl/intellij.java.compiler.impl.iml @@ -14,6 +14,7 @@ + diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.kt b/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.kt index ded7d33d9117..83b244a976f9 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.kt +++ b/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.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.compiler.impl.vcs import com.intellij.build.BuildContentManager @@ -25,7 +25,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.util.concurrent.CompletableFuture -class UnloadedModulesCompilationCheckinHandler(private val project: Project, +private class UnloadedModulesCompilationCheckinHandler(private val project: Project, private val checkinPanel: CheckinProjectPanel) : CheckinHandler(), CommitCheck { override fun getBeforeCheckinConfigurationPanel(): RefreshableOnComponent? { diff --git a/java/debugger/impl/intellij.java.debugger.impl.iml b/java/debugger/impl/intellij.java.debugger.impl.iml index 2b2a57932bba..a254bc92ea30 100644 --- a/java/debugger/impl/intellij.java.debugger.impl.iml +++ b/java/debugger/impl/intellij.java.debugger.impl.iml @@ -76,6 +76,7 @@ + diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml index 7210ee15664a..147d56133529 100644 --- a/java/execution/impl/intellij.java.execution.impl.iml +++ b/java/execution/impl/intellij.java.execution.impl.iml @@ -13,6 +13,7 @@ + @@ -43,6 +44,7 @@ + diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/AffectedTestsInChangeListPainter.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/AffectedTestsInChangeListPainter.java index a440fbf5d36d..f2f3e6ba4fcd 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/AffectedTestsInChangeListPainter.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/AffectedTestsInChangeListPainter.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// 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.testDiscovery; import com.intellij.execution.testDiscovery.actions.ShowAffectedTestsAction; @@ -20,7 +20,7 @@ import static com.intellij.ui.SimpleTextAttributes.STYLE_UNDERLINE; final class AffectedTestsInChangeListPainter implements ChangeListDecorator { private final Project myProject; - public AffectedTestsInChangeListPainter(@NotNull Project project) { + AffectedTestsInChangeListPainter(@NotNull Project project) { myProject = project; } diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java index 85b9e0dfa0b5..b9c430d3bde9 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 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.execution.testDiscovery.actions; import com.intellij.CommonBundle; @@ -83,8 +83,7 @@ import java.util.stream.Stream; import static com.intellij.openapi.actionSystem.CommonDataKeys.*; import static com.intellij.openapi.util.Pair.pair; -public class ShowAffectedTestsAction extends AnAction { - +public final class ShowAffectedTestsAction extends AnAction { @Override public @NotNull ActionUpdateThread getActionUpdateThread() { return ActionUpdateThread.BGT; diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml index 375fedf80e00..8f1a7ba7a962 100644 --- a/java/idea-ui/intellij.java.ui.iml +++ b/java/idea-ui/intellij.java.ui.iml @@ -15,9 +15,11 @@ + + diff --git a/java/idea-ui/intellij.java.ui.tests.iml b/java/idea-ui/intellij.java.ui.tests.iml index 21fa0bc41392..70e9a1b2328b 100644 --- a/java/idea-ui/intellij.java.ui.tests.iml +++ b/java/idea-ui/intellij.java.ui.tests.iml @@ -15,6 +15,7 @@ + diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt index 20b620532ddb..e5065f11f66f 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryJarsDiffDialog.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.roots.ui.configuration.projectRoot import com.intellij.diff.DiffManager @@ -18,7 +18,7 @@ import java.awt.event.ActionEvent import javax.swing.Action import javax.swing.JComponent -class LibraryJarsDiffDialog(libraryFile: VirtualFile, +internal class LibraryJarsDiffDialog(libraryFile: VirtualFile, downloadedFile: VirtualFile, private val mavenCoordinates: JpsMavenRepositoryLibraryDescriptor, private val libraryName: String, diff --git a/java/java-impl-inspections/intellij.java.impl.inspections.iml b/java/java-impl-inspections/intellij.java.impl.inspections.iml index be2c69fa3ace..80ba7c9ccc05 100644 --- a/java/java-impl-inspections/intellij.java.impl.inspections.iml +++ b/java/java-impl-inspections/intellij.java.impl.inspections.iml @@ -17,6 +17,7 @@ + diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9GenerateModuleDescriptorsAction.java b/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9GenerateModuleDescriptorsAction.java index 9d07c882aac7..c8f47d70132e 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9GenerateModuleDescriptorsAction.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9GenerateModuleDescriptorsAction.java @@ -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.codeInspection.java19api; import com.intellij.codeInspection.java19api.DescriptorsGenerator.ModuleFiles; @@ -41,7 +41,7 @@ import java.nio.file.*; import java.util.*; import java.util.stream.Stream; -public final class Java9GenerateModuleDescriptorsAction extends AnAction { +final class Java9GenerateModuleDescriptorsAction extends AnAction { private static final Logger LOG = Logger.getInstance(Java9GenerateModuleDescriptorsAction.class); private static final String CLASS_FILE_PATTERN = "glob:*" + CommonClassNames.CLASS_FILE_EXTENSION; diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml index d46edae61fde..ad08c0709cff 100644 --- a/java/java-impl/intellij.java.impl.iml +++ b/java/java-impl/intellij.java.impl.iml @@ -15,6 +15,7 @@ + @@ -76,7 +77,7 @@ - + diff --git a/java/java-impl/src/com/intellij/codeInsight/hints/JavaVcsCodeVisionContext.kt b/java/java-impl/src/com/intellij/codeInsight/hints/JavaVcsCodeVisionContext.kt index 99c8e2b7b69b..653fca063298 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hints/JavaVcsCodeVisionContext.kt +++ b/java/java-impl/src/com/intellij/codeInsight/hints/JavaVcsCodeVisionContext.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.codeInsight.hints import com.intellij.codeInsight.daemon.impl.JavaCodeVisionUsageCollector @@ -7,7 +7,7 @@ import com.intellij.psi.* import com.intellij.psi.util.PsiUtil import java.awt.event.MouseEvent -class JavaVcsCodeVisionContext : VcsCodeVisionCurlyBracketLanguageContext() { +private class JavaVcsCodeVisionContext : VcsCodeVisionCurlyBracketLanguageContext() { override fun isAccepted(element: PsiElement): Boolean { return element is PsiMethod || (element is PsiClass && element !is PsiTypeParameter) } diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index 0f16e82728e3..97404b5394ad 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -15,9 +15,11 @@ + + diff --git a/java/openapi/intellij.java.iml b/java/openapi/intellij.java.iml index 8ee2b64f70b3..994c41903a78 100644 --- a/java/openapi/intellij.java.iml +++ b/java/openapi/intellij.java.iml @@ -15,9 +15,9 @@ - + - + diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml index 85d329f34e19..fab56353e12b 100644 --- a/java/testFramework/intellij.java.testFramework.iml +++ b/java/testFramework/intellij.java.testFramework.iml @@ -7,11 +7,12 @@ - + + @@ -21,10 +22,10 @@ - - + + - + diff --git a/java/unscramble/intellij.java.unscramble.iml b/java/unscramble/intellij.java.unscramble.iml index afbfa244a001..5932db0d046f 100644 --- a/java/unscramble/intellij.java.unscramble.iml +++ b/java/unscramble/intellij.java.unscramble.iml @@ -14,6 +14,7 @@ + diff --git a/java/vcs/intellij.java.vcs.iml b/java/vcs/intellij.java.vcs.iml index 75137f842926..f567811259de 100644 --- a/java/vcs/intellij.java.vcs.iml +++ b/java/vcs/intellij.java.vcs.iml @@ -14,6 +14,7 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml index b947c9f2edab..e65882db0a22 100644 --- a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml +++ b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml @@ -11,6 +11,7 @@ + diff --git a/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml index 3f4ae3ece20e..ca7c1313e5af 100644 --- a/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml +++ b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml @@ -6,6 +6,8 @@ + + diff --git a/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml b/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml index 71950cde4b52..6551c60d4b5b 100644 --- a/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml +++ b/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml @@ -7,6 +7,7 @@ + diff --git a/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml b/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml index 10e66c73f927..76de1e3ac1db 100644 --- a/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml +++ b/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml @@ -8,6 +8,7 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml b/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml index 13ab4e1a911f..d66d676d7cc2 100644 --- a/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml +++ b/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml @@ -14,6 +14,7 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml b/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml index 46926c7f6dfb..97dd49bec184 100644 --- a/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml +++ b/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/platform/collaboration-tools/intellij.platform.collaborationTools.iml b/platform/collaboration-tools/intellij.platform.collaborationTools.iml index 9cd6221e925f..7311ee34a55d 100644 --- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml +++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml @@ -14,6 +14,7 @@ + diff --git a/platform/core-api/intellij.platform.core.iml b/platform/core-api/intellij.platform.core.iml index 25e0eac0d74e..c676eb5e0b23 100644 --- a/platform/core-api/intellij.platform.core.iml +++ b/platform/core-api/intellij.platform.core.iml @@ -26,7 +26,7 @@ - + diff --git a/platform/dvcs-api/intellij.platform.vcs.dvcs.iml b/platform/dvcs-api/intellij.platform.vcs.dvcs.iml index 9f32eb8194c3..3c921e37602b 100644 --- a/platform/dvcs-api/intellij.platform.vcs.dvcs.iml +++ b/platform/dvcs-api/intellij.platform.vcs.dvcs.iml @@ -13,6 +13,7 @@ + diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml index ea1b5cb60387..7f844b4c340e 100644 --- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml +++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml @@ -16,6 +16,7 @@ + diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesGroupingPolicy.kt b/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesGroupingPolicy.kt index 08a826b2a54d..1c1ac086b7ec 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesGroupingPolicy.kt +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesGroupingPolicy.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 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.dvcs.ui import com.intellij.dvcs.repo.Repository @@ -10,11 +10,9 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode import com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory import com.intellij.openapi.vcs.changes.ui.SimpleChangesGroupingPolicy import com.intellij.openapi.vcs.changes.ui.StaticFilePath -import org.jetbrains.annotations.ApiStatus import javax.swing.tree.DefaultTreeModel -@ApiStatus.Internal -class RepositoryChangesGroupingPolicy(val project: Project, model: DefaultTreeModel) : SimpleChangesGroupingPolicy(model) { +internal class RepositoryChangesGroupingPolicy(val project: Project, model: DefaultTreeModel) : SimpleChangesGroupingPolicy(model) { private val repositoryManager = VcsRepositoryManager.getInstance(project) private val colorManager = getColorManager(project) diff --git a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml index 2d6ccbe72a08..c70150dc457d 100644 --- a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml +++ b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml @@ -20,6 +20,7 @@ + diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml index a28877d3541d..278cd431ea4c 100644 --- a/platform/lang-impl/intellij.platform.lang.impl.iml +++ b/platform/lang-impl/intellij.platform.lang.impl.iml @@ -65,6 +65,7 @@ + diff --git a/platform/lang-impl/src/com/intellij/util/indexing/IndexingProgressReporter.kt b/platform/lang-impl/src/com/intellij/util/indexing/IndexingProgressReporter.kt index e2d847c75ac1..05598be00f50 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/IndexingProgressReporter.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/IndexingProgressReporter.kt @@ -23,8 +23,7 @@ import org.jetbrains.annotations.ApiStatus.Internal import java.util.function.Consumer // This class is thread safe -@Internal -class IndexingProgressReporter { +internal class IndexingProgressReporter { @Volatile internal var subTasksCount: Int = 0 internal val operationName = MutableStateFlow<@ProgressText String?>(null) diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml index f686ad34125a..b840cde11e06 100644 --- a/platform/platform-api/intellij.platform.ide.iml +++ b/platform/platform-api/intellij.platform.ide.iml @@ -17,6 +17,7 @@ + diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index 4efe93eed372..88d4273287df 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -83,6 +83,7 @@ + diff --git a/platform/platform-impl/internal/intellij.platform.ide.internal.iml b/platform/platform-impl/internal/intellij.platform.ide.internal.iml index c12c54aacea7..1e404e951736 100644 --- a/platform/platform-impl/internal/intellij.platform.ide.internal.iml +++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml @@ -15,6 +15,7 @@ + diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml index 61bf0b450e77..eac27e09f69a 100644 --- a/platform/platform-tests/intellij.platform.tests.iml +++ b/platform/platform-tests/intellij.platform.tests.iml @@ -13,6 +13,7 @@ + diff --git a/platform/rd-platform-community/intellij.platform.rd.community.iml b/platform/rd-platform-community/intellij.platform.rd.community.iml index fe8d5cd4f035..16db0c315eea 100644 --- a/platform/rd-platform-community/intellij.platform.rd.community.iml +++ b/platform/rd-platform-community/intellij.platform.rd.community.iml @@ -14,6 +14,7 @@ + diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml index 829376464054..72f28bc7b549 100644 --- a/platform/remoteDev-util/intellij.remoteDev.util.iml +++ b/platform/remoteDev-util/intellij.remoteDev.util.iml @@ -50,6 +50,7 @@ + diff --git a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml index 95cec436e0fb..9cf911eb2eac 100644 --- a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml +++ b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml @@ -10,6 +10,7 @@ + @@ -17,6 +18,7 @@ + \ No newline at end of file diff --git a/platform/smart-update/intellij.smart.update.iml b/platform/smart-update/intellij.smart.update.iml index f88278bee5d8..c36d22120a55 100644 --- a/platform/smart-update/intellij.smart.update.iml +++ b/platform/smart-update/intellij.smart.update.iml @@ -13,6 +13,7 @@ + diff --git a/platform/smart-update/src/com/intellij/smartUpdate/SmartUpdate.kt b/platform/smart-update/src/com/intellij/smartUpdate/SmartUpdate.kt index daa802f5954a..655d468782bf 100644 --- a/platform/smart-update/src/com/intellij/smartUpdate/SmartUpdate.kt +++ b/platform/smart-update/src/com/intellij/smartUpdate/SmartUpdate.kt @@ -29,8 +29,7 @@ private val LOG = logger() @State(name = "SmartUpdateOptions", storages = [Storage(value = StoragePathMacros.WORKSPACE_FILE, roamingType = RoamingType.DISABLED)]) @Service(Service.Level.PROJECT) -class SmartUpdate(val project: Project, private val coroutineScope: CoroutineScope) : PersistentStateComponent, Disposable { - +internal class SmartUpdate(val project: Project, private val coroutineScope: CoroutineScope) : PersistentStateComponent, Disposable { class Options: BaseState() { var scheduled by property(false) var scheduledTime by property(LocalTime.of(8, 0).toSecondOfDay()) diff --git a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml index 10296fb04894..79a2c5c6b106 100644 --- a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml +++ b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml @@ -18,6 +18,7 @@ + diff --git a/platform/structure-view-impl/intellij.platform.structureView.impl.iml b/platform/structure-view-impl/intellij.platform.structureView.impl.iml index c6dc596bfc51..57137d982d08 100644 --- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml +++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml @@ -11,10 +11,10 @@ - + - + diff --git a/platform/util/diff/api-dump.txt b/platform/util/diff/api-dump.txt index 0e15b553aab8..8e8c7ed757af 100644 --- a/platform/util/diff/api-dump.txt +++ b/platform/util/diff/api-dump.txt @@ -332,6 +332,6 @@ c:com.intellij.util.diff.Diff$ChangeBuilder - addChange(I,I):V - addEqual(I):V - getFirstChange():com.intellij.util.diff.Diff$Change -c:com.intellij.util.diff.FilesTooBigForDiffException +f:com.intellij.util.diff.FilesTooBigForDiffException - java.lang.Exception - ():V diff --git a/platform/util/diff/src/com/intellij/util/diff/FilesTooBigForDiffException.java b/platform/util/diff/src/com/intellij/util/diff/FilesTooBigForDiffException.java index 1143c0cae1e1..091e6931f39d 100644 --- a/platform/util/diff/src/com/intellij/util/diff/FilesTooBigForDiffException.java +++ b/platform/util/diff/src/com/intellij/util/diff/FilesTooBigForDiffException.java @@ -1,7 +1,7 @@ -// Copyright 2000-2021 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.util.diff; -public class FilesTooBigForDiffException extends Exception { +public final class FilesTooBigForDiffException extends Exception { public FilesTooBigForDiffException() { super("Unable to calculate diff. File is too big and there are too many changes."); } diff --git a/platform/vcs-api/intellij.platform.vcs.iml b/platform/vcs-api/intellij.platform.vcs.iml index 4662280d728e..006d01715a48 100644 --- a/platform/vcs-api/intellij.platform.vcs.iml +++ b/platform/vcs-api/intellij.platform.vcs.iml @@ -7,10 +7,10 @@ - + - + diff --git a/platform/vcs-impl/exec/intellij.platform.vcs.impl.exec.iml b/platform/vcs-impl/exec/intellij.platform.vcs.impl.exec.iml index 3817e2ae357e..a04852c4de63 100644 --- a/platform/vcs-impl/exec/intellij.platform.vcs.impl.exec.iml +++ b/platform/vcs-impl/exec/intellij.platform.vcs.impl.exec.iml @@ -10,6 +10,8 @@ + + \ No newline at end of file diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml index ba8a73222f34..036970a8cdb5 100644 --- a/platform/vcs-impl/intellij.platform.vcs.impl.iml +++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml @@ -32,7 +32,7 @@ - + @@ -55,6 +55,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 54bf4cd01a53..00a8ad85f47d 100644 --- a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml +++ b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml @@ -14,6 +14,7 @@ + diff --git a/platform/vcs-log/api/intellij.platform.vcs.log.iml b/platform/vcs-log/api/intellij.platform.vcs.log.iml index 0d1b92cfd7f3..085d79ed9576 100644 --- a/platform/vcs-log/api/intellij.platform.vcs.log.iml +++ b/platform/vcs-log/api/intellij.platform.vcs.log.iml @@ -15,5 +15,6 @@ + \ No newline at end of file diff --git a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml index 6a6fbd4e684f..96ebd844334c 100644 --- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml +++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml @@ -12,6 +12,7 @@ + diff --git a/platform/vcs-tests/intellij.platform.vcs.tests.iml b/platform/vcs-tests/intellij.platform.vcs.tests.iml index f7ba65615c70..99371f84df6e 100644 --- a/platform/vcs-tests/intellij.platform.vcs.tests.iml +++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml @@ -13,6 +13,7 @@ + diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/MockRootChecker.kt b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/MockRootChecker.kt index 0a51fee3ba61..8ec5c4a9abc6 100644 --- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/MockRootChecker.kt +++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/MockRootChecker.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.vcs.roots import com.intellij.openapi.vcs.VcsRootChecker @@ -6,7 +6,7 @@ import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs import com.intellij.openapi.vfs.VirtualFile import java.nio.file.Files -class MockRootChecker(private val vcs: MockAbstractVcs) : VcsRootChecker() { +internal class MockRootChecker(private val vcs: MockAbstractVcs) : VcsRootChecker() { private val ignoredDirs = HashSet() override fun getSupportedVcs() = vcs.keyInstanceMethod!! diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.kt b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.kt index 872f462c817e..c1ab5b8a4083 100644 --- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.kt +++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/roots/VcsRootBaseTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.vcs.roots import com.intellij.openapi.extensions.ExtensionPoint @@ -23,7 +23,7 @@ internal const val DOT_MOCK = ".mock" abstract class VcsRootBaseTest : VcsPlatformTest() { protected lateinit var vcs: MockAbstractVcs - protected lateinit var rootChecker: MockRootChecker + internal lateinit var rootChecker: MockRootChecker protected lateinit var rootModule: Module private val extensionPoint: ExtensionPoint diff --git a/platform/warmup/intellij.platform.warmup.iml b/platform/warmup/intellij.platform.warmup.iml index d2be7746b81d..fab3ba915f7d 100644 --- a/platform/warmup/intellij.platform.warmup.iml +++ b/platform/warmup/intellij.platform.warmup.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/copyright/vcs/intellij.copyright.vcs.iml b/plugins/copyright/vcs/intellij.copyright.vcs.iml index 36e9eefc3542..5b03692584e3 100644 --- a/plugins/copyright/vcs/intellij.copyright.vcs.iml +++ b/plugins/copyright/vcs/intellij.copyright.vcs.iml @@ -12,6 +12,8 @@ + + \ No newline at end of file diff --git a/plugins/copyright/vcs/src/com/maddyhome/idea/copyright/vcs/UpdateCopyrightCheckinHandlerFactory.kt b/plugins/copyright/vcs/src/com/maddyhome/idea/copyright/vcs/UpdateCopyrightCheckinHandlerFactory.kt index f7eb062e74b3..4f13d9dfd16e 100644 --- a/plugins/copyright/vcs/src/com/maddyhome/idea/copyright/vcs/UpdateCopyrightCheckinHandlerFactory.kt +++ b/plugins/copyright/vcs/src/com/maddyhome/idea/copyright/vcs/UpdateCopyrightCheckinHandlerFactory.kt @@ -55,7 +55,8 @@ private class UpdateCopyrightCheckinHandler(private val project: Project) : Chec return null } - private val settings: UpdateCopyrightCheckinHandlerState get() = UpdateCopyrightCheckinHandlerState.getInstance(project) + private val settings: UpdateCopyrightCheckinHandlerState + get() = UpdateCopyrightCheckinHandlerState.getInstance(project) private fun getPsiFiles(files: List): Array { val psiFiles = mutableListOf() diff --git a/plugins/coverage-common/intellij.platform.coverage.iml b/plugins/coverage-common/intellij.platform.coverage.iml index ee512eaa02d6..82d1ff5df55b 100644 --- a/plugins/coverage-common/intellij.platform.coverage.iml +++ b/plugins/coverage-common/intellij.platform.coverage.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/coverage-common/src/com/intellij/coverage/LineHistoryMapper.java b/plugins/coverage-common/src/com/intellij/coverage/LineHistoryMapper.java index 853517a744b8..91a8109b8ac7 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/LineHistoryMapper.java +++ b/plugins/coverage-common/src/com/intellij/coverage/LineHistoryMapper.java @@ -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.coverage; import com.intellij.history.LocalHistory; @@ -33,15 +33,15 @@ import java.util.List; /** * This service finds correspondence of lines of a file in a specified timestamp in VCS/local history and current state of the file. */ -class LineHistoryMapper { +final class LineHistoryMapper { private static final Logger LOG = Logger.getInstance(LineHistoryMapper.class); private final Object myLock = new Object(); private final Project myProject; private final VirtualFile myFile; private final Document myDocument; private final long myDate; - protected SoftReference myNewToOldLines; - protected SoftReference myOldToNewLines; + private SoftReference myNewToOldLines; + private SoftReference myOldToNewLines; private volatile SoftReference myOldContent; LineHistoryMapper(Project project, VirtualFile file, Document document, long date) { @@ -179,7 +179,7 @@ class LineHistoryMapper { }); } - protected Int2IntMap buildMapping(Diff.Change change, int firstNLines) { + private static Int2IntMap buildMapping(Diff.Change change, int firstNLines) { Int2IntMap result = new Int2IntOpenHashMap(); int prevLineInFirst = 0; int prevLineInSecond = 0; diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml index 8565e389322e..7adeaece27b6 100644 --- a/plugins/devkit/devkit-core/intellij.devkit.core.iml +++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml @@ -36,6 +36,7 @@ + @@ -73,6 +74,7 @@ + diff --git a/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIntelliJSdkExternalAnnotationsRepository.kt b/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIntelliJSdkExternalAnnotationsRepository.kt index a3dd1b1809a1..f6a43a42128d 100644 --- a/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIntelliJSdkExternalAnnotationsRepository.kt +++ b/plugins/devkit/devkit-core/src/inspections/missingApi/resolve/PublicIntelliJSdkExternalAnnotationsRepository.kt @@ -16,7 +16,7 @@ import org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor * Default implementation of [IntelliJSdkExternalAnnotationsRepository] that delegates to [JarRepositoryManager] * for searching and downloading artifacts from the IntelliJ Artifacts Repositories. */ -class PublicIntelliJSdkExternalAnnotationsRepository(private val project: Project) : IntelliJSdkExternalAnnotationsRepository { +internal class PublicIntelliJSdkExternalAnnotationsRepository(private val project: Project) : IntelliJSdkExternalAnnotationsRepository { companion object { const val RELEASES_REPO_URL = "https://www.jetbrains.com/intellij-repository/releases/" diff --git a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml index 70a544bd36c2..f6100b988d69 100644 --- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml +++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml @@ -14,6 +14,9 @@ + + + diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt index 8214763d9c04..86265639d29a 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt @@ -14,7 +14,6 @@ import com.intellij.openapi.util.RecursionManager import com.intellij.openapi.util.TextRange import com.intellij.openapi.vfs.VfsUtil import com.intellij.testFramework.PsiTestUtil -import com.intellij.testFramework.UsefulTestCase import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.TempDirTestFixture diff --git a/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml b/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml index 03b91911013b..a552134d2b10 100644 --- a/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml +++ b/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml @@ -11,6 +11,7 @@ + diff --git a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml index 8dd53db52a05..98b1fa50fe00 100644 --- a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml +++ b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml b/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml index 98936aee0b4b..d3429b32387d 100644 --- a/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml +++ b/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml @@ -10,6 +10,7 @@ + diff --git a/plugins/eclipse/intellij.eclipse.iml b/plugins/eclipse/intellij.eclipse.iml index 00fe6d072cbf..cff250ffeb41 100644 --- a/plugins/eclipse/intellij.eclipse.iml +++ b/plugins/eclipse/intellij.eclipse.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/colors/EclipseColorSchemeImporter.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/colors/EclipseColorSchemeImporter.java index e9de461716d0..eda68c30d039 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/colors/EclipseColorSchemeImporter.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/colors/EclipseColorSchemeImporter.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the 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.idea.eclipse.importer.colors; import com.intellij.execution.process.ConsoleHighlighter; @@ -40,8 +26,7 @@ import java.io.IOException; import java.io.InputStream; @SuppressWarnings("UseJBColor") -public class EclipseColorSchemeImporter implements SchemeImporter, EclipseColorThemeElements { - +public final class EclipseColorSchemeImporter implements SchemeImporter, EclipseColorThemeElements { private final static String[] ECLIPSE_THEME_EXTENSIONS = {"xml"}; private final static TextAttributesKey[] ATTRIBUTES_TO_COPY = { diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml index 589596e9dae3..8a17b64ca4fd 100644 --- a/plugins/git4idea/intellij.vcs.git.iml +++ b/plugins/git4idea/intellij.vcs.git.iml @@ -82,6 +82,7 @@ + diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.kt b/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.kt index db0cbc1b23b6..dc8a8026b967 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.kt +++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.kt @@ -47,7 +47,7 @@ import org.jetbrains.annotations.PropertyKey abstract class GitCheckinHandlerFactory : VcsCheckinHandlerFactory(GitVcs.getKey()) -class GitUserNameCheckinHandlerFactory : GitCheckinHandlerFactory() { +private class GitUserNameCheckinHandlerFactory : GitCheckinHandlerFactory() { override fun createVcsHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler { return GitUserNameCheckinHandler(panel.project) } @@ -65,19 +65,18 @@ class GitLargeFileCheckinHandlerFactory : GitCheckinHandlerFactory() { } } -class GitDetachedRootCheckinHandlerFactory : GitCheckinHandlerFactory() { +private class GitDetachedRootCheckinHandlerFactory : GitCheckinHandlerFactory() { override fun createVcsHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler { return GitDetachedRootCheckinHandler(panel.project) } } -class GitFileNameCheckinHandlerFactory : GitCheckinHandlerFactory() { +private class GitFileNameCheckinHandlerFactory : GitCheckinHandlerFactory() { override fun createVcsHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler { return GitFileNameCheckinHandler(panel.project) } } - private class GitCRLFCheckinHandler(project: Project) : GitCheckinHandler(project) { override fun getExecutionOrder(): CommitCheck.ExecutionOrder = CommitCheck.ExecutionOrder.EARLY diff --git a/plugins/github/github-core/intellij.vcs.github.iml b/plugins/github/github-core/intellij.vcs.github.iml index e59e7d115f31..94cec31f7ea7 100644 --- a/plugins/github/github-core/intellij.vcs.github.iml +++ b/plugins/github/github-core/intellij.vcs.github.iml @@ -44,6 +44,7 @@ + diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/action/GHPRActionKeys.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/action/GHPRActionKeys.kt index 784f4499deac..4c2d5da011e7 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/action/GHPRActionKeys.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/action/GHPRActionKeys.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// 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.plugins.github.pullrequest.action import com.intellij.openapi.actionSystem.DataKey @@ -6,7 +6,7 @@ import org.jetbrains.plugins.github.pullrequest.data.GHPRIdentifier import org.jetbrains.plugins.github.pullrequest.ui.list.GHPRListController import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowProjectViewModel -object GHPRActionKeys { +internal object GHPRActionKeys { @JvmStatic val PULL_REQUEST_ID = DataKey.create("org.jetbrains.plugins.github.pullrequest.id") diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/GHPRViewModelContainerImpl.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/GHPRViewModelContainerImpl.kt index 135db36d8594..90ebd1b081ad 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/GHPRViewModelContainerImpl.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/GHPRViewModelContainerImpl.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.plugins.github.pullrequest.ui import com.intellij.collaboration.async.cancelledWith @@ -39,7 +39,7 @@ import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRInfoView import org.jetbrains.plugins.github.pullrequest.ui.toolwindow.model.GHPRToolWindowProjectViewModel @ApiStatus.Internal -interface GHPRViewModelContainer { +internal interface GHPRViewModelContainer { val aiReviewVm: StateFlow val aiSummaryVm: StateFlow diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRReviewThreadCommentViewModel.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRReviewThreadCommentViewModel.kt index fb383fc4f273..4dcdd5abe478 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRReviewThreadCommentViewModel.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRReviewThreadCommentViewModel.kt @@ -7,11 +7,8 @@ import com.intellij.collaboration.ui.codereview.comment.CodeReviewSubmittableTex import com.intellij.collaboration.ui.codereview.comment.CodeReviewTextEditingViewModel import com.intellij.collaboration.ui.icon.IconsProvider import com.intellij.collaboration.util.SingleCoroutineLauncher -import com.intellij.openapi.progress.EmptyProgressIndicator import com.intellij.openapi.project.Project import com.intellij.platform.util.coroutines.childScope -import com.intellij.util.io.await -import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRDiffViewModel.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRDiffViewModel.kt index 8c5bae80977a..c269b29c7cce 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRDiffViewModel.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRDiffViewModel.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.plugins.github.pullrequest.ui.diff import com.intellij.collaboration.async.* diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/editor/editorInlays.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/editor/editorInlays.kt index 3130b4c3f923..9e5af681a0c6 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/editor/editorInlays.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/editor/editorInlays.kt @@ -10,7 +10,7 @@ import org.jetbrains.plugins.github.ai.GHPRAICommentViewModel import org.jetbrains.plugins.github.pullrequest.ui.comment.GHPRCompactReviewThreadViewModel import javax.swing.Icon -sealed interface GHPREditorMappedComponentModel : CodeReviewInlayModel { +internal sealed interface GHPREditorMappedComponentModel : CodeReviewInlayModel { abstract class Thread(val vm: VM) : GHPREditorMappedComponentModel, Hideable { final override val key: Any = vm.id diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineEventComponentFactoryImpl.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineEventComponentFactoryImpl.kt index fd4c121b94a1..cb8ca3c930f8 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineEventComponentFactoryImpl.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineEventComponentFactoryImpl.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// 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.plugins.github.pullrequest.ui.timeline import com.intellij.collaboration.ui.CollaborationToolsUIUtil @@ -27,7 +27,7 @@ import org.jetbrains.plugins.github.pullrequest.ui.timeline.GHPRTimelineItemUIUt import org.jetbrains.plugins.github.ui.avatars.GHAvatarIconsProvider import javax.swing.JComponent -class GHPRTimelineEventComponentFactoryImpl( +internal class GHPRTimelineEventComponentFactoryImpl( private val timelineVm: GHPRTimelineViewModel ) : GHPRTimelineEventComponentFactory { diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineItemComponentFactory.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineItemComponentFactory.kt index c354afa60b02..cbc121a39f08 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineItemComponentFactory.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineItemComponentFactory.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.plugins.github.pullrequest.ui.timeline import com.intellij.collaboration.ui.* @@ -41,7 +41,7 @@ import org.jetbrains.plugins.github.ui.util.addGithubHyperlinkListener import org.jetbrains.plugins.github.ui.util.handleGithubHyperlink import javax.swing.JComponent -class GHPRTimelineItemComponentFactory(private val project: Project, +internal class GHPRTimelineItemComponentFactory(private val project: Project, private val timelineVm: GHPRTimelineViewModel) : (CoroutineScope, GHPRTimelineItem) -> JComponent { diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineViewModel.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineViewModel.kt index f9e75001def6..00edbe5f3dce 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineViewModel.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/GHPRTimelineViewModel.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.plugins.github.pullrequest.ui.timeline import com.intellij.collaboration.async.launchNow diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineItem.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineItem.kt index 52f00ff30994..45c864691334 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineItem.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineItem.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.plugins.github.pullrequest.ui.timeline.item import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestCommitShort diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineReviewViewModel.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineReviewViewModel.kt index 75796c0c2a0a..a353b5febe39 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineReviewViewModel.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineReviewViewModel.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.plugins.github.pullrequest.ui.timeline.item import com.intellij.collaboration.async.launchNow @@ -13,7 +13,6 @@ import com.intellij.collaboration.util.SingleCoroutineLauncher import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe import com.intellij.platform.util.coroutines.childScope -import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel import kotlinx.coroutines.channels.BufferOverflow @@ -47,7 +46,7 @@ interface GHPRTimelineReviewViewModel { fun editBody() } -class UpdateableGHPRTimelineReviewViewModel internal constructor( +internal class UpdateableGHPRTimelineReviewViewModel internal constructor( private val project: Project, parentCs: CoroutineScope, private val dataContext: GHPRDataContext, diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineThreadViewModel.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineThreadViewModel.kt index 9899dc4eba08..c093f3aaf1cf 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineThreadViewModel.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/timeline/item/GHPRTimelineThreadViewModel.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.plugins.github.pullrequest.ui.timeline.item import com.intellij.collaboration.async.mapDataToModel @@ -70,7 +70,7 @@ interface GHPRTimelineThreadViewModel private val LOG = logger() -class UpdateableGHPRTimelineThreadViewModel internal constructor( +internal class UpdateableGHPRTimelineThreadViewModel internal constructor( override val project: Project, parentCs: CoroutineScope, private val dataContext: GHPRDataContext, diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowProjectViewModel.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowProjectViewModel.kt index 423f3b11cdd9..cf7ba8ebac04 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowProjectViewModel.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowProjectViewModel.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.plugins.github.pullrequest.ui.toolwindow.model import com.github.benmanes.caffeine.cache.Caffeine diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowViewModel.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowViewModel.kt index 712a366b82b8..c8d7915ec8df 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowViewModel.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRToolWindowViewModel.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.plugins.github.pullrequest.ui.toolwindow.model import com.intellij.collaboration.async.combineState diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml index 4bdca1c3dc0a..2fdc3eb3fcd6 100644 --- a/plugins/gradle/intellij.gradle.iml +++ b/plugins/gradle/intellij.gradle.iml @@ -20,6 +20,7 @@ + diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml index dd8a79e9a4c3..9e7a7f407f3c 100644 --- a/plugins/gradle/intellij.gradle.tests.iml +++ b/plugins/gradle/intellij.gradle.tests.iml @@ -17,9 +17,11 @@ + + diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml index fe8528c05bdb..874ff678ca43 100644 --- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml +++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml @@ -72,6 +72,7 @@ + diff --git a/plugins/grazie/src/intellij.grazie.core.iml b/plugins/grazie/src/intellij.grazie.core.iml index e91a0b83443e..dd5ee42df41c 100644 --- a/plugins/grazie/src/intellij.grazie.core.iml +++ b/plugins/grazie/src/intellij.grazie.core.iml @@ -17,6 +17,7 @@ + diff --git a/plugins/grazie/src/test/intellij.grazie.tests.iml b/plugins/grazie/src/test/intellij.grazie.tests.iml index fb62823e463b..b13700d96940 100644 --- a/plugins/grazie/src/test/intellij.grazie.tests.iml +++ b/plugins/grazie/src/test/intellij.grazie.tests.iml @@ -10,7 +10,7 @@ - + @@ -147,7 +147,9 @@ + + diff --git a/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml b/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml index 7e91c095804e..afe6ceef146c 100644 --- a/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml +++ b/plugins/junit/groovy-tests/intellij.junit.groovy.tests.iml @@ -8,6 +8,7 @@ + \ No newline at end of file diff --git a/plugins/junit/intellij.junit.iml b/plugins/junit/intellij.junit.iml index 8babe0bf752b..529ee2b954c9 100644 --- a/plugins/junit/intellij.junit.iml +++ b/plugins/junit/intellij.junit.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/junit/java-tests/intellij.junit.java.tests.iml b/plugins/junit/java-tests/intellij.junit.java.tests.iml index 889f7253bbbe..fc021d7fd441 100644 --- a/plugins/junit/java-tests/intellij.junit.java.tests.iml +++ b/plugins/junit/java-tests/intellij.junit.java.tests.iml @@ -12,6 +12,7 @@ + diff --git a/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml b/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml index b392fa18bfd5..9925e7fda8e2 100644 --- a/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml +++ b/plugins/junit/kotlin-tests-k1/intellij.junit.kotlin.tests.k1.iml @@ -10,6 +10,7 @@ + \ No newline at end of file diff --git a/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml b/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml index f4fb5e8e8d32..12ca761f201c 100644 --- a/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml +++ b/plugins/junit/kotlin-tests-k2/intellij.junit.kotlin.tests.k2.iml @@ -7,6 +7,7 @@ + diff --git a/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml b/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml index a332cb01fa6b..11be2a1dc7f4 100644 --- a/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml +++ b/plugins/junit/kotlin-tests-shared/intellij.junit.kotlin.tests.shared.iml @@ -8,6 +8,7 @@ + diff --git a/plugins/junit/testFramework/intellij.junit.testFramework.iml b/plugins/junit/testFramework/intellij.junit.testFramework.iml index 9deece3b996d..c384b6bfa3a1 100644 --- a/plugins/junit/testFramework/intellij.junit.testFramework.iml +++ b/plugins/junit/testFramework/intellij.junit.testFramework.iml @@ -10,7 +10,7 @@ - + diff --git a/plugins/kotlin/base/facet/tests/kotlin.base.facet.tests.iml b/plugins/kotlin/base/facet/tests/kotlin.base.facet.tests.iml index e7927b92b325..8f6c984f3c6d 100644 --- a/plugins/kotlin/base/facet/tests/kotlin.base.facet.tests.iml +++ b/plugins/kotlin/base/facet/tests/kotlin.base.facet.tests.iml @@ -12,6 +12,7 @@ + diff --git a/plugins/kotlin/base/indices/tests/kotlin.base.indices.tests.iml b/plugins/kotlin/base/indices/tests/kotlin.base.indices.tests.iml index b2ddc4392b7d..0147e90ed9eb 100644 --- a/plugins/kotlin/base/indices/tests/kotlin.base.indices.tests.iml +++ b/plugins/kotlin/base/indices/tests/kotlin.base.indices.tests.iml @@ -10,6 +10,7 @@ + diff --git a/plugins/kotlin/base/scripting/kotlin.base.scripting.iml b/plugins/kotlin/base/scripting/kotlin.base.scripting.iml index b5cb06c778bb..e7c5057a3bc9 100644 --- a/plugins/kotlin/base/scripting/kotlin.base.scripting.iml +++ b/plugins/kotlin/base/scripting/kotlin.base.scripting.iml @@ -38,6 +38,7 @@ + diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ReportingExternalDependenciesResolver.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ReportingExternalDependenciesResolver.kt index 6941ea94407c..21294726ba15 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ReportingExternalDependenciesResolver.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ReportingExternalDependenciesResolver.kt @@ -9,7 +9,7 @@ import kotlin.script.experimental.dependencies.ArtifactWithLocation import kotlin.script.experimental.dependencies.ExternalDependenciesResolver import kotlin.script.experimental.dependencies.RepositoryCoordinates -class ReportingExternalDependenciesResolver( +internal class ReportingExternalDependenciesResolver( private val delegate: ExternalDependenciesResolver, private val dependenciesResolutionService: DependencyResolutionService, ) : ExternalDependenciesResolver { diff --git a/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml b/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml index 18590b8b5d1b..16066a81cf11 100644 --- a/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml +++ b/plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml @@ -17,6 +17,7 @@ + diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml index 3bce6f6345ce..ede1d8c0f18b 100644 --- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml +++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml @@ -47,6 +47,7 @@ + diff --git a/plugins/kotlin/gradle/code-insight-common/kotlin.gradle.code-insight-common.iml b/plugins/kotlin/gradle/code-insight-common/kotlin.gradle.code-insight-common.iml index 84f0a0d800d6..d3d8b4e43efc 100644 --- a/plugins/kotlin/gradle/code-insight-common/kotlin.gradle.code-insight-common.iml +++ b/plugins/kotlin/gradle/code-insight-common/kotlin.gradle.code-insight-common.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.iml b/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.iml index 3350cc423ffc..7d6fdb99a2db 100644 --- a/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.iml +++ b/plugins/kotlin/gradle/gradle-java/k1/kotlin.gradle.gradle-java.k1.iml @@ -16,6 +16,7 @@ + diff --git a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml index d21edf0ccdcf..8d6189635655 100644 --- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml +++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml @@ -60,6 +60,7 @@ + diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/GradleScriptConfigurationsSource.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/GradleScriptConfigurationsSource.kt index 46db16e22b83..ffffe2d503c9 100644 --- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/GradleScriptConfigurationsSource.kt +++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/GradleScriptConfigurationsSource.kt @@ -8,14 +8,10 @@ import com.intellij.openapi.projectRoots.JavaSdkType import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.vfs.VirtualFile -import com.intellij.platform.backend.workspace.workspaceModel import com.intellij.platform.workspace.storage.EntitySource import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.platform.workspace.storage.url.VirtualFileUrl -import com.intellij.util.getValue import org.jetbrains.kotlin.idea.core.script.KotlinScriptEntitySource -import org.jetbrains.kotlin.idea.core.script.SCRIPT_CONFIGURATIONS_SOURCES -import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager.Companion.toVfsRoots import org.jetbrains.kotlin.idea.core.script.getUpdatedStorage import org.jetbrains.kotlin.idea.core.script.k2.BaseScriptModel import org.jetbrains.kotlin.idea.core.script.k2.ScriptConfigurations @@ -27,7 +23,6 @@ import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrap import org.jetbrains.kotlin.scripting.resolve.VirtualFileScriptSource import org.jetbrains.kotlin.scripting.resolve.adjustByDefinition import org.jetbrains.kotlin.scripting.resolve.refineScriptCompilationConfiguration -import org.jetbrains.kotlin.utils.addToStdlib.safeAs import java.io.File import java.nio.file.Path import kotlin.io.path.pathString @@ -36,7 +31,7 @@ import kotlin.script.experimental.jvm.JvmDependency import kotlin.script.experimental.jvm.jdkHome import kotlin.script.experimental.jvm.jvm -class GradleScriptModel( +internal class GradleScriptModel( override val virtualFile: VirtualFile, val classPath: List = listOf(), val sourcePath: List = listOf(), @@ -44,7 +39,7 @@ class GradleScriptModel( val javaHome: String? = null ) : BaseScriptModel(virtualFile) -open class GradleScriptConfigurationsSource(override val project: Project) : ScriptConfigurationsSource(project) { +internal open class GradleScriptConfigurationsSource(override val project: Project) : ScriptConfigurationsSource(project) { private val gradleEntitySourceFilter: (EntitySource) -> Boolean = { entitySource -> entitySource is KotlinGradleScriptModuleEntitySource } diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml index 34fec38d2103..3d5871cac829 100644 --- a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml +++ b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml @@ -16,6 +16,7 @@ + diff --git a/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml b/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml index 7d1f3d1f7248..6cc09e8c159e 100644 --- a/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml +++ b/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml @@ -33,6 +33,7 @@ + @@ -48,6 +49,7 @@ + diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml index a03e477426db..13a631d4d47f 100644 --- a/plugins/kotlin/idea/kotlin.idea.iml +++ b/plugins/kotlin/idea/kotlin.idea.iml @@ -56,6 +56,7 @@ + diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/script/k2/KotlinScriptingSettingsConfigurable.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/script/k2/KotlinScriptingSettingsConfigurable.kt index 0072bde9165f..a2e83cf3ca50 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/script/k2/KotlinScriptingSettingsConfigurable.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/script/k2/KotlinScriptingSettingsConfigurable.kt @@ -5,9 +5,7 @@ import com.intellij.openapi.observable.properties.AtomicProperty import com.intellij.openapi.options.SearchableConfigurable import com.intellij.openapi.project.Project import com.intellij.openapi.ui.setEmptyState -import com.intellij.platform.ide.progress.runWithModalProgressBlocking import com.intellij.platform.ide.progress.withBackgroundProgress -import com.intellij.platform.util.progress.reportSequentialProgress import com.intellij.ui.EditorNotifications import com.intellij.ui.ToolbarDecorator import com.intellij.ui.dsl.builder.Align @@ -27,7 +25,7 @@ import javax.swing.JComponent import javax.swing.JPanel import javax.swing.ListSelectionModel -class KotlinScriptingSettingsConfigurable(val project: Project, val coroutineScope: CoroutineScope) : SearchableConfigurable { +private class KotlinScriptingSettingsConfigurable(val project: Project, val coroutineScope: CoroutineScope) : SearchableConfigurable { companion object { const val ID: String = "preferences.language.Kotlin.scripting" } diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml index c4d7ff1aaf8e..21808fa0c728 100644 --- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml +++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml @@ -33,12 +33,14 @@ + + @@ -57,6 +59,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml index 14da3af9d498..1b9e15f30c70 100644 --- a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml +++ b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml @@ -50,6 +50,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/test/compose/kotlin.jvm-debugger.test.compose.k2.iml b/plugins/kotlin/jvm-debugger/test/compose/kotlin.jvm-debugger.test.compose.k2.iml index 458d71df8133..6ae419e832bf 100644 --- a/plugins/kotlin/jvm-debugger/test/compose/kotlin.jvm-debugger.test.compose.k2.iml +++ b/plugins/kotlin/jvm-debugger/test/compose/kotlin.jvm-debugger.test.compose.k2.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml index 7c7fd3bafc03..401af1c5d3f9 100644 --- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml +++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml @@ -14,10 +14,12 @@ + + diff --git a/plugins/kotlin/jvm-debugger/test/parcelize/kotlin.jvm-debugger.test.parcelize.k2.iml b/plugins/kotlin/jvm-debugger/test/parcelize/kotlin.jvm-debugger.test.parcelize.k2.iml index e07aca902341..a09ac28f76c6 100644 --- a/plugins/kotlin/jvm-debugger/test/parcelize/kotlin.jvm-debugger.test.parcelize.k2.iml +++ b/plugins/kotlin/jvm-debugger/test/parcelize/kotlin.jvm-debugger.test.parcelize.k2.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/kotlin/jvm/kotlin.jvm.iml b/plugins/kotlin/jvm/kotlin.jvm.iml index 9c11ed0b7fd7..70c081c47ef1 100644 --- a/plugins/kotlin/jvm/kotlin.jvm.iml +++ b/plugins/kotlin/jvm/kotlin.jvm.iml @@ -52,6 +52,7 @@ + diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt index 3187f7a1dbc6..f13c7fbbff81 100644 --- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt +++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt @@ -35,7 +35,7 @@ import java.text.SimpleDateFormat import java.util.* import java.util.zip.ZipOutputStream -class CreateIncrementalCompilationBackup : AnAction(KotlinJvmBundle.message("create.backup.for.debugging.kotlin.incremental.compilation")) { +private class CreateIncrementalCompilationBackup : AnAction(KotlinJvmBundle.message("create.backup.for.debugging.kotlin.incremental.compilation")) { companion object { const val BACKUP_DIR_NAME = ".backup" const val PATCHES_TO_CREATE = 5 diff --git a/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml b/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml index 680efa05cfe9..cc9574da2c01 100644 --- a/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml +++ b/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml @@ -25,6 +25,7 @@ + diff --git a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml index e49ea2ce50c1..943eb30ff894 100644 --- a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml +++ b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml @@ -16,10 +16,13 @@ + + + diff --git a/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml b/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml index cfbe3641aaab..09c4a0826d26 100644 --- a/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml +++ b/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml @@ -14,6 +14,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/plugins/kotlin/project-configuration/kotlin.project-configuration.iml b/plugins/kotlin/project-configuration/kotlin.project-configuration.iml index 4578862c7466..b48dae6189dd 100644 --- a/plugins/kotlin/project-configuration/kotlin.project-configuration.iml +++ b/plugins/kotlin/project-configuration/kotlin.project-configuration.iml @@ -14,11 +14,13 @@ + + diff --git a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt index 79be148dbcff..3f15add5f498 100644 --- a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt +++ b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerService.kt @@ -35,7 +35,7 @@ private class KotlinConfigurationCheckerStartupActivity : ProjectActivity { } } -const val KOTLIN_LANGUAGE_VERSION_CONFIGURED_PROPERTY_NAME = "kotlin-language-version-configured" +const val KOTLIN_LANGUAGE_VERSION_CONFIGURED_PROPERTY_NAME: String = "kotlin-language-version-configured" @Service(Service.Level.PROJECT) class KotlinConfigurationCheckerService(private val project: Project) { diff --git a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesBrowser.kt b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesBrowser.kt index 93c24e2c67f0..9797a6b25bc9 100644 --- a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesBrowser.kt +++ b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesBrowser.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.configuration.ui.changes import com.intellij.openapi.Disposable @@ -10,7 +10,7 @@ import com.intellij.openapi.vcs.changes.ChangeListChange import com.intellij.openapi.vcs.changes.ui.* import com.intellij.util.containers.ContainerUtil -class KotlinConfiguratorChangesBrowser(project: Project, private val changes: List, private val changeSelector: (Change) -> Unit) : +internal class KotlinConfiguratorChangesBrowser(project: Project, private val changes: List, private val changeSelector: (Change) -> Unit) : AsyncChangesBrowserBase(project, false, false), Disposable { override val changesTreeModel: AsyncChangesTreeModel = SimpleAsyncChangesTreeModel.create { grouping -> diff --git a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesDialog.kt b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesDialog.kt index 1d5e2879af5b..d6efafdce0af 100644 --- a/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesDialog.kt +++ b/plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ui/changes/KotlinConfiguratorChangesDialog.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.configuration.ui.changes import com.intellij.openapi.project.Project diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml index adc760a03e43..e45eef2a1e61 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml @@ -35,6 +35,7 @@ + diff --git a/plugins/kotlin/test-framework/kotlin.test-framework.iml b/plugins/kotlin/test-framework/kotlin.test-framework.iml index 1409dfdb80d6..41e38b747d6e 100644 --- a/plugins/kotlin/test-framework/kotlin.test-framework.iml +++ b/plugins/kotlin/test-framework/kotlin.test-framework.iml @@ -14,6 +14,7 @@ + @@ -21,6 +22,7 @@ + diff --git a/plugins/kotlin/tests-common/kotlin.tests-common.iml b/plugins/kotlin/tests-common/kotlin.tests-common.iml index 8f39cd48cc25..6e3313c26b2c 100644 --- a/plugins/kotlin/tests-common/kotlin.tests-common.iml +++ b/plugins/kotlin/tests-common/kotlin.tests-common.iml @@ -19,6 +19,7 @@ + diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml index 0f994f072b71..5b4c0c27942c 100644 --- a/plugins/maven/intellij.maven.iml +++ b/plugins/maven/intellij.maven.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.kt index 0d0ad7eaa273..7efce04d8a93 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.kt @@ -47,8 +47,7 @@ private val LOG = Logger.getInstance(MavenProjectBuilder::class.java) * Use [com.intellij.ide.impl.ProjectUtil.openOrImport] to open (import) a new project. */ @Deprecated("use MavenProjectAsyncBuilder") -class MavenProjectBuilder : ProjectImportBuilder(), DeprecatedProjectBuilderForImport { - +internal class MavenProjectBuilder : ProjectImportBuilder(), DeprecatedProjectBuilderForImport { private class Parameters { var myProjectToUpdate: Project? = null diff --git a/plugins/maven/src/test/intellij.maven.tests.iml b/plugins/maven/src/test/intellij.maven.tests.iml index b261912e4b90..56079bae1def 100644 --- a/plugins/maven/src/test/intellij.maven.tests.iml +++ b/plugins/maven/src/test/intellij.maven.tests.iml @@ -17,10 +17,12 @@ + + diff --git a/plugins/ml-local-models/java/intellij.ml.models.local.java.iml b/plugins/ml-local-models/java/intellij.ml.models.local.java.iml index 1de920bc7024..f91e6f29d82f 100644 --- a/plugins/ml-local-models/java/intellij.ml.models.local.java.iml +++ b/plugins/ml-local-models/java/intellij.ml.models.local.java.iml @@ -11,6 +11,7 @@ + diff --git a/plugins/ml-local-models/java/src/com/intellij/java/ml/local/CompletionSessionsCounter.kt b/plugins/ml-local-models/java/src/com/intellij/java/ml/local/CompletionSessionsCounter.kt index 5be304684a20..5dcce7530643 100644 --- a/plugins/ml-local-models/java/src/com/intellij/java/ml/local/CompletionSessionsCounter.kt +++ b/plugins/ml-local-models/java/src/com/intellij/java/ml/local/CompletionSessionsCounter.kt @@ -23,7 +23,6 @@ import com.intellij.util.concurrency.AppExecutorUtil import com.intellij.workspaceModel.ide.legacyBridge.impl.java.JAVA_MODULE_ENTITY_TYPE_ID import java.util.concurrent.atomic.AtomicInteger - internal class CompletionSessionsCounter : LookupManagerListener { companion object { private const val NOTIFICATION_EXPIRED_KEY = "ml.local.models.training.notification.expired" @@ -47,7 +46,8 @@ internal class CompletionSessionsCounter : LookupManagerListener { isJavaProject = WorkspaceModel.getInstance(project).currentSnapshot.entities(ModuleEntity::class.java).any { it.type == JAVA_MODULE_ENTITY_TYPE_ID } - } else if (!isJavaProject) { + } + else if (!isJavaProject) { return } @@ -61,24 +61,25 @@ internal class CompletionSessionsCounter : LookupManagerListener { } } - private class TrainingNotification(project: Project, language: Language) : Notification( - MlLocalModelsBundle.message("ml.local.models.notification.groupId"), - MlLocalModelsBundle.message("ml.local.models.notification.title"), - MlLocalModelsBundle.message("ml.local.models.notification.content"), - NotificationType.INFORMATION - ) { - init { - addAction(object : NotificationAction(MlLocalModelsBundle.message("ml.local.models.notification.ok")) { - override fun actionPerformed(e: AnActionEvent, notification: Notification) { - LocalModelsTraining.train(project, language) - notification.expire() - } - }) - addAction(object : NotificationAction(MlLocalModelsBundle.message("ml.local.models.notification.cancel")) { - override fun actionPerformed(e: AnActionEvent, notification: Notification) { - notification.expire() - } - }) - } +} + +private class TrainingNotification(project: Project, language: Language) : Notification( + MlLocalModelsBundle.message("ml.local.models.notification.groupId"), + MlLocalModelsBundle.message("ml.local.models.notification.title"), + MlLocalModelsBundle.message("ml.local.models.notification.content"), + NotificationType.INFORMATION +) { + init { + addAction(object : NotificationAction(MlLocalModelsBundle.message("ml.local.models.notification.ok")) { + override fun actionPerformed(e: AnActionEvent, notification: Notification) { + LocalModelsTraining.train(project, language) + notification.expire() + } + }) + addAction(object : NotificationAction(MlLocalModelsBundle.message("ml.local.models.notification.cancel")) { + override fun actionPerformed(e: AnActionEvent, notification: Notification) { + notification.expire() + } + }) } -} \ No newline at end of file +} diff --git a/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml b/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml index e3119725206f..7e8a953ad1e9 100644 --- a/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml +++ b/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml @@ -8,7 +8,9 @@ + + \ No newline at end of file diff --git a/plugins/properties/tests/intellij.properties.tests.iml b/plugins/properties/tests/intellij.properties.tests.iml index 2af9090d7350..c47f2f54ef49 100644 --- a/plugins/properties/tests/intellij.properties.tests.iml +++ b/plugins/properties/tests/intellij.properties.tests.iml @@ -13,6 +13,7 @@ + diff --git a/plugins/settings-repository/intellij.settingsRepository.iml b/plugins/settings-repository/intellij.settingsRepository.iml index 90cb7467ad47..c7db04defca8 100644 --- a/plugins/settings-repository/intellij.settingsRepository.iml +++ b/plugins/settings-repository/intellij.settingsRepository.iml @@ -58,10 +58,12 @@ + + diff --git a/plugins/settings-repository/intellij.settingsRepository.tests.iml b/plugins/settings-repository/intellij.settingsRepository.tests.iml index 318ff17372fe..38d8dbe258a0 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-repository/src/autoSync.kt b/plugins/settings-repository/src/autoSync.kt index a69f440729c1..cf28746edb2e 100644 --- a/plugins/settings-repository/src/autoSync.kt +++ b/plugins/settings-repository/src/autoSync.kt @@ -122,9 +122,9 @@ internal inline fun catchAndLog(asWarning: Boolean = false, runnable: () -> Unit try { runnable() } - catch (ignored: ProcessCanceledException) { + catch (_: ProcessCanceledException) { } - catch (ignored: CancellationException) { + catch (_: CancellationException) { } catch (e: Throwable) { if (asWarning || e is AuthenticationException || e is NoRemoteRepositoryException) { diff --git a/plugins/settings-repository/testSrc/SettingsRepositoryGitTestBase.kt b/plugins/settings-repository/testSrc/SettingsRepositoryGitTestBase.kt index e8f41537162b..3222a17df3c9 100644 --- a/plugins/settings-repository/testSrc/SettingsRepositoryGitTestBase.kt +++ b/plugins/settings-repository/testSrc/SettingsRepositoryGitTestBase.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.settingsRepository.test import com.intellij.openapi.vcs.merge.MergeSession @@ -24,7 +24,7 @@ internal abstract class SettingsRepositoryGitTestBase : IcsTestCase() { } protected val repositoryManager: GitRepositoryManager - get() = icsManager.repositoryManager as GitRepositoryManager + get() = icsManager.repositoryManager protected val repository: Repository get() = repositoryManager.repository diff --git a/plugins/settings-sync/intellij.settingsSync.iml b/plugins/settings-sync/intellij.settingsSync.iml index 41d48b2cb5d0..8610435010a7 100644 --- a/plugins/settings-sync/intellij.settingsSync.iml +++ b/plugins/settings-sync/intellij.settingsSync.iml @@ -40,6 +40,7 @@ + diff --git a/plugins/stream-debugger/intellij.java.debugger.streams.iml b/plugins/stream-debugger/intellij.java.debugger.streams.iml index f786c464bd65..6f542e092e80 100644 --- a/plugins/stream-debugger/intellij.java.debugger.streams.iml +++ b/plugins/stream-debugger/intellij.java.debugger.streams.iml @@ -20,6 +20,7 @@ + diff --git a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml index 2bf1ce1bc59a..48a7b9eaf2bd 100644 --- a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml +++ b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml @@ -12,6 +12,7 @@ + diff --git a/plugins/toml/tests/intellij.toml.tests.iml b/plugins/toml/tests/intellij.toml.tests.iml index 2e7df947493e..6ea91b2e1cc3 100644 --- a/plugins/toml/tests/intellij.toml.tests.iml +++ b/plugins/toml/tests/intellij.toml.tests.iml @@ -12,6 +12,7 @@ + \ No newline at end of file diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.iml b/python/ide/impl/intellij.pycharm.community.ide.impl.iml index 1c8b233d593f..e82fbc9b3465 100644 --- a/python/ide/impl/intellij.pycharm.community.ide.impl.iml +++ b/python/ide/impl/intellij.pycharm.community.ide.impl.iml @@ -23,6 +23,7 @@ + diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyEnvironmentYmlSdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyEnvironmentYmlSdkConfiguration.kt index 36c73c9ff12b..782d42107d6a 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyEnvironmentYmlSdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyEnvironmentYmlSdkConfiguration.kt @@ -16,29 +16,32 @@ import com.intellij.openapi.ui.ValidationInfo import com.intellij.openapi.util.Disposer import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile +import com.intellij.pycharm.community.ide.impl.PyCharmCommunityCustomizationBundle +import com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector.CondaEnvResult +import com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector.InputData +import com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector.Source import com.intellij.ui.IdeBorderFactory import com.intellij.ui.components.JBLabel import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import com.intellij.util.ui.JBUI import com.jetbrains.python.PyBundle -import com.intellij.pycharm.community.ide.impl.PyCharmCommunityCustomizationBundle import com.jetbrains.python.configuration.PyConfigurableInterpreterList import com.jetbrains.python.pathValidation.PlatformAndRoot import com.jetbrains.python.psi.PyUtil import com.jetbrains.python.run.PythonInterpreterTargetEnvironmentFactory +import com.jetbrains.python.sdk.PythonSdkUpdater import com.jetbrains.python.sdk.add.v1.PyAddNewCondaEnvFromFilePanel +import com.jetbrains.python.sdk.basePath +import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer import com.jetbrains.python.sdk.conda.createCondaSdkAlongWithNewEnv import com.jetbrains.python.sdk.conda.suggestCondaPath -import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer -import com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector.CondaEnvResult -import com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector.InputData -import com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector.Source -import com.jetbrains.python.sdk.* import com.jetbrains.python.sdk.configuration.PyProjectSdkConfigurationExtension import com.jetbrains.python.sdk.flavors.conda.CondaEnvSdkFlavor import com.jetbrains.python.sdk.flavors.conda.NewCondaEnvRequest import com.jetbrains.python.sdk.flavors.conda.PyCondaCommand import com.jetbrains.python.sdk.flavors.listCondaEnvironments +import com.jetbrains.python.sdk.setAssociationToModule +import com.jetbrains.python.sdk.showSdkExecutionException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking import java.awt.BorderLayout @@ -51,8 +54,7 @@ import javax.swing.JPanel * This class only supports local, not remote target. * TODO: Support remote target (ie \\wsl) */ -class PyEnvironmentYmlSdkConfiguration : PyProjectSdkConfigurationExtension { - +internal class PyEnvironmentYmlSdkConfiguration : PyProjectSdkConfigurationExtension { private val LOGGER = Logger.getInstance(PyEnvironmentYmlSdkConfiguration::class.java) override fun createAndAddSdkForConfigurator(module: Module): Sdk? = createAndAddSdk(module, Source.CONFIGURATOR) diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml index 0607e28663ec..bc32266129e0 100644 --- a/python/intellij.python.community.tests.iml +++ b/python/intellij.python.community.tests.iml @@ -16,9 +16,11 @@ + + diff --git a/uast/testFramework/intellij.platform.uast.testFramework.iml b/uast/testFramework/intellij.platform.uast.testFramework.iml index 54dde947134f..9043938c79c9 100644 --- a/uast/testFramework/intellij.platform.uast.testFramework.iml +++ b/uast/testFramework/intellij.platform.uast.testFramework.iml @@ -9,8 +9,10 @@ + + diff --git a/xml/dom-tests/intellij.xml.dom.tests.iml b/xml/dom-tests/intellij.xml.dom.tests.iml index 7956643aacfa..d11fd7af9a56 100644 --- a/xml/dom-tests/intellij.xml.dom.tests.iml +++ b/xml/dom-tests/intellij.xml.dom.tests.iml @@ -13,6 +13,7 @@ + diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml index 791a6ed68c06..2781ae36a4c1 100644 --- a/xml/impl/intellij.xml.impl.iml +++ b/xml/impl/intellij.xml.impl.iml @@ -20,6 +20,7 @@ + diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java index 43448e18f9dc..e5764c2f5d15 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java @@ -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.codeInsight.daemon.impl.analysis; import com.intellij.codeInsight.actions.RearrangeCodeProcessor; @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.Collections; -public class RearrangeAttributesIntention implements IntentionAction { +final class RearrangeAttributesIntention implements IntentionAction { @Override public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getText() { return getFamilyName();