Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-15 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152136 from microsoft/tyriar/151228

Browse Source 
Try prevent duplicate placeholder decorations showing
This commit is contained in:
Daniel Imms
2022-06-15 05:11:50 -07:00
committed by GitHub
parent 83326654e3 adf9340be6
commit e07cc2a604
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
View File

@@ -297,6 +297,12 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
}
handleCommandStart(): void {
// Only update the column if the line has already been set
if (this._currentCommand.commandStartMarker?.line === this._terminal.buffer.active.cursorY) {
this._currentCommand.commandStartX = this._terminal.buffer.active.cursorX;
this._logService.debug('CommandDetectionCapability#handleCommandStart', this._currentCommand.commandStartX, this._currentCommand.commandStartMarker?.line);
return;
}
if (this._isWindowsPty) {
this._handleCommandStartWindows();
return;

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

@@ -215,14 +215,14 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
if (!decoration) {
return undefined;
}
if (beforeCommandExecution) {
this._placeholderDecoration = decoration;
}
decoration.onRender(element => {
if (element.classList.contains(DecorationSelector.OverviewRuler)) {
return;
}
if (beforeCommandExecution && !this._placeholderDecoration) {
this._placeholderDecoration = decoration;
} else if (!this._decorations.get(decoration.marker.id)) {
if (!this._decorations.get(decoration.marker.id)) {
decoration.onDispose(() => this._decorations.delete(decoration.marker.id));
this._decorations.set(decoration.marker.id,
{