Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename asCssValue -> asCssVariable #171829

Merged
merged 1 commit into from Jan 20, 2023
Merged

rename asCssValue -> asCssVariable #171829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/vs/editor/browser/editorDom.ts
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
import { RunOnceScheduler } from 'vs/base/common/async';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { asCssValue } from 'vs/platform/theme/common/colorRegistry';
import { asCssVariable } from 'vs/platform/theme/common/colorRegistry';
import { ThemeColor } from 'vs/base/common/themables';

/**
Expand Down Expand Up @@ -378,7 +378,7 @@ class RefCountedCssRule {
const value = (properties as any)[prop] as string | ThemeColor;
let cssValue;
if (typeof value === 'object') {
cssValue = asCssValue(value.id);
cssValue = asCssVariable(value.id);
} else {
cssValue = value;
}
Expand Down
8 changes: 4 additions & 4 deletions src/vs/editor/contrib/find/browser/findOptionsWidget.ts
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPosit
import { FIND_IDS } from 'vs/editor/contrib/find/browser/findModel';
import { FindReplaceState } from 'vs/editor/contrib/find/browser/findState';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { asCssValue, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from 'vs/platform/theme/common/colorRegistry';
import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from 'vs/platform/theme/common/colorRegistry';

export class FindOptionsWidget extends Widget implements IOverlayWidget {

Expand Down Expand Up @@ -47,9 +47,9 @@ export class FindOptionsWidget extends Widget implements IOverlayWidget {
this._domNode.setAttribute('aria-hidden', 'true');

const toggleStyles = {
inputActiveOptionBorder: asCssValue(inputActiveOptionBorder),
inputActiveOptionForeground: asCssValue(inputActiveOptionForeground),
inputActiveOptionBackground: asCssValue(inputActiveOptionBackground),
inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
};

this.caseSensitive = this._register(new CaseSensitiveToggle({
Expand Down
8 changes: 4 additions & 4 deletions src/vs/editor/contrib/find/browser/findWidget.ts
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { asCssValue, contrastBorder, editorFindMatch, editorFindMatchBorder, editorFindMatchHighlight, editorFindMatchHighlightBorder, editorFindRangeHighlight, editorFindRangeHighlightBorder, editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, editorWidgetResizeBorder, errorForeground, focusBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, toolbarHoverBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
import { asCssVariable, contrastBorder, editorFindMatch, editorFindMatchBorder, editorFindMatchHighlight, editorFindMatchHighlightBorder, editorFindRangeHighlight, editorFindRangeHighlightBorder, editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, editorWidgetResizeBorder, errorForeground, focusBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, toolbarHoverBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
import { registerIcon, widgetClose } from 'vs/platform/theme/common/iconRegistry';
import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import { ThemeIcon } from 'vs/base/common/themables';
Expand Down Expand Up @@ -1042,9 +1042,9 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
icon: findSelectionIcon,
title: NLS_TOGGLE_SELECTION_FIND_TITLE + this._keybindingLabelFor(FIND_IDS.ToggleSearchScopeCommand),
isChecked: false,
inputActiveOptionBackground: asCssValue(inputActiveOptionBackground),
inputActiveOptionBorder: asCssValue(inputActiveOptionBorder),
inputActiveOptionForeground: asCssValue(inputActiveOptionForeground),
inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
}));

this._register(this._toggleSelectionFind.onChange(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/actionWidget/browser/actionList.ts
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import { IActionItem } from 'vs/platform/actionWidget/common/actionWidget';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { defaultListStyles } from 'vs/platform/theme/browser/defaultStyles';
import { asCssValue } from 'vs/platform/theme/common/colorRegistry';
import { asCssVariable } from 'vs/platform/theme/common/colorRegistry';

export const acceptSelectedActionCommand = 'acceptSelectedCodeAction';
export const previewSelectedActionCommand = 'previewSelectedCodeAction';
Expand Down Expand Up @@ -107,7 +107,7 @@ class ActionItemRenderer<T extends IListMenuItem<IActionItem>> implements IListR
if (element.group?.icon) {
data.icon.className = ThemeIcon.asClassName(element.group.icon);
if (element.group.icon.color) {
data.icon.style.color = asCssValue(element.group.icon.color.id);
data.icon.style.color = asCssVariable(element.group.icon.color.id);
}
} else {
data.icon.className = ThemeIcon.asClassName(Codicon.lightBulb);
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/actions/browser/menuEntryActionViewItem.ts
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ import { ThemeIcon } from 'vs/base/common/themables';
import { isDark } from 'vs/platform/theme/common/theme';
import { IHoverDelegate } from 'vs/base/browser/ui/iconLabel/iconHoverDelegate';
import { assertType } from 'vs/base/common/types';
import { asCssValue, selectBorder } from 'vs/platform/theme/common/colorRegistry';
import { asCssVariable, selectBorder } from 'vs/platform/theme/common/colorRegistry';
import { defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';

export function createAndFillInContextMenuActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[] }, primaryGroup?: string): void {
Expand Down Expand Up @@ -479,7 +479,7 @@ class SubmenuEntrySelectActionViewItem extends SelectActionViewItem {

override render(container: HTMLElement): void {
super.render(container);
container.style.borderColor = asCssValue(selectBorder);
container.style.borderColor = asCssVariable(selectBorder);
}

protected override runAction(option: string, index: number): void {
Expand Down
16 changes: 8 additions & 8 deletions src/vs/platform/quickinput/browser/quickInput.ts
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ import { QuickAccessController } from 'vs/platform/quickinput/browser/quickAcces
import { IQuickAccessController } from 'vs/platform/quickinput/common/quickAccess';
import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
import { defaultButtonStyles, defaultCountBadgeStyles, defaultInputBoxStyles, defaultKeybindingLabelStyles, defaultProgressBarStyles, defaultToggleStyles, getListStyles } from 'vs/platform/theme/browser/defaultStyles';
import { activeContrastBorder, asCssValue, pickerGroupBorder, pickerGroupForeground, quickInputBackground, quickInputForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, quickInputTitleBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
import { activeContrastBorder, asCssVariable, pickerGroupBorder, pickerGroupForeground, quickInputBackground, quickInputForeground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, quickInputTitleBackground, widgetBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';

export interface IQuickInputControllerHost extends ILayoutService { }
Expand Down Expand Up @@ -185,11 +185,11 @@ export class QuickInputService extends Themable implements IQuickInputService {
private computeStyles(): IQuickInputStyles {
return {
widget: {
quickInputBackground: asCssValue(quickInputBackground),
quickInputForeground: asCssValue(quickInputForeground),
quickInputTitleBackground: asCssValue(quickInputTitleBackground),
widgetBorder: asCssValue(widgetBorder),
widgetShadow: asCssValue(widgetShadow),
quickInputBackground: asCssVariable(quickInputBackground),
quickInputForeground: asCssVariable(quickInputForeground),
quickInputTitleBackground: asCssVariable(quickInputTitleBackground),
widgetBorder: asCssVariable(widgetBorder),
widgetShadow: asCssVariable(widgetShadow),
},
inputBox: defaultInputBoxStyles,
toggle: defaultToggleStyles,
Expand All @@ -209,8 +209,8 @@ export class QuickInputService extends Themable implements IQuickInputService {
listInactiveFocusOutline: activeContrastBorder,
}),
pickerGroup: {
pickerGroupBorder: asCssValue(pickerGroupBorder),
pickerGroupForeground: asCssValue(pickerGroupForeground),
pickerGroupBorder: asCssVariable(pickerGroupBorder),
pickerGroupForeground: asCssVariable(pickerGroupForeground),
}
};
}
Expand Down