From c7330bb771d5e77ac2db9ba962e91cca8962e254 Mon Sep 17 00:00:00 2001 From: rebornix Date: Tue, 1 Nov 2022 20:15:42 -0700 Subject: [PATCH 1/4] Notebook find widget and toolbar css variable. --- .../find/notebookFindReplaceWidget.css | 10 ++++++ .../contrib/find/notebookFindReplaceWidget.ts | 35 +------------------ .../browser/media/notebookToolbar.css | 2 +- .../viewParts/notebookEditorToolbar.ts | 13 ------- 4 files changed, 12 insertions(+), 48 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.css b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.css index 52cfc8adcaccb..083fb5197c204 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.css +++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.css @@ -14,6 +14,9 @@ padding:0 var(--notebook-find-horizontal-padding); transition: top 200ms linear; visibility: hidden; + background-color: var(--vscode-editorWidget-background) !important; + color: var(--vscode-editorWidget-foreground); + box-shadow: 0 0 8px 2px var(--vscode-widget-shadow); } .monaco-workbench.reduce-motion .simple-fr-find-part-wrapper { @@ -154,10 +157,17 @@ padding: 2px; } +.simple-fr-find-part .find-filter-button > .monaco-action-bar .action-label.notebook-filters.checked { + border-color: var(--vscode-inputOption-activeBorder); + color: var(--vscode-inputOption-activeForeground); + background-color: var(--vscode-inputOption-activeBackground); +} + .monaco-workbench .simple-fr-find-part .monaco-inputbox > .ibwrapper > .input, .monaco-workbench .simple-fr-replace-part .monaco-inputbox > .ibwrapper > .input { height: 24px; } .monaco-workbench .simple-fr-find-part-wrapper .monaco-sash { left: 0 !important; + background-color: var(--vscode-editorWidget-resizeBorder, var(--vscode-editorWidget-border)); } diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts index 736a6f2eb1ecc..f27f0505e8721 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts @@ -18,7 +18,7 @@ import * as nls from 'vs/nls'; import { ContextScopedReplaceInput, registerAndCreateHistoryNavigationContext } from 'vs/platform/history/browser/contextScopedHistoryWidget'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, editorWidgetResizeBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground, widgetShadow } from 'vs/platform/theme/common/colorRegistry'; +import { inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground } from 'vs/platform/theme/common/colorRegistry'; import { registerIcon, widgetClose } from 'vs/platform/theme/common/iconRegistry'; import { attachProgressBarStyler } from 'vs/platform/theme/common/styler'; import { IColorTheme, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService'; @@ -766,39 +766,6 @@ export abstract class SimpleFindReplaceWidget extends Widget { // theming registerThemingParticipant((theme, collector) => { - const findWidgetBGColor = theme.getColor(editorWidgetBackground); - if (findWidgetBGColor) { - collector.addRule(`.monaco-workbench .simple-fr-find-part-wrapper { background-color: ${findWidgetBGColor} !important; }`); - } - - const widgetForeground = theme.getColor(editorWidgetForeground); - if (widgetForeground) { - collector.addRule(`.monaco-workbench .simple-fr-find-part-wrapper { color: ${widgetForeground}; }`); - } - - const widgetShadowColor = theme.getColor(widgetShadow); - if (widgetShadowColor) { - collector.addRule(`.monaco-workbench .simple-fr-find-part-wrapper { box-shadow: 0 0 8px 2px ${widgetShadowColor}; }`); - } - - const inputActiveOptionBorderColor = theme.getColor(inputActiveOptionBorder); - if (inputActiveOptionBorderColor) { - collector.addRule(`.simple-fr-find-part .find-filter-button > .monaco-action-bar .action-label.notebook-filters.checked { border-color: ${inputActiveOptionBorderColor}; }`); - } - const inputActiveOptionForegroundColor = theme.getColor(inputActiveOptionForeground); - if (inputActiveOptionForegroundColor) { - collector.addRule(`.simple-fr-find-part .find-filter-button > .monaco-action-bar .action-label.notebook-filters.checked { color: ${inputActiveOptionForegroundColor}; }`); - } - const inputActiveOptionBackgroundColor = theme.getColor(inputActiveOptionBackground); - if (inputActiveOptionBackgroundColor) { - collector.addRule(`.simple-fr-find-part .find-filter-button > .monaco-action-bar .action-label.notebook-filters.checked { background-color: ${inputActiveOptionBackgroundColor}; }`); - } - - const resizeBorderBackground = theme.getColor(editorWidgetResizeBorder) ?? theme.getColor(editorWidgetBorder); - if (resizeBorderBackground) { - collector.addRule(`.monaco-workbench .simple-fr-find-part-wrapper .monaco-sash { background-color: ${resizeBorderBackground}; }`); - } - collector.addRule(` :root { --notebook-find-width: ${NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH}px; diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebookToolbar.css b/src/vs/workbench/contrib/notebook/browser/media/notebookToolbar.css index f7ddb6665a70a..5413489266c9d 100644 --- a/src/vs/workbench/contrib/notebook/browser/media/notebookToolbar.css +++ b/src/vs/workbench/contrib/notebook/browser/media/notebookToolbar.css @@ -78,7 +78,7 @@ } .monaco-workbench .notebookOverlay .notebook-toolbar-container .monaco-action-bar:not(.vertical) .action-item.active { - background-color: unset; + background-color: var(--vscode-toolbar-activeBackground); } .monaco-workbench .notebookOverlay .notebook-toolbar-container .monaco-action-bar .action-item .codicon-notebook-state-error { diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts index 18abfa18c17f3..49779ff74ebf8 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts @@ -17,8 +17,6 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { toolbarActiveBackground } from 'vs/platform/theme/common/colorRegistry'; -import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { SELECT_KERNEL_ID } from 'vs/workbench/contrib/notebook/browser/controller/coreActions'; import { NOTEBOOK_EDITOR_ID, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser'; @@ -620,14 +618,3 @@ export class NotebookEditorToolbar extends Disposable { super.dispose(); } } - -registerThemingParticipant((theme, collector) => { - const toolbarActiveBackgroundColor = theme.getColor(toolbarActiveBackground); - if (toolbarActiveBackgroundColor) { - collector.addRule(` - .monaco-workbench .notebookOverlay .notebook-toolbar-container .monaco-action-bar:not(.vertical) .action-item.active { - background-color: ${toolbarActiveBackgroundColor}; - } - `); - } -}); From abfb1f679b4685e0332c9f6d5e2bf172c5423564 Mon Sep 17 00:00:00 2001 From: rebornix Date: Tue, 1 Nov 2022 20:23:46 -0700 Subject: [PATCH 2/4] Cell comments css variables --- .../notebook/browser/media/notebook.css | 18 ++++++++++ .../browser/view/cellParts/cellComments.ts | 34 +++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebook.css b/src/vs/workbench/contrib/notebook/browser/media/notebook.css index 5ab3a43366f1d..0a0c0c97b22d8 100644 --- a/src/vs/workbench/contrib/notebook/browser/media/notebook.css +++ b/src/vs/workbench/contrib/notebook/browser/media/notebook.css @@ -551,3 +551,21 @@ .monaco-workbench .notebookOverlay .cell-editor-container .monaco-editor .margin-view-overlays .codicon-folding-collapsed { margin-left: 0; } + +/** Notebook Cell Comments */ + +.cell-comment-container.review-widget { + border-left: 1px solid var(--vscode-peekView-border); border-right: 1px solid var(--vscode-peekView-border); +} + +.cell-comment-container.review-widget > .head { + border-top: 1px solid var(--vscode-peekView-border); +} + +.cell-comment-container.review-widget > .body { + border-bottom: 1px solid var(--vscode-peekView-border); +} + +.cell-comment-container.review-widget { + background-color: var(--vscode-peekViewResult-background); +} diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts index d18b4c332a05b..b4bc5a482a3ab 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts @@ -3,22 +3,21 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { coalesce } from 'vs/base/common/arrays'; +import { DisposableStore } from 'vs/base/common/lifecycle'; +import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions'; import * as languages from 'vs/editor/common/languages'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +import { IThemeService } from 'vs/platform/theme/common/themeService'; +import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService'; +import { CommentThreadWidget } from 'vs/workbench/contrib/comments/browser/commentThreadWidget'; import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser'; import { CellPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart'; -import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel'; -import { CommentThreadWidget } from 'vs/workbench/contrib/comments/browser/commentThreadWidget'; -import { DisposableStore } from 'vs/base/common/lifecycle'; -import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; +import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon'; import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange'; -import { ICommentService } from 'vs/workbench/contrib/comments/browser/commentService'; -import { coalesce } from 'vs/base/common/arrays'; -import { peekViewBorder, peekViewResultsBackground } from 'vs/editor/contrib/peekView/browser/peekView'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions'; export class CellComments extends CellPart { private _initialized: boolean = false; @@ -176,20 +175,3 @@ export class CellComments extends CellPart { } } -registerThemingParticipant((theme, collector) => { - const borderColor = theme.getColor(peekViewBorder); - - if (borderColor) { - collector.addRule(`.cell-comment-container.review-widget { border-left: 1px solid ${borderColor}; border-right: 1px solid ${borderColor}; }`); - collector.addRule(`.cell-comment-container.review-widget > .head { border-top: 1px solid ${borderColor}; }`); - collector.addRule(`.cell-comment-container.review-widget > .body { border-bottom: 1px solid ${borderColor}; }`); - } - - const peekViewBackground = theme.getColor(peekViewResultsBackground); - if (peekViewBackground) { - collector.addRule( - `.cell-comment-container.review-widget {` + - ` background-color: ${peekViewBackground};` + - `}`); - } -}); From 19ca0198456d0f9eb47287da14db0838d1464bae Mon Sep 17 00:00:00 2001 From: rebornix Date: Tue, 1 Nov 2022 22:17:30 -0700 Subject: [PATCH 3/4] Diff overview ruler css variables --- .../notebook/browser/diff/notebookDiff.css | 12 +++++++ .../browser/diff/notebookDiffOverviewRuler.ts | 33 ++----------------- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css index bb6786c48c20d..d8bd1615fb1a6 100644 --- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css +++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css @@ -306,3 +306,15 @@ .notebook-text-diff-editor .notebook-overview-ruler-container .diffViewport { z-index: var(--notebook-diff-view-viewport-slider); } + +.notebook-text-diff-editor .diffViewport { + background: var(--vscode-scrollbarSlider-background); +} + +.notebook-text-diff-editor .diffViewport:hover { + background: var(--vscode-scrollbarSlider-hoverBackground); +} + +.notebook-text-diff-editor .diffViewport:active { + background: var(--vscode-scrollbarSlider-activeBackground); +} diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts index 7ccc71587d38b..e9a9be4f8c78a 100644 --- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts +++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts @@ -8,8 +8,8 @@ import * as DOM from 'vs/base/browser/dom'; import { createFastDomNode, FastDomNode } from 'vs/base/browser/fastDomNode'; import { Color } from 'vs/base/common/color'; import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle'; -import { defaultInsertColor, defaultRemoveColor, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground } from 'vs/platform/theme/common/colorRegistry'; -import { IColorTheme, IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService'; +import { defaultInsertColor, defaultRemoveColor, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from 'vs/platform/theme/common/colorRegistry'; +import { IColorTheme, IThemeService, Themable } from 'vs/platform/theme/common/themeService'; import { DiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel'; import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher'; import { INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser'; @@ -214,32 +214,3 @@ export class NotebookDiffOverviewRuler extends Themable { super.dispose(); } } - -registerThemingParticipant((theme, collector) => { - const scrollbarSliderBackgroundColor = theme.getColor(scrollbarSliderBackground); - if (scrollbarSliderBackgroundColor) { - collector.addRule(` - .notebook-text-diff-editor .diffViewport { - background: ${scrollbarSliderBackgroundColor}; - } - `); - } - - const scrollbarSliderHoverBackgroundColor = theme.getColor(scrollbarSliderHoverBackground); - if (scrollbarSliderHoverBackgroundColor) { - collector.addRule(` - .notebook-text-diff-editor .diffViewport:hover { - background: ${scrollbarSliderHoverBackgroundColor}; - } - `); - } - - const scrollbarSliderActiveBackgroundColor = theme.getColor(scrollbarSliderActiveBackground); - if (scrollbarSliderActiveBackgroundColor) { - collector.addRule(` - .notebook-text-diff-editor .diffViewport:active { - background: ${scrollbarSliderActiveBackgroundColor}; - } - `); - } -}); From 55a95c7086307225f7562cbb813383a806b45a9f Mon Sep 17 00:00:00 2001 From: rebornix Date: Tue, 1 Nov 2022 22:36:34 -0700 Subject: [PATCH 4/4] Reduce theme participant for notebook diff editor --- .../notebook/browser/diff/notebookDiff.css | 72 +++++++++++ .../browser/diff/notebookDiffEditor.ts | 122 +----------------- 2 files changed, 74 insertions(+), 120 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css index d8bd1615fb1a6..a0a89a75d844c 100644 --- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css +++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css @@ -318,3 +318,75 @@ .notebook-text-diff-editor .diffViewport:active { background: var(--vscode-scrollbarSlider-activeBackground); } + +/** Diff cell borders */ +.notebook-text-diff-editor .cell-body .border-container .top-border, +.notebook-text-diff-editor .cell-body .border-container .bottom-border, +.notebook-text-diff-editor .cell-diff-editor-container .output-header-container, +.notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container { + border-top: 1px solid var(--vscode-notebook-cellBorderColor); +} + +.notebook-text-diff-editor .cell-body .border-container .left-border { + border-left: 1px solid var(--vscode-notebook-cellBorderColor); +} + +.notebook-text-diff-editor .cell-body .border-container .right-border { + border-right: 1px solid var(--vscode-notebook-cellBorderColor); +} + +/** Diff cell active borders */ +.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .top-border, +.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .bottom-border { + border-top: 1px solid var(--vscode-notebook-focusedEditorBorder); +} + +.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .left-border { + border-left: 1px solid var(--vscode-notebook-focusedEditorBorder); +} + +.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .right-border { + border-right: 1px solid var(--vscode-notebook-focusedEditorBorder); +} + +/** Diff cell diff background */ + +.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-right div.foreground, +.monaco-workbench .notebook-text-diff-editor .cell-body.right .output-info-container .output-view-container div.foreground, +.monaco-workbench .notebook-text-diff-editor .cell-body.right .output-info-container .output-view-container div.output-empty-view, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .margin, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .monaco-editor-background, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .margin, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .monaco-editor-background, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-editor-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-editor-container .monaco-editor .margin, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-editor-container .monaco-editor .monaco-editor-background, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-header-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-header-container { + background-color: var(--vscode-diffEditor-insertedTextBackground); +} + +.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-left div.foreground, +.monaco-workbench .notebook-text-diff-editor .cell-body.left .output-info-container .output-view-container div.foreground, +.monaco-workbench .notebook-text-diff-editor .cell-body.left .output-info-container .output-view-container div.output-empty-view, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .margin, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .monaco-editor-background, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .margin, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .monaco-editor-background, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-editor-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-editor-container .monaco-editor .margin, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-editor-container .monaco-editor .monaco-editor-background, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-header-container, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-header-container { + background-color: var(--vscode-diffEditor-removedTextBackground); +} + +/** Diff cell editor background */ +.notebook-text-diff-editor .cell-body .cell-diff-editor-container .source-container .monaco-editor .margin, +.notebook-text-diff-editor .cell-body .cell-diff-editor-container .source-container .monaco-editor .monaco-editor-background { + background: var(--vscode-notebook-cellEditorBackground, var(--vscode-editor-background)); +} diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts index 5b3b671e3a326..a1af89f6e233f 100644 --- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts +++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts @@ -9,7 +9,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, IEditorOpenContext, IEditorPaneSelection, IEditorPaneSelectionChangeEvent, IEditorPaneWithSelection } from 'vs/workbench/common/editor'; -import { cellEditorBackground, focusedEditorBorderColor, getDefaultNotebookCreationOptions, notebookCellBorder, NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget'; +import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget'; import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService'; import { NotebookDiffEditorInput } from '../../common/notebookDiffEditorInput'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; @@ -17,7 +17,7 @@ import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDif import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { CellDiffSideBySideRenderer, CellDiffSingleSideRenderer, NotebookCellTextDiffListDelegate, NotebookTextDiffList } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffList'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { diffDiagonalFill, diffInserted, diffRemoved, editorBackground, focusBorder, foreground } from 'vs/platform/theme/common/colorRegistry'; +import { diffDiagonalFill, editorBackground, focusBorder, foreground } from 'vs/platform/theme/common/colorRegistry'; import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions'; @@ -1023,27 +1023,6 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD registerZIndex(ZIndex.Base, 10, 'notebook-diff-view-viewport-slider'); registerThemingParticipant((theme, collector) => { - const cellBorderColor = theme.getColor(notebookCellBorder); - if (cellBorderColor) { - collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .top-border { border-top: 1px solid ${cellBorderColor};}`); - collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .bottom-border { border-top: 1px solid ${cellBorderColor};}`); - collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .left-border { border-left: 1px solid ${cellBorderColor};}`); - collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .right-border { border-right: 1px solid ${cellBorderColor};}`); - collector.addRule(`.notebook-text-diff-editor .cell-diff-editor-container .output-header-container, - .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container { - border-top: 1px solid ${cellBorderColor}; - }`); - } - - const focusCellBackgroundColor = theme.getColor(focusedEditorBorderColor); - - if (focusCellBackgroundColor) { - collector.addRule(`.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .top-border { border-top: 1px solid ${focusCellBackgroundColor};}`); - collector.addRule(`.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .bottom-border { border-top: 1px solid ${focusCellBackgroundColor};}`); - collector.addRule(`.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .left-border { border-left: 1px solid ${focusCellBackgroundColor};}`); - collector.addRule(`.notebook-text-diff-editor .monaco-list-row.focused .cell-body .border-container .right-border { border-right: 1px solid ${focusCellBackgroundColor};}`); - } - const diffDiagonalFillColor = theme.getColor(diffDiagonalFill); collector.addRule(` .notebook-text-diff-editor .diagonal-fill { @@ -1058,102 +1037,5 @@ registerThemingParticipant((theme, collector) => { } `); - const editorBackgroundColor = theme.getColor(cellEditorBackground) ?? theme.getColor(editorBackground); - if (editorBackgroundColor) { - collector.addRule(`.notebook-text-diff-editor .cell-body .cell-diff-editor-container .source-container .monaco-editor .margin, - .notebook-text-diff-editor .cell-body .cell-diff-editor-container .source-container .monaco-editor .monaco-editor-background { background: ${editorBackgroundColor}; }` - ); - } - - const added = theme.getColor(diffInserted); - if (added) { - collector.addRule( - ` - .monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-right div.foreground { background-color: ${added}; } - .monaco-workbench .notebook-text-diff-editor .cell-body.right .output-info-container .output-view-container div.foreground { background-color: ${added}; } - .monaco-workbench .notebook-text-diff-editor .cell-body.right .output-info-container .output-view-container div.output-empty-view { background-color: ${added}; } - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container { background-color: ${added}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .margin, - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .monaco-editor-background { - background-color: ${added}; - } - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container { background-color: ${added}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .margin, - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .monaco-editor-background { - background-color: ${added}; - } - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-editor-container { background-color: ${added}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-editor-container .monaco-editor .margin, - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-editor-container .monaco-editor .monaco-editor-background { - background-color: ${added}; - } - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-header-container { background-color: ${added}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .output-header-container { background-color: ${added}; } - ` - ); - } - const removed = theme.getColor(diffRemoved); - if (removed) { - collector.addRule( - ` - .monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-left div.foreground { background-color: ${removed}; } - .monaco-workbench .notebook-text-diff-editor .cell-body.left .output-info-container .output-view-container div.foreground { background-color: ${removed}; } - .monaco-workbench .notebook-text-diff-editor .cell-body.left .output-info-container .output-view-container div.output-empty-view { background-color: ${removed}; } - - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container { background-color: ${removed}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .margin, - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .monaco-editor-background { - background-color: ${removed}; - } - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container { background-color: ${removed}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .margin, - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .monaco-editor-background { - background-color: ${removed}; - } - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-editor-container { background-color: ${removed}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-editor-container .monaco-editor .margin, - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-editor-container .monaco-editor .monaco-editor-background { - background-color: ${removed}; - } - ` - ); - collector.addRule(` - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-header-container { background-color: ${removed}; } - .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .output-header-container { background-color: ${removed}; } - ` - ); - } - - // const changed = theme.getColor(editorGutterModifiedBackground); - - // if (changed) { - // collector.addRule(` - // .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container.modified { - // background-color: ${changed}; - // } - // `); - // } - collector.addRule(`.notebook-text-diff-editor .cell-body { margin: ${DIFF_CELL_MARGIN}px; }`); });