From e786b57beed28acffe737da105d68460ca0b0b53 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 12 Feb 2026 09:32:38 +0100 Subject: [PATCH] IJPL-233558 IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 refactor(plugins): apply internal visibility and style cleanup GitOrigin-RevId: eb2c68d6f07bb387e5b9faf667c305bff49b66fe --- .../src/training/dsl/TaskTestContext.kt | 10 +++--- .../JavaOrKotlinOnboardingTourPromoter.kt | 4 +-- .../com/intellij/laf/macos/MacIconLookup.kt | 31 ++++++++++--------- .../src/PushSettingsToServerCommand.kt | 2 +- .../src/SettingsSyncCommandProvider.kt | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/plugins/ide-features-trainer/src/training/dsl/TaskTestContext.kt b/plugins/ide-features-trainer/src/training/dsl/TaskTestContext.kt index c34077d0e2de..bf3f0c11fade 100644 --- a/plugins/ide-features-trainer/src/training/dsl/TaskTestContext.kt +++ b/plugins/ide-features-trainer/src/training/dsl/TaskTestContext.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-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package training.dsl import com.intellij.ide.util.treeView.NodeRenderer @@ -51,7 +51,7 @@ import javax.swing.tree.TreePath @LearningDsl class TaskTestContext(rt: TaskRuntimeContext) : TaskRuntimeContext(rt) { - val defaultTimeout = Timeout.timeout(3, TimeUnit.SECONDS) + val defaultTimeout: Timeout = Timeout.timeout(3, TimeUnit.SECONDS) val robot: Robot get() = LearningUiUtil.robot @@ -211,7 +211,7 @@ class TaskTestContext(rt: TaskRuntimeContext) : TaskRuntimeContext(rt) { } JDialogFixture(robot, dialog) } - catch (timeoutError: WaitTimedOutError) { + catch (_: WaitTimedOutError) { throw ComponentLookupException("Timeout error for finding JDialog by title \"$title\" for ${timeout.duration()}") } } @@ -350,7 +350,7 @@ private fun Component.findText(): String? { ) return resultList.firstOrNull { it.isNotEmpty() } } - catch (ignored: ComponentLookupException) { + catch (_: ComponentLookupException) { return null } } @@ -409,7 +409,7 @@ private fun findIdeFrame(project: Project, robot: Robot, timeout: Timeout): IdeF val ideFrame = robot.finder().find(matcher) IdeFrameFixture(robot, ideFrame) } - catch (timedOutError: WaitTimedOutError) { + catch (_: WaitTimedOutError) { throw ComponentLookupException("Unable to find IdeFrame in " + timeout.duration()) } } diff --git a/plugins/kotlin/onboarding-promoter/src/org/jetbrains/kotlin/training/promoter/JavaOrKotlinOnboardingTourPromoter.kt b/plugins/kotlin/onboarding-promoter/src/org/jetbrains/kotlin/training/promoter/JavaOrKotlinOnboardingTourPromoter.kt index 271b69ed18ce..e74faedb1054 100644 --- a/plugins/kotlin/onboarding-promoter/src/org/jetbrains/kotlin/training/promoter/JavaOrKotlinOnboardingTourPromoter.kt +++ b/plugins/kotlin/onboarding-promoter/src/org/jetbrains/kotlin/training/promoter/JavaOrKotlinOnboardingTourPromoter.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.training.promoter import com.intellij.java.ift.JavaLessonsBundle @@ -21,7 +21,7 @@ import javax.swing.JComponent * Use Kotlin language as a language of this promoter, because it will be used only to log [StatisticBase.onboardingBannerShown] event. * And it will be possible to distinguish this promoter shown events from Java onboarding promoter. */ -private class JavaOrKotlinOnboardingTourPromoter : OnboardingLessonPromoter( +internal class JavaOrKotlinOnboardingTourPromoter : OnboardingLessonPromoter( lessonId = ideaOnboardingLessonId, languageId = kotlinLanguageId, lessonName = JavaLessonsBundle.message("java.onboarding.lesson.name") ) { // show this promoter instead of Java onboarding tour promoter diff --git a/plugins/laf/macos/src/com/intellij/laf/macos/MacIconLookup.kt b/plugins/laf/macos/src/com/intellij/laf/macos/MacIconLookup.kt index db33eefaccc6..dde3372d4a19 100644 --- a/plugins/laf/macos/src/com/intellij/laf/macos/MacIconLookup.kt +++ b/plugins/laf/macos/src/com/intellij/laf/macos/MacIconLookup.kt @@ -16,19 +16,22 @@ private object MacDirProvider : DirProvider() { object MacIconLookup { @JvmStatic @JvmOverloads - fun getIcon(name: String, - selected: Boolean = false, - focused: Boolean = false, - enabled: Boolean = true, - editable: Boolean = false, - pressed: Boolean = false): Icon { - - return LafIconLookup.findIcon(name, - selected = selected, - focused = focused, - enabled = enabled, - editable = editable, - pressed = pressed, - dirProvider = MacDirProvider) ?: AllIcons.Actions.Stub + fun getIcon( + name: String, + selected: Boolean = false, + focused: Boolean = false, + enabled: Boolean = true, + editable: Boolean = false, + pressed: Boolean = false, + ): Icon { + return LafIconLookup.findIcon( + name = name, + selected = selected, + focused = focused, + enabled = enabled, + editable = editable, + pressed = pressed, + dirProvider = MacDirProvider, + ) ?: AllIcons.Actions.Stub } } \ No newline at end of file diff --git a/plugins/settings-sync/settingsSync.performanceTesting/src/PushSettingsToServerCommand.kt b/plugins/settings-sync/settingsSync.performanceTesting/src/PushSettingsToServerCommand.kt index e56ae52bdc99..0f6d3142ac53 100644 --- a/plugins/settings-sync/settingsSync.performanceTesting/src/PushSettingsToServerCommand.kt +++ b/plugins/settings-sync/settingsSync.performanceTesting/src/PushSettingsToServerCommand.kt @@ -9,7 +9,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.jetbrains.annotations.NonNls -class PushSettingsToServerCommand(text: @NonNls String, line: Int) : PlaybackCommandCoroutineAdapter(text, line) { +internal class PushSettingsToServerCommand(text: @NonNls String, line: Int) : PlaybackCommandCoroutineAdapter(text, line) { companion object { const val PREFIX: @NonNls String = CMD_PREFIX + "pushSettingsToServer" } diff --git a/plugins/settings-sync/settingsSync.performanceTesting/src/SettingsSyncCommandProvider.kt b/plugins/settings-sync/settingsSync.performanceTesting/src/SettingsSyncCommandProvider.kt index 8d47f3c2e36c..46e319a7ad9c 100644 --- a/plugins/settings-sync/settingsSync.performanceTesting/src/SettingsSyncCommandProvider.kt +++ b/plugins/settings-sync/settingsSync.performanceTesting/src/SettingsSyncCommandProvider.kt @@ -3,7 +3,7 @@ package com.intellij.settingsSync.performanceTesting import com.jetbrains.performancePlugin.CommandProvider import com.jetbrains.performancePlugin.CreateCommand -class SettingsSyncCommandProvider: CommandProvider { +internal class SettingsSyncCommandProvider: CommandProvider { override fun getCommands(): MutableMap { return mutableMapOf( EnableSettingsSyncCommand.PREFIX to CreateCommand(::EnableSettingsSyncCommand),