From 9fec499a7d32c5e159efcd2f2e1f42ca644e2caf Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Sun, 5 Jan 2025 09:01:03 +0100 Subject: [PATCH] don't export intellij.flex.shared GitOrigin-RevId: 4ab9b4527cedcf53794583681edccda4c47d4668 --- jupyter/viewOnly/intellij.jupyter.viewOnly.iml | 1 + ...tellij.platform.configurationStore.impl.iml | 1 + .../intellij.platform.diagnostic.freezes.iml | 1 + .../tests/intellij.platform.diff.tests.iml | 1 + ...llij.platform.externalProcessAuthHelper.iml | 2 +- .../intellij.platform.indexing.tests.iml | 1 + .../platform-api/intellij.platform.ide.iml | 2 +- .../intellij.platform.ide.bootstrap.iml | 1 + .../intellij.platform.ide.designer.iml | 1 + .../remoteDev-util/intellij.remoteDev.util.iml | 1 + ...ficationBasedEmbeddedClientErrorReporter.kt | 2 +- .../intellij.platform.structureView.impl.iml | 1 + .../intellij.platform.testFramework.junit5.iml | 1 + platform/ui.jcef/intellij.platform.ui.jcef.iml | 1 + .../intellij.platform.vcs.testFramework.iml | 1 + .../whatsNew/intellij.platform.whatsNew.iml | 1 + ...tellij.platform.workspace.storage.tests.iml | 1 + .../php/PhpunitEnvCompletionContributor.java | 4 ++-- .../intellij.vcs.git.featuresTrainer.iml | 1 + .../src/training/git/GitProjectUtil.kt | 4 ++-- plugins/git4idea/intellij.vcs.git.iml | 5 +++-- .../git4idea/commands/GitHttpAuthService.kt | 18 ++---------------- .../git4idea/rebase/GitRebaseEditorService.kt | 6 +++--- .../github/github-core/intellij.vcs.github.iml | 1 + .../gitlab/gitlab-core/intellij.vcs.gitlab.iml | 1 + .../tests/kotlin.features-trainer.tests.iml | 1 + .../plugin-updater/kotlin.plugin-updater.iml | 1 + ...ortedAbiVersionNotificationPanelProvider.kt | 6 ++++-- .../remote-control/intellij.remoteControl.iml | 1 + .../git/intellij.settingsSync.git.iml | 2 ++ .../git/SettingsHistoryToolWindowFactory.kt | 2 +- .../tasks/tasks-tests/intellij.tasks.tests.iml | 1 + 32 files changed, 43 insertions(+), 31 deletions(-) diff --git a/jupyter/viewOnly/intellij.jupyter.viewOnly.iml b/jupyter/viewOnly/intellij.jupyter.viewOnly.iml index be4c33278090..cc31649b0af0 100644 --- a/jupyter/viewOnly/intellij.jupyter.viewOnly.iml +++ b/jupyter/viewOnly/intellij.jupyter.viewOnly.iml @@ -13,6 +13,7 @@ + diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml index b775e35b1141..5c89268c2bd6 100644 --- a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml +++ b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml @@ -17,6 +17,7 @@ + diff --git a/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml b/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml index 1f6f82e804ef..c77df6d4b698 100644 --- a/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml +++ b/platform/diagnostic/freezeInPluginNotifier/intellij.platform.diagnostic.freezes.iml @@ -37,6 +37,7 @@ + diff --git a/platform/diff-impl/tests/intellij.platform.diff.tests.iml b/platform/diff-impl/tests/intellij.platform.diff.tests.iml index 617dd6ce3f8b..0e85f3121a61 100644 --- a/platform/diff-impl/tests/intellij.platform.diff.tests.iml +++ b/platform/diff-impl/tests/intellij.platform.diff.tests.iml @@ -16,6 +16,7 @@ + diff --git a/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml b/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml index 9a0638a4387e..0130876680a9 100644 --- a/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml +++ b/platform/external-process-auth-helper/intellij.platform.externalProcessAuthHelper.iml @@ -17,7 +17,7 @@ - + diff --git a/platform/indexing-tests/intellij.platform.indexing.tests.iml b/platform/indexing-tests/intellij.platform.indexing.tests.iml index f7efcd33bb17..72aedd9fdf00 100644 --- a/platform/indexing-tests/intellij.platform.indexing.tests.iml +++ b/platform/indexing-tests/intellij.platform.indexing.tests.iml @@ -8,6 +8,7 @@ + diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml index b840cde11e06..d51dfb5cce10 100644 --- a/platform/platform-api/intellij.platform.ide.iml +++ b/platform/platform-api/intellij.platform.ide.iml @@ -15,7 +15,7 @@ - + diff --git a/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml b/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml index 6b4317d3a4d1..3c94a15d16aa 100644 --- a/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml +++ b/platform/platform-impl/bootstrap/intellij.platform.ide.bootstrap.iml @@ -14,6 +14,7 @@ + diff --git a/platform/platform-impl/designer/intellij.platform.ide.designer.iml b/platform/platform-impl/designer/intellij.platform.ide.designer.iml index 6022bfb841a6..d3956233034e 100644 --- a/platform/platform-impl/designer/intellij.platform.ide.designer.iml +++ b/platform/platform-impl/designer/intellij.platform.ide.designer.iml @@ -7,6 +7,7 @@ + diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml index 8b36a7cbfae5..6526cc4105ca 100644 --- a/platform/remoteDev-util/intellij.remoteDev.util.iml +++ b/platform/remoteDev-util/intellij.remoteDev.util.iml @@ -39,6 +39,7 @@ + diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/NotificationBasedEmbeddedClientErrorReporter.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/NotificationBasedEmbeddedClientErrorReporter.kt index eb3057a73741..b4cd1e59e024 100644 --- a/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/NotificationBasedEmbeddedClientErrorReporter.kt +++ b/platform/remoteDev-util/src/com/intellij/remoteDev/downloader/NotificationBasedEmbeddedClientErrorReporter.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project import com.intellij.remoteDev.RemoteDevUtilBundle import com.intellij.testFramework.LightVirtualFile -class NotificationBasedEmbeddedClientErrorReporter(private val project: Project?) : EmbeddedClientErrorReporter { +internal class NotificationBasedEmbeddedClientErrorReporter(private val project: Project?) : EmbeddedClientErrorReporter { override fun startupFailed(exitCode: Int, output: List) { val outputString = output.joinToString("") thisLogger().warn("Embedded client failed to start with exit code $exitCode:\n$outputString") diff --git a/platform/structure-view-impl/intellij.platform.structureView.impl.iml b/platform/structure-view-impl/intellij.platform.structureView.impl.iml index 57137d982d08..f73bc53d6676 100644 --- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml +++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml @@ -17,6 +17,7 @@ + diff --git a/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml b/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml index 18e0cb914407..52150b45619b 100644 --- a/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml +++ b/platform/testFramework/junit5/intellij.platform.testFramework.junit5.iml @@ -16,6 +16,7 @@ + diff --git a/platform/ui.jcef/intellij.platform.ui.jcef.iml b/platform/ui.jcef/intellij.platform.ui.jcef.iml index 14ce5606ec35..bf5e5f249d4c 100644 --- a/platform/ui.jcef/intellij.platform.ui.jcef.iml +++ b/platform/ui.jcef/intellij.platform.ui.jcef.iml @@ -14,6 +14,7 @@ + diff --git a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml index a06e01f05dac..5ba7fbf6ffbc 100644 --- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml +++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml @@ -14,6 +14,7 @@ + diff --git a/platform/whatsNew/intellij.platform.whatsNew.iml b/platform/whatsNew/intellij.platform.whatsNew.iml index fb48a80c2508..6ea64b251534 100644 --- a/platform/whatsNew/intellij.platform.whatsNew.iml +++ b/platform/whatsNew/intellij.platform.whatsNew.iml @@ -44,6 +44,7 @@ + diff --git a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml index 65f1e9b35dff..186d9620315c 100644 --- a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml +++ b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml @@ -30,6 +30,7 @@ + diff --git a/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java index e66653141ea0..b862cc6fc07a 100644 --- a/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java +++ b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java @@ -23,10 +23,10 @@ import ru.adelf.idea.dotenv.common.BaseEnvCompletionProvider; import java.util.Arrays; import java.util.List; -public class PhpunitEnvCompletionContributor extends BaseEnvCompletionProvider implements GotoDeclarationHandler { +final class PhpunitEnvCompletionContributor extends BaseEnvCompletionProvider implements GotoDeclarationHandler { public static final List TAGS = Arrays.asList("server", "env"); - public PhpunitEnvCompletionContributor() { + PhpunitEnvCompletionContributor() { extend(CompletionType.BASIC, PlatformPatterns.psiElement(XmlToken.class).withParent(XmlAttributeValue.class), new CompletionProvider() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, @NotNull ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { diff --git a/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml b/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml index fe101741538c..ed6a4ac45bc4 100644 --- a/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml +++ b/plugins/git-features-trainer/intellij.vcs.git.featuresTrainer.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/git-features-trainer/src/training/git/GitProjectUtil.kt b/plugins/git-features-trainer/src/training/git/GitProjectUtil.kt index fa59dba91138..9b1b480a3e6f 100644 --- a/plugins/git-features-trainer/src/training/git/GitProjectUtil.kt +++ b/plugins/git-features-trainer/src/training/git/GitProjectUtil.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-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package training.git import com.intellij.dvcs.repo.VcsRepositoryManager @@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException -object GitProjectUtil { +internal object GitProjectUtil { private const val remoteProjectName = "RemoteLearningProject" fun restoreGitLessonsFiles(project: Project, branch: String) { diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml index 23aaa53f9b9e..673a848e5a24 100644 --- a/plugins/git4idea/intellij.vcs.git.iml +++ b/plugins/git4idea/intellij.vcs.git.iml @@ -49,7 +49,7 @@ - + @@ -81,13 +81,14 @@ - + + diff --git a/plugins/git4idea/src/git4idea/commands/GitHttpAuthService.kt b/plugins/git4idea/src/git4idea/commands/GitHttpAuthService.kt index 3101bf42dca3..3f1a6e09be59 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHttpAuthService.kt +++ b/plugins/git4idea/src/git4idea/commands/GitHttpAuthService.kt @@ -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-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package git4idea.commands import com.intellij.externalProcessAuthHelper.AuthenticationGate @@ -74,7 +60,7 @@ abstract class GitHttpAuthService : ExternalProcessHandlerService( +private class GitAskPassExternalProcessRest : ExternalProcessRest( GitAskPassAppHandler.ENTRY_POINT_NAME ) { override val externalProcessHandler: ExternalProcessHandlerService get() = service() diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.kt b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.kt index 9a8fa574b624..fde44b866b0d 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.kt +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.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-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package git4idea.rebase import com.intellij.externalProcessAuthHelper.ExternalProcessHandlerService @@ -13,7 +13,7 @@ import java.io.File import java.util.* @Service(Service.Level.APP) -class GitRebaseEditorService : ExternalProcessHandlerService( +internal class GitRebaseEditorService : ExternalProcessHandlerService( "intellij-git-editor", GitRebaseEditorApp::class.java ) { @@ -43,7 +43,7 @@ class GitRebaseEditorService : ExternalProcessHandlerService( +private class GitRebaseEditorExternalProcessRest : ExternalProcessRest( GitRebaseEditorAppHandler.ENTRY_POINT_NAME ) { override val externalProcessHandler: ExternalProcessHandlerService get() = GitRebaseEditorService.getInstance() diff --git a/plugins/github/github-core/intellij.vcs.github.iml b/plugins/github/github-core/intellij.vcs.github.iml index 94cec31f7ea7..a123e78065ab 100644 --- a/plugins/github/github-core/intellij.vcs.github.iml +++ b/plugins/github/github-core/intellij.vcs.github.iml @@ -32,6 +32,7 @@ + diff --git a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml index b5300d77edb2..2007e4f4feff 100644 --- a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml +++ b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml @@ -50,6 +50,7 @@ + diff --git a/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml b/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml index 85b84b5f3732..4a88d52ebaee 100644 --- a/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml +++ b/plugins/kotlin/features-trainer/tests/kotlin.features-trainer.tests.iml @@ -15,6 +15,7 @@ + diff --git a/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml b/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml index fda2d0406e2f..6d4562ed87ba 100644 --- a/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml +++ b/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml @@ -16,6 +16,7 @@ + diff --git a/plugins/kotlin/plugin-updater/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt b/plugins/kotlin/plugin-updater/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt index 0144501b9f18..f901d8984f69 100644 --- a/plugins/kotlin/plugin-updater/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt +++ b/plugins/kotlin/plugin-updater/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.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-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.versions @@ -23,7 +23,9 @@ import com.intellij.openapi.util.NlsContexts import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFile -import com.intellij.ui.* +import com.intellij.ui.EditorNotificationPanel +import com.intellij.ui.EditorNotificationProvider +import com.intellij.ui.EditorNotifications import org.jetbrains.annotations.NotNull import org.jetbrains.kotlin.idea.base.util.createComponentActionLabel import org.jetbrains.kotlin.idea.compiler.configuration.KotlinIdePlugin diff --git a/plugins/remote-control/intellij.remoteControl.iml b/plugins/remote-control/intellij.remoteControl.iml index de3df26e9bd2..11ec97279565 100644 --- a/plugins/remote-control/intellij.remoteControl.iml +++ b/plugins/remote-control/intellij.remoteControl.iml @@ -17,6 +17,7 @@ + diff --git a/plugins/settings-sync/git/intellij.settingsSync.git.iml b/plugins/settings-sync/git/intellij.settingsSync.git.iml index 7309de2c6f3a..86ac05302d7d 100644 --- a/plugins/settings-sync/git/intellij.settingsSync.git.iml +++ b/plugins/settings-sync/git/intellij.settingsSync.git.iml @@ -10,10 +10,12 @@ + + diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt b/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt index c457041287aa..a4a86a16dd26 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt +++ b/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.withContext -class SettingsHistoryToolWindowFactory(private val corotineScope: CoroutineScope) : ToolWindowFactory, DumbAware { +internal class SettingsHistoryToolWindowFactory(private val corotineScope: CoroutineScope) : ToolWindowFactory, DumbAware { companion object { const val ID = "Backup and Sync History" } diff --git a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml index bcd5bcb75652..63235931f152 100644 --- a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml +++ b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml @@ -15,6 +15,7 @@ +