From 6f5d3529923bf39591060fcccd23924c8302103c Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 18 Sep 2023 10:21:21 -0700 Subject: [PATCH 1/6] use closest instead of big parent chain --- .../contrib/terminalContrib/quickFix/browser/quickFixAddon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts index 365dd9f00d1..9d318850e75 100644 --- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts @@ -283,7 +283,7 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon, updateLayout(this._configurationService, e); this._audioCueService.playAudioCue(AudioCue.terminalQuickFix); - const parentElement = e.parentElement?.parentElement?.parentElement?.parentElement; + const parentElement = e.closest('.xterm.terminal.focus') as HTMLElement; if (!parentElement) { return; } From 3197655a6089ad6300ba29b540cc8c92471103e0 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 18 Sep 2023 10:26:25 -0700 Subject: [PATCH 2/6] fix css --- .../terminal/browser/media/terminal.css | 13 ------------- .../terminal/browser/terminal.contribution.ts | 1 + .../browser/media/terminalQuickFix.css | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css index c32f1c421b0..a11d5cc80b7 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css +++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css @@ -285,10 +285,6 @@ border-style: solid; } -.xterm-screen .xterm-decoration-container .xterm-decoration.quick-fix { - z-index: 7; -} - .monaco-workbench .part.sidebar > .title > .title-actions .switch-terminal { display: flex; align-items: center; @@ -484,15 +480,6 @@ pointer-events: none; color: var(--vscode-terminalCommandDecoration-defaultBackground); } -.monaco-workbench .terminal .terminal-command-decoration.quick-fix { - color: var(--vscode-editorLightBulb-foreground) !important; - background-color: var(--vscode-terminal-background, var(--vscode-panel-background)); -} -.monaco-workbench .terminal .terminal-command-decoration.quick-fix.explainOnly { - /* Use success background to blend in with the terminal better as it's lower priority. We will - * probably want to add an explicit color for this eventually. */ - color: var(--vscode-terminalCommandDecoration-successBackground) !important; -} .terminal-scroll-highlight { left: 0; diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index 1bb341555ef..b45c61f9218 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -8,6 +8,7 @@ import 'vs/css!./media/scrollbar'; import 'vs/css!./media/widgets'; import 'vs/css!./media/xterm'; import 'vs/css!./media/terminal'; +import 'vs/css!./media/terminalQuickFix'; import * as nls from 'vs/nls'; import { URI } from 'vs/base/common/uri'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css new file mode 100644 index 00000000000..11a54028fe5 --- /dev/null +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +.xterm-screen .xterm-decoration-container .xterm-decoration.quick-fix { + z-index: 7; +} + +.monaco-workbench .terminal .terminal-command-decoration.quick-fix { + color: var(--vscode-editorLightBulb-foreground) !important; + background-color: var(--vscode-terminal-background, var(--vscode-panel-background)); +} + +.monaco-workbench .terminal .terminal-command-decoration.quick-fix.explainOnly { + /* Use success background to blend in with the terminal better as it's lower priority. We will + * probably want to add an explicit color for this eventually. */ + color: var(--vscode-terminalCommandDecoration-successBackground) !important; +} From f30f7d80cc2609b868b74b2d811a2c554366f029 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 18 Sep 2023 10:35:10 -0700 Subject: [PATCH 3/6] move css to where it works --- .../quickFix => terminal}/browser/media/terminalQuickFix.css | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/vs/workbench/contrib/{terminalContrib/quickFix => terminal}/browser/media/terminalQuickFix.css (100%) diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css b/src/vs/workbench/contrib/terminal/browser/media/terminalQuickFix.css similarity index 100% rename from src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css rename to src/vs/workbench/contrib/terminal/browser/media/terminalQuickFix.css From 027d141bdf8db942a1f07ae76e04ca518ff227f3 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 18 Sep 2023 10:47:58 -0700 Subject: [PATCH 4/6] less specific selector --- .../contrib/terminalContrib/quickFix/browser/quickFixAddon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts index 9d318850e75..697f6db5009 100644 --- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts @@ -283,7 +283,7 @@ export class TerminalQuickFixAddon extends Disposable implements ITerminalAddon, updateLayout(this._configurationService, e); this._audioCueService.playAudioCue(AudioCue.terminalQuickFix); - const parentElement = e.closest('.xterm.terminal.focus') as HTMLElement; + const parentElement = e.closest('.xterm') as HTMLElement; if (!parentElement) { return; } From 962e89aa7ef353d5d4d322dcfd0edb08e5de19a7 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 18 Sep 2023 14:01:55 -0700 Subject: [PATCH 5/6] Revert "move css to where it works" This reverts commit f30f7d80cc2609b868b74b2d811a2c554366f029. --- .../quickFix}/browser/media/terminalQuickFix.css | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/vs/workbench/contrib/{terminal => terminalContrib/quickFix}/browser/media/terminalQuickFix.css (100%) diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminalQuickFix.css b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css similarity index 100% rename from src/vs/workbench/contrib/terminal/browser/media/terminalQuickFix.css rename to src/vs/workbench/contrib/terminalContrib/quickFix/browser/media/terminalQuickFix.css From 5a1642eddaf8e89a727a242493cc88f889b6ae15 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 18 Sep 2023 14:02:51 -0700 Subject: [PATCH 6/6] add import in the right place --- .../workbench/contrib/terminal/browser/terminal.contribution.ts | 1 - .../quickFix/browser/terminal.quickFix.contribution.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index b45c61f9218..1bb341555ef 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -8,7 +8,6 @@ import 'vs/css!./media/scrollbar'; import 'vs/css!./media/widgets'; import 'vs/css!./media/xterm'; import 'vs/css!./media/terminal'; -import 'vs/css!./media/terminalQuickFix'; import * as nls from 'vs/nls'; import { URI } from 'vs/base/common/uri'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts index 96f2fccd74f..4fca04ec9a9 100644 --- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts @@ -3,6 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import 'vs/css!./media/terminalQuickFix'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { DisposableStore } from 'vs/base/common/lifecycle'; import { localize } from 'vs/nls';