diff --git a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/CommonLogicForOnboardingTours.kt b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/CommonLogicForOnboardingTours.kt index 631320b61628..d6a673efa40a 100644 --- a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/CommonLogicForOnboardingTours.kt +++ b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/CommonLogicForOnboardingTours.kt @@ -327,7 +327,7 @@ abstract class CommonLogicForOnboardingTours(id: String, @Nls lessonName: String } text(JavaLessonsBundle.message("java.onboarding.search.everywhere.description", code("AVERAGE"), code(JavaLessonsBundle.message("toggle.case.part")))) - val actionText = ActionManager.getInstance().getAction("EditorToggleCase").toString() + val actionText = ActionsBundle.actionText("EditorToggleCase") triggerAndBorderHighlight().listItem { item -> item.isToStringContains(actionText) } diff --git a/platform/searchEverywhere/frontend/src/ui/SeResultListItem.kt b/platform/searchEverywhere/frontend/src/ui/SeResultListItem.kt index e3fcbccde8f3..6eb03366c82c 100644 --- a/platform/searchEverywhere/frontend/src/ui/SeResultListItem.kt +++ b/platform/searchEverywhere/frontend/src/ui/SeResultListItem.kt @@ -10,7 +10,7 @@ sealed interface SeResultListRow @Internal class SeResultListItemRow(val item: SeItemData) : SeResultListRow { override fun toString(): String { - return item.fetchItemIfExists()?.rawObject?.toString() ?: "SeResultListItemRow(item=$item)" + return "SeResultListItemRow(presentation=${item.presentation})" } } diff --git a/platform/searchEverywhere/shared/src/presentations/SeTargetItemPresentation.kt b/platform/searchEverywhere/shared/src/presentations/SeTargetItemPresentation.kt index 4454a3bc98b8..18f836be33c3 100644 --- a/platform/searchEverywhere/shared/src/presentations/SeTargetItemPresentation.kt +++ b/platform/searchEverywhere/shared/src/presentations/SeTargetItemPresentation.kt @@ -173,7 +173,7 @@ class SeTargetItemPresentationBuilder { @Serializable @ApiStatus.Internal -class SeTargetItemPresentationImpl internal constructor( +data class SeTargetItemPresentationImpl( private val backgroundColorId: ColorId? = null, private val iconId: IconId? = null, val iconOriginalWidth: Int? = null, diff --git a/plugins/ide-features-trainer/src/training/learn/lesson/general/GotoActionLesson.kt b/plugins/ide-features-trainer/src/training/learn/lesson/general/GotoActionLesson.kt index d36ac58a1200..d005e66bdf81 100644 --- a/plugins/ide-features-trainer/src/training/learn/lesson/general/GotoActionLesson.kt +++ b/plugins/ide-features-trainer/src/training/learn/lesson/general/GotoActionLesson.kt @@ -4,7 +4,6 @@ package training.learn.lesson.general import com.intellij.ide.IdeBundle import com.intellij.ide.actions.searcheverywhere.SearchEverywhereUI import com.intellij.idea.ActionsBundle -import com.intellij.openapi.actionSystem.ActionManager import com.intellij.openapi.application.ApplicationNamesInfo import com.intellij.openapi.client.ClientSystemInfo import com.intellij.openapi.editor.impl.EditorComponentImpl @@ -81,10 +80,13 @@ class GotoActionLesson(private val sample: LessonSample, task { val prefix = LearnBundle.message("show.line.number.prefix.to.show.first") text(LessonsBundle.message("goto.action.show.line.numbers.request", strong(prefix), strong(showLineNumbersName))) - val actionText = ActionManager.getInstance().getAction("EditorGutterToggleGlobalLineNumbers").toString() + + val localActionDescription = ActionsBundle.actionDescription("EditorToggleShowLineNumbers") + val globalActionText = ActionsBundle.actionText("EditorGutterToggleGlobalLineNumbers") triggerAndBorderHighlight().listItem { item -> - item.isToStringContains(actionText) + item.isToStringContains(globalActionText) && !item.isToStringContains(localActionDescription) } + restoreState { !checkInsideSearchEverywhere() } test { waitComponent(SearchEverywhereUI::class.java) diff --git a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt index 15fb28af4b95..7d9049d999f1 100644 --- a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt +++ b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt @@ -546,7 +546,7 @@ class PythonOnboardingTourLesson : } text(PythonLessonsBundle.message("python.onboarding.search.everywhere.description", code("AVERAGE"), code(PythonLessonsBundle.message("toggle.case.part")))) - val actionText = ActionManager.getInstance().getAction("EditorToggleCase").toString() + val actionText = ActionsBundle.actionText("EditorToggleCase") triggerAndBorderHighlight().listItem { item -> item.isToStringContains(actionText) }