microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 18:12:45 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

add OverviewRuler to the terminal (#145146)

Browse Source
This commit is contained in:
Megan Rogge
2022-03-15 21:35:33 -04:00
committed by GitHub
parent 438c67889b
commit 280e61839a
3 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vs/workbench/contrib/terminal/browser/media/xterm.css
View File

@@ -182,3 +182,10 @@
z-index: 6;
position: absolute;
}
.xterm-decoration-overview-ruler {
z-index: 7;
position: absolute;
top: 0;
right: 0;
}

40
src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
View File

@@ -22,13 +22,15 @@ import { fromNow } from 'vs/base/common/date';
import { toolbarHoverBackground } from 'vs/platform/theme/common/colorRegistry';
import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
import { Color } from 'vs/base/common/color';
const enum DecorationSelector {
CommandDecoration = 'terminal-command-decoration',
ErrorColor = 'error',
DefaultColor = 'default',
Codicon = 'codicon',
XtermDecoration = 'xterm-decoration'
XtermDecoration = 'xterm-decoration',
OverviewRuler = 'xterm-decoration-overview-ruler'
}
const enum DecorationStyles {
@@ -46,6 +48,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
private _contextMenuVisible: boolean = false;
private _decorations: Map<number, IDisposableDecoration> = new Map();
private _placeholderDecoration: IDecoration | undefined;
private _overviewRuler: IDecoration | undefined;
private readonly _onDidRequestRunCommand = this._register(new Emitter<string>());
readonly onDidRequestRunCommand = this._onDidRequestRunCommand.event;
@@ -92,6 +95,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
if (disableDecorations) {
this._commandStartedListener?.dispose();
this._commandFinishedListener?.dispose();
this._overviewRuler?.dispose();
}
this._placeholderDecoration?.dispose();
this._placeholderDecoration?.marker.dispose();
@@ -161,7 +165,9 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
});
}
activate(terminal: Terminal): void { this._terminal = terminal; }
activate(terminal: Terminal): void {
this._terminal = terminal;
}
registerCommandDecoration(command: ITerminalCommand, beforeCommandExecution?: boolean): IDecoration | undefined {
if (!this._terminal) {
@@ -172,24 +178,32 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
}
this._placeholderDecoration?.dispose();
const decoration = this._terminal.registerDecoration({ marker: command.marker });
let color = command.exitCode === undefined ? defaultColor : command.exitCode ? errorColor : successColor;
if (color && typeof color !== 'string') {
color = color.toString();
} else {
color = '';
}
const decoration = this._terminal.registerDecoration({ marker: command.marker, overviewRulerOptions: { color } });
if (!decoration) {
return undefined;
}
decoration.onRender(element => {
decoration.onDispose(() => this._decorations.delete(decoration.marker.id));
if (element.classList.contains(DecorationSelector.OverviewRuler)) {
return;
}
if (beforeCommandExecution && !this._placeholderDecoration) {
this._placeholderDecoration = decoration;
this._placeholderDecoration.onDispose(() => this._placeholderDecoration = undefined);
} else {
if (!this._decorations.has(decoration.marker.id)) {
this._decorations.set(decoration.marker.id, {
decoration.onDispose(() => this._decorations.delete(decoration.marker.id));
this._decorations.set(decoration.marker.id,
{
decoration,
disposables: command.exitCode === undefined ? [] : [this._createContextMenu(element, command), ...this._createHover(element, command)],
exitCode: command.exitCode
});
}
}
if (!element.classList.contains(DecorationSelector.Codicon) || command.marker?.line === 0) {
// first render or buffer was cleared
@@ -292,11 +306,13 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
return actions;
}
}
let successColor: string | Color | undefined;
let errorColor: string | Color | undefined;
let defaultColor: string | Color | undefined;
registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
const successColor = theme.getColor(TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR);
const errorColor = theme.getColor(TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR);
const defaultColor = theme.getColor(TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR);
successColor = theme.getColor(TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR);
errorColor = theme.getColor(TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR);
defaultColor = theme.getColor(TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR);
const hoverBackgroundColor = theme.getColor(toolbarHoverBackground);
if (successColor) {

3
src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
View File

@@ -130,7 +130,8 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal {
fastScrollSensitivity: config.fastScrollSensitivity,
scrollSensitivity: config.mouseWheelScrollSensitivity,
rendererType: this._getBuiltInXtermRenderer(config.gpuAcceleration, XtermTerminal._suggestedRendererType),
wordSeparator: config.wordSeparators
wordSeparator: config.wordSeparators,
overviewRulerWidth: 10
}));
this._core = (this.raw as any)._core as IXtermCore;