diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index bc7b7a3d4c45..2278eb386ca6 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -11061,6 +11061,7 @@ c:com.intellij.execution.impl.ConsoleViewImpl - p:calcNextOccurrence(I):com.intellij.ide.OccurenceNavigator$OccurenceInfo - canPause():Z - clear():V +- pf:clearThisConsoleAction():com.intellij.openapi.actionSystem.AnAction - p:createCenterComponent():javax.swing.JComponent - p:createCompositeFilter():com.intellij.execution.filters.CompositeFilter - createConsoleActions():com.intellij.openapi.actionSystem.AnAction[] diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java index dc2c89fda4ad..05599e17158a 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java @@ -1420,7 +1420,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo consoleActions.add(switchSoftWrapsAction); consoleActions.add(autoScrollToTheEndAction); consoleActions.add(ActionManager.getInstance().getAction("Print")); - consoleActions.add(new ClearThisConsoleAction(this)); + consoleActions.add(clearThisConsoleAction()); consoleActions.addAll(customActions); List postProcessors = ConsoleActionsPostProcessor.EP_NAME.getExtensionList(); AnAction[] result = consoleActions.toArray(AnAction.EMPTY_ARRAY); @@ -1430,6 +1430,11 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo return result; } + @NotNull + protected final AnAction clearThisConsoleAction() { + return new ClearThisConsoleAction(this); + } + @Override public void allowHeavyFilters() { myAllowHeavyFilters = true; diff --git a/platform/vcs-impl/api-dump-unreviewed.txt b/platform/vcs-impl/api-dump-unreviewed.txt index b9628c1fa9d9..3d2138970144 100644 --- a/platform/vcs-impl/api-dump-unreviewed.txt +++ b/platform/vcs-impl/api-dump-unreviewed.txt @@ -9326,6 +9326,7 @@ f:com.intellij.vcs.console.VcsConsoleView - sf:CONSOLE_PLACE:com.intellij.execution.ui.ConsoleViewPlace - sf:Companion:com.intellij.vcs.console.VcsConsoleView$Companion - (com.intellij.openapi.project.Project):V +- createConsoleActions():com.intellij.openapi.actionSystem.AnAction[] - getPlace():com.intellij.execution.ui.ConsoleViewPlace f:com.intellij.vcs.console.VcsConsoleView$Companion a:com.intellij.vcs.editor.ComplexPathVirtualFileSystem diff --git a/platform/vcs-impl/src/com/intellij/vcs/console/VcsConsoleView.kt b/platform/vcs-impl/src/com/intellij/vcs/console/VcsConsoleView.kt index 61a70c9f8ec0..0347d1fcca9d 100644 --- a/platform/vcs-impl/src/com/intellij/vcs/console/VcsConsoleView.kt +++ b/platform/vcs-impl/src/com/intellij/vcs/console/VcsConsoleView.kt @@ -4,7 +4,11 @@ package com.intellij.vcs.console import com.intellij.execution.impl.ConsoleViewImpl import com.intellij.execution.impl.EditorHyperlinkSupport import com.intellij.execution.ui.ConsoleViewPlace +import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.diagnostic.logger +import com.intellij.openapi.editor.actions.ScrollToTheEndToolbarAction +import com.intellij.openapi.editor.actions.ToggleUseSoftWrapsToolbarAction +import com.intellij.openapi.editor.impl.softwrap.SoftWrapAppliancePlaces import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project import com.intellij.openapi.util.TextRange @@ -19,6 +23,12 @@ class VcsConsoleView(project: Project) : ConsoleViewImpl(project, true) { override fun getPlace(): ConsoleViewPlace = CONSOLE_PLACE + override fun createConsoleActions(): Array { + val switchSoftWrapsAction = ToggleUseSoftWrapsToolbarAction(SoftWrapAppliancePlaces.CONSOLE) + val scrollToTheEndToolbarAction = ScrollToTheEndToolbarAction(editor) + return arrayOf(switchSoftWrapsAction, scrollToTheEndToolbarAction, clearThisConsoleAction()) + } + override fun updateFoldings(startLine: Int, endLine: Int) { super.updateFoldings(startLine, endLine)