From c5d2007c55b49248e53b8e8cf1f5d1135a8b7eec Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 3 Oct 2024 12:13:45 -0700 Subject: [PATCH 1/6] Move css specific code to own file Planning to add some additional css helpers. `dom` is getting fairly large and unfocused so I think we should start a new file just for helping write css --- src/vs/base/browser/css.ts | 35 +++++++++++++++++++ src/vs/base/browser/dom.ts | 31 +--------------- src/vs/base/browser/ui/iconLabel/iconLabel.ts | 3 +- src/vs/base/browser/ui/inputbox/inputBox.ts | 5 +-- src/vs/base/browser/ui/list/listWidget.ts | 3 +- .../browser/ui/selectBox/selectBoxCustom.ts | 3 +- src/vs/base/browser/ui/tree/abstractTree.ts | 3 +- src/vs/base/test/browser/dom.test.ts | 3 +- .../services/abstractCodeEditorService.ts | 5 +-- .../browser/menuEntryActionViewItem.ts | 3 +- .../quickinput/browser/quickInputTree.ts | 3 +- .../quickinput/browser/quickInputUtils.ts | 5 +-- .../platform/theme/browser/iconsStyleSheet.ts | 2 +- .../browser/parts/banner/bannerPart.ts | 3 +- .../browser/parts/paneCompositeBar.ts | 3 +- .../workbench/browser/parts/views/treeView.ts | 3 +- .../workbench/browser/parts/views/viewPane.ts | 4 ++- .../bulkEdit/browser/preview/bulkEditTree.ts | 17 ++++----- .../comments/browser/reactionsAction.ts | 3 +- .../contrib/scm/browser/scmViewPane.ts | 3 +- .../terminal/browser/terminalService.ts | 5 +-- .../contrib/terminal/browser/terminalView.ts | 3 +- .../contrib/timeline/browser/timelinePane.ts | 3 +- .../browser/webviewIconManager.ts | 5 +-- .../decorations/browser/decorationsService.ts | 3 +- .../themes/browser/fileIconThemeData.ts | 2 +- 26 files changed, 95 insertions(+), 66 deletions(-) create mode 100644 src/vs/base/browser/css.ts diff --git a/src/vs/base/browser/css.ts b/src/vs/base/browser/css.ts new file mode 100644 index 0000000000000..dc2ec39eabdd5 --- /dev/null +++ b/src/vs/base/browser/css.ts @@ -0,0 +1,35 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +import { FileAccess } from '../common/network'; +import { URI } from '../common/uri'; + +export function asCssValueWithDefault(cssPropertyValue: string | undefined, dflt: string): string { + if (cssPropertyValue !== undefined) { + const variableMatch = cssPropertyValue.match(/^\s*var\((.+)\)$/); + if (variableMatch) { + const varArguments = variableMatch[1].split(',', 2); + if (varArguments.length === 2) { + dflt = asCssValueWithDefault(varArguments[1].trim(), dflt); + } + return `var(${varArguments[0]}, ${dflt})`; + } + return cssPropertyValue; + } + return dflt; +} + +export function asCSSPropertyValue(value: string) { + return `'${value.replace(/'/g, '%27')}'`; +} + +/** + * returns url('...') + */ +export function asCSSUrl(uri: URI | null | undefined): string { + if (!uri) { + return `url('')`; + } + return `url('${FileAccess.uriToBrowserUri(uri).toString(true).replace(/'/g, '%27')}')`; +} diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts index 49378a9462d38..aed3a0c01ee2d 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts @@ -13,7 +13,7 @@ import * as event from '../common/event.js'; import * as dompurify from './dompurify/dompurify.js'; import { KeyCode } from '../common/keyCodes.js'; import { Disposable, DisposableStore, IDisposable, toDisposable } from '../common/lifecycle.js'; -import { FileAccess, RemoteAuthorities, Schemas } from '../common/network.js'; +import { RemoteAuthorities, Schemas } from '../common/network.js'; import * as platform from '../common/platform.js'; import { URI } from '../common/uri.js'; import { hash } from '../common/hash.js'; @@ -1676,35 +1676,6 @@ export function animate(targetWindow: Window, fn: () => void): IDisposable { RemoteAuthorities.setPreferredWebSchema(/^https:/.test(mainWindow.location.href) ? 'https' : 'http'); -/** - * returns url('...') - */ -export function asCSSUrl(uri: URI | null | undefined): string { - if (!uri) { - return `url('')`; - } - return `url('${FileAccess.uriToBrowserUri(uri).toString(true).replace(/'/g, '%27')}')`; -} - -export function asCSSPropertyValue(value: string) { - return `'${value.replace(/'/g, '%27')}'`; -} - -export function asCssValueWithDefault(cssPropertyValue: string | undefined, dflt: string): string { - if (cssPropertyValue !== undefined) { - const variableMatch = cssPropertyValue.match(/^\s*var\((.+)\)$/); - if (variableMatch) { - const varArguments = variableMatch[1].split(',', 2); - if (varArguments.length === 2) { - dflt = asCssValueWithDefault(varArguments[1].trim(), dflt); - } - return `var(${varArguments[0]}, ${dflt})`; - } - return cssPropertyValue; - } - return dflt; -} - export function triggerDownload(dataOrUri: Uint8Array | URI, name: string): void { // If the data is provided as Buffer, we create a diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts index 8d97f4392c1f5..87ce33bedb787 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts @@ -5,6 +5,7 @@ import './iconlabel.css'; import * as dom from '../../dom.js'; +import * as css from '../../css'; import { HighlightedLabel } from '../highlightedlabel/highlightedLabel.js'; import { IHoverDelegate } from '../hover/hoverDelegate.js'; import { IMatch } from '../../../common/filters.js'; @@ -165,7 +166,7 @@ export class IconLabel extends Disposable { } else { iconNode = existingIconNode; } - iconNode.style.backgroundImage = dom.asCSSUrl(options?.iconPath); + iconNode.style.backgroundImage = css.asCSSUrl(options?.iconPath); } else if (existingIconNode) { existingIconNode.remove(); } diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts index 990ee8083f86c..2d27df7ccd9d8 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/src/vs/base/browser/ui/inputbox/inputBox.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../dom.js'; +import * as cssJs from '../../css.js'; import { DomEmitter } from '../../event.js'; import { renderFormattedText, renderText } from '../../formattedTextRenderer.js'; import { IHistoryNavigationWidget } from '../../history.js'; @@ -403,7 +404,7 @@ export class InputBox extends Widget { this.element.classList.add(this.classForType(message.type)); const styles = this.stylesForType(this.message.type); - this.element.style.border = `1px solid ${dom.asCssValueWithDefault(styles.border, 'transparent')}`; + this.element.style.border = `1px solid ${cssJs.asCssValueWithDefault(styles.border, 'transparent')}`; if (this.message.content && (this.hasFocus() || force)) { this._showMessage(); @@ -578,7 +579,7 @@ export class InputBox extends Widget { this.input.style.color = foreground; // there's always a border, even if the color is not set. - this.element.style.border = `1px solid ${dom.asCssValueWithDefault(border, 'transparent')}`; + this.element.style.border = `1px solid ${cssJs.asCssValueWithDefault(border, 'transparent')}`; } public layout(): void { diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 67b8e18a3a610..bc3b025eac1d5 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -4,7 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { IDragAndDropData } from '../../dnd.js'; -import { asCssValueWithDefault, createStyleSheet, Dimension, EventHelper, getActiveElement, getWindow, isActiveElement, isEditableElement, isHTMLElement, isMouseEvent } from '../../dom.js'; +import { createStyleSheet, Dimension, EventHelper, getActiveElement, getWindow, isActiveElement, isEditableElement, isHTMLElement, isMouseEvent } from '../../dom.js'; +import { asCssValueWithDefault } from '../../css.js'; import { DomEmitter } from '../../event.js'; import { IKeyboardEvent, StandardKeyboardEvent } from '../../keyboardEvent.js'; import { Gesture } from '../../touch.js'; diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index 6b14b86990606..f9b30ce485f54 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../dom.js'; +import * as cssJs from '../../css.js'; import { DomEmitter } from '../../event.js'; import { IContentActionHandler } from '../../formattedTextRenderer.js'; import { StandardKeyboardEvent } from '../../keyboardEvent.js'; @@ -426,7 +427,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi private styleList() { const background = this.styles.selectBackground ?? ''; - const listBackground = dom.asCssValueWithDefault(this.styles.selectListBackground, background); + const listBackground = cssJs.asCssValueWithDefault(this.styles.selectListBackground, background); this.selectDropDownListContainer.style.backgroundColor = listBackground; this.selectionDetailsPane.style.backgroundColor = listBackground; const optionsBorder = this.styles.focusBorder ?? ''; diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index 7ddb0bcca7344..366c38979847e 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -4,7 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { IDragAndDropData } from '../../dnd.js'; -import { $, append, clearNode, createStyleSheet, getWindow, h, hasParentWithClass, isActiveElement, asCssValueWithDefault, isKeyboardEvent, addDisposableListener, isEditableElement } from '../../dom.js'; +import { $, append, clearNode, createStyleSheet, getWindow, h, hasParentWithClass, isActiveElement, isKeyboardEvent, addDisposableListener, isEditableElement } from '../../dom.js'; +import { asCssValueWithDefault } from '../../css.js'; import { DomEmitter } from '../../event.js'; import { StandardKeyboardEvent } from '../../keyboardEvent.js'; import { ActionBar } from '../actionbar/actionbar.js'; diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts index ede638b5920e3..724c67c07be96 100644 --- a/src/vs/base/test/browser/dom.test.ts +++ b/src/vs/base/test/browser/dom.test.ts @@ -4,7 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import assert from 'assert'; -import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle } from '../../browser/dom.js'; +import { $, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle } from '../../browser/dom.js'; +import { asCssValueWithDefault } from 'vs/base/browser/css.js'; import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from '../../browser/window.js'; import { DeferredPromise, timeout } from '../../common/async.js'; import { runWithFakedTimers } from '../common/timeTravelScheduler.js'; diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts index d92fc24c9cff7..d9b53a2e86a77 100644 --- a/src/vs/editor/browser/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; +import * as cssJs from 'vs/base/browser/css.js'; import { Emitter, Event } from '../../../base/common/event.js'; import { IDisposable, DisposableStore, Disposable, toDisposable } from '../../../base/common/lifecycle.js'; import { LinkedList } from '../../../base/common/linkedList.js'; @@ -771,7 +772,7 @@ class DecorationCSSRules { if (typeof opts !== 'undefined') { this.collectBorderSettingsCSSText(opts, cssTextArr); if (typeof opts.contentIconPath !== 'undefined') { - cssTextArr.push(strings.format(_CSS_MAP.contentIconPath, dom.asCSSUrl(URI.revive(opts.contentIconPath)))); + cssTextArr.push(strings.format(_CSS_MAP.contentIconPath, cssJs.asCSSUrl(URI.revive(opts.contentIconPath)))); } if (typeof opts.contentText === 'string') { const truncated = opts.contentText.match(/^.*$/m)![0]; // only take first line @@ -798,7 +799,7 @@ class DecorationCSSRules { const cssTextArr: string[] = []; if (typeof opts.gutterIconPath !== 'undefined') { - cssTextArr.push(strings.format(_CSS_MAP.gutterIconPath, dom.asCSSUrl(URI.revive(opts.gutterIconPath)))); + cssTextArr.push(strings.format(_CSS_MAP.gutterIconPath, cssJs.asCSSUrl(URI.revive(opts.gutterIconPath)))); if (typeof opts.gutterIconSize !== 'undefined') { cssTextArr.push(strings.format(_CSS_MAP.gutterIconSize, opts.gutterIconSize)); } diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts index 03080a71d7e61..7aa6166333f53 100644 --- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts +++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts @@ -3,7 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { $, addDisposableListener, append, asCSSUrl, EventType, ModifierKeyEmitter, prepend } from '../../../base/browser/dom.js'; +import { $, addDisposableListener, append, EventType, ModifierKeyEmitter, prepend } from '../../../base/browser/dom.js'; +import { asCSSUrl } from 'vs/base/browser/css.js'; import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js'; import { ActionViewItem, BaseActionViewItem, SelectActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js'; import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js'; diff --git a/src/vs/platform/quickinput/browser/quickInputTree.ts b/src/vs/platform/quickinput/browser/quickInputTree.ts index a4641a71831c1..a1a1ec5b8ee72 100644 --- a/src/vs/platform/quickinput/browser/quickInputTree.ts +++ b/src/vs/platform/quickinput/browser/quickInputTree.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; +import * as cssJs from 'vs/base/browser/css.js'; import { Emitter, Event, EventBufferer, IValueWithChangeEvent } from '../../../base/common/event.js'; import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js'; import { IListVirtualDelegate } from '../../../base/browser/ui/list/list.js'; @@ -428,7 +429,7 @@ class QuickPickItemElementRenderer extends BaseQuickInputListRenderer 1) { css += ( `.monaco-workbench .terminal-tab.${iconClasses[0]}::before` + - `{content: ''; background-image: ${dom.asCSSUrl(uri)};}` + `{content: ''; background-image: ${cssJs.asCSSUrl(uri)};}` ); } if (ThemeIcon.isThemeIcon(icon)) { @@ -1269,7 +1270,7 @@ class TerminalEditorStyle extends Themable { if (def) { css += ( `.monaco-workbench .terminal-tab.codicon-${icon.id}::before` + - `{content: '${def.fontCharacter}' !important; font-family: ${dom.asCSSPropertyValue(def.font?.id ?? 'codicon')} !important;}` + `{content: '${def.fontCharacter}' !important; font-family: ${cssJs.asCSSPropertyValue(def.font?.id ?? 'codicon')} !important;}` ); } } diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts index 13d0821a9ece7..1cbe9b84eff0a 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts @@ -5,6 +5,7 @@ import * as nls from '../../../../nls.js'; import * as dom from '../../../../base/browser/dom.js'; +import * as cssJs from 'vs/base/browser/css.js'; import { Action, IAction } from '../../../../base/common/actions.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js'; @@ -618,7 +619,7 @@ class TerminalThemeIconStyle extends Themable { if (uri instanceof URI && iconClasses && iconClasses.length > 1) { css += ( `.monaco-workbench .${iconClasses[0]} .monaco-highlighted-label .codicon, .monaco-action-bar .terminal-uri-icon.single-terminal-tab.action-label:not(.alt-command) .codicon` + - `{background-image: ${dom.asCSSUrl(uri)};}` + `{background-image: ${cssJs.asCSSUrl(uri)};}` ); } } diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts index 8536c4e8e06af..db74bc972e248 100644 --- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts +++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts @@ -6,6 +6,7 @@ import './media/timelinePane.css'; import { localize, localize2 } from '../../../../nls.js'; import * as DOM from '../../../../base/browser/dom.js'; +import * as css from 'vs/base/browser/css'; import { IAction, ActionRunner } from '../../../../base/common/actions.js'; import { CancellationTokenSource } from '../../../../base/common/cancellation.js'; import { fromNow } from '../../../../base/common/date.js'; @@ -1186,7 +1187,7 @@ class TimelineTreeRenderer implements ITreeRenderer Date: Thu, 3 Oct 2024 12:24:47 -0700 Subject: [PATCH 2/6] Use more specific file name --- src/vs/base/browser/{css.ts => cssValue.ts} | 0 src/vs/base/browser/ui/iconLabel/iconLabel.ts | 2 +- src/vs/base/browser/ui/inputbox/inputBox.ts | 2 +- src/vs/base/browser/ui/list/listWidget.ts | 2 +- src/vs/base/browser/ui/selectBox/selectBoxCustom.ts | 2 +- src/vs/base/browser/ui/tree/abstractTree.ts | 2 +- src/vs/base/test/browser/dom.test.ts | 2 +- src/vs/editor/browser/services/abstractCodeEditorService.ts | 2 +- src/vs/platform/actions/browser/menuEntryActionViewItem.ts | 2 +- src/vs/platform/quickinput/browser/quickInputTree.ts | 2 +- src/vs/platform/quickinput/browser/quickInputUtils.ts | 2 +- src/vs/platform/theme/browser/iconsStyleSheet.ts | 2 +- src/vs/workbench/browser/parts/banner/bannerPart.ts | 2 +- src/vs/workbench/browser/parts/paneCompositeBar.ts | 2 +- src/vs/workbench/browser/parts/views/treeView.ts | 2 +- src/vs/workbench/browser/parts/views/viewPane.ts | 4 ++-- .../contrib/bulkEdit/browser/preview/bulkEditTree.ts | 2 +- src/vs/workbench/contrib/comments/browser/reactionsAction.ts | 2 +- src/vs/workbench/contrib/scm/browser/scmViewPane.ts | 2 +- src/vs/workbench/contrib/terminal/browser/terminalService.ts | 2 +- src/vs/workbench/contrib/terminal/browser/terminalView.ts | 2 +- src/vs/workbench/contrib/timeline/browser/timelinePane.ts | 2 +- .../contrib/webviewPanel/browser/webviewIconManager.ts | 2 +- .../services/decorations/browser/decorationsService.ts | 2 +- src/vs/workbench/services/themes/browser/fileIconThemeData.ts | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) rename src/vs/base/browser/{css.ts => cssValue.ts} (100%) diff --git a/src/vs/base/browser/css.ts b/src/vs/base/browser/cssValue.ts similarity index 100% rename from src/vs/base/browser/css.ts rename to src/vs/base/browser/cssValue.ts diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts index 87ce33bedb787..2d675ad9d3abe 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts @@ -5,7 +5,7 @@ import './iconlabel.css'; import * as dom from '../../dom.js'; -import * as css from '../../css'; +import * as css from '../../cssValue'; import { HighlightedLabel } from '../highlightedlabel/highlightedLabel.js'; import { IHoverDelegate } from '../hover/hoverDelegate.js'; import { IMatch } from '../../../common/filters.js'; diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts index 2d27df7ccd9d8..3e0eedcef9d1d 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/src/vs/base/browser/ui/inputbox/inputBox.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../dom.js'; -import * as cssJs from '../../css.js'; +import * as cssJs from '../../cssValue.js'; import { DomEmitter } from '../../event.js'; import { renderFormattedText, renderText } from '../../formattedTextRenderer.js'; import { IHistoryNavigationWidget } from '../../history.js'; diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index bc3b025eac1d5..2f4826648b8ae 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -5,7 +5,7 @@ import { IDragAndDropData } from '../../dnd.js'; import { createStyleSheet, Dimension, EventHelper, getActiveElement, getWindow, isActiveElement, isEditableElement, isHTMLElement, isMouseEvent } from '../../dom.js'; -import { asCssValueWithDefault } from '../../css.js'; +import { asCssValueWithDefault } from '../../cssValue.js'; import { DomEmitter } from '../../event.js'; import { IKeyboardEvent, StandardKeyboardEvent } from '../../keyboardEvent.js'; import { Gesture } from '../../touch.js'; diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index f9b30ce485f54..24341bab33c52 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../dom.js'; -import * as cssJs from '../../css.js'; +import * as cssJs from '../../cssValue.js'; import { DomEmitter } from '../../event.js'; import { IContentActionHandler } from '../../formattedTextRenderer.js'; import { StandardKeyboardEvent } from '../../keyboardEvent.js'; diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index 366c38979847e..a66897904b479 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -5,7 +5,7 @@ import { IDragAndDropData } from '../../dnd.js'; import { $, append, clearNode, createStyleSheet, getWindow, h, hasParentWithClass, isActiveElement, isKeyboardEvent, addDisposableListener, isEditableElement } from '../../dom.js'; -import { asCssValueWithDefault } from '../../css.js'; +import { asCssValueWithDefault } from '../../cssValue.js'; import { DomEmitter } from '../../event.js'; import { StandardKeyboardEvent } from '../../keyboardEvent.js'; import { ActionBar } from '../actionbar/actionbar.js'; diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts index 724c67c07be96..b96fa7dbe0b21 100644 --- a/src/vs/base/test/browser/dom.test.ts +++ b/src/vs/base/test/browser/dom.test.ts @@ -5,7 +5,7 @@ import assert from 'assert'; import { $, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle } from '../../browser/dom.js'; -import { asCssValueWithDefault } from 'vs/base/browser/css.js'; +import { asCssValueWithDefault } from 'vs/base/browser/cssValue.js'; import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from '../../browser/window.js'; import { DeferredPromise, timeout } from '../../common/async.js'; import { runWithFakedTimers } from '../common/timeTravelScheduler.js'; diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts index d9b53a2e86a77..e3f8b8b373138 100644 --- a/src/vs/editor/browser/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { Emitter, Event } from '../../../base/common/event.js'; import { IDisposable, DisposableStore, Disposable, toDisposable } from '../../../base/common/lifecycle.js'; import { LinkedList } from '../../../base/common/linkedList.js'; diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts index 7aa6166333f53..e11680f3493bd 100644 --- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts +++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { $, addDisposableListener, append, EventType, ModifierKeyEmitter, prepend } from '../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/css.js'; +import { asCSSUrl } from 'vs/base/browser/cssValue.js'; import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js'; import { ActionViewItem, BaseActionViewItem, SelectActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js'; import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js'; diff --git a/src/vs/platform/quickinput/browser/quickInputTree.ts b/src/vs/platform/quickinput/browser/quickInputTree.ts index a1a1ec5b8ee72..24e6e2b197a76 100644 --- a/src/vs/platform/quickinput/browser/quickInputTree.ts +++ b/src/vs/platform/quickinput/browser/quickInputTree.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { Emitter, Event, EventBufferer, IValueWithChangeEvent } from '../../../base/common/event.js'; import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js'; import { IListVirtualDelegate } from '../../../base/browser/ui/list/list.js'; diff --git a/src/vs/platform/quickinput/browser/quickInputUtils.ts b/src/vs/platform/quickinput/browser/quickInputUtils.ts index b3088cdcfffe8..c8133a1aa6885 100644 --- a/src/vs/platform/quickinput/browser/quickInputUtils.ts +++ b/src/vs/platform/quickinput/browser/quickInputUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { DomEmitter } from '../../../base/browser/event.js'; import { Event } from '../../../base/common/event.js'; import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js'; diff --git a/src/vs/platform/theme/browser/iconsStyleSheet.ts b/src/vs/platform/theme/browser/iconsStyleSheet.ts index b65813e730c33..0640e07c164da 100644 --- a/src/vs/platform/theme/browser/iconsStyleSheet.ts +++ b/src/vs/platform/theme/browser/iconsStyleSheet.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { asCSSPropertyValue, asCSSUrl } from 'vs/base/browser/css.js'; +import { asCSSPropertyValue, asCSSUrl } from 'vs/base/browser/cssValue.js'; import { Emitter, Event } from '../../../base/common/event.js'; import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js'; import { ThemeIcon } from '../../../base/common/themables.js'; diff --git a/src/vs/workbench/browser/parts/banner/bannerPart.ts b/src/vs/workbench/browser/parts/banner/bannerPart.ts index 17e22f8b432cd..1d164c9131133 100644 --- a/src/vs/workbench/browser/parts/banner/bannerPart.ts +++ b/src/vs/workbench/browser/parts/banner/bannerPart.ts @@ -6,7 +6,7 @@ import './media/bannerpart.css'; import { localize2 } from '../../../../nls.js'; import { $, addDisposableListener, append, clearNode, EventType, isHTMLElement } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/css'; +import { asCSSUrl } from 'vs/base/browser/cssValue'; import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; diff --git a/src/vs/workbench/browser/parts/paneCompositeBar.ts b/src/vs/workbench/browser/parts/paneCompositeBar.ts index 315674477876f..1bf06b7a8c1a4 100644 --- a/src/vs/workbench/browser/parts/paneCompositeBar.ts +++ b/src/vs/workbench/browser/parts/paneCompositeBar.ts @@ -12,7 +12,7 @@ import { IDisposable, DisposableStore, Disposable, DisposableMap } from '../../. import { IColorTheme } from '../../../platform/theme/common/themeService.js'; import { CompositeBar, ICompositeBarItem, CompositeDragAndDrop } from './compositeBar.js'; import { Dimension, createCSSRule, isMouseEvent } from '../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/css.js'; +import { asCSSUrl } from 'vs/base/browser/cssValue.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js'; import { IExtensionService } from '../../services/extensions/common/extensions.js'; import { URI, UriComponents } from '../../../base/common/uri.js'; diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index b70db733280d3..70cc575579012 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -5,7 +5,7 @@ import { DataTransfers, IDragAndDropData } from '../../../../base/browser/dnd.js'; import * as DOM from '../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js'; import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js'; import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js'; diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts index b6123f3876788..67399bdaa8ac9 100644 --- a/src/vs/workbench/browser/parts/views/viewPane.ts +++ b/src/vs/workbench/browser/parts/views/viewPane.ts @@ -8,8 +8,8 @@ import * as nls from '../../../../nls.js'; import { Event, Emitter } from '../../../../base/common/event.js'; import { asCssVariable, foreground } from '../../../../platform/theme/common/colorRegistry.js'; import { after, append, $, trackFocus, EventType, addDisposableListener, createCSSRule, Dimension, reset } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/css'; -import { asCssValueWithDefault } from 'vs/base/browser/css'; +import { asCSSUrl } from 'vs/base/browser/cssValue'; +import { asCssValueWithDefault } from 'vs/base/browser/cssValue'; import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js'; import { Action, IAction, IActionRunner } from '../../../../base/common/actions.js'; import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js'; diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts index 7a89bd91eb63a..d12f2fd56f566 100644 --- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts +++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts @@ -11,7 +11,7 @@ import { HighlightedLabel, IHighlight } from '../../../../../base/browser/ui/hig import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from '../../../../../base/browser/ui/list/list.js'; import { Range } from '../../../../../editor/common/core/range.js'; import * as dom from '../../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { ITextModel } from '../../../../../editor/common/model.js'; import { IDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js'; import { TextModel } from '../../../../../editor/common/model/textModel.js'; diff --git a/src/vs/workbench/contrib/comments/browser/reactionsAction.ts b/src/vs/workbench/contrib/comments/browser/reactionsAction.ts index 04a96202babb8..0347baad5a8f3 100644 --- a/src/vs/workbench/contrib/comments/browser/reactionsAction.ts +++ b/src/vs/workbench/contrib/comments/browser/reactionsAction.ts @@ -5,7 +5,7 @@ import * as nls from '../../../../nls.js'; import * as dom from '../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { Action, IAction } from '../../../../base/common/actions.js'; import { URI, UriComponents } from '../../../../base/common/uri.js'; import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js'; diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts index 4e3da6dde7d9d..eeac5d115a077 100644 --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts @@ -9,7 +9,7 @@ import { basename, dirname } from '../../../../base/common/resources.js'; import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable, MutableDisposable, DisposableMap } from '../../../../base/common/lifecycle.js'; import { ViewPane, IViewPaneOptions, ViewAction } from '../../../browser/parts/views/viewPane.js'; import { append, $, Dimension, trackFocus, clearNode, isPointerEvent, isActiveElement } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/css'; +import { asCSSUrl } from 'vs/base/browser/cssValue'; import { IListVirtualDelegate, IIdentityProvider } from '../../../../base/browser/ui/list/list.js'; import { ISCMResourceGroup, ISCMResource, InputValidationType, ISCMRepository, ISCMInput, IInputValidation, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, ISCMService, SCMInputChangeReason, VIEW_PANE_ID, ISCMActionButton, ISCMActionButtonDescriptor, ISCMRepositorySortKey, ISCMInputValueProviderContext } from '../common/scm.js'; import { ResourceLabels, IResourceLabel, IFileLabelOptions } from '../../../browser/labels.js'; diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts index ed944e9cb9846..783b40e539232 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { DeferredPromise, timeout } from '../../../../base/common/async.js'; import { debounce, memoize } from '../../../../base/common/decorators.js'; import { DynamicListEventMultiplexer, Emitter, Event, IDynamicListEventMultiplexer } from '../../../../base/common/event.js'; diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts index 1cbe9b84eff0a..8998032391727 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts @@ -5,7 +5,7 @@ import * as nls from '../../../../nls.js'; import * as dom from '../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { Action, IAction } from '../../../../base/common/actions.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js'; diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts index db74bc972e248..6622325e9df15 100644 --- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts +++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts @@ -6,7 +6,7 @@ import './media/timelinePane.css'; import { localize, localize2 } from '../../../../nls.js'; import * as DOM from '../../../../base/browser/dom.js'; -import * as css from 'vs/base/browser/css'; +import * as css from 'vs/base/browser/cssValue'; import { IAction, ActionRunner } from '../../../../base/common/actions.js'; import { CancellationTokenSource } from '../../../../base/common/cancellation.js'; import { fromNow } from '../../../../base/common/date.js'; diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts index 735bc4dd64705..3a462dffaa7af 100644 --- a/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts +++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/css.js'; +import * as cssJs from 'vs/base/browser/cssValue.js'; import { Disposable } from '../../../../base/common/lifecycle.js'; import { URI } from '../../../../base/common/uri.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts index 5fab1134c921b..b6b976e8610f8 100644 --- a/src/vs/workbench/services/decorations/browser/decorationsService.ts +++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts @@ -11,7 +11,7 @@ import { IDisposable, toDisposable, DisposableStore } from '../../../../base/com import { isThenable } from '../../../../base/common/async.js'; import { LinkedList } from '../../../../base/common/linkedList.js'; import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector } from '../../../../base/browser/dom.js'; -import { asCSSPropertyValue } from 'vs/base/browser/css.js'; +import { asCSSPropertyValue } from 'vs/base/browser/cssValue.js'; import { IThemeService } from '../../../../platform/theme/common/themeService.js'; import { ThemeIcon } from '../../../../base/common/themables.js'; import { isFalsyOrWhitespace } from '../../../../base/common/strings.js'; diff --git a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts index 3ded93ccd4894..c78d2e9068f24 100644 --- a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts +++ b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts @@ -10,7 +10,7 @@ import * as resources from '../../../../base/common/resources.js'; import * as Json from '../../../../base/common/json.js'; import { ExtensionData, IThemeExtensionPoint, IWorkbenchFileIconTheme } from '../common/workbenchThemeService.js'; import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js'; -import { asCSSUrl } from 'vs/base/browser/css.js'; +import { asCSSUrl } from 'vs/base/browser/cssValue.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js'; import { ILanguageService } from '../../../../editor/common/languages/language.js'; From 11945501f0a93e5b45573d5a6dfb1c5ef87b1348 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 3 Oct 2024 13:10:02 -0700 Subject: [PATCH 3/6] Fix a few imports to have `.js` --- src/vs/base/browser/ui/iconLabel/iconLabel.ts | 2 +- src/vs/workbench/browser/parts/banner/bannerPart.ts | 2 +- src/vs/workbench/browser/parts/views/viewPane.ts | 4 ++-- src/vs/workbench/contrib/scm/browser/scmViewPane.ts | 2 +- src/vs/workbench/contrib/timeline/browser/timelinePane.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts index 2d675ad9d3abe..7a3583f7c4030 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts @@ -5,7 +5,7 @@ import './iconlabel.css'; import * as dom from '../../dom.js'; -import * as css from '../../cssValue'; +import * as css from '../../cssValue.js'; import { HighlightedLabel } from '../highlightedlabel/highlightedLabel.js'; import { IHoverDelegate } from '../hover/hoverDelegate.js'; import { IMatch } from '../../../common/filters.js'; diff --git a/src/vs/workbench/browser/parts/banner/bannerPart.ts b/src/vs/workbench/browser/parts/banner/bannerPart.ts index 1d164c9131133..3e085076996c5 100644 --- a/src/vs/workbench/browser/parts/banner/bannerPart.ts +++ b/src/vs/workbench/browser/parts/banner/bannerPart.ts @@ -6,7 +6,7 @@ import './media/bannerpart.css'; import { localize2 } from '../../../../nls.js'; import { $, addDisposableListener, append, clearNode, EventType, isHTMLElement } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue'; +import { asCSSUrl } from 'vs/base/browser/cssValue.js'; import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts index 67399bdaa8ac9..11cd156144b31 100644 --- a/src/vs/workbench/browser/parts/views/viewPane.ts +++ b/src/vs/workbench/browser/parts/views/viewPane.ts @@ -8,8 +8,8 @@ import * as nls from '../../../../nls.js'; import { Event, Emitter } from '../../../../base/common/event.js'; import { asCssVariable, foreground } from '../../../../platform/theme/common/colorRegistry.js'; import { after, append, $, trackFocus, EventType, addDisposableListener, createCSSRule, Dimension, reset } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue'; -import { asCssValueWithDefault } from 'vs/base/browser/cssValue'; +import { asCSSUrl } from 'vs/base/browser/cssValue.js'; +import { asCssValueWithDefault } from 'vs/base/browser/cssValue.js'; import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js'; import { Action, IAction, IActionRunner } from '../../../../base/common/actions.js'; import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js'; diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts index eeac5d115a077..41ae2f79b9d87 100644 --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts @@ -9,7 +9,7 @@ import { basename, dirname } from '../../../../base/common/resources.js'; import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable, MutableDisposable, DisposableMap } from '../../../../base/common/lifecycle.js'; import { ViewPane, IViewPaneOptions, ViewAction } from '../../../browser/parts/views/viewPane.js'; import { append, $, Dimension, trackFocus, clearNode, isPointerEvent, isActiveElement } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue'; +import { asCSSUrl } from 'vs/base/browser/cssValue.js'; import { IListVirtualDelegate, IIdentityProvider } from '../../../../base/browser/ui/list/list.js'; import { ISCMResourceGroup, ISCMResource, InputValidationType, ISCMRepository, ISCMInput, IInputValidation, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, ISCMService, SCMInputChangeReason, VIEW_PANE_ID, ISCMActionButton, ISCMActionButtonDescriptor, ISCMRepositorySortKey, ISCMInputValueProviderContext } from '../common/scm.js'; import { ResourceLabels, IResourceLabel, IFileLabelOptions } from '../../../browser/labels.js'; diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts index 6622325e9df15..3d3e29ce23745 100644 --- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts +++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts @@ -6,7 +6,7 @@ import './media/timelinePane.css'; import { localize, localize2 } from '../../../../nls.js'; import * as DOM from '../../../../base/browser/dom.js'; -import * as css from 'vs/base/browser/cssValue'; +import * as css from 'vs/base/browser/cssValue.js'; import { IAction, ActionRunner } from '../../../../base/common/actions.js'; import { CancellationTokenSource } from '../../../../base/common/cancellation.js'; import { fromNow } from '../../../../base/common/date.js'; From 9577ec4d7deb6ac768d9fb90fc0875d70f636228 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 3 Oct 2024 13:20:00 -0700 Subject: [PATCH 4/6] More path fixes --- src/vs/base/test/browser/dom.test.ts | 2 +- .../services/abstractCodeEditorService.ts | 2 +- .../actions/browser/menuEntryActionViewItem.ts | 2 +- .../quickinput/browser/quickInputTree.ts | 2 +- .../quickinput/browser/quickInputUtils.ts | 2 +- .../platform/theme/browser/iconsStyleSheet.ts | 2 +- .../browser/parts/banner/bannerPart.ts | 2 +- .../browser/parts/paneCompositeBar.ts | 2 +- .../workbench/browser/parts/views/treeView.ts | 2 +- .../workbench/browser/parts/views/viewPane.ts | 3 +-- .../bulkEdit/browser/preview/bulkEditTree.ts | 18 +++++++++--------- .../comments/browser/reactionsAction.ts | 2 +- .../terminal/browser/terminalService.ts | 2 +- .../contrib/terminal/browser/terminalView.ts | 2 +- .../contrib/timeline/browser/timelinePane.ts | 2 +- .../webviewPanel/browser/webviewIconManager.ts | 2 +- .../decorations/browser/decorationsService.ts | 2 +- .../themes/browser/fileIconThemeData.ts | 2 +- 18 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts index b96fa7dbe0b21..92aed20349803 100644 --- a/src/vs/base/test/browser/dom.test.ts +++ b/src/vs/base/test/browser/dom.test.ts @@ -5,7 +5,7 @@ import assert from 'assert'; import { $, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle } from '../../browser/dom.js'; -import { asCssValueWithDefault } from 'vs/base/browser/cssValue.js'; +import { asCssValueWithDefault } from '../../../base/browser/cssValue.js'; import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from '../../browser/window.js'; import { DeferredPromise, timeout } from '../../common/async.js'; import { runWithFakedTimers } from '../common/timeTravelScheduler.js'; diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts index e3f8b8b373138..3e927a9a437df 100644 --- a/src/vs/editor/browser/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/cssValue.js'; +import * as cssJs from '../../../base/browser/cssValue.js'; import { Emitter, Event } from '../../../base/common/event.js'; import { IDisposable, DisposableStore, Disposable, toDisposable } from '../../../base/common/lifecycle.js'; import { LinkedList } from '../../../base/common/linkedList.js'; diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts index e11680f3493bd..3386feda5ddcc 100644 --- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts +++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { $, addDisposableListener, append, EventType, ModifierKeyEmitter, prepend } from '../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue.js'; +import { asCSSUrl } from '../../../base/browser/cssValue.js'; import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js'; import { ActionViewItem, BaseActionViewItem, SelectActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js'; import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js'; diff --git a/src/vs/platform/quickinput/browser/quickInputTree.ts b/src/vs/platform/quickinput/browser/quickInputTree.ts index 24e6e2b197a76..0cc8255971d8a 100644 --- a/src/vs/platform/quickinput/browser/quickInputTree.ts +++ b/src/vs/platform/quickinput/browser/quickInputTree.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/cssValue.js'; +import * as cssJs from '../../../base/browser/cssValue.js'; import { Emitter, Event, EventBufferer, IValueWithChangeEvent } from '../../../base/common/event.js'; import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js'; import { IListVirtualDelegate } from '../../../base/browser/ui/list/list.js'; diff --git a/src/vs/platform/quickinput/browser/quickInputUtils.ts b/src/vs/platform/quickinput/browser/quickInputUtils.ts index c8133a1aa6885..a3f611101aa8b 100644 --- a/src/vs/platform/quickinput/browser/quickInputUtils.ts +++ b/src/vs/platform/quickinput/browser/quickInputUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from '../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/cssValue.js'; +import * as cssJs from '../../../base/browser/cssValue.js'; import { DomEmitter } from '../../../base/browser/event.js'; import { Event } from '../../../base/common/event.js'; import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js'; diff --git a/src/vs/platform/theme/browser/iconsStyleSheet.ts b/src/vs/platform/theme/browser/iconsStyleSheet.ts index 0640e07c164da..9133d54c5c73f 100644 --- a/src/vs/platform/theme/browser/iconsStyleSheet.ts +++ b/src/vs/platform/theme/browser/iconsStyleSheet.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { asCSSPropertyValue, asCSSUrl } from 'vs/base/browser/cssValue.js'; +import { asCSSPropertyValue, asCSSUrl } from '../../../base/browser/cssValue.js'; import { Emitter, Event } from '../../../base/common/event.js'; import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js'; import { ThemeIcon } from '../../../base/common/themables.js'; diff --git a/src/vs/workbench/browser/parts/banner/bannerPart.ts b/src/vs/workbench/browser/parts/banner/bannerPart.ts index 3e085076996c5..8495bd425bc69 100644 --- a/src/vs/workbench/browser/parts/banner/bannerPart.ts +++ b/src/vs/workbench/browser/parts/banner/bannerPart.ts @@ -6,7 +6,7 @@ import './media/bannerpart.css'; import { localize2 } from '../../../../nls.js'; import { $, addDisposableListener, append, clearNode, EventType, isHTMLElement } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue.js'; +import { asCSSUrl } from '../../../../base/browser/cssValue.js'; import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; diff --git a/src/vs/workbench/browser/parts/paneCompositeBar.ts b/src/vs/workbench/browser/parts/paneCompositeBar.ts index 1bf06b7a8c1a4..5abc0b5e98596 100644 --- a/src/vs/workbench/browser/parts/paneCompositeBar.ts +++ b/src/vs/workbench/browser/parts/paneCompositeBar.ts @@ -12,7 +12,7 @@ import { IDisposable, DisposableStore, Disposable, DisposableMap } from '../../. import { IColorTheme } from '../../../platform/theme/common/themeService.js'; import { CompositeBar, ICompositeBarItem, CompositeDragAndDrop } from './compositeBar.js'; import { Dimension, createCSSRule, isMouseEvent } from '../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue.js'; +import { asCSSUrl } from '../../../base/browser/cssValue.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../platform/storage/common/storage.js'; import { IExtensionService } from '../../services/extensions/common/extensions.js'; import { URI, UriComponents } from '../../../base/common/uri.js'; diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 70cc575579012..e003591cd42c0 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -5,7 +5,7 @@ import { DataTransfers, IDragAndDropData } from '../../../../base/browser/dnd.js'; import * as DOM from '../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/cssValue.js'; +import * as cssJs from '../../../../base/browser/cssValue.js'; import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js'; import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js'; import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js'; diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts index 11cd156144b31..98199760b38c7 100644 --- a/src/vs/workbench/browser/parts/views/viewPane.ts +++ b/src/vs/workbench/browser/parts/views/viewPane.ts @@ -8,8 +8,7 @@ import * as nls from '../../../../nls.js'; import { Event, Emitter } from '../../../../base/common/event.js'; import { asCssVariable, foreground } from '../../../../platform/theme/common/colorRegistry.js'; import { after, append, $, trackFocus, EventType, addDisposableListener, createCSSRule, Dimension, reset } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue.js'; -import { asCssValueWithDefault } from 'vs/base/browser/cssValue.js'; +import { asCssValueWithDefault, asCSSUrl } from '../../../../base/browser/cssValue.js'; import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js'; import { Action, IAction, IActionRunner } from '../../../../base/common/actions.js'; import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js'; diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts index d12f2fd56f566..6c78277c3d657 100644 --- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts +++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts @@ -11,7 +11,6 @@ import { HighlightedLabel, IHighlight } from '../../../../../base/browser/ui/hig import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from '../../../../../base/browser/ui/list/list.js'; import { Range } from '../../../../../editor/common/core/range.js'; import * as dom from '../../../../../base/browser/dom.js'; -import * as cssJs from 'vs/base/browser/cssValue.js'; import { ITextModel } from '../../../../../editor/common/model.js'; import { IDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js'; import { TextModel } from '../../../../../editor/common/model/textModel.js'; @@ -31,6 +30,7 @@ import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/mo import { SnippetParser } from '../../../../../editor/contrib/snippet/browser/snippetParser.js'; import { AriaRole } from '../../../../../base/browser/ui/aria/aria.js'; import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js'; +import * as css from '../../../../../base/browser/cssValue.js'; // --- VIEW MODEL @@ -437,14 +437,14 @@ export class CategoryElementRenderer implements ITreeRenderer Date: Thu, 3 Oct 2024 13:26:23 -0700 Subject: [PATCH 5/6] Add import ext --- src/vs/base/browser/cssValue.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/base/browser/cssValue.ts b/src/vs/base/browser/cssValue.ts index dc2ec39eabdd5..c758b629a718c 100644 --- a/src/vs/base/browser/cssValue.ts +++ b/src/vs/base/browser/cssValue.ts @@ -2,8 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { FileAccess } from '../common/network'; -import { URI } from '../common/uri'; +import { FileAccess } from '../common/network.js'; +import { URI } from '../common/uri.js'; export function asCssValueWithDefault(cssPropertyValue: string | undefined, dflt: string): string { if (cssPropertyValue !== undefined) { From f77884976a2ac4956c83d0e61189f515e2303411 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 3 Oct 2024 13:53:08 -0700 Subject: [PATCH 6/6] One more path fix --- src/vs/workbench/contrib/scm/browser/scmViewPane.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts index 41ae2f79b9d87..eba0d7372e759 100644 --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts @@ -9,7 +9,7 @@ import { basename, dirname } from '../../../../base/common/resources.js'; import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable, MutableDisposable, DisposableMap } from '../../../../base/common/lifecycle.js'; import { ViewPane, IViewPaneOptions, ViewAction } from '../../../browser/parts/views/viewPane.js'; import { append, $, Dimension, trackFocus, clearNode, isPointerEvent, isActiveElement } from '../../../../base/browser/dom.js'; -import { asCSSUrl } from 'vs/base/browser/cssValue.js'; +import { asCSSUrl } from '../../../../base/browser/cssValue.js'; import { IListVirtualDelegate, IIdentityProvider } from '../../../../base/browser/ui/list/list.js'; import { ISCMResourceGroup, ISCMResource, InputValidationType, ISCMRepository, ISCMInput, IInputValidation, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, ISCMService, SCMInputChangeReason, VIEW_PANE_ID, ISCMActionButton, ISCMActionButtonDescriptor, ISCMRepositorySortKey, ISCMInputValueProviderContext } from '../common/scm.js'; import { ResourceLabels, IResourceLabel, IFileLabelOptions } from '../../../browser/labels.js';