ckaczor/azuredatastudio
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge vscode source through release 1.79.2 (#23482)

Browse Source 
* log when an editor action doesn't run because of enablement

* notebooks create/dispose editors. this means controllers must be created eagerly (😢) and that notebooks need a custom way of plugging comparision keys for session. works unless creating another session for the same cell of a duplicated editor

* Set offSide to sql lang configuration to true (#183461)

* Fixes #181764 (#183550)

* fix typo

* Always scroll down and focus the input (#183557)

* Fixes #180386 (#183561)

* cli: ensure ordering of rpc server messages (#183558)

* cli: ensure ordering of rpc server messages

Sending lots of messages to a stream would block them around the async
tokio mutex, which is "fair" so doesn't preserve ordering. Instead, use
the write_loop approach I introduced to the server_multiplexer for the
same reason some time ago.

* fix clippy

* update for May endgame

* testing: allow invalidateTestResults to take an array (#183569)

* Document `ShareProvider` API proposal (#183568)

* Document `ShareProvider` API proposal

* Remove mention of VS Code from JSDoc

* Add support for rendering svg and md in welcome message (#183580)

* Remove toggle setting more eagerly (#183584)

* rm message abt macOS

* Change text (#183589)

* Change text

* Accidentally changed the wrong file

* cli: improve output for code tunnel status (#183571)

* testing: allow invalidateTestResults to take an array

* cli: improve output for code tunnel status

Fixes #183570

* [json/css/html] update services (#183595)

* Add experimental setting to enable this dialog

* Fix exporting chat model to JSON before it is initialized (#183597)

* minimum scrolling to reveal the next cell on shift+enter (#183600)

do minimum scrolling to reveal the next cell on Execute cell and select next

* Fixing Jupyter notebook issue 13263 (#183527)

fix for the issue, still need to understand why there is strange focusing

* Tweak proposed API JSDoc (#183590)

* Tweak proposed API JSDoc

* workbench -> workspace

* fix ? operator

* Use active editor and show progress when sharing (#183603)

Use active editor and show progress

* use scroll setting variable correctly

* Schedule welcome widget to show once between typing. (#183606)

* Schedule dialog to show once between typing

* Don't re-render if already displayed once

* Add F10 keybinding for debugger step, even on Web. (#183510)

Fixes #181792.
Previously, for Web the keyboard shortcut was Alt-F10, because it was
believed that F10 could not be bound on browsers. This turned out to be
incorrect, so we make the shortcut consistent (F10) with desktop VSCode
which is also what many other debuggers use.
We keep Alt-F10 on web as a secondary keybinding to keep the experience
some web users may have gotten used to by now.

* Also pass process.env

* Restore missing chat clear commands (#183651)

* chore: update electron@22.5.4 (#183716)

* Show remote indicator in web when remoteAuthority is set (#183728)

* feat: .vuerc as json file (#153017)

Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>

* Delete --compatibility=1.63 code from the server (#183738)

* Copy vscode.dev link to tunnel generates an invalid link when an untitled workspace is open (#183739)

* Recent devcontainer display string corrupted on Get Started page (#183740)

* Improve "next codeblock" navigation (#183744)

* Improve "next codeblock" navigation
Operate on the current focused response, or the last one, and scroll to the selected item

* Normalize command title

* Git - run git status if similarityThreshold changes (#183762)

* fix aria-label issue in kb editor

fixes A11y_GradeB_VSCode_Keyboard shortcut reads words together - Blind: Arrow key navigation to row Find the binding keys and  "when" cell data are read together resulting in a word " CTRL + FeditorFocus  instead of CTRL + F editorFocus" #182490

* Status - fix compact padding (#183768)

* Remove angle brackets from VB brackets (#183782)

Fixes #183359

* Update language config schema with more details about brackets. (#183779)

* fix comment (#183812)

* Support for `Notebook` CodeAction Kind (#183457)

* nb kind support -- wip

* allow notebook codeactions around single cell edit check

* move notebook code action type out of editor

---------

Co-authored-by: rebornix <penn.lv@gmail.com>

* cli: fix connection default being applied (#183827)

* cli: bump to openssl 1.1.1u (#183828)

* Implement "delete" action for chat history (#183609)

* Use desired file name when generating new md pasted file paths (#183861)

Fixes #183851

* Default to filename for markdown new file if empty (#183864)

Fixes #183848

* Fix small typo (#183865)

Fixes #183819

* Noop when moving a symbol into the file it is already in (#183866)

Fixes #183793

* Adjust codeAction validation to account for notebook kind (#183859)

* Make JS/TS `go to configuration` commands work on non-`file:` file systems (#183688)

Make `go to project` commands work on non-`file:` file systems

Fixes #183685

* Can't do regex search after opening notebook (#183884)

Fixes #183858

* Default to current dir for `move to file` select (#183875)

Fixes #183870

`showOpenDialog` seems to ignore `defaultUri` if the file doesn't exist

* Use `<...>` style markdown links when needed (#183876)

Fixes #183849

* Remove check for context keys

* Update xterm package

* Enable updating a chat model without triggering incremental typing (#183894)

* Enable chat "move" commands on empty sessions (#183895)

* Enable chat "move" commands on empty sessions
and also imported sessions

* Fix command name

* Fix some chat keybindings on windows (#183896)

* "Revert File" on inactive editors are ignored (fix #177557) (#183903)

* Empty reason while switching profile (fix #183775) (#183904)

* fix https://github.com/microsoft/vscode-internalbacklog/issues/4278 (#183910)

* fix https://github.com/microsoft/vscode/issues/183770 (#183914)

* code --status displays a lot of errors before actual status output (fix #183787) (#183915)

* joh/icy manatee (#183917)

* Use idle value for widget of interactive editor controller

https://github.com/microsoft/vscode/issues/183820

* also make preview editors idle values

https://github.com/microsoft/vscode/issues/183820

* Fix #183777 (#183929)

* Fix #182309 (#183925)

* Tree checkbox item -> items (#183931)

Fixes #183826

* Fixes #183909 (#183940)

* Fix #183837 (#183943)

fix #183837

* Git - fix #183941 (#183944)

* Update xterm.css

Fixes #181242

* chore: add @ulugbekna and @aiday-mar to my-endgame notebook (#183946)

* Revert "When snippet mode is active, make `Tab` not accept suggestion but advance placeholder"

This reverts commit 50a80cdb61511343996ff1d41d0b676c3d329f48.

* revert not focusing completion list when quick suggest happens during snippet

* change `snippetsPreventQuickSuggestions` default to false

* Fix #181446 (#183956)

* fix https://github.com/microsoft/vscode-internalbacklog/issues/4298 (#183957)

* fix: remove extraneous incorrect context keys (#183959)

These were actually getting added in getTestItemContextOverlay, and the test ID was using the extended ID which extensions do not know about.

Fixes #183612

* Fixes https://github.com/microsoft/monaco-editor/issues/3920 (#183960)

* fix https://github.com/microsoft/vscode-internalbacklog/issues/4324 (#183961)

* fix #183030

* fix #180826 (#183962)

* make message more generic for interactive editor help

* .

* fix #183968

* Keep codeblock toolbar visible when focused

* Fix when clause on "Run in terminal" command

* add important info to help menu

* fix #183970

* Set `isRefactoring` for all TS refactoring edits (#183982)

* consolidate

* Disable move to file in TS versions < 5.2 (#183992)

There are still a few key bugs with refactoring. We will  ship this as a preview for TS 5.2+ instead of for 5.1

* Polish query accepting (#183995)

We shouldn't send the same request to Copilot if the query hasn't changed. So if the query is the same, we short circut.

Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4286

Also, when we open in chat, we should use the last accepted query, not what's in the input box.

Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4280

* Allow widget to have focus (#184000)

So that selecting non-code text works.

Fixes https://github.com/microsoft/vscode-internalbacklog/issues/4294

* Fix microsoft/vscode-internalbacklog#4257. Mitigate zindex for zone widgets. (#184001)

* Change welcome dialog contribution to Eventually

* Misc fixes

* Workspace folder picker entry descriptions are suboptimal for some filesystems (fix #183418) (#184018)

* cli - ignore std error unless verbose (#183787) (#184031)

* joh/inquisitive meerkat (#184034)

* only stash sessions that are none empty

https://github.com/microsoft/vscode-internalbacklog/issues/4281

* only unstash a session once - unless new exchanges are made,

https://github.com/microsoft/vscode-internalbacklog/issues/4281

* account for all exchange types

* Improve declared components (#184039)

* make sure to read setting (#184040)

d'oh, related to https://github.com/microsoft/vscode/issues/173387#issuecomment-1571696644

* [html] update service (#184049)

[html] update service. FIxes #181176

* reset context keys on reset/hide (#184042)

fixes https://github.com/microsoft/vscode-internalbacklog/issues/4330

* use `Lazy`, not `IdleValue` for the IE widget held by the eager controller (#184048)

https://github.com/microsoft/vscode/issues/183820

* fix https://github.com/microsoft/vscode-internalbacklog/issues/4333 (#184067)

* use undo-loop instead of undo-edit when discarding chat session (#184063)

* use undo-loop instead of undo-edit when discarding chat session

fixes https://github.com/microsoft/vscode-internalbacklog/issues/4118

* fix tests, wait for correct state

* Add logging to node download (#184070)

Add logging to node download. For #182951

* re-enable default zone widget revealing when showing (#184072)

fixes https://github.com/microsoft/vscode-internalbacklog/issues/4332, also fixes https://github.com/microsoft/vscode-internalbacklog/issues/3784

* fix #178202

* Allow APIs in stable (#184062)

* Fix microsoft/vscode-internalbacklog#4206. Override List view whitespace css for monaco editor (#184087)

* Fix JSDoc grammatical error (#184090)

* Pick up TS 5.1.3 (#184091)

Fixes #182931

* Misc fixes

* update distro (#184097)

* chore: update electron@22.5.5 (#184116)

* Extension host veto is registered multiple times on restart (fix #183778) (#184127)

Extension host veto is registered multiple times on restart (#183778)

* Do not auto start the local web worker extension host (#184137)

* Allow embedders to intercept trustedTypes.createPolicy calls (#184136)

Allow embedders to intercept trustedTypes.createPolicy calls (#184100)

* fix: reading from console output for --status on windows and linux (#184138)

fix: reading from console output for --status on windows and linux (#184118)

* Misc fixes

* code --status displays a lot of errors before actual status output (fix #183787) (#184200)

fix 183787

* (cherry-pick to 1.79 from main) Handle galleryExtension failure in featuredExtensionService (#184205)

Handle galleryExtension failure in featuredExtensionService (#184198)

Handle galleryExtension failure

* Fix #184183. Multiple output height updates are skipped. (#184188)

* Post merge init fixes

* Misc build issues

* disable toggle inline diff of `alt` down

https://github.com/microsoft/vscode-internalbacklog/issues/4342

* Take into account already activated extensions when computing running locations (#184303)

Take into account already activated extensions when computing running locations (fixes #184180)

* Avoid `extensionService.getExtension` and use `ActivationKind.Immediate` to allow that URI handling works while resolving (#184310)

Avoid `extensionService.getExtension` and use `ActivationKind.Immediate` to allow that URI handling works while resolving (fixes #182217)

* WIP

* rm fish auto injection

* More breaks

* Fix Port Attributes constructor (#184412)

* WIP

* WIP

* Allow extensions to get at the exports of other extensions during resolving (#184487)

Allow extensions to get at the exports of other extensions during resolving (fixes #184472)

* do not auto finish session when inline chat widgets have focus

re https://github.com/microsoft/vscode-internalbacklog/issues/4354

* fix compile errors caused by new base method

* WIP

* WIP

* WIP

* WIP

* Build errors

* unc - fix path traversal bypass

* Bump version

* cherry-pick prod changes from main

* Disable sandbox

* Build break from merge

* bump version

* Merge pull request #184739 from max06/max06/issue184659

Restore ShellIntegration for fish (#184659)

* Git - only add --find-renames if the value is not the default one (#185053)

Git - only add --find-renames if the value is not the default one (#184992)

* Cherry-pick: Revert changes to render featured extensions when available (#184747)

Revert changes to render featured extensions when available.  (#184573)

* Lower timeouts for experimentation and gallery service

* Revert changes to render extensions when available

* Add audio cues

* fix: disable app sandbox when --no-sandbox is present (#184913)

* fix: disable app sandbox when --no-sandbox is present (#184897)

* fix: loading minimist in packaged builds

* Runtime errors

* UNC allow list checks cannot be disabled in extension host (fix #184989) (#185085)

* UNC allow list checks cannot be disabled in extension host (#184989)

* Update src/vs/base/node/unc.js

Co-authored-by: Robo <hop2deep@gmail.com>

---------

Co-authored-by: Robo <hop2deep@gmail.com>

* Add notebook extension

* Fix mangling issues

* Fix mangling issues

* npm install

* npm install

* Issues blocking bundle

* Fix build folder compile errors

* Fix windows bundle build

* Linting fixes

* Fix sqllint issues

* Update yarn.lock files

* Fix unit tests

* Fix a couple breaks from test fixes

* Bump distro

* redo the checkbox style

* Update linux build container dockerfile

* Bump build image tag

* Bump native watch dog package

* Bump node-pty

* Bump distro

* Fix documnetation error

* Update distro

* redo the button styles

* Update datasource TS

* Add missing yarn.lock files

* Windows setup fix

* Turn off extension unit tests while investigating

* color box style

* Remove appx

* Turn off test log upload

* update dropdownlist style

* fix universal app build error (#23488)

* Skip flaky bufferContext vscode test

---------

Co-authored-by: Johannes <johannes.rieken@gmail.com>
Co-authored-by: Henning Dieterichs <hdieterichs@microsoft.com>
Co-authored-by: Julien Richard <jairbubbles@hotmail.com>
Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>
Co-authored-by: Megan Rogge <merogge@microsoft.com>
Co-authored-by: meganrogge <megan.rogge@microsoft.com>
Co-authored-by: Rob Lourens <roblourens@gmail.com>
Co-authored-by: Connor Peet <connor@peet.io>
Co-authored-by: Joyce Er <joyce.er@microsoft.com>
Co-authored-by: Bhavya U <bhavyau@microsoft.com>
Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
Co-authored-by: Aaron Munger <aamunger@microsoft.com>
Co-authored-by: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Co-authored-by: rebornix <penn.lv@gmail.com>
Co-authored-by: Ole <oler@google.com>
Co-authored-by: Jean Pierre <jeanp413@hotmail.com>
Co-authored-by: Robo <hop2deep@gmail.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Co-authored-by: Ulugbek Abdullaev <ulugbekna@gmail.com>
Co-authored-by: Alex Ross <alros@microsoft.com>
Co-authored-by: Michael Lively <milively@microsoft.com>
Co-authored-by: Matt Bierner <matb@microsoft.com>
Co-authored-by: Andrea Mah <31675041+andreamah@users.noreply.github.com>
Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Co-authored-by: Sandeep Somavarapu <sasomava@microsoft.com>
Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Co-authored-by: Tyler James Leonhardt <me@tylerleonhardt.com>
Co-authored-by: Alexandru Dima <alexdima@microsoft.com>
Co-authored-by: Joao Moreno <Joao.Moreno@microsoft.com>
Co-authored-by: Alan Ren <alanren@microsoft.com>
This commit is contained in:
Karl Burtram
2023-06-27 15:26:51 -07:00
committed by GitHub
co-authored by Robo Johannes Henning Dieterichs Julien Richard Charles Gagnon Megan Rogge meganrogge Rob Lourens Connor Peet Joyce Er Bhavya U Raymond Zhao Martin Aeschlimann Aaron Munger Aiday Marlen Kyzy rebornix Ole Jean Pierre Yash Singh Ladislau Szomoru Ulugbek Abdullaev Alex Ross Michael Lively Matt Bierner Andrea Mah Benjamin Pasero Sandeep Somavarapu Daniel Imms Tyler James Leonhardt Alexandru Dima Joao Moreno Alan Ren
parent 7975fda6dd
commit 01e66ab3e6
4335 changed files with 252586 additions and 164604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sql/azdata.d.ts
Vendored
+1 -1
View File
@@ -1580,7 +1580,7 @@ declare module 'azdata' {
}
export enum FrequencyTypes {
Unknown,
Unknown = 0,
OneTime = 1 << 1,
Daily = 1 << 2,
Weekly = 1 << 3,
src/sql/base/browser/ui/button/button.ts
+2 -5
View File
@@ -3,17 +3,14 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Button as vsButton, IButtonOptions, IButtonStyles as vsIButtonStyles } from 'vs/base/browser/ui/button/button';
import { Button as vsButton, IButtonOptions } from 'vs/base/browser/ui/button/button';
import { Color } from 'vs/base/common/color';
export interface IButtonStyles extends vsIButtonStyles {
}
export class Button extends vsButton {
protected buttonFocusOutline?: Color;
constructor(container: HTMLElement, options?: IButtonOptions) {
super(container, options);
super(container, options ?? {});
}
public set title(value: string) {
src/sql/base/browser/ui/checkbox/checkbox.ts
+13 -25
View File
@@ -4,13 +4,11 @@
*--------------------------------------------------------------------------------------------*/
import 'vs/css!./media/checkbox';
import { Color } from 'vs/base/common/color';
import { Event, Emitter } from 'vs/base/common/event';
import { Widget } from 'vs/base/browser/ui/widget';
import { generateUuid } from 'vs/base/common/uuid';
export interface ICheckboxOptions {
export interface ICheckboxOptions extends Partial<ICheckboxStyles> {
label: string;
enabled?: boolean;
checked?: boolean;
@@ -20,13 +18,12 @@ export interface ICheckboxOptions {
}
export interface ICheckboxStyles {
disabledCheckboxForeground?: Color;
disabledCheckboxForeground?: string;
}
export class Checkbox extends Widget {
private _el: HTMLInputElement;
private _label: HTMLSpanElement;
private disabledCheckboxForeground?: Color;
private _onChange = new Emitter<boolean>();
public readonly onChange: Event<boolean> = this._onChange.event;
@@ -34,7 +31,7 @@ export class Checkbox extends Widget {
private _onFocus = new Emitter<void>();
public readonly onFocus: Event<void> = this._onFocus.event;
constructor(container: HTMLElement, opts: ICheckboxOptions) {
constructor(container: HTMLElement, private readonly _options: ICheckboxOptions) {
super();
const id = generateUuid();
this._el = document.createElement('input');
@@ -42,12 +39,12 @@ export class Checkbox extends Widget {
this._el.style.verticalAlign = 'middle';
this._el.id = id;
if (opts.ariaLabel) {
this.ariaLabel = opts.ariaLabel;
if (_options.ariaLabel) {
this.ariaLabel = _options.ariaLabel;
}
if (opts.ariaDescription) {
this._el.setAttribute('aria-description', opts.ariaDescription);
if (_options.ariaDescription) {
this._el.setAttribute('aria-description', _options.ariaDescription);
}
this.onchange(this._el, e => {
@@ -62,12 +59,12 @@ export class Checkbox extends Widget {
this._label.style.verticalAlign = 'middle';
this._label.setAttribute('for', id);
this.label = opts.label;
this.enabled = opts.enabled ?? true;
this.checked = opts.checked ?? false;
this.label = _options.label;
this.enabled = _options.enabled ?? true;
this.checked = _options.checked ?? false;
if (opts.onChange) {
this.onChange(opts.onChange);
if (_options.onChange) {
this.onChange(_options.onChange);
}
container.appendChild(this._el);
@@ -84,7 +81,7 @@ export class Checkbox extends Widget {
public set enabled(val: boolean) {
this._el.disabled = !val;
this.updateStyle();
this._label.style.color = !this.enabled && this._options.disabledCheckboxForeground ? this._options.disabledCheckboxForeground : 'inherit';
}
public get enabled(): boolean {
@@ -134,13 +131,4 @@ export class Checkbox extends Widget {
public setWidth(value: string) {
this._el.style.width = value;
}
public style(styles: ICheckboxStyles): void {
this.disabledCheckboxForeground = styles.disabledCheckboxForeground;
this.updateStyle();
}
private updateStyle(): void {
this._label.style.color = !this.enabled && this.disabledCheckboxForeground ? this.disabledCheckboxForeground.toString() : 'inherit';
}
}
src/sql/base/browser/ui/colorbox/colorbox.ts
+4 -21
View File
@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'vs/css!./media/colorbox';
import { Color } from 'vs/base/common/color';
import { Event, Emitter } from 'vs/base/common/event';
import { Widget } from 'vs/base/browser/ui/widget';
import * as DOM from 'vs/base/browser/dom';
@@ -13,18 +11,13 @@ import { generateUuid } from 'vs/base/common/uuid';
export interface ColorboxOptions {
name: string;
class?: string[];
label: string;
}
export interface ColorboxStyle {
backgroundColor?: Color;
color: string;
}
export class Colorbox extends Widget {
readonly radioButton: HTMLInputElement;
readonly colorElement: HTMLDivElement;
private labelNode: HTMLLabelElement;
private backgroundColor?: Color;
private _onSelect = new Emitter<void>();
public readonly onSelect: Event<void> = this._onSelect.event;
@@ -34,6 +27,7 @@ export class Colorbox extends Widget {
const colorboxContainer = DOM.$('.colorbox-container');
this.colorElement = DOM.$('.color-element');
const radiobuttonContainer = DOM.$('.color-selector-container');
this.colorElement.style.background = opts.color;
this.radioButton = DOM.$('input');
this.radioButton.type = 'radio';
this.radioButton.name = opts.name;
@@ -43,10 +37,10 @@ export class Colorbox extends Widget {
if (opts.class) {
this.radioButton.classList.add(...opts.class);
}
this.radioButton.setAttribute('aria-label', opts.label);
this.radioButton.setAttribute('aria-label', opts.color);
this.labelNode = DOM.$('label.colorbox-label');
this.labelNode.setAttribute('for', this.radioButton.id);
this.labelNode.innerText = opts.label;
this.labelNode.innerText = opts.color;
radiobuttonContainer.appendChild(this.radioButton);
radiobuttonContainer.appendChild(this.labelNode);
@@ -60,17 +54,6 @@ export class Colorbox extends Widget {
}
public style(styles: ColorboxStyle): void {
if (styles.backgroundColor) {
this.backgroundColor = styles.backgroundColor;
}
this.updateStyle();
}
private updateStyle(): void {
this.colorElement.style.background = this.backgroundColor ? this.backgroundColor.toString() : this.radioButton.style.background;
}
public get checked(): boolean {
return this.radioButton.checked;
}
src/sql/base/browser/ui/dropdownList/dropdownList.ts
+69 -32
View File
@@ -5,28 +5,81 @@
import 'vs/css!./media/dropdownList';
import * as DOM from 'vs/base/browser/dom';
import { Dropdown, IDropdownOptions } from 'vs/base/browser/ui/dropdown/dropdown';
import { IDisposable } from 'vs/base/common/lifecycle';
import { Color } from 'vs/base/common/color';
import { IAction } from 'vs/base/common/actions';
import { EventType as GestureEventType } from 'vs/base/browser/touch';
import { List } from 'vs/base/browser/ui/list/listWidget';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { Button, IButtonStyles } from 'sql/base/browser/ui/button/button';
import { Button } from 'sql/base/browser/ui/button/button';
import { BaseDropdown, IBaseDropdownOptions } from 'vs/base/browser/ui/dropdown/dropdown';
import { IAnchor, IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
import { IButtonStyles } from 'vs/base/browser/ui/button/button';
export interface IDropdownStyles {
backgroundColor?: Color;
foregroundColor?: Color;
borderColor?: Color;
backgroundColor?: string;
foregroundColor?: string;
borderColor?: string;
}
export class DropdownList extends Dropdown {
export interface IDropdownOptions extends IBaseDropdownOptions {
contextViewProvider: IContextViewProvider;
buttonStyles: IButtonStyles;
dropdownStyles: IDropdownStyles;
}
protected backgroundColor?: Color;
protected foregroundColor?: Color;
protected borderColor?: Color;
export class Dropdown extends BaseDropdown {
private contextViewProvider: IContextViewProvider;
constructor(container: HTMLElement, options: IDropdownOptions) {
super(container, options);
this.contextViewProvider = options.contextViewProvider;
}
override show(): void {
super.show();
this.element.classList.add('active');
this.contextViewProvider.showContextView({
getAnchor: () => this.getAnchor(),
render: (container) => {
return this.renderContents(container);
},
onDOMEvent: (e, activeElement) => {
this.onEvent(e, activeElement);
},
onHide: () => this.onHide()
});
}
protected getAnchor(): HTMLElement | IAnchor {
return this.element;
}
protected onHide(): void {
this.element.classList.remove('active');
}
override hide(): void {
super.hide();
if (this.contextViewProvider) {
this.contextViewProvider.hideContextView();
}
}
protected renderContents(container: HTMLElement): IDisposable | null {
return null;
}
}
export class DropdownList extends BaseDropdown {
protected borderWidth = 1;
private button?: Button;
@@ -40,7 +93,7 @@ export class DropdownList extends Dropdown {
) {
super(container, _options);
if (action) {
this.button = new Button(_contentContainer);
this.button = new Button(_contentContainer, this._options.buttonStyles);
this.button.label = action.label;
this._register(DOM.addDisposableListener(this.button.element, DOM.EventType.CLICK, () => {
action.run();
@@ -83,12 +136,16 @@ export class DropdownList extends Dropdown {
}));
this.element.setAttribute('tabindex', '0');
this.applyStylesOnElement(this._contentContainer, _options.dropdownStyles.backgroundColor, _options.dropdownStyles.foregroundColor, _options.dropdownStyles.borderColor);
if (this.label) {
this.applyStylesOnElement(this.element, _options.dropdownStyles.backgroundColor, _options.dropdownStyles.foregroundColor, _options.dropdownStyles.borderColor);
}
}
/**
* Render the dropdown contents
*/
protected override renderContents(container: HTMLElement): IDisposable {
protected renderContents(container: HTMLElement): IDisposable | null {
let div = DOM.append(container, this._contentContainer);
div.style.width = (DOM.getTotalWidth(this.element) - this.borderWidth * 2) + 'px'; // Subtract border width
return { dispose: () => { } };
@@ -121,26 +178,6 @@ export class DropdownList extends Dropdown {
}
}
public style(styles: IDropdownStyles & IButtonStyles): void {
this.backgroundColor = styles.backgroundColor;
this.foregroundColor = styles.foregroundColor;
this.borderColor = styles.borderColor;
this.applyStyles();
if (this.button) {
this.button.style(styles);
}
}
protected applyStyles(): void {
const background = this.backgroundColor ? this.backgroundColor.toString() : '';
const foreground = this.foregroundColor ? this.foregroundColor.toString() : '';
const border = this.borderColor ? this.borderColor.toString() : '';
this.applyStylesOnElement(this._contentContainer, background, foreground, border);
if (this.label) {
this.applyStylesOnElement(this.element, background, foreground, border);
}
}
private applyStylesOnElement(element: HTMLElement, background: string, foreground: string, border: string): void {
if (element) {
element.style.backgroundColor = background;
src/sql/base/browser/ui/editableDropdown/browser/dropdown.ts
+3 -1
View File
@@ -20,6 +20,7 @@ import { clamp } from 'vs/base/common/numbers';
import { mixin } from 'vs/base/common/objects';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import * as nls from 'vs/nls';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
export interface IDropdownOptions extends IDropdownStyles {
@@ -124,7 +125,8 @@ export class Dropdown extends Disposable implements IListVirtualDelegate<string>
},
placeholder: this._options.placeholder,
ariaLabel: this._options.ariaLabel,
ariaDescription: this._options.ariaDescription
ariaDescription: this._options.ariaDescription,
inputBoxStyles: defaultInputBoxStyles
});
// Clear title from input box element (defaults to placeholder value) since we don't want a tooltip for the selected value
src/sql/base/browser/ui/infoButton/infoButton.ts
+35 -27
View File
@@ -5,16 +5,16 @@
import 'vs/css!./infoButton';
import { Button as sqlButton } from 'sql/base/browser/ui/button/button';
import { IButtonOptions, IButtonStyles } from 'vs/base/browser/ui/button/button';
import { IButtonOptions } from 'vs/base/browser/ui/button/button';
export interface IInfoButtonOptions extends IButtonOptions {
buttonMaxHeight: number,
buttonMaxWidth: number,
description: string,
iconClass: string,
iconHeight: number,
iconWidth: number,
title: string,
buttonMaxHeight?: number,
buttonMaxWidth?: number,
description?: string,
iconClass?: string,
iconHeight?: number,
iconWidth?: number,
title?: string,
}
export class InfoButton extends sqlButton {
@@ -34,8 +34,6 @@ export class InfoButton extends sqlButton {
private _iconWidth?: number;
private _title?: string;
private _styles: IButtonStyles;
constructor(container: HTMLElement, options?: IInfoButtonOptions) {
super(container, options);
this._container = container;
@@ -143,27 +141,37 @@ export class InfoButton extends sqlButton {
if (!options) {
return;
}
this.buttonMaxHeight = options.buttonMaxHeight;
this.buttonMaxWidth = options.buttonMaxWidth;
this.description = options.description;
this.iconHeight = options.iconHeight;
this.iconWidth = options.iconWidth;
this.iconClass = options.iconClass;
this.title = options.title;
if (options.buttonMaxHeight !== undefined) {
this.buttonMaxHeight = options.buttonMaxHeight;
}
if (options.buttonMaxWidth !== undefined) {
this.buttonMaxWidth = options.buttonMaxWidth;
}
if (options.description) {
this.description = options.description;
}
if (options.iconHeight !== undefined) {
this.iconHeight = options.iconHeight;
}
if (options.iconWidth !== undefined) {
this.iconWidth = options.iconWidth;
}
if (options.iconClass) {
this.iconClass = options.iconClass;
}
if (options.title) {
this.title = options.title;
}
}
override style(styles: IButtonStyles): void {
this._styles = styles;
this.applyStyles();
override updateStyles() {
this.element.style.backgroundColor = this.options.buttonBackground ?? '';
this.element.style.color = this.options.buttonForeground ?? '';
this.element.style.borderColor = this.options.buttonBorder ?? '';
}
override applyStyles(): void {
this.element.style.backgroundColor = this._styles?.buttonBackground?.toString();
this.element.style.color = this._styles?.buttonForeground?.toString();
this.element.style.borderColor = this._styles?.buttonBorder?.toString();
override updateBackground(hover: boolean): void {
this.element.style.backgroundColor = (hover ? this.options.buttonHoverBackground : this.options.buttonBackground) ?? '';
}
override setHoverBackground(): void {
this.element.style.backgroundColor = this._styles?.buttonHoverBackground?.toString();
}
}
src/sql/base/browser/ui/inputBox/inputBox.ts
+23 -22
View File
@@ -31,12 +31,12 @@ export interface IInputOptions extends vsIInputBoxOptions {
}
export class InputBox extends vsInputBox implements AdsWidget {
private enabledInputBackground?: Color;
private enabledInputForeground?: Color;
private enabledInputBorder?: Color;
private disabledInputBackground?: Color;
private disabledInputForeground?: Color;
private disabledInputBorder?: Color;
// private enabledInputBackground?: Color;
// private enabledInputForeground?: Color;
// private enabledInputBorder?: Color;
// private disabledInputBackground?: Color;
// private disabledInputForeground?: Color;
// private disabledInputBorder?: Color;
private _lastLoseFocusValue: string;
@@ -51,10 +51,11 @@ export class InputBox extends vsInputBox implements AdsWidget {
constructor(container: HTMLElement, contextViewProvider: IContextViewProvider, private _sqlOptions?: IInputOptions, id?: string) {
super(container, contextViewProvider, _sqlOptions);
this.enabledInputBackground = this.inputBackground;
this.enabledInputForeground = this.inputForeground;
this.enabledInputBorder = this.inputBorder;
this.disabledInputBackground = Color.transparent;
// {{SQL CARBON TODO}} - fix styles
// this.enabledInputBackground = this.inputBackground;
// this.enabledInputForeground = this.inputForeground;
// this.enabledInputBorder = this.inputBorder;
//this.disabledInputBackground = Color.transparent;
this._lastLoseFocusValue = this.value;
let self = this;
@@ -82,14 +83,14 @@ export class InputBox extends vsInputBox implements AdsWidget {
}
public override style(styles: IInputBoxStyles): void {
super.style(styles);
this.enabledInputBackground = this.inputBackground;
this.enabledInputForeground = this.inputForeground;
this.enabledInputBorder = this.inputBorder;
this.disabledInputBackground = styles.disabledInputBackground;
this.disabledInputForeground = styles.disabledInputForeground;
this.updateInputEnabledDisabledColors();
this.applyStyles();
// super.style(styles);
// this.enabledInputBackground = this.inputBackground;
// this.enabledInputForeground = this.inputForeground;
// this.enabledInputBorder = this.inputBorder;
// this.disabledInputBackground = styles.disabledInputBackground;
// this.disabledInputForeground = styles.disabledInputForeground;
// this.updateInputEnabledDisabledColors();
// this.applyStyles();
}
public override enable(): void {
@@ -168,10 +169,10 @@ export class InputBox extends vsInputBox implements AdsWidget {
}
private updateInputEnabledDisabledColors(): void {
let enabled = this.isEnabled();
this.inputBackground = enabled ? this.enabledInputBackground : this.disabledInputBackground;
this.inputForeground = enabled ? this.enabledInputForeground : this.disabledInputForeground;
this.inputBorder = enabled ? this.enabledInputBorder : this.disabledInputBorder;
// let enabled = this.isEnabled();
// this.inputBackground = enabled ? this.enabledInputBackground : this.disabledInputBackground;
// this.inputForeground = enabled ? this.enabledInputForeground : this.disabledInputForeground;
// this.inputBorder = enabled ? this.enabledInputBorder : this.disabledInputBorder;
}
public override validate(force?: boolean): MessageType | undefined {
src/sql/base/browser/ui/listBox/listBox.ts
+52 -49
View File
@@ -3,15 +3,16 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { SelectBox, ISelectBoxStyles, ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
import { SelectBox, ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
import { Color } from 'vs/base/common/color';
import { isUndefinedOrNull } from 'vs/base/common/types';
import { IMessage, MessageType, defaultOpts } from 'vs/base/browser/ui/inputbox/inputBox';
import { IMessage, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
import * as dom from 'vs/base/browser/dom';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { IContextViewProvider, AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
import { Emitter } from 'vs/base/common/event';
import { renderFormattedText, renderText, FormattedTextRenderOptions } from 'vs/base/browser/formattedTextRenderer';
import { defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
const $ = dom.$;
@@ -31,12 +32,12 @@ export interface IListBoxStyles {
* Extends SelectBox to allow multiple selection and adding/remove items dynamically
*/
export class ListBox extends SelectBox {
private enabledSelectBackground?: Color;
private enabledSelectForeground?: Color;
private enabledSelectBorder?: Color;
private disabledSelectBackground?: Color;
private disabledSelectForeground?: Color;
private disabledSelectBorder?: Color;
// private enabledSelectBackground?: Color;
// private enabledSelectForeground?: Color;
// private enabledSelectBorder?: Color;
// private disabledSelectBackground?: Color;
// private disabledSelectForeground?: Color;
// private disabledSelectBorder?: Color;
private inputValidationInfoBorder?: Color;
private inputValidationInfoBackground?: Color;
@@ -56,7 +57,7 @@ export class ListBox extends SelectBox {
private options: ISelectOptionItem[],
contextViewProvider: IContextViewProvider) {
super(options, 0, contextViewProvider);
super(options, 0, contextViewProvider, defaultSelectBoxStyles);
this.contextViewProvider = contextViewProvider;
this.isValid = true;
this.selectElement.multiple = true;
@@ -77,51 +78,53 @@ export class ListBox extends SelectBox {
this.selectElement.focus();
}));
this.enabledSelectBackground = this.selectBackground;
this.enabledSelectForeground = this.selectForeground;
this.enabledSelectBorder = this.selectBorder;
this.disabledSelectBackground = Color.transparent;
// this.enabledSelectBackground = this.selectBackground;
// this.enabledSelectForeground = this.selectForeground;
// this.enabledSelectBorder = this.selectBorder;
//this.disabledSelectBackground = Color.transparent;
this.inputValidationInfoBorder = defaultOpts.inputValidationInfoBorder;
this.inputValidationInfoBackground = defaultOpts.inputValidationInfoBackground;
this.inputValidationWarningBorder = defaultOpts.inputValidationWarningBorder;
this.inputValidationWarningBackground = defaultOpts.inputValidationWarningBackground;
this.inputValidationErrorBorder = defaultOpts.inputValidationErrorBorder;
this.inputValidationErrorBackground = defaultOpts.inputValidationErrorBackground;
// this.inputValidationInfoBorder = defaultOpts.inputValidationInfoBorder;
// this.inputValidationInfoBackground = defaultOpts.inputValidationInfoBackground;
// this.inputValidationWarningBorder = defaultOpts.inputValidationWarningBorder;
// this.inputValidationWarningBackground = defaultOpts.inputValidationWarningBackground;
// this.inputValidationErrorBorder = defaultOpts.inputValidationErrorBorder;
// this.inputValidationErrorBackground = defaultOpts.inputValidationErrorBackground;
this.onblur(this.selectElement, () => this.onBlur());
this.onfocus(this.selectElement, () => this.onFocus());
}
public override style(styles: IListBoxStyles): void {
let superStyle: ISelectBoxStyles = {
selectBackground: styles.selectBackground,
selectForeground: styles.selectForeground,
selectBorder: styles.selectBorder
};
super.style(superStyle);
this.enabledSelectBackground = this.selectBackground;
this.enabledSelectForeground = this.selectForeground;
this.enabledSelectBorder = this.selectBorder;
// {{SQL CARBON TODO}} - apply styles
public style(styles: IListBoxStyles): void {
// let superStyle: ISelectBoxStyles = {
// selectBackground: styles.selectBackground,
// selectForeground: styles.selectForeground,
// selectBorder: styles.selectBorder
// };
// super.style(superStyle);
// this.enabledSelectBackground = this.selectBackground;
// this.enabledSelectForeground = this.selectForeground;
// this.enabledSelectBorder = this.selectBorder;
this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
// this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
// this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
// this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
// this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
// this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
// this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
}
public setValidation(isValid: boolean, message?: IMessage): void {
this.isValid = isValid;
this.message = message;
if (this.isValid) {
this.selectElement.style.border = `1px solid ${this.selectBorder}`;
} else if (this.message) {
const styles = this.stylesForType(this.message.type);
this.selectElement.style.border = styles.border ? `1px solid ${styles.border}` : '';
}
// {{SQL CARBON TODO}} - apply styles
// if (this.isValid) {
// this.selectElement.style.border = `1px solid ${this.selectBorder}`;
// } else if (this.message) {
// const styles = this.stylesForType(this.message.type);
// this.selectElement.style.border = styles.border ? `1px solid ${styles.border}` : '';
// }
}
public get isContentValid(): boolean {
@@ -171,18 +174,18 @@ export class ListBox extends SelectBox {
public enable(): void {
this.selectElement.disabled = false;
this.selectBackground = this.enabledSelectBackground;
this.selectForeground = this.enabledSelectForeground;
this.selectBorder = this.enabledSelectBorder;
this.applyStyles();
// this.selectBackground = this.enabledSelectBackground;
// this.selectForeground = this.enabledSelectForeground;
// this.selectBorder = this.enabledSelectBorder;
// this.applyStyles();
}
public disable(): void {
this.selectElement.disabled = true;
this.selectBackground = this.disabledSelectBackground;
this.selectForeground = this.disabledSelectForeground;
this.selectBorder = this.disabledSelectBorder;
this.applyStyles();
// this.selectBackground = this.disabledSelectBackground;
// this.selectForeground = this.disabledSelectForeground;
// this.selectBorder = this.disabledSelectBorder;
// this.applyStyles();
}
public onBlur(): void {
src/sql/base/browser/ui/panel/panel.component.ts
+1 -2
View File
@@ -22,7 +22,6 @@ import * as nls from 'vs/nls';
import { TabHeaderComponent } from 'sql/base/browser/ui/panel/tabHeader.component';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { IThemable } from 'vs/base/common/styler';
import { ITabbedPanelStyles } from 'sql/base/browser/ui/panel/panel';
import { createStyleSheet } from 'vs/base/browser/dom';
@@ -83,7 +82,7 @@ let idPool = 0;
</div>
`
})
export class PanelComponent extends Disposable implements IThemable {
export class PanelComponent extends Disposable {
private _options: IPanelOptions = defaultOptions;
@Input() public set options(newOptions: IPanelOptions) {
src/sql/base/browser/ui/selectBox/selectBox.ts
+31 -30
View File
@@ -18,6 +18,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import { SelectBoxList } from 'vs/base/browser/ui/selectBox/selectBoxCustom';
import { Event, Emitter } from 'vs/base/common/event';
import { AdsWidget } from 'sql/base/browser/ui/adsWidget';
import { defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
const $ = dom.$;
@@ -45,12 +46,12 @@ export class SelectBox extends vsSelectBox implements AdsWidget {
private _dialogOptions: SelectOptionItemSQL[];
private _selectedOption: string;
private _selectBoxOptions?: ISelectBoxOptions;
private enabledSelectBackground?: Color;
private enabledSelectForeground?: Color;
private enabledSelectBorder?: Color;
private disabledSelectBackground?: Color;
private disabledSelectForeground?: Color;
private disabledSelectBorder?: Color;
// private enabledSelectBackground?: Color;
// private enabledSelectForeground?: Color;
// private enabledSelectBorder?: Color;
// private disabledSelectBackground?: Color;
// private disabledSelectForeground?: Color;
// private disabledSelectBorder?: Color;
private contextViewProvider: IContextViewProvider;
private message?: IMessage;
private _onDidSelect: Emitter<ISelectData>;
@@ -70,7 +71,7 @@ export class SelectBox extends vsSelectBox implements AdsWidget {
constructor(options: SelectOptionItemSQL[] | string[], selectedOption: string, contextViewProvider: IContextViewProvider, container?: HTMLElement, selectBoxOptions?: ISelectBoxOptions, id?: string) {
let optionItems: SelectOptionItemSQL[] = SelectBox.createOptions(options);
super(optionItems, 0, contextViewProvider, undefined, selectBoxOptions);
super(optionItems, 0, contextViewProvider, defaultSelectBoxStyles, selectBoxOptions);
this._onDidSelect = new Emitter<ISelectData>();
this._onDidFocus = new Emitter<void>();
@@ -88,12 +89,13 @@ export class SelectBox extends vsSelectBox implements AdsWidget {
this._onDidSelect.fire(newSelect);
}));
this.enabledSelectBackground = this.selectBackground;
this.enabledSelectForeground = this.selectForeground;
this.enabledSelectBorder = this.selectBorder;
this.disabledSelectBackground = Color.transparent;
this.disabledSelectForeground = undefined;
this.disabledSelectBorder = undefined;
// {{SQL CARBON TODO}} - fix styles
// this.enabledSelectBackground = this.selectBackground;
// this.enabledSelectForeground = this.selectForeground;
// this.enabledSelectBorder = this.selectBorder;
// this.disabledSelectBackground = Color.transparent;
// this.disabledSelectForeground = undefined;
// this.disabledSelectBorder = undefined;
this.contextViewProvider = contextViewProvider;
if (container) {
this.element = dom.append(container, $('.monaco-selectbox.idle'));
@@ -178,13 +180,12 @@ export class SelectBox extends vsSelectBox implements AdsWidget {
this._dialogOptions = options;
}
public override style(styles: ISelectBoxStyles): void {
super.style(styles);
this.enabledSelectBackground = this.selectBackground;
this.enabledSelectForeground = this.selectForeground;
this.enabledSelectBorder = this.selectBorder;
this.disabledSelectBackground = styles.disabledSelectBackground;
this.disabledSelectForeground = styles.disabledSelectForeground;
public style(styles: ISelectBoxStyles): void {
// this.enabledSelectBackground = this.selectBackground;
// this.enabledSelectForeground = this.selectForeground;
// this.enabledSelectBorder = this.selectBorder;
// this.disabledSelectBackground = styles.disabledSelectBackground;
// this.disabledSelectForeground = styles.disabledSelectForeground;
this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
this.inputValidationInfoForeground = styles.inputinputValidationInfoForeground;
@@ -194,7 +195,7 @@ export class SelectBox extends vsSelectBox implements AdsWidget {
this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
this.inputValidationErrorForeground = styles.inputValidationErrorForeground;
this.applyStyles();
//this.applyStyles();
}
public selectWithOptionName(optionName?: string, selectFirstByDefault: boolean = true, forceSelectionEvent: boolean = false): void {
@@ -244,18 +245,18 @@ export class SelectBox extends vsSelectBox implements AdsWidget {
public enable(): void {
this.selectElement.disabled = false;
this.selectBackground = this.enabledSelectBackground;
this.selectForeground = this.enabledSelectForeground;
this.selectBorder = this.enabledSelectBorder;
this.applyStyles();
// this.selectBackground = this.enabledSelectBackground;
// this.selectForeground = this.enabledSelectForeground;
// this.selectBorder = this.enabledSelectBorder;
//this.applyStyles();
}
public disable(): void {
this.selectElement.disabled = true;
this.selectBackground = this.disabledSelectBackground;
this.selectForeground = this.disabledSelectForeground;
this.selectBorder = this.disabledSelectBorder;
this.applyStyles();
// this.selectBackground = this.disabledSelectBackground;
// this.selectForeground = this.disabledSelectForeground;
// this.selectBorder = this.disabledSelectBorder;
//this.applyStyles();
}
public getAriaLabel(): string {
@@ -343,7 +344,7 @@ export class SelectBox extends vsSelectBox implements AdsWidget {
}
this._hideMessage();
this.applyStyles();
//this.applyStyles();
this.message = undefined;
}
src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts
+37 -29
View File
@@ -19,7 +19,8 @@ import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { Emitter } from 'vs/base/common/event';
import { CountBadge, ICountBadgetyles } from 'vs/base/browser/ui/countBadge/countBadge';
import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
import { defaultCountBadgeStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
export type HeaderFilterCommands = 'sort-asc' | 'sort-desc';
@@ -35,17 +36,17 @@ export interface ITableFilterOptions {
*/
disabledFilterMessage?: string;
/**
* The columns are refreshed by default to add the filter menu button to the headers.
* The columns are refreshed by default to add the filter menu button to the headers. The default value is true.
* Set to false to prevent the grid from being re-drawn multiple times by different plugins.
*/
refreshColumns?: boolean;
/**
* The button styles.
*/
buttonStyles: IButtonStyles;
}
const DefaultTableFilterOptions: ITableFilterOptions = {
refreshColumns: true
};
export interface ITableFilterStyles extends IButtonStyles, IInputBoxStyles, IListStyles, ICountBadgetyles {
export interface ITableFilterStyles extends IInputBoxStyles, IListStyles {
}
interface NotificationProvider {
@@ -69,8 +70,9 @@ export class HeaderFilter<T extends Slick.SlickData> {
private okButton?: Button;
private clearButton?: Button;
private cancelButton?: Button;
private sortAscButton?: Button;
private sortDescButton?: Button;
// {{SQL CARBON TODO}} - disable
// private sortAscButton?: Button;
// private sortDescButton?: Button;
private selectAllCheckBox?: Checkbox;
private searchInputBox?: InputBox;
private countBadge?: CountBadge;
@@ -86,7 +88,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
private previouslyFocusedElement: HTMLElement;
private listContainer?: HTMLElement;
constructor(private readonly contextViewProvider: IContextViewProvider, private readonly notificationProvider?: NotificationProvider, private readonly options: ITableFilterOptions = DefaultTableFilterOptions) {
constructor(private readonly options: ITableFilterOptions, private readonly contextViewProvider: IContextViewProvider, private readonly notificationProvider?: NotificationProvider) {
}
public init(grid: Slick.Grid<T>): void {
@@ -182,8 +184,8 @@ export class HeaderFilter<T extends Slick.SlickData> {
private createButtonMenuItem(title: string, command: HeaderFilterCommands, iconClass: string): Button {
const buttonContainer = append(this.menu, $('.slick-header-menu-image-button-container'));
const button = new Button(buttonContainer);
button.icon = { id: `slick-header-menuicon ${iconClass}` };
const button = new Button(buttonContainer, this.options.buttonStyles);
button.icon = `slick-header-menuicon ${iconClass}`;
button.label = title;
button.onDidClick(async () => {
await this.handleMenuItemClick(command, this.columnDef);
@@ -205,20 +207,21 @@ export class HeaderFilter<T extends Slick.SlickData> {
this.searchInputBox = new InputBox(append(searchRow, $('.search-input')), this.contextViewProvider, {
placeholder: localize('table.searchPlaceHolder', "Search")
placeholder: localize('table.searchPlaceHolder', "Search"),
inputBoxStyles: defaultInputBoxStyles
});
const visibleCountContainer = append(searchRow, $('.visible-count'));
visibleCountContainer.setAttribute('aria-live', 'polite');
visibleCountContainer.setAttribute('aria-atomic', 'true');
this.visibleCountBadge = new CountBadge(visibleCountContainer, {
countFormat: localize({ key: 'tableFilter.visibleCount', comment: ['This tells the user how many items are shown in the list. Currently not visible, but read by screen readers.'] }, "{0} Results")
});
}, defaultCountBadgeStyles);
const selectedCountBadgeContainer = append(searchRow, $('.selected-count'));
selectedCountBadgeContainer.setAttribute('aria-live', 'polite');
this.countBadge = new CountBadge(selectedCountBadgeContainer, {
countFormat: localize({ key: 'tableFilter.selectedCount', comment: ['This tells the user how many items are selected in the list'] }, "{0} Selected")
});
}, defaultCountBadgeStyles);
this.searchInputBox.onDidChange(async (newString) => {
this.filteredListData = this.listData.filter(element => element.value?.toUpperCase().indexOf(newString.toUpperCase()) !== -1);
@@ -405,27 +408,31 @@ export class HeaderFilter<T extends Slick.SlickData> {
// Make sure the menu can fit in the screen.
this.menu.style.height = `${Math.min(DefaultMenuHeight, window.innerHeight - MenuBarHeight) - MenuVerticalPadding}px`;
this.sortAscButton = this.createButtonMenuItem(localize('table.sortAscending', "Sort Ascending"), 'sort-asc', 'ascending');
this.sortDescButton = this.createButtonMenuItem(localize('table.sortDescending', "Sort Descending"), 'sort-desc', 'descending');
// {{SQL CARBON TODO}} - style buttons
// this.sortAscButton = this.createButtonMenuItem(localize('table.sortAscending', "Sort Ascending"), 'sort-asc', 'ascending');
// this.sortDescButton = this.createButtonMenuItem(localize('table.sortDescending', "Sort Descending"), 'sort-desc', 'descending');
this.createButtonMenuItem(localize('table.sortAscending', "Sort Ascending"), 'sort-asc', 'ascending');
this.createButtonMenuItem(localize('table.sortDescending', "Sort Descending"), 'sort-desc', 'descending');
this.createSearchInputRow();
await this.createFilterList();
const buttonGroupContainer = append(this.menu, $('.filter-menu-button-container'));
this.okButton = this.createButton(buttonGroupContainer, 'filter-ok-button', localize('headerFilter.ok', "OK"));
this.okButton = this.createButton(buttonGroupContainer, 'filter-ok-button', localize('headerFilter.ok', "OK"), this.options.buttonStyles);
this.okButton.onDidClick(async () => {
this.columnDef.filterValues = this.listData.filter(element => element.checked).map(element => element.value);
this.setButtonImage($menuButton, this.columnDef.filterValues.length > 0);
await this.handleApply(this.columnDef);
});
this.clearButton = this.createButton(buttonGroupContainer, 'filter-clear-button', localize('headerFilter.clear', "Clear"), { secondary: true });
this.clearButton = this.createButton(buttonGroupContainer, 'filter-clear-button', localize('headerFilter.clear', "Clear"), { secondary: true, ...this.options.buttonStyles });
this.clearButton.onDidClick(async () => {
this.columnDef.filterValues!.length = 0;
this.setButtonImage($menuButton, false);
await this.handleApply(this.columnDef);
});
this.cancelButton = this.createButton(buttonGroupContainer, 'filter-cancel-button', localize('headerFilter.cancel', "Cancel"), { secondary: true });
this.cancelButton = this.createButton(buttonGroupContainer, 'filter-cancel-button', localize('headerFilter.cancel', "Cancel"), { secondary: true, ...this.options.buttonStyles });
this.cancelButton.onDidClick(() => {
this.hideMenu();
});
@@ -441,15 +448,16 @@ export class HeaderFilter<T extends Slick.SlickData> {
private applyStyles() {
if (this.filterStyles) {
this.okButton?.style(this.filterStyles);
this.cancelButton?.style(this.filterStyles);
this.clearButton?.style(this.filterStyles);
this.sortAscButton?.style(this.filterStyles);
this.sortDescButton?.style(this.filterStyles);
this.searchInputBox?.style(this.filterStyles);
this.countBadge?.style(this.filterStyles);
this.visibleCountBadge?.style(this.filterStyles);
this.list?.style(this.filterStyles);
// {{SQL CARBON TODO}} - apply styles
// this.okButton?.style(this.filterStyles);
// this.cancelButton?.style(this.filterStyles);
// this.clearButton?.style(this.filterStyles);
// this.sortAscButton?.style(this.filterStyles);
// this.sortDescButton?.style(this.filterStyles);
// this.searchInputBox?.style(this.filterStyles);
// this.countBadge?.style(this.filterStyles);
// this.visibleCountBadge?.style(this.filterStyles);
// this.list?.style(this.filterStyles);
}
}
src/sql/base/browser/ui/table/table.ts
+5 -4
View File
@@ -15,7 +15,7 @@ import { mixin } from 'vs/base/common/objects';
import { IDisposable } from 'vs/base/common/lifecycle';
import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
import { Widget } from 'vs/base/browser/ui/widget';
import { isArray, isBoolean } from 'vs/base/common/types';
import { isBoolean } from 'vs/base/common/types';
import { Event, Emitter } from 'vs/base/common/event';
import { range } from 'vs/base/common/arrays';
import { AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView';
@@ -23,6 +23,7 @@ import { IDisposableDataProvider } from 'sql/base/common/dataProvider';
import { IAccessibilityProvider } from 'sql/base/browser/ui/accessibility/accessibilityProvider';
import { IQuickInputProvider } from 'sql/base/browser/ui/quickInput/quickInputProvider';
import { localize } from 'vs/nls';
import { IThemable } from 'sql/platform/theme/common/vsstyler';
function getDefaultOptions<T>(): Slick.GridOptions<T> {
return <Slick.GridOptions<T>>{
@@ -32,7 +33,7 @@ function getDefaultOptions<T>(): Slick.GridOptions<T> {
};
}
export class Table<T extends Slick.SlickData> extends Widget implements IDisposable {
export class Table<T extends Slick.SlickData> extends Widget implements IDisposable, IThemable {
protected styleElement: HTMLStyleElement;
protected idPrefix: string;
@@ -75,10 +76,10 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
configuration?: ITableConfiguration<T>,
options?: Slick.GridOptions<T>) {
super();
if (!configuration || !configuration.dataProvider || isArray(configuration.dataProvider)) {
if (!configuration || !configuration.dataProvider || Array.isArray(configuration.dataProvider)) {
this._data = new TableDataView<T>(configuration && configuration.dataProvider as Array<T>);
} else {
this._data = configuration.dataProvider;
this._data = <any>configuration.dataProvider;
}
this._register(this._data);
src/sql/base/browser/ui/table/tableCellEditorFactory.ts
+3 -1
View File
@@ -11,6 +11,7 @@ import * as DOM from 'vs/base/browser/dom';
import { Dropdown } from 'sql/base/browser/ui/editableDropdown/browser/dropdown';
import { Event } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
const InverseKeyCodeMap: { [k: string]: number } = Object.fromEntries(Object.entries(EVENT_KEY_CODE_MAP).map(([key, value]) => [value, Number(key)]));
@@ -64,7 +65,8 @@ export class TableCellEditorFactory {
public init(): void {
this._input = new InputBox(this._args.container, self._contextViewProvider, {
type: inputType
type: inputType,
inputBoxStyles: defaultInputBoxStyles
});
self._options.editorStyler(this._input);
this._input.element.style.height = '100%';
src/sql/base/browser/ui/taskbar/actionbar.ts
+1 -1
View File
@@ -227,7 +227,7 @@ export class ActionBar extends ActionRunner implements IActionRunner {
let item: IActionViewItem | undefined = undefined;
if (this._options.actionViewItemProvider) {
item = this._options.actionViewItemProvider(action);
item = this._options.actionViewItemProvider(action, {});
}
if (!item) {
src/sql/base/browser/ui/taskbar/taskbar.ts
+2 -2
View File
@@ -52,7 +52,7 @@ export class Taskbar {
orientation: options.orientation,
ariaLabel: options.ariaLabel,
actionViewItemProvider: (action: IAction): IActionViewItem | undefined => {
return options.actionViewItemProvider ? options.actionViewItemProvider(action) : undefined;
return options.actionViewItemProvider ? options.actionViewItemProvider(action, {}) : undefined;
}
}
);
@@ -63,7 +63,7 @@ export class Taskbar {
orientation: options.orientation,
ariaLabel: options.ariaLabel,
actionViewItemProvider: (action: IAction): IActionViewItem | undefined => {
return options.actionViewItemProvider ? options.actionViewItemProvider(action) : undefined;
return options.actionViewItemProvider ? options.actionViewItemProvider(action, {}) : undefined;
}
}
);
src/sql/base/parts/tree/browser/treeDefaults.ts
+6 -6
View File
@@ -14,7 +14,7 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import * as _ from 'sql/base/parts/tree/browser/tree';
import { IDragAndDropData } from 'vs/base/browser/dnd';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { createKeybinding, Keybinding, SimpleKeybinding } from 'vs/base/common/keybindings';
import { Keybinding, decodeKeybinding } from 'vs/base/common/keybindings';
export interface IKeyBindingCallback {
(tree: _.ITree, event: IKeyboardEvent): void;
@@ -63,7 +63,7 @@ export class KeybindingDispatcher {
}
public has(keybinding: KeyCode): boolean {
let target = createKeybinding(keybinding, platform.OS);
let target = decodeKeybinding(keybinding, platform.OS);
if (target !== null) {
for (const a of this._arr) {
if (target.equals(a.keybinding)) {
@@ -76,16 +76,16 @@ export class KeybindingDispatcher {
public set(keybinding: number, callback: IKeyBindingCallback) {
this._arr.push({
keybinding: createKeybinding(keybinding, platform.OS),
keybinding: decodeKeybinding(keybinding, platform.OS),
callback: callback
});
}
public dispatch(keybinding: SimpleKeybinding): IKeyBindingCallback | null {
public dispatch(keybinding: Keybinding): IKeyBindingCallback | null {
// Loop from the last to the first to handle overwrites
for (let i = this._arr.length - 1; i >= 0; i--) {
let item = this._arr[i];
if (keybinding.toChord().equals(item.keybinding)) {
if (keybinding.equals(item.keybinding)) {
return item.callback;
}
}
@@ -266,7 +266,7 @@ export class DefaultController implements _.IController {
}
private onKey(bindings: KeybindingDispatcher, tree: _.ITree, event: IKeyboardEvent): boolean {
const handler: any = bindings.dispatch(event.toKeybinding());
const handler: any = bindings.dispatch(event.toKeyCodeChord().toKeybinding());
if (handler) {
// TODO: TS 3.1 upgrade. Why are we checking against void?
if (handler(tree, event)) {
src/sql/base/parts/tree/browser/treeView.ts
+2 -1
View File
@@ -20,11 +20,12 @@ import { HeightMap, IViewItem } from 'sql/base/parts/tree/browser/treeViewModel'
import * as _ from 'sql/base/parts/tree/browser/tree';
import { KeyCode } from 'vs/base/common/keyCodes';
import { Event, Emitter } from 'vs/base/common/event';
import { DataTransfers, StaticDND, IDragAndDropData } from 'vs/base/browser/dnd';
import { DataTransfers, IDragAndDropData } from 'vs/base/browser/dnd';
import { DefaultTreestyler } from './treeDefaults';
import { Delayer, timeout } from 'vs/base/common/async';
import { MappedNavigator } from 'sql/base/common/navigator';
import { onUnexpectedError } from 'vs/base/common/errors';
import { StaticDND } from 'vs/base/browser/ui/list/listView';
export interface IRow {
element: HTMLElement | null;
src/sql/base/test/browser/ui/taskbar/overflowActionbar.test.ts
+1 -1
View File
@@ -96,7 +96,7 @@ suite('Overflow Actionbar tests', () => {
assert(overflowActionbar.actionsList.children.length === 4);
assert(overflowActionbar.items.length === 4);
assert.strictEqual(getMoreItemPlaceholderIndex(overflowActionbar.items), 2);
assert(overflowActionbar.overflow.childElementCount === 1);
assert(<any>overflowActionbar.overflow.childElementCount === 1);
verifyOverflowFocusedIndex(overflowActionbar, 3);
// move separator to overflow
src/sql/platform/accounts/common/accountActions.ts
+1 -1
View File
@@ -81,7 +81,7 @@ export class RemoveAccountAction extends Action {
const confirm: IConfirmation = {
message: localize('confirmRemoveUserAccountMessage', "Are you sure you want to remove '{0}'?", this._account.displayInfo.displayName),
primaryButton: localize('accountActions.yes', "Yes"),
secondaryButton: localize('accountActions.no', "No"),
cancelButton: localize('accountActions.no', "No"),
type: 'question'
};
src/sql/platform/accounts/test/common/accountStore.test.ts
+2 -1
View File
@@ -7,7 +7,8 @@ import * as assert from 'assert';
import * as azdata from 'azdata';
import AccountStore from 'sql/platform/accounts/common/accountStore';
import { EventVerifierSingle } from 'sql/base/test/common/event';
import { ConsoleLogger, LogService } from 'vs/platform/log/common/log';
import { ConsoleLogger } from 'vs/platform/log/common/log';
import { LogService } from 'vs/platform/log/common/logService';
const consoleLogService = new LogService(new ConsoleLogger());
suite('Account Store Tests', () => {
src/sql/platform/actions/browser/menuEntryActionViewItem.ts
+4 -3
View File
@@ -10,10 +10,11 @@ import { MenuItemAction } from 'vs/platform/actions/common/actions';
import { ICommandAction } from 'vs/platform/action/common/action';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { ThemeIcon } from 'vs/base/common/themables';
const ids = new IdGenerator('menu-item-action-item-icon-');
@@ -39,7 +40,7 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem {
super(_action, undefined, labeledkeybindingService, _notificationService, _contextKeyService, _themeService, _contextMenuService);
}
override updateLabel(): void {
protected override updateLabel(): void {
if (this.label) {
this.label.innerText = this._commandAction.label;
}
@@ -114,7 +115,7 @@ export class MaskedLabeledMenuItemActionItem extends MenuEntryActionViewItem {
super(action, undefined, keybindingService, notificationService, contextKeyService, _themeService, _contextMenuService);
}
override updateLabel(): void {
protected override updateLabel(): void {
if (this.label) {
this.label.innerText = this._commandAction.label;
}
src/sql/platform/browser/inputbox/inputBox.component.ts
+4 -2
View File
@@ -11,9 +11,10 @@ import {
import { InputBox as vsInputBox } from 'sql/base/browser/ui/inputBox/inputBox';
import { AngularDisposable } from 'sql/base/browser/lifecycle';
import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
import { attachInputBoxStyler } from 'sql/platform/theme/common/vsstyler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
@Component({
selector: 'input-box',
@@ -45,7 +46,8 @@ export class InputBox extends AngularDisposable implements OnInit, OnChanges {
max: this.max,
type: this.type,
placeholder: this.placeholder,
ariaLabel: this.ariaLabel
ariaLabel: this.ariaLabel,
inputBoxStyles: defaultInputBoxStyles
});
if (this.value) {
this._inputbox.value = this.value;
src/sql/platform/browser/selectBox/selectBox.component.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import { AngularDisposable } from 'sql/base/browser/lifecycle';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
import { attachSelectBoxStyler } from 'sql/platform/theme/common/vsstyler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
@Component({
src/sql/platform/theme/browser/defaultStyles.ts
+41
View File
@@ -0,0 +1,41 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ICheckboxStyles } from 'sql/base/browser/ui/checkbox/checkbox';
import { IDropdownStyles } from 'sql/base/browser/ui/dropdownList/dropdownList';
import * as sqlcr from 'sql/platform/theme/common/colorRegistry';
import { disabledCheckboxForeground } from 'sql/platform/theme/common/colors';
import { IButtonStyles } from 'vs/base/browser/ui/button/button';
import { IStyleOverride, overrideStyles } from 'vs/platform/theme/browser/defaultStyles';
import { asCssVariable, editorBackground, inputBorder, inputForeground } from 'vs/platform/theme/common/colorRegistry';
export const defaultCheckboxStyles: ICheckboxStyles = {
disabledCheckboxForeground: asCssVariable(disabledCheckboxForeground)
};
export function getCheckboxStyles(override: IStyleOverride<ICheckboxStyles>): ICheckboxStyles {
return overrideStyles(override, defaultCheckboxStyles);
}
export const defaultInfoButtonStyles: IButtonStyles = {
buttonBackground: asCssVariable(sqlcr.infoButtonBackground),
buttonForeground: asCssVariable(sqlcr.infoButtonForeground),
buttonBorder: asCssVariable(sqlcr.infoButtonBorder),
buttonHoverBackground: asCssVariable(sqlcr.infoButtonHoverBackground),
buttonSeparator: undefined,
buttonSecondaryBackground: undefined,
buttonSecondaryForeground: undefined,
buttonSecondaryHoverBackground: undefined,
buttonSecondaryBorder: undefined,
buttonDisabledBackground: undefined,
buttonDisabledForeground: undefined,
buttonDisabledBorder: undefined
}
export const defaultDropdownStyles: IDropdownStyles = {
foregroundColor: asCssVariable(inputForeground),
borderColor: asCssVariable(inputBorder),
backgroundColor: asCssVariable(editorBackground)
}
src/sql/platform/theme/common/styler.ts
+1 -55
View File
@@ -8,35 +8,8 @@ import * as colors from './colors';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import * as cr from 'vs/platform/theme/common/colorRegistry';
import * as sqlcr from 'sql/platform/theme/common/colorRegistry';
import { attachStyler, computeStyles, defaultButtonStyles, defaultListStyles, IColorMapping, IStyleOverrides } from 'vs/platform/theme/common/styler';
import { IThemable, attachStyler, computeStyles, defaultListStyles, IColorMapping, IStyleOverrides } from 'sql/platform/theme/common/vsstyler';
import { IDisposable } from 'vs/base/common/lifecycle';
import { IThemable } from 'vs/base/common/styler';
export interface IDropdownStyleOverrides extends IStyleOverrides {
foregroundColor?: cr.ColorIdentifier;
borderColor?: cr.ColorIdentifier;
backgroundColor?: cr.ColorIdentifier;
buttonForeground?: cr.ColorIdentifier;
buttonBackground?: cr.ColorIdentifier;
buttonHoverBackground?: cr.ColorIdentifier;
buttonBorder?: cr.ColorIdentifier;
buttonFocusOutline?: cr.ColorIdentifier;
}
export const defaultDropdownStyle: IDropdownStyleOverrides = {
foregroundColor: cr.inputForeground,
borderColor: cr.inputBorder,
backgroundColor: cr.editorBackground,
buttonForeground: cr.buttonForeground,
buttonBackground: cr.buttonBackground,
buttonHoverBackground: cr.buttonHoverBackground,
buttonBorder: cr.contrastBorder,
buttonFocusOutline: colors.buttonFocusOutline
};
export function attachDropdownStyler(widget: IThemable, themeService: IThemeService, style?: IDropdownStyleOverrides): IDisposable {
return attachStyler(themeService, { ...defaultDropdownStyle, ...(style || {}) }, widget);
}
export interface IInputBoxStyleOverrides extends IStyleOverrides {
inputBackground?: cr.ColorIdentifier,
@@ -302,18 +275,6 @@ export function attachEditableDropdownStyler(widget: IThemable, themeService: IT
return attachStyler(themeService, { ...defaultEditableDropdownStyle, ...(style || {}) }, widget);
}
export interface ICheckboxStyleOverrides extends IStyleOverrides {
disabledCheckboxForeground?: cr.ColorIdentifier
}
export const defaultCheckboxStyles: ICheckboxStyleOverrides = {
disabledCheckboxForeground: colors.disabledCheckboxForeground
};
export function attachCheckboxStyler(widget: IThemable, themeService: IThemeService, style?: ICheckboxStyleOverrides): IDisposable {
return attachStyler(themeService, {}, widget);
}
export interface IInfoBoxStyleOverrides {
informationBackground: cr.ColorIdentifier,
warningBackground: cr.ColorIdentifier,
@@ -339,17 +300,6 @@ export interface IInfoButtonStyleOverrides {
buttonHoverBackground: cr.ColorIdentifier
}
export const defaultInfoButtonStyles: IInfoButtonStyleOverrides = {
buttonBackground: sqlcr.infoButtonBackground,
buttonForeground: sqlcr.infoButtonForeground,
buttonBorder: sqlcr.infoButtonBorder,
buttonHoverBackground: sqlcr.infoButtonHoverBackground
};
export function attachInfoButtonStyler(widget: IThemable, themeService: IThemeService, style?: IInfoButtonStyleOverrides): IDisposable {
return attachStyler(themeService, { ...defaultInfoButtonStyles, ...style }, widget);
}
export function attachTableFilterStyler(widget: IThemable, themeService: IThemeService): IDisposable {
return attachStyler(themeService, {
...defaultInputBoxStyles,
@@ -377,15 +327,11 @@ export function attachDesignerStyler(widget: any, themeService: IThemeService):
const inputStyles = computeStyles(colorTheme, defaultInputBoxStyles);
const selectBoxStyles = computeStyles(colorTheme, defaultSelectBoxStyles);
const tableStyles = computeStyles(colorTheme, defaultTableStyles);
const checkboxStyles = computeStyles(colorTheme, defaultCheckboxStyles);
const buttonStyles = computeStyles(colorTheme, defaultButtonStyles);
const editableDropdownStyles = computeStyles(colorTheme, defaultEditableDropdownStyle);
widget.style({
inputBoxStyles: inputStyles,
selectBoxStyles: selectBoxStyles,
tableStyles: tableStyles,
checkboxStyles: checkboxStyles,
buttonStyles: buttonStyles,
dropdownStyles: editableDropdownStyles,
paneSeparator: cr.resolveColorValue(sqlcr.DesignerPaneSeparator, colorTheme),
groupHeaderBackground: cr.resolveColorValue(sqlcr.GroupHeaderBackground, colorTheme)
src/sql/platform/theme/common/vsstyler.ts
+363
View File
@@ -0,0 +1,363 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Color } from 'vs/base/common/color';
import { IDisposable } from 'vs/base/common/lifecycle';
import { activeContrastBorder, badgeBackground, badgeForeground, breadcrumbsActiveSelectionForeground, breadcrumbsBackground, breadcrumbsFocusForeground, breadcrumbsForeground, buttonBackground, buttonBorder, buttonForeground, buttonHoverBackground, buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground, ColorIdentifier, ColorTransform, ColorValue, contrastBorder, editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, focusBorder, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground, inputBackground, inputBorder, inputForeground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationInfoForeground, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationWarningForeground, keybindingLabelBackground, keybindingLabelBorder, keybindingLabelBottomBorder, keybindingLabelForeground, listActiveSelectionBackground, listActiveSelectionForeground, listActiveSelectionIconForeground, listDropBackground, listFilterWidgetBackground, listFilterWidgetNoMatchesOutline, listFilterWidgetOutline, listFocusBackground, listFocusForeground, listFocusOutline, listHoverBackground, listHoverForeground, listInactiveFocusBackground, listInactiveFocusOutline, listInactiveSelectionBackground, listInactiveSelectionForeground, listInactiveSelectionIconForeground, menuBackground, menuBorder, menuForeground, menuSelectionBackground, menuSelectionBorder, menuSelectionForeground, menuSeparatorBackground, pickerGroupForeground, problemsErrorIconForeground, problemsInfoIconForeground, problemsWarningIconForeground, progressBarBackground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, resolveColorValue, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, selectBackground, selectBorder, selectForeground, selectListBackground, checkboxBackground, checkboxBorder, checkboxForeground, tableColumnsBorder, tableOddRowsBackgroundColor, textLinkForeground, treeIndentGuidesStroke, widgetShadow, listFocusAndSelectionOutline, listFilterWidgetShadow, buttonSeparator } from 'vs/platform/theme/common/colorRegistry'; // {{SQL CARBON EDIT}} Added buttonSecondaryBorder, buttonDisabledBorder, buttonDisabledBackground, buttonDisabledForeground to import list
import { isHighContrast } from 'vs/platform/theme/common/theme';
import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
//export type styleFn = (colors: { [name: string]: Color | undefined }) => void;
export type styleFn = (colors: any) => void;
export interface IThemable {
style: styleFn;
}
export interface IStyleOverrides {
[color: string]: ColorIdentifier | undefined;
}
export interface IColorMapping {
[optionsKey: string]: ColorValue | undefined;
}
export interface IComputedStyles {
[color: string]: string | Color | undefined;
}
export function computeStyles(theme: IColorTheme, styleMap: IColorMapping): IComputedStyles {
const styles = Object.create(null) as IComputedStyles;
for (const key in styleMap) {
const value = styleMap[key];
if (value) {
let color: any = resolveColorValue(value, theme);
if (color) {
color = color.toString();
}
styles[key] = color;
}
}
return styles;
}
export function attachStyler<T extends IColorMapping>(themeService: IThemeService, styleMap: T, widgetOrCallback: IThemable | styleFn): IDisposable {
function applyStyles(): void {
const styles = computeStyles(themeService.getColorTheme(), styleMap);
if (typeof widgetOrCallback === 'function') {
widgetOrCallback(styles);
} else {
widgetOrCallback.style(styles);
}
}
applyStyles();
return themeService.onDidColorThemeChange(applyStyles);
}
export interface IBadgeStyleOverrides extends IStyleOverrides {
badgeBackground?: ColorIdentifier;
badgeForeground?: ColorIdentifier;
}
export function attachBadgeStyler(widget: IThemable, themeService: IThemeService, style?: IBadgeStyleOverrides): IDisposable {
return attachStyler(themeService, {
badgeBackground: style?.badgeBackground || badgeBackground,
badgeForeground: style?.badgeForeground || badgeForeground,
badgeBorder: contrastBorder
} as IBadgeStyleOverrides, widget);
}
export interface IInputBoxStyleOverrides extends IStyleOverrides {
inputBackground?: ColorIdentifier;
inputForeground?: ColorIdentifier;
inputBorder?: ColorIdentifier;
inputActiveOptionBorder?: ColorIdentifier;
inputActiveOptionForeground?: ColorIdentifier;
inputActiveOptionBackground?: ColorIdentifier;
inputValidationInfoBorder?: ColorIdentifier;
inputValidationInfoBackground?: ColorIdentifier;
inputValidationInfoForeground?: ColorIdentifier;
inputValidationWarningBorder?: ColorIdentifier;
inputValidationWarningBackground?: ColorIdentifier;
inputValidationWarningForeground?: ColorIdentifier;
inputValidationErrorBorder?: ColorIdentifier;
inputValidationErrorBackground?: ColorIdentifier;
inputValidationErrorForeground?: ColorIdentifier;
}
export function attachInputBoxStyler(widget: IThemable, themeService: IThemeService, style?: IInputBoxStyleOverrides): IDisposable {
return attachStyler(themeService, {
inputBackground: style?.inputBackground || inputBackground,
inputForeground: style?.inputForeground || inputForeground,
inputBorder: style?.inputBorder || inputBorder,
inputValidationInfoBorder: style?.inputValidationInfoBorder || inputValidationInfoBorder,
inputValidationInfoBackground: style?.inputValidationInfoBackground || inputValidationInfoBackground,
inputValidationInfoForeground: style?.inputValidationInfoForeground || inputValidationInfoForeground,
inputValidationWarningBorder: style?.inputValidationWarningBorder || inputValidationWarningBorder,
inputValidationWarningBackground: style?.inputValidationWarningBackground || inputValidationWarningBackground,
inputValidationWarningForeground: style?.inputValidationWarningForeground || inputValidationWarningForeground,
inputValidationErrorBorder: style?.inputValidationErrorBorder || inputValidationErrorBorder,
inputValidationErrorBackground: style?.inputValidationErrorBackground || inputValidationErrorBackground,
inputValidationErrorForeground: style?.inputValidationErrorForeground || inputValidationErrorForeground
} as IInputBoxStyleOverrides, widget);
}
export interface ISelectBoxStyleOverrides extends IStyleOverrides, IListStyleOverrides {
selectBackground?: ColorIdentifier;
selectListBackground?: ColorIdentifier;
selectForeground?: ColorIdentifier;
decoratorRightForeground?: ColorIdentifier;
selectBorder?: ColorIdentifier;
focusBorder?: ColorIdentifier;
}
export function attachSelectBoxStyler(widget: IThemable, themeService: IThemeService, style?: ISelectBoxStyleOverrides): IDisposable {
return attachStyler(themeService, {
selectBackground: style?.selectBackground || selectBackground,
selectListBackground: style?.selectListBackground || selectListBackground,
selectForeground: style?.selectForeground || selectForeground,
decoratorRightForeground: style?.pickerGroupForeground || pickerGroupForeground,
selectBorder: style?.selectBorder || selectBorder,
focusBorder: style?.focusBorder || focusBorder,
listFocusBackground: style?.listFocusBackground || quickInputListFocusBackground,
listInactiveSelectionIconForeground: style?.listInactiveSelectionIconForeground || quickInputListFocusIconForeground,
listFocusForeground: style?.listFocusForeground || quickInputListFocusForeground,
listFocusOutline: style?.listFocusOutline || ((theme: IColorTheme) => isHighContrast(theme.type) ? activeContrastBorder : Color.transparent),
listHoverBackground: style?.listHoverBackground || listHoverBackground,
listHoverForeground: style?.listHoverForeground || listHoverForeground,
listHoverOutline: style?.listFocusOutline || activeContrastBorder,
selectListBorder: style?.selectListBorder || editorWidgetBorder
} as ISelectBoxStyleOverrides, widget);
}
export function attachFindReplaceInputBoxStyler(widget: IThemable, themeService: IThemeService, style?: IInputBoxStyleOverrides): IDisposable {
return attachStyler(themeService, {
inputBackground: style?.inputBackground || inputBackground,
inputForeground: style?.inputForeground || inputForeground,
inputBorder: style?.inputBorder || inputBorder,
inputActiveOptionBorder: style?.inputActiveOptionBorder || inputActiveOptionBorder,
inputActiveOptionForeground: style?.inputActiveOptionForeground || inputActiveOptionForeground,
inputActiveOptionBackground: style?.inputActiveOptionBackground || inputActiveOptionBackground,
inputValidationInfoBorder: style?.inputValidationInfoBorder || inputValidationInfoBorder,
inputValidationInfoBackground: style?.inputValidationInfoBackground || inputValidationInfoBackground,
inputValidationInfoForeground: style?.inputValidationInfoForeground || inputValidationInfoForeground,
inputValidationWarningBorder: style?.inputValidationWarningBorder || inputValidationWarningBorder,
inputValidationWarningBackground: style?.inputValidationWarningBackground || inputValidationWarningBackground,
inputValidationWarningForeground: style?.inputValidationWarningForeground || inputValidationWarningForeground,
inputValidationErrorBorder: style?.inputValidationErrorBorder || inputValidationErrorBorder,
inputValidationErrorBackground: style?.inputValidationErrorBackground || inputValidationErrorBackground,
inputValidationErrorForeground: style?.inputValidationErrorForeground || inputValidationErrorForeground
} as IInputBoxStyleOverrides, widget);
}
export interface IListStyleOverrides extends IStyleOverrides {
listBackground?: ColorIdentifier;
listFocusBackground?: ColorIdentifier;
listFocusForeground?: ColorIdentifier;
listFocusOutline?: ColorIdentifier;
listActiveSelectionBackground?: ColorIdentifier;
listActiveSelectionForeground?: ColorIdentifier;
listActiveSelectionIconForeground?: ColorIdentifier;
listFocusAndSelectionOutline?: ColorIdentifier;
listFocusAndSelectionBackground?: ColorIdentifier;
listFocusAndSelectionForeground?: ColorIdentifier;
listInactiveSelectionBackground?: ColorIdentifier;
listInactiveSelectionIconForeground?: ColorIdentifier;
listInactiveSelectionForeground?: ColorIdentifier;
listInactiveFocusBackground?: ColorIdentifier;
listInactiveFocusOutline?: ColorIdentifier;
listHoverBackground?: ColorIdentifier;
listHoverForeground?: ColorIdentifier;
listDropBackground?: ColorIdentifier;
listSelectionOutline?: ColorIdentifier;
listHoverOutline?: ColorIdentifier;
listFilterWidgetBackground?: ColorIdentifier;
listFilterWidgetOutline?: ColorIdentifier;
listFilterWidgetNoMatchesOutline?: ColorIdentifier;
listFilterWidgetShadow?: ColorIdentifier;
treeIndentGuidesStroke?: ColorIdentifier;
tableColumnsBorder?: ColorIdentifier;
tableOddRowsBackgroundColor?: ColorIdentifier;
}
export function attachListStyler(widget: IThemable, themeService: IThemeService, overrides?: IColorMapping): IDisposable {
return attachStyler(themeService, { ...defaultListStyles, ...(overrides || {}) }, widget);
}
export const defaultListStyles: IColorMapping = {
listFocusBackground,
listFocusForeground,
listFocusOutline,
listActiveSelectionBackground,
listActiveSelectionForeground,
listActiveSelectionIconForeground,
listFocusAndSelectionOutline,
listFocusAndSelectionBackground: listActiveSelectionBackground,
listFocusAndSelectionForeground: listActiveSelectionForeground,
listInactiveSelectionBackground,
listInactiveSelectionIconForeground,
listInactiveSelectionForeground,
listInactiveFocusBackground,
listInactiveFocusOutline,
listHoverBackground,
listHoverForeground,
listDropBackground,
listSelectionOutline: activeContrastBorder,
listHoverOutline: activeContrastBorder,
listFilterWidgetBackground,
listFilterWidgetOutline,
listFilterWidgetNoMatchesOutline,
listFilterWidgetShadow,
treeIndentGuidesStroke,
tableColumnsBorder,
tableOddRowsBackgroundColor,
inputActiveOptionBorder,
inputActiveOptionForeground,
inputActiveOptionBackground,
inputBackground,
inputForeground,
inputBorder,
inputValidationInfoBackground,
inputValidationInfoForeground,
inputValidationInfoBorder,
inputValidationWarningBackground,
inputValidationWarningForeground,
inputValidationWarningBorder,
inputValidationErrorBackground,
inputValidationErrorForeground,
inputValidationErrorBorder,
};
export interface IKeybindingLabelStyleOverrides extends IStyleOverrides {
keybindingLabelBackground?: ColorIdentifier;
keybindingLabelForeground?: ColorIdentifier;
keybindingLabelBorder?: ColorIdentifier;
keybindingLabelBottomBorder?: ColorIdentifier;
keybindingLabelShadow?: ColorIdentifier;
}
export function attachKeybindingLabelStyler(widget: IThemable, themeService: IThemeService, style?: IKeybindingLabelStyleOverrides): IDisposable {
return attachStyler(themeService, {
keybindingLabelBackground: (style && style.keybindingLabelBackground) || keybindingLabelBackground,
keybindingLabelForeground: (style && style.keybindingLabelForeground) || keybindingLabelForeground,
keybindingLabelBorder: (style && style.keybindingLabelBorder) || keybindingLabelBorder,
keybindingLabelBottomBorder: (style && style.keybindingLabelBottomBorder) || keybindingLabelBottomBorder,
keybindingLabelShadow: (style && style.keybindingLabelShadow) || widgetShadow
} as IKeybindingLabelStyleOverrides, widget);
}
export interface IProgressBarStyleOverrides extends IStyleOverrides {
progressBarBackground?: ColorIdentifier;
}
export function attachProgressBarStyler(widget: IThemable, themeService: IThemeService, style?: IProgressBarStyleOverrides): IDisposable {
return attachStyler(themeService, {
progressBarBackground: style?.progressBarBackground || progressBarBackground
} as IProgressBarStyleOverrides, widget);
}
export function attachStylerCallback(themeService: IThemeService, colors: { [name: string]: ColorIdentifier }, callback: styleFn): IDisposable {
return attachStyler(themeService, colors, callback);
}
export interface IBreadcrumbsWidgetStyleOverrides extends IColorMapping {
breadcrumbsBackground?: ColorIdentifier | ColorTransform;
breadcrumbsForeground?: ColorIdentifier;
breadcrumbsHoverForeground?: ColorIdentifier;
breadcrumbsFocusForeground?: ColorIdentifier;
breadcrumbsFocusAndSelectionForeground?: ColorIdentifier;
}
export const defaultBreadcrumbsStyles = <IBreadcrumbsWidgetStyleOverrides>{
breadcrumbsBackground: breadcrumbsBackground,
breadcrumbsForeground: breadcrumbsForeground,
breadcrumbsHoverForeground: breadcrumbsFocusForeground,
breadcrumbsFocusForeground: breadcrumbsFocusForeground,
breadcrumbsFocusAndSelectionForeground: breadcrumbsActiveSelectionForeground,
};
export function attachBreadcrumbsStyler(widget: IThemable, themeService: IThemeService, style?: IBreadcrumbsWidgetStyleOverrides): IDisposable {
return attachStyler(themeService, { ...defaultBreadcrumbsStyles, ...style }, widget);
}
export interface IMenuStyleOverrides extends IColorMapping {
shadowColor?: ColorIdentifier;
borderColor?: ColorIdentifier;
foregroundColor?: ColorIdentifier;
backgroundColor?: ColorIdentifier;
selectionForegroundColor?: ColorIdentifier;
selectionBackgroundColor?: ColorIdentifier;
selectionBorderColor?: ColorIdentifier;
separatorColor?: ColorIdentifier;
}
export const defaultMenuStyles = <IMenuStyleOverrides>{
shadowColor: widgetShadow,
borderColor: menuBorder,
foregroundColor: menuForeground,
backgroundColor: menuBackground,
selectionForegroundColor: menuSelectionForeground,
selectionBackgroundColor: menuSelectionBackground,
selectionBorderColor: menuSelectionBorder,
separatorColor: menuSeparatorBackground,
scrollbarShadow: scrollbarShadow,
scrollbarSliderBackground: scrollbarSliderBackground,
scrollbarSliderHoverBackground: scrollbarSliderHoverBackground,
scrollbarSliderActiveBackground: scrollbarSliderActiveBackground
};
export function attachMenuStyler(widget: IThemable, themeService: IThemeService, style?: IMenuStyleOverrides): IDisposable {
return attachStyler(themeService, { ...defaultMenuStyles, ...style }, widget);
}
export interface IDialogStyleOverrides {
dialogForeground?: ColorIdentifier;
dialogBackground?: ColorIdentifier;
dialogShadow?: ColorIdentifier;
dialogBorder?: ColorIdentifier;
checkboxBorder?: ColorIdentifier;
checkboxBackground?: ColorIdentifier;
checkboxForeground?: ColorIdentifier;
errorIconForeground?: ColorIdentifier;
warningIconForeground?: ColorIdentifier;
infoIconForeground?: ColorIdentifier;
inputBackground?: ColorIdentifier;
inputForeground?: ColorIdentifier;
inputBorder?: ColorIdentifier;
}
export const defaultDialogStyles = <IDialogStyleOverrides>{
dialogBackground: editorWidgetBackground,
dialogForeground: editorWidgetForeground,
dialogShadow: widgetShadow,
dialogBorder: contrastBorder,
buttonForeground: buttonForeground,
buttonSeparator: buttonSeparator,
buttonBackground: buttonBackground,
buttonSecondaryBackground: buttonSecondaryBackground,
buttonSecondaryForeground: buttonSecondaryForeground,
buttonSecondaryHoverBackground: buttonSecondaryHoverBackground,
buttonHoverBackground: buttonHoverBackground,
buttonBorder: buttonBorder,
checkboxBorder: checkboxBorder,
checkboxBackground: checkboxBackground,
checkboxForeground: checkboxForeground,
errorIconForeground: problemsErrorIconForeground,
warningIconForeground: problemsWarningIconForeground,
infoIconForeground: problemsInfoIconForeground,
inputBackground: inputBackground,
inputForeground: inputForeground,
inputBorder: inputBorder,
textLinkForeground: textLinkForeground
};
export function attachDialogStyler(widget: IThemable, themeService: IThemeService, style?: IDialogStyleOverrides): IDisposable {
return attachStyler(themeService, { ...defaultDialogStyles, ...style }, widget);
}
src/sql/workbench/api/common/extHostModelViewTree.ts
+7 -1
View File
@@ -9,7 +9,7 @@ import * as vscode from 'vscode';
import { ExtHostModelViewTreeViewsShape, MainThreadModelViewShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
import { ITreeComponentItem } from 'sql/workbench/common/views';
import { CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
import { CheckboxUpdate, IMainContext } from 'vs/workbench/api/common/extHost.protocol';
import * as azdata from 'azdata';
import * as vsTreeExt from 'vs/workbench/api/common/extHostTreeViews';
import { Emitter } from 'vs/base/common/event';
@@ -93,6 +93,12 @@ export class ExtHostModelViewTreeViews implements ExtHostModelViewTreeViewsShape
return Promise.resolve(undefined);
}
$setFocus(treeViewId: string, treeItemHandle: string): void {
}
$changeCheckboxState(treeViewId: string, checkboxUpdates: CheckboxUpdate[]): void {
}
private createExtHostTreeViewer<T>(handle: number, id: string, dataProvider: azdata.TreeComponentDataProvider<T>, extension: IExtensionDescription, logService: ILogService): ExtHostTreeView<T> {
const treeView = new ExtHostTreeView<T>(handle, id, dataProvider, this._proxy, undefined, extension, logService);
this.treeViews.set(`${handle}-${id}`, treeView);
src/sql/workbench/api/common/sqlExtHost.protocol.ts
+3 -1
View File
@@ -21,7 +21,7 @@ import {
ISerializationManagerDetails,
IErrorDialogOptions
} from 'sql/workbench/api/common/sqlExtHostTypes';
import { IUndoStopOptions } from 'vs/workbench/api/common/extHost.protocol';
import { CheckboxUpdate, IUndoStopOptions } from 'vs/workbench/api/common/extHost.protocol';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { EditorViewColumn } from 'vs/workbench/api/common/shared/editor';
import { ITelemetryEventProperties } from 'sql/platform/telemetry/common/telemetry';
@@ -811,6 +811,8 @@ export interface ExtHostModelViewTreeViewsShape {
$setVisible(treeViewId: string, visible: boolean): void;
$hasResolve(treeViewId: string): Promise<boolean>;
$resolve(treeViewId: string, treeItemHandle: string): Promise<ITreeComponentItem | undefined>;
$setFocus(treeViewId: string, treeItemHandle: string): void;
$changeCheckboxState(treeViewId: string, checkboxUpdates: CheckboxUpdate[]): void;
}
export interface ExtHostBackgroundTaskManagementShape {
src/sql/workbench/api/common/sqlExtHostTypes.ts
+1 -1
View File
@@ -120,7 +120,7 @@ export enum AlertType {
}
export enum FrequencyTypes {
Unknown,
Unknown = 0,
OneTime = 1 << 1,
Daily = 1 << 2,
Weekly = 1 << 3,
src/sql/workbench/browser/actions/layoutActions.ts
+24 -20
View File
@@ -3,39 +3,43 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Action } from 'vs/base/common/actions';
import { Action2 } from 'vs/platform/actions/common/actions';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { IKeybindingRule } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
import { IViewDescriptorService, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
// --- Toggle View with Command
export abstract class ToggleViewAction extends Action {
constructor(
id: string,
label: string,
private readonly viewId: string,
protected viewsService: IViewsService,
protected viewDescriptorService: IViewDescriptorService,
protected contextKeyService: IContextKeyService,
private layoutService: IWorkbenchLayoutService,
cssClass?: string
) {
super(id, label, cssClass);
export abstract class ToggleViewAction extends Action2 {
private viewId: string;
constructor(id: string, labelOrg: string, label: string, keybinding?: Omit<IKeybindingRule, 'id'>) {
super({
id: id,
title: { value: label, original: labelOrg },
category: 'View',
f1: true,
keybinding: keybinding,
});
this.viewId = id;
}
override async run(): Promise<void> {
const focusedViewId = FocusedViewContext.getValue(this.contextKeyService);
run(accessor: ServicesAccessor): void {
const contextKeyService = accessor.get(IContextKeyService);
const viewDescriptorService = accessor.get(IViewDescriptorService);
const viewsService = accessor.get(IViewsService);
const layoutService = accessor.get(IWorkbenchLayoutService);
const focusedViewId = FocusedViewContext.getValue(contextKeyService);
if (focusedViewId === this.viewId) {
if (this.viewDescriptorService.getViewLocationById(this.viewId) === ViewContainerLocation.Sidebar) {
this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
if (viewDescriptorService.getViewLocationById(this.viewId) === ViewContainerLocation.Sidebar) {
layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
} else {
this.layoutService.setPartHidden(true, Parts.PANEL_PART);
layoutService.setPartHidden(true, Parts.PANEL_PART);
}
} else {
this.viewsService.openView(this.viewId, true);
viewsService.openView(this.viewId, true);
}
}
}
src/sql/workbench/browser/designer/designer.ts
+16 -17
View File
@@ -17,8 +17,7 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { IInputBoxStyles, InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
import 'vs/css!./media/designer';
import { ITableStyles } from 'sql/base/browser/ui/table/interfaces';
import { IThemable } from 'vs/base/common/styler';
import { Checkbox, ICheckboxStyles } from 'sql/base/browser/ui/checkbox/checkbox';
import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
import { Table } from 'sql/base/browser/ui/table/table';
import { ISelectBoxStyles, SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
@@ -27,7 +26,6 @@ import { TableCellEditorFactory } from 'sql/base/browser/ui/table/tableCellEdito
import { CheckBoxColumn } from 'sql/base/browser/ui/table/plugins/checkboxColumn.plugin';
import { DesignerTabPanelView } from 'sql/workbench/browser/designer/designerTabPanelView';
import { DesignerPropertiesPane } from 'sql/workbench/browser/designer/designerPropertiesPane';
import { Button, IButtonStyles } from 'sql/base/browser/ui/button/button';
import { ButtonColumn } from 'sql/base/browser/ui/table/plugins/buttonColumn.plugin';
import { Codicon } from 'vs/base/common/codicons';
import { Color } from 'vs/base/common/color';
@@ -56,14 +54,15 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
import { ThemeIcon } from 'vs/base/common/themables';
import { defaultCheckboxStyles } from 'sql/platform/theme/browser/defaultStyles';
export interface IDesignerStyle {
tabbedPanelStyles?: ITabbedPanelStyles;
inputBoxStyles?: IInputBoxStyles;
tableStyles?: ITableStyles;
selectBoxStyles?: ISelectBoxStyles;
checkboxStyles?: ICheckboxStyles;
buttonStyles?: IButtonStyles;
dropdownStyles?: IListStyles & IInputBoxStyles & IDropdownStyles;
paneSeparator?: Color;
groupHeaderBackground?: Color;
@@ -82,7 +81,7 @@ interface DesignerTableCellContext {
const ScriptTabId = 'scripts';
const IssuesTabId = 'issues';
export class Designer extends Disposable implements IThemable {
export class Designer extends Disposable {
private _loadingSpinner: LoadingSpinner;
private _horizontalSplitViewContainer: HTMLElement;
private _verticalSplitViewContainer: HTMLElement;
@@ -217,18 +216,15 @@ export class Designer extends Disposable implements IThemable {
}, this._instantiationService);
}
private styleComponent(component: TabbedPanel | InputBox | Checkbox | Table<Slick.SlickData> | SelectBox | Button | Dropdown): void {
private styleComponent(component: TabbedPanel | InputBox | Checkbox | Table<Slick.SlickData> | SelectBox | Dropdown): void {
if (component instanceof InputBox) {
component.style(this._styles.inputBoxStyles);
} else if (component instanceof Checkbox) {
component.style(this._styles.checkboxStyles);
} else if (component instanceof TabbedPanel) {
component.style(this._styles.tabbedPanelStyles);
} else if (component instanceof Table) {
this.removeTableSelectionStyles();
component.style(this._styles.tableStyles);
} else if (component instanceof Button) {
component.style(this._styles.buttonStyles);
} else if (component instanceof Dropdown) {
component.style(this._styles.dropdownStyles);
} else {
@@ -256,8 +252,10 @@ export class Designer extends Disposable implements IThemable {
public style(styles: IDesignerStyle): void {
this._styles = styles;
this._componentMap.forEach((value, key, map) => {
if (value.component.style) {
this.styleComponent(value.component);
if (!(value.component instanceof Checkbox)) {
if (value.component.style) {
this.styleComponent(value.component);
}
}
});
this._propertiesPane.componentMap.forEach((value) => {
@@ -765,7 +763,8 @@ export class Designer extends Disposable implements IThemable {
const input = new InputBox(inputContainer, this._contextViewProvider, {
ariaLabel: inputProperties.title,
type: inputProperties.inputType,
ariaDescription: componentDefinition.description
ariaDescription: componentDefinition.description,
inputBoxStyles: defaultInputBoxStyles
});
input.onLoseFocus((args) => {
if (args.hasChanged) {
@@ -829,7 +828,7 @@ export class Designer extends Disposable implements IThemable {
container.appendChild(DOM.$('')).appendChild(DOM.$('span.component-label')).innerText = componentDefinition.componentProperties?.title ?? '';
const checkboxContainer = container.appendChild(DOM.$(''));
const checkboxProperties = componentDefinition.componentProperties as CheckBoxProperties;
const checkbox = new Checkbox(checkboxContainer, { label: '', ariaLabel: checkboxProperties.title, ariaDescription: componentDefinition.description });
const checkbox = new Checkbox(checkboxContainer, { ...defaultCheckboxStyles, label: '', ariaLabel: checkboxProperties.title, ariaDescription: componentDefinition.description });
checkbox.onChange((newValue) => {
this.handleEdit({ type: DesignerEditType.Update, path: propertyPath, value: newValue, source: view });
});
@@ -876,7 +875,7 @@ export class Designer extends Disposable implements IThemable {
const moveRowsPlugin = new RowMoveManager({
cancelEditOnDrag: true,
id: 'moveRow',
iconCssClass: Codicon.grabber.classNames,
iconCssClass: ThemeIcon.asClassName(Codicon.grabber),
name: localize('designer.moveRowText', 'Move'),
width: 50,
resizable: true,
@@ -946,7 +945,7 @@ export class Designer extends Disposable implements IThemable {
const removeText = localize('designer.removeRowText', "Remove");
const deleteRowColumn = new ButtonColumn({
id: 'deleteRow',
iconCssClass: Codicon.trash.classNames,
iconCssClass: ThemeIcon.asClassName(Codicon.trash),
name: removeText,
title: removeText,
width: 60,
@@ -978,7 +977,7 @@ export class Designer extends Disposable implements IThemable {
const moreActionsText = localize('designer.actions', "More Actions");
const actionsColumn = new ButtonColumn({
id: 'actions',
iconCssClass: Codicon.ellipsis.classNames,
iconCssClass: ThemeIcon.asClassName(Codicon.ellipsis),
name: moreActionsText,
title: moreActionsText,
width: 100,
src/sql/workbench/browser/designer/designerIssuesTabPanelView.ts
+5 -4
View File
@@ -12,11 +12,12 @@ import { IListAccessibilityProvider, List } from 'vs/base/browser/ui/list/listWi
import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
import { localize } from 'vs/nls';
import { IColorTheme, ICssStyleCollector, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import { attachListStyler } from 'vs/platform/theme/common/styler';
import { attachListStyler } from 'sql/platform/theme/common/vsstyler';
import { problemsErrorIconForeground, problemsInfoIconForeground, problemsWarningIconForeground } from 'vs/platform/theme/common/colorRegistry';
import { Codicon } from 'vs/base/common/codicons';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { Link } from 'vs/platform/opener/browser/link';
import { ThemeIcon } from 'vs/base/common/themables';
export class DesignerIssuesTabPanelView extends Disposable implements IPanelView {
private _container: HTMLElement;
@@ -116,13 +117,13 @@ class TableFilterListRenderer implements IListRenderer<DesignerIssue, DesignerIs
let iconClass;
switch (element.severity) {
case 'warning':
iconClass = Codicon.warning.classNames;
iconClass = ThemeIcon.asClassName(Codicon.warning);
break;
case 'information':
iconClass = Codicon.info.classNames;
iconClass = ThemeIcon.asClassName(Codicon.info);
break;
default:
iconClass = Codicon.error.classNames;
iconClass = ThemeIcon.asClassName(Codicon.error);
break;
}
templateData.issueIcon.className = `issue-icon ${iconClass}`;
src/sql/workbench/browser/designer/designerScriptEditor.ts
+1 -1
View File
@@ -71,7 +71,7 @@ export class DesignerScriptEditor extends AbstractTextCodeEditor<editorCommon.IC
});
}
public override createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
protected override createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
this.editorControl = this.instantiationService.createInstance(DesignerCodeEditor, parent, configuration, {});
return this.editorControl;
src/sql/workbench/browser/editData/editDataInput.ts
+6 -3
View File
@@ -14,10 +14,10 @@ import Severity from 'vs/base/common/severity';
import { EditDataResultsInput } from 'sql/workbench/browser/editData/editDataResultsInput';
import { IEditorViewState } from 'vs/editor/common/editorCommon';
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
import { IUntitledTextEditorModel, UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
import { EncodingMode } from 'vs/workbench/services/textfile/common/textfiles';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { IEditorModel, IEditorOptions } from 'vs/platform/editor/common/editor';
/**
* Input for the EditDataEditor.
@@ -222,7 +222,10 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
return this._connectionManagementService.getTabColorForUri(this.uri);
}
public override resolve(refresh?: boolean): Promise<IUntitledTextEditorModel & IResolvedTextEditorModel> { return this._sql.resolve(); }
public override async resolve(options?: IEditorOptions): Promise<IEditorModel | null> {
return this._sql.resolve();
}
public getEncoding(): string | undefined { return this._sql.getEncoding(); }
public override getName(): string { return this._sql.getName(); }
public get hasAssociatedFilePath(): boolean { return this._sql.model.hasAssociatedFilePath; }
src/sql/workbench/browser/editData/editDataResultsInput.ts
+2 -1
View File
@@ -6,6 +6,7 @@
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { Emitter } from 'vs/base/common/event';
import { URI } from 'vs/base/common/uri';
import { IEditorModel, IEditorOptions } from 'vs/platform/editor/common/editor';
export interface IGridPanel {
readonly onRefreshComplete: Promise<void>;
@@ -57,7 +58,7 @@ export class EditDataResultsInput extends EditorInput {
return false;
}
override resolve(refresh?: boolean): Promise<any> {
override async resolve(options?: IEditorOptions): Promise<IEditorModel | null> {
return Promise.resolve(null);
}
src/sql/workbench/browser/modal/dialogHelper.ts
+2 -1
View File
@@ -10,6 +10,7 @@ import * as types from 'vs/base/common/types';
import * as azdata from 'azdata';
import { wrapStringWithNewLine } from 'sql/workbench/common/sqlWorkbenchUtils';
import { RequiredIndicatorClassName } from 'sql/base/browser/ui/label/label';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
export function appendRow(container: HTMLElement, label: string, labelClass: string, cellContainerClass: string, rowContainerClass?: string | Array<string>, showRequiredIndicator: boolean = false, title?: string, titleMaxWidth?: number): HTMLElement {
let rowContainer = append(container, $('tr'));
@@ -41,7 +42,7 @@ export function appendRowLink(container: HTMLElement, label: string, labelClass:
let rowContainer = append(container, $('tr'));
append(append(rowContainer, $(`td.${labelClass}`)), $('div')).innerText = label;
let buttonContainer = append(append(rowContainer, $(`td.${cellContainerClass}`)), $('div'));
let rowButton = new Button(buttonContainer);
let rowButton = new Button(buttonContainer, defaultButtonStyles);
return rowButton.element;
}
src/sql/workbench/browser/modal/modal.ts
+17 -24
View File
@@ -17,7 +17,6 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { Schemas } from 'vs/base/common/network';
import { mixin } from 'vs/base/common/objects';
import { IThemable } from 'vs/base/common/styler';
import { isUndefinedOrNull } from 'vs/base/common/types';
import { URI } from 'vs/base/common/uri';
import { generateUuid } from 'vs/base/common/uuid';
@@ -26,10 +25,12 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
import { ILogService } from 'vs/platform/log/common/log';
import { attachButtonStyler } from 'vs/platform/theme/common/styler';
import { IThemable } from 'sql/platform/theme/common/vsstyler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { Emitter } from 'vs/base/common/event';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
import { defaultButtonStyles, getButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
export enum MessageLevel {
Error = 0,
@@ -269,10 +270,13 @@ export abstract class Modal extends Disposable implements IThemable {
this._modalHeaderSection = DOM.append(this._modalContent, DOM.$('.modal-header'));
if (this._modalOptions.hasBackButton) {
const container = DOM.append(this._modalHeaderSection, DOM.$('.modal-go-back'));
this._backButton = new Button(container, { secondary: true });
this._backButton.icon = {
id: 'backButtonIcon'
};
this._backButton = new Button(container,
getButtonStyles({
buttonBackground: SIDE_BAR_BACKGROUND,
buttonHoverBackground: SIDE_BAR_BACKGROUND
})
);
this._backButton.icon = 'backButtonIcon';
this._backButton.title = localize('modal.back', "Back");
}
@@ -291,31 +295,21 @@ export abstract class Modal extends Disposable implements IThemable {
this._messageIcon = DOM.append(headerContainer, DOM.$('.dialog-message-icon'));
this._messageSeverity = DOM.append(headerContainer, DOM.$('.dialog-message-severity'));
this._detailsButtonContainer = DOM.append(headerContainer, DOM.$('.dialog-message-button'));
this._toggleMessageDetailButton = new Button(this._detailsButtonContainer);
this._toggleMessageDetailButton.icon = {
id: 'message-details-icon'
};
this._toggleMessageDetailButton = new Button(this._detailsButtonContainer, defaultButtonStyles);
this._toggleMessageDetailButton.icon = 'message-details-icon';
this._toggleMessageDetailButton.label = SHOW_DETAILS_TEXT;
this._register(this._toggleMessageDetailButton.onDidClick(() => this.toggleMessageDetail()));
const copyMessageButtonContainer = DOM.append(headerContainer, DOM.$('.dialog-message-button'));
this._copyMessageButton = new Button(copyMessageButtonContainer);
this._copyMessageButton.icon = {
id: 'copy-message-icon'
};
this._copyMessageButton = new Button(copyMessageButtonContainer, defaultButtonStyles);
this._copyMessageButton.icon = 'copy-message-icon';
this._copyMessageButton.label = COPY_TEXT;
this._register(this._copyMessageButton.onDidClick(() => this._clipboardService.writeText(this.getTextForClipboard())));
const closeMessageButtonContainer = DOM.append(headerContainer, DOM.$('.dialog-message-button'));
this._closeMessageButton = new Button(closeMessageButtonContainer);
this._closeMessageButton.icon = {
id: 'close-message-icon'
};
this._closeMessageButton = new Button(closeMessageButtonContainer, defaultButtonStyles);
this._closeMessageButton.icon = 'close-message-icon';
this._closeMessageButton.label = CLOSE_TEXT;
this._register(this._closeMessageButton.onDidClick(() => this.setError(undefined)));
this._register(attachButtonStyler(this._toggleMessageDetailButton, this._themeService));
this._register(attachButtonStyler(this._copyMessageButton, this._themeService));
this._register(attachButtonStyler(this._closeMessageButton, this._themeService));
this._messageBody = DOM.append(this._messageElement, DOM.$('.dialog-message-body'));
this._messageSummary = DOM.append(this._messageBody, DOM.$('.dialog-message-summary'));
this._register(DOM.addDisposableListener(this._messageSummary, DOM.EventType.CLICK, () => this.toggleMessageDetail()));
@@ -538,7 +532,7 @@ export abstract class Modal extends Disposable implements IThemable {
*/
protected addFooterButton(label: string, onSelect: () => void, position: 'left' | 'right' = 'right', isSecondary: boolean = false, index?: number): Button {
let footerButton = DOM.$('.footer-button');
let button = this._register(new Button(footerButton, { secondary: isSecondary }));
let button = this._register(new Button(footerButton, { secondary: isSecondary, ...defaultButtonStyles }));
button.label = label;
button.onDidClick(() => onSelect()); // @todo this should be registered to dispose but that brakes some dialogs
const container = position === 'left' ? this._leftFooter! : this._rightFooter!;
@@ -549,7 +543,6 @@ export abstract class Modal extends Disposable implements IThemable {
} else {
DOM.append(container, footerButton);
}
attachButtonStyler(button, this._themeService);
this._footerButtons.push(button);
return button;
}
src/sql/workbench/browser/modal/optionsDialog.ts
+14 -10
View File
@@ -12,12 +12,12 @@ import * as OptionsDialogHelper from './optionsDialogHelper';
import * as azdata from 'azdata';
import { Event, Emitter } from 'vs/base/common/event';
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
//import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { localize } from 'vs/nls';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
import * as styler from 'vs/platform/theme/common/styler';
//import * as styler from 'sql/platform/theme/common/vsstyler';
import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
import { Widget } from 'vs/base/browser/ui/widget';
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -75,13 +75,16 @@ export class OptionsDialog extends Modal {
attachModalDialogStyler(this, this._themeService);
if (this.backButton) {
this.backButton.onDidClick(() => this.cancel());
styler.attachButtonStyler(this.backButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND });
//styler.attachButtonStyler(this.backButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND });
}
let okButton = this.addFooterButton(localize('optionsDialog.ok', "OK"), () => this.ok());
let closeButton = this.addFooterButton(this.options.cancelLabel || localize('optionsDialog.cancel', "Cancel"), () => this.cancel(), 'right', true);
// {{SQL CARBON TODO}} - theming
this.addFooterButton(localize('optionsDialog.ok', "OK"), () => this.ok());
this.addFooterButton(this.options.cancelLabel || localize('optionsDialog.cancel', "Cancel"), () => this.cancel(), 'right', true);
// let okButton = this.addFooterButton(localize('optionsDialog.ok', "OK"), () => this.ok());
// let closeButton = this.addFooterButton(this.options.cancelLabel || localize('optionsDialog.cancel', "Cancel"), () => this.cancel(), 'right', true);
// Theme styler
styler.attachButtonStyler(okButton, this._themeService);
styler.attachButtonStyler(closeButton, this._themeService);
//styler.attachButtonStyler(okButton, this._themeService);
//styler.attachButtonStyler(closeButton, this._themeService);
this._register(this._themeService.onDidColorThemeChange(e => this.updateTheme(e)));
this.updateTheme(this._themeService.getColorTheme());
}
@@ -135,17 +138,18 @@ export class OptionsDialog extends Modal {
private registerStyling(): void {
// Theme styler
for (let optionName in this._optionElements) {
let widget: Widget = this._optionElements[optionName].optionWidget;
// {{SQL CARBON TODO}} - styling
//let widget: Widget = this._optionElements[optionName].optionWidget;
let option = this._optionElements[optionName].option;
switch (option.valueType) {
case ServiceOptionType.category:
case ServiceOptionType.boolean:
this.disposableStore.add(styler.attachSelectBoxStyler(<SelectBox>widget, this._themeService));
//this.disposableStore.add(styler.attachSelectBoxStyler(<SelectBox>widget, this._themeService));
break;
case ServiceOptionType.string:
case ServiceOptionType.password:
case ServiceOptionType.number:
this.disposableStore.add(styler.attachInputBoxStyler(<InputBox>widget, this._themeService));
//this.disposableStore.add(styler.attachInputBoxStyler(<InputBox>widget, this._themeService));
}
}
}
src/sql/workbench/browser/modal/optionsDialogHelper.ts
+5 -2
View File
@@ -12,6 +12,7 @@ import * as types from 'vs/base/common/types';
import * as azdata from 'azdata';
import { localize } from 'vs/nls';
import { ServiceOptionType } from 'sql/platform/connection/common/interfaces';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
export interface IOptionElement {
optionWidget: any;
@@ -42,7 +43,8 @@ export function createOptionElement(option: azdata.ServiceOption, rowContainer:
}
},
ariaLabel: option.displayName,
placeholder: option.placeholder
placeholder: option.placeholder,
inputBoxStyles: defaultInputBoxStyles
}, option.name);
optionWidget.value = optionValue;
inputElement = findElement(rowContainer, 'input');
@@ -56,7 +58,8 @@ export function createOptionElement(option: azdata.ServiceOption, rowContainer:
validation: (value: string) => (!value && option.isRequired) ? ({ type: MessageType.ERROR, content: option.displayName + missingErrorMessage }) : null
},
ariaLabel: option.displayName,
placeholder: option.placeholder
placeholder: option.placeholder,
inputBoxStyles: defaultInputBoxStyles
}, option.name);
optionWidget.value = optionValue;
if (option.valueType === ServiceOptionType.password) {
src/sql/workbench/browser/modelComponents/button.component.ts
+5 -27
View File
@@ -10,13 +10,11 @@ import { convertSize } from 'sql/base/browser/dom';
import { Button } from 'sql/base/browser/ui/button/button';
import { InfoButton } from 'sql/base/browser/ui/infoButton/infoButton';
import { ComponentEventType, IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces';
import { attachInfoButtonStyler } from 'sql/platform/theme/common/styler';
import { ComponentWithIconBase } from 'sql/workbench/browser/modelComponents/componentWithIconBase';
import { createIconCssClass } from 'sql/workbench/browser/modelComponents/iconUtils';
import { IDisposable } from 'vs/base/common/lifecycle';
import { ILogService } from 'vs/platform/log/common/log';
import { attachButtonStyler } from 'vs/platform/theme/common/styler';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
import { defaultInfoButtonStyles } from 'sql/platform/theme/browser/defaultStyles';
enum ButtonType {
File = 'File',
@@ -46,7 +44,6 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
private _button: Button | InfoButton;
public fileType: string = '.sql';
private _currentButtonType?: ButtonType = undefined;
private _buttonStyler: IDisposable | undefined = undefined;
@ViewChild('input', { read: ElementRef }) private _inputContainer: ElementRef;
@ViewChild('fileInput', { read: ElementRef }) private _fileInputContainer: ElementRef;
@@ -54,7 +51,6 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
@Inject(forwardRef(() => ElementRef)) el: ElementRef,
@Inject(ILogService) logService: ILogService
) {
@@ -77,9 +73,9 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
this._currentButtonType = this.buttonType;
const elementToRemove = this._button?.element;
if (this._inputContainer) {
this._button = new Button(this._inputContainer.nativeElement, { secondary: this.secondary });
this._button = new Button(this._inputContainer.nativeElement, { secondary: this.secondary, ...defaultButtonStyles });
} else if (this._infoButtonContainer) {
this._button = new InfoButton(this._infoButtonContainer.nativeElement);
this._button = new InfoButton(this._infoButtonContainer.nativeElement, defaultInfoButtonStyles);
}
// remove the previously created element if any.
@@ -89,7 +85,6 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
}
this._register(this._button);
this.updateStyler();
this._register(this._button.onDidClick(e => {
if (this._fileInputContainer) {
const self = this;
@@ -176,27 +171,10 @@ export default class ButtonComponent extends ComponentWithIconBase<azdata.Button
if (this.iconPath) {
if (!this._iconClass) {
super.updateIcon();
this._button.icon = {
id: this._iconClass + ' icon'
};
this.updateStyler();
this._button.icon = this._iconClass + ' icon';
} else {
super.updateIcon();
}
} else {
this.updateStyler();
}
}
/**
* Updates the styler for this button based on whether it has an icon or not
*/
private updateStyler(): void {
this._buttonStyler?.dispose();
if (this.buttonType === ButtonType.Informational) {
this._buttonStyler = this._register(attachInfoButtonStyler(this._button, this.themeService));
} else {
this._buttonStyler = this._register(attachButtonStyler(this._button, this.themeService));
}
}
src/sql/workbench/browser/modelComponents/checkbox.component.ts
+2 -4
View File
@@ -12,13 +12,12 @@ import * as azdata from 'azdata';
import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox';
import { attachCheckboxStyler } from 'sql/platform/theme/common/styler';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/platform/dashboard/browser/interfaces';
import { isNumber } from 'vs/base/common/types';
import { convertSize } from 'sql/base/browser/dom';
import { onUnexpectedError } from 'vs/base/common/errors';
import { ILogService } from 'vs/platform/log/common/log';
import { defaultCheckboxStyles } from 'sql/platform/theme/browser/defaultStyles';
@Component({
selector: 'modelview-checkbox',
@@ -34,7 +33,6 @@ export default class CheckBoxComponent extends ComponentBase<azdata.CheckBoxProp
@ViewChild('input', { read: ElementRef }) private _inputContainer: ElementRef;
constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
@Inject(ILogService) logService: ILogService,
@Inject(forwardRef(() => ElementRef)) el: ElementRef) {
super(changeRef, el, logService);
@@ -43,6 +41,7 @@ export default class CheckBoxComponent extends ComponentBase<azdata.CheckBoxProp
ngAfterViewInit(): void {
if (this._inputContainer) {
let inputOptions: ICheckboxOptions = {
...defaultCheckboxStyles,
label: ''
};
@@ -57,7 +56,6 @@ export default class CheckBoxComponent extends ComponentBase<azdata.CheckBoxProp
args: e
});
}));
this._register(attachCheckboxStyler(this._input, this.themeService));
this._validations.push(() => !this.required || this.checked);
}
this.baseInit();
src/sql/workbench/browser/modelComponents/diffeditor.component.ts
+4 -3
View File
@@ -153,9 +153,10 @@ export default class DiffEditorComponent extends ComponentBase<azdata.DiffEditor
private updateLanguageMode() {
if (this._editorModel && this._editor) {
this._languageMode = this.languageMode;
let languageSelection = this._modeService.createById(this._languageMode);
this._modelService.setMode(this._editorModel.originalModel.textEditorModel, languageSelection);
this._modelService.setMode(this._editorModel.modifiedModel.textEditorModel, languageSelection);
// {{SQL CARBON TODO}} - set mode?
// let languageSelection = this._modeService.createById(this._languageMode);
// this._modelService.setMode(this._editorModel.originalModel.textEditorModel, languageSelection);
// this._modelService.setMode(this._editorModel.modifiedModel.textEditorModel, languageSelection);
}
}
src/sql/workbench/browser/modelComponents/dropdown.component.ts
+1 -1
View File
@@ -14,7 +14,7 @@ import * as azdata from 'azdata';
import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
import { attachEditableDropdownStyler } from 'sql/platform/theme/common/styler';
import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
import { attachSelectBoxStyler } from 'sql/platform/theme/common/vsstyler';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
src/sql/workbench/browser/modelComponents/editor.component.ts
+5 -4
View File
@@ -25,7 +25,7 @@ import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } fro
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { convertSizeToNumber } from 'sql/base/browser/dom';
import { IModelService } from 'vs/editor/common/services/model';
import { ILanguageService } from 'vs/editor/common/languages/language';
// import { ILanguageService } from 'vs/editor/common/languages/language';
@Component({
template: '',
@@ -48,7 +48,7 @@ export default class EditorComponent extends ComponentBase<azdata.EditorProperti
@Inject(forwardRef(() => ElementRef)) el: ElementRef,
@Inject(IInstantiationService) private _instantiationService: IInstantiationService,
@Inject(IModelService) private _modelService: IModelService,
@Inject(ILanguageService) private _languageService: ILanguageService,
// @Inject(ILanguageService) private _languageService: ILanguageService,
@Inject(ILogService) private _logService: ILogService,
@Inject(IEditorService) private readonly editorService: IEditorService,
@Inject(ILogService) logService: ILogService
@@ -141,8 +141,9 @@ export default class EditorComponent extends ComponentBase<azdata.EditorProperti
private updateLanguageMode() {
if (this._editorModel && this._editor) {
this._languageMode = this.languageMode;
let languageSelection = this._languageService.createById(this._languageMode);
this._modelService.setMode(this._editorModel, languageSelection);
// {{SQL CARBON TODO}} - call set mode
// let languageSelection = this._languageService.createById(this._languageMode);
//this._modelService.setMode(this._editorModel, languageSelection);
}
}
src/sql/workbench/browser/modelComponents/inputbox.component.ts
+3 -1
View File
@@ -27,6 +27,7 @@ import { isNumber } from 'vs/base/common/types';
import { convertSize, convertSizeToNumber } from 'sql/base/browser/dom';
import { onUnexpectedError } from 'vs/base/common/errors';
import { ILogService } from 'vs/platform/log/common/log';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
@Component({
selector: 'modelview-inputBox',
@@ -69,7 +70,8 @@ export default class InputBoxComponent extends ComponentBase<azdata.InputBoxProp
}
}
},
useDefaultValidation: true
useDefaultValidation: true,
inputBoxStyles: defaultInputBoxStyles
};
if (this._inputContainer) {
inputOptions.requireForceValidations = true; // Non-text area input boxes handle our own validations when the text changes so don't run the base ones
src/sql/workbench/browser/modelComponents/listView.component.ts
+1 -1
View File
@@ -16,7 +16,7 @@ import 'vs/css!./media/listView';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/platform/dashboard/browser/interfaces';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
import { attachListStyler } from 'vs/platform/theme/common/styler';
import { attachListStyler } from 'sql/platform/theme/common/vsstyler';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { ILogService } from 'vs/platform/log/common/log';
import { createIconCssClass } from 'sql/workbench/browser/modelComponents/iconUtils';
src/sql/workbench/browser/modelComponents/media/flexContainer.css
+1 -1
View File
@@ -5,4 +5,4 @@
.flexContainer {
display: flex;
}
}
src/sql/workbench/browser/modelComponents/modelViewEditor.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export class ModelViewEditor extends EditorPane {
/**
* Called to create the editor in the parent element.
*/
public createEditor(parent: HTMLElement): void {
protected createEditor(parent: HTMLElement): void {
this._editorFrame = parent;
this._content = document.createElement('div');
parent.appendChild(this._content);
src/sql/workbench/browser/modelComponents/modelViewInput.ts
+2 -2
View File
@@ -5,7 +5,7 @@
import * as azdata from 'azdata';
import { IEditorModel } from 'vs/platform/editor/common/editor';
import { IEditorModel, IEditorOptions } from 'vs/platform/editor/common/editor';
import * as DOM from 'vs/base/browser/dom';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -82,7 +82,7 @@ export class ModelViewInput extends EditorInput {
return 'ModelViewEditorInput';
}
public override resolve(refresh?: boolean): Promise<IEditorModel> {
public override async resolve(options?: IEditorOptions): Promise<IEditorModel | null> {
return undefined;
}
src/sql/workbench/browser/modelComponents/queryTextEditor.ts
+1 -1
View File
@@ -57,7 +57,7 @@ export class QueryTextEditor extends AbstractTextCodeEditor<editorCommon.ICodeEd
configurationService, themeService, editorService, editorGroupService, fileService);
}
public override createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
protected override createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
this.editorControl = this.instantiationService.createInstance(CodeEditorWidget, parent, configuration, {});
return this.editorControl;
src/sql/workbench/browser/modelComponents/tabbedPanel.component.ts
+2 -2
View File
@@ -109,7 +109,7 @@ export default class TabbedPanelComponent extends ContainerBase<TabConfig> imple
return this._tabs;
}
override onItemsUpdated(): void {
protected override onItemsUpdated(): void {
if (this.items.length === 0) {
this._itemIndexToProcess = 0;
this._tabs = [];
@@ -121,7 +121,7 @@ export default class TabbedPanelComponent extends ContainerBase<TabConfig> imple
}
}
override onItemLayoutUpdated(item: ItemDescriptor<TabConfig>): void {
protected override onItemLayoutUpdated(item: ItemDescriptor<TabConfig>): void {
this._panel.updateTab(item.config.id, { title: item.config.title, iconClass: item.config.icon ? createIconCssClass(item.config.icon) : undefined });
}
src/sql/workbench/browser/modelComponents/table.component.ts
+2 -1
View File
@@ -41,6 +41,7 @@ import { IAccessibilityService } from 'vs/platform/accessibility/common/accessib
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { deepClone, equals } from 'vs/base/common/objects';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
export enum ColumnSizingMode {
ForceFit = 0, // all columns will be sized to fit in viewable space, no horiz scroll bar
@@ -606,7 +607,7 @@ export default class TableComponent extends ComponentBase<azdata.TableComponentP
private registerFilterPlugin() {
const filterPlugin = new HeaderFilter<Slick.SlickData>(this.contextViewService);
const filterPlugin = new HeaderFilter<Slick.SlickData>({ buttonStyles: defaultButtonStyles }, this.contextViewService);
this._register(attachTableFilterStyler(filterPlugin, this.themeService));
this._filterPlugin = filterPlugin;
this._filterPlugin.onFilterApplied.subscribe((e, args) => {
src/sql/workbench/browser/modelComponents/tree.component.ts
+1 -1
View File
@@ -15,7 +15,7 @@ import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBa
import { Tree } from 'sql/base/parts/tree/browser/treeImpl';
import { TreeComponentRenderer } from 'sql/workbench/browser/modelComponents/treeComponentRenderer';
import { TreeComponentDataSource } from 'sql/workbench/browser/modelComponents/treeDataSource';
import { attachListStyler } from 'vs/platform/theme/common/styler';
import { attachListStyler } from 'sql/platform/theme/common/vsstyler';
import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'sql/base/parts/tree/browser/treeDefaults';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ITreeComponentItem } from 'sql/workbench/common/views';
src/sql/workbench/browser/modelComponents/treeViewDataProvider.ts
-3
View File
@@ -3,12 +3,9 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
// eslint-disable-next-line code-import-patterns
import { ExtHostModelViewTreeViewsShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
// eslint-disable-next-line code-import-patterns
import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views';
import { INotificationService } from 'vs/platform/notification/common/notification';
// eslint-disable-next-line code-import-patterns
import * as vsTreeView from 'vs/workbench/api/browser/mainThreadTreeViews';
import { ResolvableTreeItem } from 'vs/workbench/common/views';
import { deepClone } from 'vs/base/common/objects';
src/sql/workbench/browser/parts/activitybar/activitybarActions.ts
+2 -1
View File
@@ -29,7 +29,8 @@ export class AccountsActionViewItem extends ActivityActionViewItem {
@IConfigurationService configurationService: IConfigurationService,
@IKeybindingService keybindingService: IKeybindingService,
) {
super(action, { draggable: false, colors, icon: true, hoverOptions: hoverOptions }, themeService, hoverService, configurationService, keybindingService);
super(action, { draggable: false, colors, icon: true, hoverOptions: hoverOptions },
(/*badgesEnabledForCompositeId*/) => false, themeService, hoverService, configurationService, keybindingService);
}
override render(container: HTMLElement): void {
src/sql/workbench/browser/ui/infoBox/infoBox.ts
+3 -3
View File
@@ -7,7 +7,6 @@ import 'vs/css!./media/infoBox';
import * as azdata from 'azdata';
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { alert, status } from 'vs/base/browser/ui/aria/aria';
import { IThemable } from 'vs/base/common/styler';
import { Color } from 'vs/base/common/color';
import * as DOM from 'vs/base/browser/dom';
import { Event, Emitter } from 'vs/base/common/event';
@@ -16,6 +15,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { ILogService } from 'vs/platform/log/common/log';
import { ThemeIcon } from 'vs/base/common/themables';
export interface IInfoBoxStyles {
informationBackground?: Color;
@@ -35,7 +35,7 @@ export interface InfoBoxOptions {
clickableButtonAriaLabel?: string;
}
export class InfoBox extends Disposable implements IThemable {
export class InfoBox extends Disposable {
private _imageElement: HTMLDivElement;
private _textElement: HTMLDivElement;
private _infoBoxElement: HTMLDivElement;
@@ -72,7 +72,7 @@ export class InfoBox extends Disposable implements IThemable {
this._infoBoxElement.appendChild(this._imageElement);
this._infoBoxElement.appendChild(this._textElement);
this._clickableIndicator = DOM.$('a');
this._clickableIndicator.classList.add('infobox-clickable-arrow', ...Codicon.arrowRight.classNamesArray);
this._clickableIndicator.classList.add('infobox-clickable-arrow', ...ThemeIcon.asClassNameArray(Codicon.arrowRight));
this._infoBoxElement.appendChild(this._clickableIndicator);
if (options) {
src/sql/workbench/common/editor/query/queryEditorInput.ts
+1 -1
View File
@@ -185,7 +185,7 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
}));
this._register(this.configurationService.onDidChangeConfiguration(e => {
if (e.affectedKeys.indexOf('queryEditor') > -1) {
if (e.affectedKeys.has('queryEditor')) {
this._onDidChangeLabel.fire();
}
}));
src/sql/workbench/common/editor/query/queryResultsInput.ts
+2 -1
View File
@@ -13,6 +13,7 @@ import { GridPanelState } from 'sql/workbench/common/editor/query/gridTableState
import { QueryModelViewState } from 'sql/workbench/common/editor/query/modelViewState';
import { URI } from 'vs/base/common/uri';
import { ExecutionPlanState } from 'sql/workbench/common/editor/query/executionPlanState';
import { IEditorModel, IEditorOptions } from 'vs/platform/editor/common/editor';
export class ResultsViewState {
public readonly gridPanelState: GridPanelState = new GridPanelState();
@@ -68,7 +69,7 @@ export class QueryResultsInput extends EditorInput {
return false;
}
override resolve(refresh?: boolean): Promise<any> {
override async resolve(options?: IEditorOptions): Promise<IEditorModel | null> {
return Promise.resolve(null);
}
src/sql/workbench/common/styler.ts
+1 -2
View File
@@ -7,8 +7,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IDisposable } from 'vs/base/common/lifecycle';
import * as cr from 'vs/platform/theme/common/colorRegistry';
import * as sqlcr from 'sql/platform/theme/common/colorRegistry';
import { IThemable } from 'vs/base/common/styler';
import { attachStyler, IStyleOverrides } from 'vs/platform/theme/common/styler';
import { IThemable, attachStyler, IStyleOverrides } from 'sql/platform/theme/common/vsstyler';
import {
SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND,
PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND
src/sql/workbench/contrib/assessment/browser/asmtResultsView.component.ts
+5 -2
View File
@@ -51,6 +51,7 @@ import { DASHBOARD_BORDER } from 'sql/workbench/common/theme';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { defaultButtonStyles, defaultListStyles } from 'vs/platform/theme/browser/defaultStyles';
export const ASMTRESULTSVIEW_SELECTOR: string = 'asmt-results-view-component';
export const ROW_HEIGHT: number = 25;
@@ -325,7 +326,7 @@ export class AsmtResultsViewComponent extends TabChild implements IAssessmentCom
columnDef.formatter = (row, cell, value, columnDef, dataContext) => this.detailSelectionFormatter(row, cell, value, columnDef, dataContext as ExtendedItem<Slick.SlickData>);
columns.unshift(columnDef);
let filterPlugin = new HeaderFilter<Slick.SlickData>(this._contextViewService);
let filterPlugin = new HeaderFilter<Slick.SlickData>({ buttonStyles: defaultButtonStyles }, this._contextViewService);
this._register(attachTableFilterStyler(filterPlugin, this._themeService));
this.filterPlugin = filterPlugin;
this.filterPlugin.onFilterApplied.subscribe((e, args) => {
@@ -596,8 +597,10 @@ export class AsmtResultsViewComponent extends TabChild implements IAssessmentCom
private _updateStyles(theme: IColorTheme): void {
this.actionBarContainer.nativeElement.style.borderTopColor = theme.getColor(DASHBOARD_BORDER, true).toString();
// {{SQL CARBON TODO}} - do defaultListStyles work here?
let tableStyle: ITableStyles = {
tableHeaderBackground: theme.getColor(themeColors.PANEL_BACKGROUND)
tableHeaderBackground: theme.getColor(themeColors.PANEL_BACKGROUND),
...defaultListStyles
};
this._table.style(tableStyle);
const rowExclSelector = '.asmtview-grid > .monaco-table .slick-viewport > .grid-canvas > .ui-widget-content.slick-row';
src/sql/workbench/contrib/assessment/test/browser/asmtActions.test.ts
+2 -1
View File
@@ -251,7 +251,8 @@ suite('Assessment Actions', () => {
resource: fileUri,
size: 42,
readonly: false,
children: []
children: [],
locked: false
});
});
src/sql/workbench/contrib/backup/browser/backup.component.ts
+33 -29
View File
@@ -11,7 +11,7 @@ import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
import { ListBox } from 'sql/base/browser/ui/listBox/listBox';
import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
import { attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler';
import { attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants';
import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService';
@@ -34,10 +34,11 @@ import { AngularDisposable } from 'sql/base/browser/lifecycle';
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
import { fileFiltersSet } from 'sql/workbench/services/restore/common/constants';
import { IColorTheme } from 'vs/platform/theme/common/themeService';
import { attachButtonStyler } from 'vs/platform/theme/common/styler';
import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes';
import { IBackupRestoreUrlBrowserDialogService } from 'sql/workbench/services/backupRestoreUrlBrowser/common/urlBrowserDialogService';
import { defaultButtonStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
import { defaultCheckboxStyles } from 'sql/platform/theme/browser/defaultStyles';
export const BACKUP_SELECTOR: string = 'backup-component';
@@ -236,7 +237,8 @@ export class BackupComponent extends AngularDisposable {
this.recoveryBox = this._register(new InputBox(this.recoveryModelElement!.nativeElement, this.contextViewService, {
placeholder: this.recoveryModel,
ariaLabel: LocalizedStrings.RECOVERY_MODEL
ariaLabel: LocalizedStrings.RECOVERY_MODEL,
inputBoxStyles: defaultInputBoxStyles
}));
// Set backup type
this.backupTypeSelectBox = this._register(new SelectBox([], '', this.contextViewService, undefined, { ariaLabel: this.localizedStrings.BACKUP_TYPE }));
@@ -244,6 +246,7 @@ export class BackupComponent extends AngularDisposable {
// Set copy-only check box
this.copyOnlyCheckBox = this._register(new Checkbox(this.copyOnlyElement!.nativeElement, {
...defaultCheckboxStyles,
label: LocalizedStrings.COPY_ONLY,
checked: false,
onChange: (viaKeyboard) => { },
@@ -252,6 +255,7 @@ export class BackupComponent extends AngularDisposable {
// Set to url check box
this.toUrlCheckBox = this._register(new Checkbox(this.toUrlElement!.nativeElement, {
...defaultCheckboxStyles,
label: LocalizedStrings.TO_URL,
checked: false,
onChange: () => this.onChangeToUrl(),
@@ -260,6 +264,7 @@ export class BackupComponent extends AngularDisposable {
// Encryption checkbox
this.encryptCheckBox = this._register(new Checkbox(this.encryptElement!.nativeElement, {
...defaultCheckboxStyles,
label: LocalizedStrings.ENCRYPTION,
checked: false,
onChange: () => this.onChangeEncrypt(),
@@ -268,6 +273,7 @@ export class BackupComponent extends AngularDisposable {
// Verify backup checkbox
this.verifyCheckBox = this._register(new Checkbox(this.verifyElement!.nativeElement, {
...defaultCheckboxStyles,
label: LocalizedStrings.VERIFY_CONTAINER,
checked: false,
onChange: () => { },
@@ -276,6 +282,7 @@ export class BackupComponent extends AngularDisposable {
// Perform checksum checkbox
this.checksumCheckBox = this._register(new Checkbox(this.checksumElement!.nativeElement, {
...defaultCheckboxStyles,
label: LocalizedStrings.CHECKSUM_CONTAINER,
checked: false,
onChange: () => { },
@@ -284,6 +291,7 @@ export class BackupComponent extends AngularDisposable {
// Continue on error checkbox
this.continueOnErrorCheckBox = this._register(new Checkbox(this.continueOnErrorElement!.nativeElement, {
...defaultCheckboxStyles,
label: LocalizedStrings.CONTINUE_ON_ERROR_CONTAINER,
checked: false,
onChange: () => { },
@@ -292,12 +300,14 @@ export class BackupComponent extends AngularDisposable {
// Set backup name
this.backupNameBox = this._register(new InputBox(this.backupNameElement!.nativeElement, this.contextViewService, {
ariaLabel: LocalizedStrings.BACKUP_NAME
ariaLabel: LocalizedStrings.BACKUP_NAME,
inputBoxStyles: defaultInputBoxStyles
}));
// Set backup path list
this.urlInputBox = this._register(new InputBox(this.urlPathElement!.nativeElement, this.contextViewService, {
ariaLabel: LocalizedStrings.BACKUP_URL
ariaLabel: LocalizedStrings.BACKUP_URL,
inputBoxStyles: defaultInputBoxStyles
}));
this._register(this.urlInputBox.onDidChange((value) => this.onUrlInputBoxChanged(value)));
@@ -324,13 +334,13 @@ export class BackupComponent extends AngularDisposable {
this.pathListBox.render(this.filePathElement!.nativeElement);
// Set backup path add/remove buttons
this.addUrlPathButton = this._register(new Button(this.addUrlPathElement!.nativeElement, { secondary: true }));
this.addUrlPathButton = this._register(new Button(this.addUrlPathElement!.nativeElement, { secondary: true, ...defaultButtonStyles }));
this.addUrlPathButton.label = localize('backupBrowseButton', "Browse");
this.addUrlPathButton.title = localize('addUrl', "Add URL");
this.addFilePathButton = this._register(new Button(this.addFilePathElement!.nativeElement, { secondary: true }));
this.addFilePathButton = this._register(new Button(this.addFilePathElement!.nativeElement, { secondary: true, ...defaultButtonStyles }));
this.addFilePathButton.label = '+';
this.addFilePathButton.title = localize('addFile', "Add File");
this.removeFilePathButton = this._register(new Button(this.removeFilePathElement!.nativeElement, { secondary: true }));
this.removeFilePathButton = this._register(new Button(this.removeFilePathElement!.nativeElement, { secondary: true, ...defaultButtonStyles }));
this.removeFilePathButton.label = '-';
this.removeFilePathButton.title = localize('removeFile', "Remove files");
@@ -351,12 +361,14 @@ export class BackupComponent extends AngularDisposable {
validationOptions: {
validation: (value: string) => !value ? ({ type: MessageType.ERROR, content: LocalizedStrings.MEDIA_NAME_REQUIRED_ERROR }) : null
},
ariaLabel: LocalizedStrings.NEW_MEDIA_SET_NAME
ariaLabel: LocalizedStrings.NEW_MEDIA_SET_NAME,
inputBoxStyles: defaultInputBoxStyles
}
));
this.mediaDescriptionBox = this._register(new InputBox(this.mediaDescriptionElement!.nativeElement, this.contextViewService, {
ariaLabel: LocalizedStrings.NEW_MEDIA_SET_DESCRIPTION
ariaLabel: LocalizedStrings.NEW_MEDIA_SET_DESCRIPTION,
inputBoxStyles: defaultInputBoxStyles
}));
// Set backup retain days
@@ -376,7 +388,8 @@ export class BackupComponent extends AngularDisposable {
}
}
},
ariaLabel: LocalizedStrings.SET_BACKUP_RETAIN_DAYS
ariaLabel: LocalizedStrings.SET_BACKUP_RETAIN_DAYS,
inputBoxStyles: defaultInputBoxStyles
}));
// Disable elements
@@ -441,24 +454,24 @@ export class BackupComponent extends AngularDisposable {
private addFooterButtons(): void {
// Set script footer button
this.scriptButton = this._register(new Button(this.scriptButtonElement!.nativeElement, { secondary: true }));
this.scriptButton = this._register(new Button(this.scriptButtonElement!.nativeElement, { secondary: true, ...defaultButtonStyles }));
this.scriptButton.label = localize('backupComponent.script', "Script");
this._register(this.scriptButton.onDidClick(() => this.onScript()));
this._register(attachButtonStyler(this.scriptButton, this.themeService));
this._register(this.scriptButton);
this.scriptButton.enabled = false;
// Set backup footer button
this.backupButton = this._register(new Button(this.backupButtonElement!.nativeElement));
this.backupButton = this._register(new Button(this.backupButtonElement!.nativeElement, defaultButtonStyles));
this.backupButton.label = localize('backupComponent.backup', "Backup");
this._register(this.backupButton.onDidClick(() => this.onOk()));
this._register(attachButtonStyler(this.backupButton, this.themeService));
this._register(this.backupButton);
this.backupEnabled = false;
// Set cancel footer button
this.cancelButton = this._register(new Button(this.cancelButtonElement!.nativeElement, { secondary: true }));
this.cancelButton = this._register(new Button(this.cancelButtonElement!.nativeElement, { secondary: true, ...defaultButtonStyles }));
this.cancelButton.label = localize('backupComponent.cancel', "Cancel");
this._register(this.cancelButton.onDidClick(() => this.onCancel()));
this._register(attachButtonStyler(this.cancelButton, this.themeService));
this._register(this.cancelButton);
}
private initialize(isMetadataPopulated: boolean): void {
@@ -586,9 +599,9 @@ export class BackupComponent extends AngularDisposable {
this.urlInputBox!.value = '';
this.pathListBox!.setValidation(true);
this.cancelButton!.applyStyles();
this.scriptButton!.applyStyles();
this.backupButton!.applyStyles();
// this.cancelButton!.applyStyles();
// this.scriptButton!.applyStyles();
// this.backupButton!.applyStyles();
}
private registerListeners(): void {
@@ -597,9 +610,6 @@ export class BackupComponent extends AngularDisposable {
this._register(attachInputBoxStyler(this.recoveryBox!, this.themeService));
this._register(attachSelectBoxStyler(this.backupTypeSelectBox!, this.themeService));
this._register(attachListBoxStyler(this.pathListBox!, this.themeService));
this._register(attachButtonStyler(this.addUrlPathButton!, this.themeService));
this._register(attachButtonStyler(this.addFilePathButton!, this.themeService));
this._register(attachButtonStyler(this.removeFilePathButton!, this.themeService));
this._register(attachSelectBoxStyler(this.compressionSelectBox!, this.themeService));
this._register(attachSelectBoxStyler(this.algorithmSelectBox!, this.themeService));
this._register(attachSelectBoxStyler(this.encryptorSelectBox!, this.themeService));
@@ -607,12 +617,6 @@ export class BackupComponent extends AngularDisposable {
this._register(attachInputBoxStyler(this.urlInputBox!, this.themeService));
this._register(attachInputBoxStyler(this.mediaDescriptionBox!, this.themeService));
this._register(attachInputBoxStyler(this.backupRetainDaysBox!, this.themeService));
this._register(attachCheckboxStyler(this.copyOnlyCheckBox!, this.themeService));
this._register(attachCheckboxStyler(this.toUrlCheckBox!, this.themeService));
this._register(attachCheckboxStyler(this.encryptCheckBox!, this.themeService));
this._register(attachCheckboxStyler(this.verifyCheckBox!, this.themeService));
this._register(attachCheckboxStyler(this.checksumCheckBox!, this.themeService));
this._register(attachCheckboxStyler(this.continueOnErrorCheckBox!, this.themeService));
this._register(this.backupTypeSelectBox!.onDidSelect(selected => this.onBackupTypeChanged()));
this._register(this.addUrlPathButton!.onDidClick(() => this.onAddUrlClick()));
src/sql/workbench/contrib/charts/browser/chartView.ts
+17 -7
View File
@@ -25,10 +25,11 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { Registry } from 'vs/platform/registry/common/platform';
import { attachInputBoxStyler, attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
import { attachInputBoxStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/vsstyler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { ChartOptions, ControlType, IChartOption } from './chartOptions';
import { Insight } from './insight';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);
@@ -366,8 +367,10 @@ export class ChartView extends Disposable implements IPanelView {
this.optionDisposables.push(attachSelectBoxStyler(dropdown, this._themeService));
break;
case ControlType.input:
let input = new InputBox(optionInput, this._contextViewService);
input.setAriaLabel(option.label);
let input = new InputBox(optionInput, this._contextViewService, {
ariaLabel: option.label,
inputBoxStyles: defaultInputBoxStyles
});
input.value = value || '';
input.onDidChange(e => {
if (this._options[entry] !== e) {
@@ -385,8 +388,11 @@ export class ChartView extends Disposable implements IPanelView {
this.optionDisposables.push(attachInputBoxStyler(input, this._themeService));
break;
case ControlType.numberInput:
let numberInput = new InputBox(optionInput, this._contextViewService, { type: 'number' });
numberInput.setAriaLabel(option.label);
let numberInput = new InputBox(optionInput, this._contextViewService, {
type: 'number',
ariaLabel: option.label,
inputBoxStyles: defaultInputBoxStyles
});
numberInput.value = value || '';
numberInput.onDidChange(e => {
if (this._options[entry] !== e) {
@@ -405,8 +411,12 @@ export class ChartView extends Disposable implements IPanelView {
this.optionDisposables.push(attachInputBoxStyler(numberInput, this._themeService));
break;
case ControlType.dateInput:
let dateInput = new InputBox(optionInput, this._contextViewService, { type: 'datetime-local' });
dateInput.setAriaLabel(option.label);
let dateInput = new InputBox(optionInput, this._contextViewService, {
type: 'datetime-local',
ariaLabel: option.label,
inputBoxStyles: defaultInputBoxStyles
});
dateInput.value = value || '';
dateInput.onDidChange(e => {
if (this._options[entry] !== e) {
src/sql/workbench/contrib/charts/browser/configureChartDialog.ts
+1 -4
View File
@@ -14,7 +14,6 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
import { ILogService } from 'vs/platform/log/common/log';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
import { attachModalDialogStyler } from 'sql/workbench/common/styler';
import { attachButtonStyler } from 'vs/platform/theme/common/styler';
export class ConfigureChartDialog extends Modal {
constructor(
@@ -39,9 +38,7 @@ export class ConfigureChartDialog extends Modal {
public override render() {
super.render();
attachModalDialogStyler(this, this._themeService);
let closeButton = this.addFooterButton(localize('configureChartDialog.close', "Close"), () => this.close());
attachButtonStyler(closeButton, this._themeService);
this.addFooterButton(localize('configureChartDialog.close', "Close"), () => this.close());
}
protected renderBody(container: HTMLElement) {
src/sql/workbench/contrib/charts/browser/interfaces.ts
+1 -1
View File
@@ -20,7 +20,7 @@ export interface IPointDataSet {
export function customMixin(destination: any, source: any, overwrite?: boolean): any {
if (types.isObject(source)) {
mixin(destination, source, overwrite, customMixin);
} else if (types.isArray(source)) {
} else if (Array.isArray(source)) {
for (let i = 0; i < source.length; i++) {
if (destination[i]) {
mixin(destination[i], source[i], overwrite, customMixin);
src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts
+1 -1
View File
@@ -80,7 +80,7 @@ class TestParsedArgs implements NativeParsedArgs {
'install-source'?: string;
'list-extensions'?: boolean;
locale?: string;
log?: string;
log?: string[];
logExtensionHostCommunication?: boolean;
'max-memory'?: string;
'new-window'?: boolean;
src/sql/workbench/contrib/connection/browser/connection.contribution.ts
+7 -43
View File
@@ -7,8 +7,7 @@ import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platf
import { Registry } from 'vs/platform/registry/common/platform';
import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/services/connection/browser/connectionActions';
import * as azdata from 'azdata';
import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
import { Action2, MenuId, MenuRegistry, SyncActionDescriptor, registerAction2 } from 'vs/platform/actions/common/actions';
import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
import { localize } from 'vs/nls';
import { ConnectionStatusbarItem } from 'sql/workbench/contrib/connection/browser/connectionStatus';
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -35,44 +34,16 @@ import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
// Connection Dashboard registration
const actionRegistry = <IWorkbenchActionRegistry>Registry.as(Extensions.WorkbenchActions);
// Connection Actions
actionRegistry.registerWorkbenchAction(
SyncActionDescriptor.create(
ClearRecentConnectionsAction,
ClearRecentConnectionsAction.ID,
ClearRecentConnectionsAction.LABEL
),
ClearRecentConnectionsAction.LABEL
);
actionRegistry.registerWorkbenchAction(
SyncActionDescriptor.create(
AddServerGroupAction,
AddServerGroupAction.ID,
AddServerGroupAction.LABEL
),
AddServerGroupAction.LABEL
);
registerAction2(ClearRecentConnectionsAction);
actionRegistry.registerWorkbenchAction(
SyncActionDescriptor.create(
ActiveConnectionsFilterAction,
ActiveConnectionsFilterAction.ID,
ActiveConnectionsFilterAction.SHOW_ACTIVE_CONNECTIONS_LABEL
),
ActiveConnectionsFilterAction.SHOW_ACTIVE_CONNECTIONS_LABEL
);
registerAction2(AddServerGroupAction);
actionRegistry.registerWorkbenchAction(
SyncActionDescriptor.create(
AddServerAction,
AddServerAction.ID,
AddServerAction.LABEL
),
AddServerAction.LABEL
);
registerAction2(ActiveConnectionsFilterAction);
registerAction2(AddServerAction);
MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
group: 'navigation',
@@ -182,14 +153,7 @@ CommandsRegistry.registerCommand('azdata.connect',
}
});
actionRegistry.registerWorkbenchAction(
SyncActionDescriptor.create(
GetCurrentConnectionStringAction,
GetCurrentConnectionStringAction.ID,
GetCurrentConnectionStringAction.LABEL
),
GetCurrentConnectionStringAction.LABEL
);
registerAction2(GetCurrentConnectionStringAction);
const configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigExtensions.Configuration);
configurationRegistry.registerConfiguration({
src/sql/workbench/contrib/connection/common/connectionProviderExtension.ts
+2 -3
View File
@@ -13,7 +13,6 @@ import { ConnectionProviderProperties, ICapabilitiesService } from 'sql/platform
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import type { IDisposable } from 'vs/base/common/lifecycle';
import { isArray } from 'vs/base/common/types';
const ConnectionProviderContrib: IJSONSchema = {
type: 'object',
@@ -170,7 +169,7 @@ class ConnectionProviderHandler implements IWorkbenchContribution {
delta.added.forEach(added => {
resolveIconPath(added);
if (isArray(added.value)) {
if (Array.isArray(added.value)) {
for (const provider of added.value) {
this.disposables.set(provider, handleProvider(provider));
}
@@ -179,7 +178,7 @@ class ConnectionProviderHandler implements IWorkbenchContribution {
}
});
delta.removed.forEach(removed => {
if (isArray(removed.value)) {
if (Array.isArray(removed.value)) {
for (const provider of removed.value) {
this.disposables.get(provider)!.dispose();
}
src/sql/workbench/contrib/connection/common/connectionTreeProviderExentionPoint.ts
+2 -2
View File
@@ -6,7 +6,7 @@
import { IConnectionTreeDescriptor, IConnectionTreeService } from 'sql/workbench/services/connection/common/connectionTreeService';
import { IJSONSchema } from 'vs/base/common/jsonSchema';
import { IDisposable } from 'vs/base/common/lifecycle';
import { isArray, isString } from 'vs/base/common/types';
import { isString } from 'vs/base/common/types';
import { localize } from 'vs/nls';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { Registry } from 'vs/platform/registry/common/platform';
@@ -44,7 +44,7 @@ class ConnectionTreeProviderHandle implements IWorkbenchContribution {
delta.added.forEach(added => {
// resolveIconPath(added);
if (!isArray(added.value)) {
if (!Array.isArray(added.value)) {
added.collector.error('Value must be array');
return;
}
src/sql/workbench/contrib/dashboard/browser/contents/webviewContent.component.ts
+4 -3
View File
@@ -79,7 +79,7 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
public setHtml(html: string): void {
this._html = html;
if (this._webview) {
this._webview.html = html;
this._webview.setHtml(html);
}
}
@@ -99,7 +99,8 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
}
this._webview = this.webviewService.createWebviewElement({
id: this.id,
providedViewType: this.id,
title: this.id,
contentOptions: {
allowScripts: true,
},
@@ -113,7 +114,7 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
this._onMessage.fire(e.message);
});
if (this._html) {
this._webview.html = this._html;
this._webview.setHtml(this._html);
}
}
}
src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts
+3 -3
View File
@@ -182,7 +182,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
let secondary: IAction[] = [];
const menu = this.menuService.createMenu(MenuId.DashboardToolbar, this.contextKeyService);
let groups = menu.getActions({ arg: this.connectionManagementService.connectionInfo.connectionProfile.toIConnectionProfile(), shouldForwardArgs: true });
fillInActions(groups, { primary, secondary }, false, g => g === '', Number.MAX_SAFE_INTEGER, (action: SubmenuAction, group: string, groupSize: number) => group === undefined || group === '');
fillInActions(groups, { primary, secondary }, false, g => g === '', (action: SubmenuAction, group: string, groupSize: number) => group === undefined || group === '');
primary.forEach(a => {
if (a instanceof MenuItemAction) {
@@ -219,7 +219,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
const toolbarTasks = this.tabToolbarActionsConfig.get(tabId);
let tasks = TaskRegistry.getTasks();
let content = [];
if (types.isArray(toolbarTasks.actions) && toolbarTasks.actions.length > 0) {
if (Array.isArray(toolbarTasks.actions) && toolbarTasks.actions.length > 0) {
tasks = toolbarTasks.actions.map(i => {
if (types.isString(i)) {
if (tasks.some(x => x === i)) {
@@ -514,7 +514,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
return properties ? [this.propertiesWidget] : [];
} else if (types.isString(properties) && properties === 'collapsed') {
return [this.propertiesWidget];
} else if (types.isArray(properties)) {
} else if (Array.isArray(properties)) {
return properties.map((item) => {
const retVal = Object.assign({}, this.propertiesWidget);
retVal.edition = item.edition;
src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts
+1 -1
View File
@@ -52,7 +52,7 @@ export class DashboardEditor extends EditorPane {
/**
* Called to create the editor in the parent element.
*/
public createEditor(parent: HTMLElement): void {
protected createEditor(parent: HTMLElement): void {
}
/**
src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerActions.ts
-9
View File
@@ -6,7 +6,6 @@
import { ManageAction, ManageActionContext } from 'sql/workbench/browser/actions';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService';
import { ExecuteCommandAction } from 'vs/workbench/browser/parts/editor/editorActions';
export class ExplorerManageAction extends ManageAction {
public static override readonly ID = 'explorerwidget.manage';
@@ -22,11 +21,3 @@ export class ExplorerManageAction extends ManageAction {
await super.run(actionContext);
}
}
export class CustomExecuteCommandAction extends ExecuteCommandAction {
override run(): Promise<any> {
// {{SQL CARBON TODO}}
//return super.run(context.profile);
return super.run();
}
}
src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component.ts
+8 -3
View File
@@ -27,13 +27,14 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { ILogService } from 'vs/platform/log/common/log';
import { IEditorProgressService } from 'vs/platform/progress/common/progress';
import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { getFlavor } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry';
import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { getInputBoxStyle } from 'vs/platform/theme/browser/defaultStyles';
import { settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
@Component({
selector: 'explorer-widget',
@@ -84,7 +85,12 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
const inputOptions: IInputOptions = {
placeholder: placeholderLabel,
ariaLabel: placeholderLabel
ariaLabel: placeholderLabel,
inputBoxStyles: getInputBoxStyle({
inputBackground: settingsTextInputBackground,
inputForeground: settingsTextInputForeground,
inputBorder: settingsTextInputBorder
})
};
this._input = new InputBox(this._inputContainer.nativeElement, this.contextViewService, inputOptions);
this._table = new ExplorerTable(this._tableContainer.nativeElement,
@@ -103,7 +109,6 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
this.quickInputService,
this.componentContextService);
this._register(this._input);
this._register(attachInputBoxStyler(this._input, this.themeService));
this._register(this._table);
this._register(this._input.onDidChange(e => {
this._filterDelayer.trigger(async () => {
src/sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.component.ts
+5 -3
View File
@@ -61,7 +61,7 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget,
public setHtml(html: string): void {
this._html = html;
if (this._webview) {
this._webview.html = html;
this._webview.setHtml(html);
}
}
@@ -99,8 +99,10 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget,
this._onMessageDisposable.dispose();
}
// {{SQL CARBON TODO}} - are the id & title values correct with new createWebviewElement API
this._webview = this.webviewService.createWebviewElement({
id: this.id,
providedViewType: this.id,
title: this.id,
contentOptions: {
allowScripts: true,
},
@@ -113,7 +115,7 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget,
this._onMessage.fire(e.message);
});
if (this._html) {
this._webview.html = this._html;
this._webview.setHtml(this._html);
}
}
}
src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts
+3 -3
View File
@@ -55,11 +55,11 @@ export class ConnectionViewletPanel extends ViewPane {
super.renderHeader(container);
}
override renderHeaderTitle(container: HTMLElement): void {
protected override renderHeaderTitle(container: HTMLElement): void {
super.renderHeaderTitle(container, this.options.title);
}
override renderBody(container: HTMLElement): void {
protected override renderBody(container: HTMLElement): void {
const viewletContainer = DOM.append(container, DOM.$('div.server-explorer-viewlet'));
const viewContainer = DOM.append(viewletContainer, DOM.$('div.object-explorer-view'));
this._serverTreeView.renderBody(viewContainer).then(undefined, error => {
@@ -72,7 +72,7 @@ export class ConnectionViewletPanel extends ViewPane {
return this._serverTreeView.tree;
}
override layoutBody(size: number): void {
protected override layoutBody(size: number): void {
this._serverTreeView.layout(size);
this._root!.classList.toggle('narrow', this._root!.clientWidth < 300);
}
src/sql/workbench/contrib/editData/browser/editDataActions.ts
+1 -1
View File
@@ -14,7 +14,7 @@ import * as dom from 'vs/base/browser/dom';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { INotificationService } from 'vs/platform/notification/common/notification';
import Severity from 'vs/base/common/severity';
import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
import { attachSelectBoxStyler } from 'sql/platform/theme/common/vsstyler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
const $ = dom.$;
src/sql/workbench/contrib/editData/browser/editDataEditor.ts
+1 -1
View File
@@ -213,7 +213,7 @@ export class EditDataEditor extends EditorPane {
/**
* Sets this editor and the sub-editors to visible.
*/
public override setEditorVisible(visible: boolean, group: IEditorGroup): void {
protected override setEditorVisible(visible: boolean, group: IEditorGroup): void {
if (this._resultsEditor) {
this._resultsEditor.setVisible(visible, group);
}
src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts
+1 -1
View File
@@ -52,7 +52,7 @@ export class EditDataResultsEditor extends EditorPane {
return this._input;
}
public createEditor(parent: HTMLElement): void {
protected createEditor(parent: HTMLElement): void {
parent.appendChild(this.styleSheet);
}
src/sql/workbench/contrib/executionPlan/browser/azdataGraphView.ts
+1 -1
View File
@@ -62,7 +62,7 @@ export class AzdataGraphView extends Disposable {
this.initializeGraphEvents();
configurationService.onDidChangeConfiguration(e => {
if (e.affectedKeys.includes('executionPlan.tooltips.enableOnHoverTooltips')) {
if (e.affectedKeys.has('executionPlan.tooltips.enableOnHoverTooltips')) {
const enableHoverOnTooltip = configurationService.getValue<boolean>('executionPlan.tooltips.enableOnHoverTooltips');
if (this._diagram) {
this._diagram.setShowTooltipOnClick(!enableHoverOnTooltip);
src/sql/workbench/contrib/executionPlan/browser/executionPlanComparisonEditorView.ts
+2 -3
View File
@@ -33,8 +33,8 @@ import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import { ExecutionPlanWidgetController } from 'sql/workbench/contrib/executionPlan/browser/executionPlanWidgetController';
import { NodeSearchWidget } from 'sql/workbench/contrib/executionPlan/browser/widgets/nodeSearchWidget';
import { Button } from 'sql/base/browser/ui/button/button';
import { attachButtonStyler } from 'vs/platform/theme/common/styler';
import { Disposable } from 'vs/base/common/lifecycle';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
const ADD_EXECUTION_PLAN_STRING = localize('epCompare.addExecutionPlanLabel', 'Add execution plan');
@@ -214,8 +214,7 @@ export class ExecutionPlanComparisonEditorView extends Disposable {
this._placeholderInfoboxContainer = DOM.$('.placeholder-infobox');
this._placeholderButton = this._register(new Button(this._placeholderInfoboxContainer, { secondary: true }));
this._register(attachButtonStyler(this._placeholderButton, this.themeService));
this._placeholderButton = this._register(new Button(this._placeholderInfoboxContainer, { secondary: true, ...defaultButtonStyles }));
this._placeholderButton.label = ADD_EXECUTION_PLAN_STRING;
this._placeholderButton.ariaLabel = ADD_EXECUTION_PLAN_STRING;
this._placeholderButton.enabled = true;
src/sql/workbench/contrib/executionPlan/browser/executionPlanComparisonPropertiesView.ts
+3 -2
View File
@@ -21,6 +21,7 @@ import { deepClone } from 'vs/base/common/objects';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { ThemeIcon } from 'vs/base/common/themables';
export enum ExecutionPlanCompareOrientation {
Horizontal = 'horizontal',
@@ -391,8 +392,8 @@ export class ExecutionPlanComparisonPropertiesView extends ExecutionPlanProperti
diffIcon.iconClass = executionPlanComparisonPropertiesDifferent;
} else {
diffIcon = (parseFloat(v.primaryProp.displayValue) > parseFloat(v.secondaryProp.displayValue))
? { iconClass: Codicon.chevronRight.classNames, title: greaterThanTitle }
: { iconClass: Codicon.chevronLeft.classNames, title: lessThanTitle };
? { iconClass: ThemeIcon.asClassName(Codicon.chevronRight), title: greaterThanTitle }
: { iconClass: ThemeIcon.asClassName(Codicon.chevronLeft), title: lessThanTitle };
}
break;
case sqlExtHostType.executionPlan.ExecutionPlanGraphElementPropertyDataType.String:
src/sql/workbench/contrib/executionPlan/browser/executionPlanEditor.ts
+1 -1
View File
@@ -39,7 +39,7 @@ export class ExecutionPlanEditor extends EditorPane {
/**
* Called to create the editor in the parent element.
*/
public createEditor(parent: HTMLElement): void {
protected createEditor(parent: HTMLElement): void {
this._parentContainer = parent;
//Enable scrollbars when drawing area is larger than viewport
parent.style.overflow = 'auto';
src/sql/workbench/contrib/executionPlan/browser/executionPlanInput.ts
+2 -2
View File
@@ -7,11 +7,11 @@ import * as path from 'vs/base/common/path';
import { URI } from 'vs/base/common/uri';
import { localize } from 'vs/nls';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import * as azdata from 'azdata';
import { ExecutionPlanEditor } from 'sql/workbench/contrib/executionPlan/browser/executionPlanEditor';
import { IEditorModel, IEditorOptions } from 'vs/platform/editor/common/editor';
export class ExecutionPlanInput extends EditorInput {
@@ -86,7 +86,7 @@ export class ExecutionPlanInput extends EditorInput {
return false;
}
public override async resolve(refresh?: boolean): Promise<EditorModel | undefined> {
public override async resolve(options?: IEditorOptions): Promise<IEditorModel | null> {
if (!this.executionPlanGraphinfo.graphFileContent) {
this.executionPlanGraphinfo.graphFileContent = (await this._fileService.read(this._uri, { acceptTextOnly: true })).value;
}
src/sql/workbench/contrib/executionPlan/browser/executionPlanPropertiesViewBase.ts
+7 -4
View File
@@ -28,6 +28,8 @@ import { Disposable } from 'vs/base/common/lifecycle';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
import { ThemeIcon } from 'vs/base/common/themables';
export abstract class ExecutionPlanPropertiesViewBase extends Disposable implements IVerticalSashLayoutProvider {
// Title bar with close button action
@@ -143,7 +145,8 @@ export abstract class ExecutionPlanPropertiesViewBase extends Disposable impleme
this._propertiesSearchInput = this._register(new InputBox(this._propertiesSearchInputContainer, this._contextViewService, {
ariaDescription: propertiesSearchDescription,
placeholder: searchPlaceholder
placeholder: searchPlaceholder,
inputBoxStyles: defaultInputBoxStyles
}));
this._register(attachInputBoxStyler(this._propertiesSearchInput, this._themeService));
@@ -403,7 +406,7 @@ export class ClosePropertyViewAction extends Action {
public static LABEL = localize('executionPlanPropertyViewClose', "Close");
constructor() {
super(ClosePropertyViewAction.ID, ClosePropertyViewAction.LABEL, Codicon.close.classNames);
super(ClosePropertyViewAction.ID, ClosePropertyViewAction.LABEL, ThemeIcon.asClassName(Codicon.close));
}
public override async run(context: ExecutionPlanPropertiesViewBase): Promise<void> {
@@ -465,7 +468,7 @@ export class ExpandAllPropertiesAction extends Action {
public static LABEL = localize('executionPlanExpandAllProperties', 'Expand All');
constructor() {
super(ExpandAllPropertiesAction.ID, ExpandAllPropertiesAction.LABEL, Codicon.expandAll.classNames);
super(ExpandAllPropertiesAction.ID, ExpandAllPropertiesAction.LABEL, ThemeIcon.asClassName(Codicon.expandAll));
}
public override async run(context: ExecutionPlanPropertiesViewBase): Promise<void> {
@@ -478,7 +481,7 @@ export class CollapseAllPropertiesAction extends Action {
public static LABEL = localize('executionPlanCollapseAllProperties', 'Collapse All');
constructor() {
super(CollapseAllPropertiesAction.ID, CollapseAllPropertiesAction.LABEL, Codicon.collapseAll.classNames);
super(CollapseAllPropertiesAction.ID, CollapseAllPropertiesAction.LABEL, ThemeIcon.asClassName(Codicon.collapseAll));
}
public override async run(context: ExecutionPlanPropertiesViewBase): Promise<void> {
src/sql/workbench/contrib/executionPlan/browser/executionPlanView.ts
+5 -5
View File
@@ -171,12 +171,12 @@ export class ExecutionPlanView extends Disposable implements IHorizontalSashLayo
this._register(this._instantiationService.createInstance(SavePlanFile)),
this._register(new OpenPlanFile()),
this._register(this._instantiationService.createInstance(OpenQueryAction, 'ActionBar')),
this._register(new Separator()),
new Separator(),
this._register(this._instantiationService.createInstance(ZoomInAction, 'ActionBar')),
this._register(this._instantiationService.createInstance(ZoomOutAction, 'ActionBar')),
this._register(this._instantiationService.createInstance(ZoomToFitAction, 'ActionBar')),
this._register(this._instantiationService.createInstance(CustomZoomAction, 'ActionBar')),
this._register(new Separator()),
new Separator(),
this._register(this._instantiationService.createInstance(SearchNodeAction, 'ActionBar')),
this._register(this._instantiationService.createInstance(PropertiesAction, 'ActionBar')),
this._register(this._instantiationService.createInstance(CompareExecutionPlanAction, 'ActionBar')),
@@ -189,18 +189,18 @@ export class ExecutionPlanView extends Disposable implements IHorizontalSashLayo
this._register(this._instantiationService.createInstance(SavePlanFile)),
this._register(new OpenPlanFile()),
this._register(this._instantiationService.createInstance(OpenQueryAction, 'ContextMenu')),
this._register(new Separator()),
new Separator(),
this._register(this._instantiationService.createInstance(ZoomInAction, 'ContextMenu')),
this._register(this._instantiationService.createInstance(ZoomOutAction, 'ContextMenu')),
this._register(this._instantiationService.createInstance(ZoomToFitAction, 'ContextMenu')),
this._register(this._instantiationService.createInstance(CustomZoomAction, 'ContextMenu')),
this._register(new Separator()),
new Separator(),
this._register(this._instantiationService.createInstance(SearchNodeAction, 'ContextMenu')),
this._register(this._instantiationService.createInstance(PropertiesAction, 'ContextMenu')),
this._register(this._instantiationService.createInstance(CompareExecutionPlanAction, 'ContextMenu')),
this._register(this._instantiationService.createInstance(HighlightExpensiveOperationAction, 'ContextMenu')),
this.contextMenuToggleTooltipAction,
this._register(new Separator()),
new Separator(),
];
if (this._queryResultsView) {
src/sql/workbench/contrib/executionPlan/browser/executionPlanViewHeader.ts
+2
View File
@@ -12,6 +12,7 @@ import { RunQueryOnConnectionMode } from 'sql/platform/connection/common/connect
import { Button } from 'sql/base/browser/ui/button/button';
import { removeLineBreaks } from 'sql/base/common/strings';
import { Disposable } from 'vs/base/common/lifecycle';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
export class ExecutionPlanViewHeader extends Disposable {
@@ -106,6 +107,7 @@ export class ExecutionPlanViewHeader extends Disposable {
const link = this._register(new Button(this._recommendationsContainer, {
title: r.displayString,
secondary: true,
...defaultButtonStyles
}));
link.label = r.displayString;
src/sql/workbench/contrib/executionPlan/browser/topOperationsTab.ts
+3 -1
View File
@@ -33,6 +33,7 @@ import { filterIconClassNames, searchPlaceholder, topOperationsSearchDescription
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
const TABLE_SORT_COLUMN_KEY = 'tableCostColumnForSorting';
@@ -182,7 +183,8 @@ export class TopOperationsTabView extends Disposable implements IPanelView {
const topOperationsSearchInput = this._register(new InputBox(headerSearchBarContainer, this._contextViewService, {
ariaDescription: topOperationsSearchDescription,
placeholder: searchPlaceholder
placeholder: searchPlaceholder,
inputBoxStyles: defaultInputBoxStyles,
}));
this._register(attachInputBoxStyler(topOperationsSearchInput, this._themeService));
topOperationsSearchInput.element.classList.add('codicon', filterIconClassNames);
src/sql/workbench/contrib/executionPlan/browser/widgets/customZoomWidget.ts
+7 -5
View File
@@ -18,6 +18,8 @@ import { zoomIconClassNames } from 'sql/workbench/contrib/executionPlan/browser/
import { Button } from 'sql/base/browser/ui/button/button';
import { AzdataGraphView } from 'sql/workbench/contrib/executionPlan/browser/azdataGraphView';
import { ExecutionPlanWidgetController } from 'sql/workbench/contrib/executionPlan/browser/executionPlanWidgetController';
import { defaultButtonStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
import { ThemeIcon } from 'vs/base/common/themables';
export class CustomZoomWidget extends ExecutionPlanWidgetBase {
private _actionBar: ActionBar;
@@ -38,7 +40,8 @@ export class CustomZoomWidget extends ExecutionPlanWidgetBase {
this.customZoomInputBox = this._register(new InputBox(this.container, this.contextViewService, {
type: 'number',
ariaLabel: zoomValueLabel,
flexibleWidth: false
flexibleWidth: false,
inputBoxStyles: defaultInputBoxStyles
}));
this._register(attachInputBoxStyler(this.customZoomInputBox, this.themeService));
@@ -58,7 +61,8 @@ export class CustomZoomWidget extends ExecutionPlanWidgetBase {
}));
const applyButton = this._register(new Button(this.container, {
title: localize('customZoomApplyButtonTitle', "Apply Zoom")
title: localize('customZoomApplyButtonTitle', "Apply Zoom"),
...defaultButtonStyles
}));
applyButton.setWidth('60px');
applyButton.label = localize('customZoomApplyButton', "Apply");
@@ -105,12 +109,10 @@ export class CancelZoom extends Action {
public static LABEL = localize('cancelCustomZoomAction', "Close");
constructor() {
super(CancelZoom.ID, CancelZoom.LABEL, Codicon.chromeClose.classNames);
super(CancelZoom.ID, CancelZoom.LABEL, ThemeIcon.asClassName(Codicon.chromeClose));
}
public override async run(context: CustomZoomWidget): Promise<void> {
context.widgetController.removeWidget(context);
}
}
src/sql/workbench/contrib/executionPlan/browser/widgets/highlightExpensiveNodeWidget.ts
+5 -2
View File
@@ -21,6 +21,8 @@ import { Button } from 'sql/base/browser/ui/button/button';
import { searchIconClassNames } from 'sql/workbench/contrib/executionPlan/browser/constants';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { ThemeIcon } from 'vs/base/common/themables';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
const SELECT_EXPENSE_METRIC_TITLE = localize('executionPlanSelectExpenseMetricTitle', 'Select expense metric');
@@ -125,7 +127,8 @@ export class HighlightExpensiveOperationWidget extends ExecutionPlanWidgetBase {
const self = this;
const applyButton = this._register(new Button(this.container, {
title: localize('highlightExpensiveOperationButtonTitle', 'Highlight Expensive Operation')
title: localize('highlightExpensiveOperationButtonTitle', 'Highlight Expensive Operation'),
...defaultButtonStyles
}));
applyButton.label = localize('highlightExpensiveOperationApplyButton', 'Apply');
@@ -326,7 +329,7 @@ export class CancelHIghlightExpensiveOperationAction extends Action {
public static LABEL = localize('cancelExpensiveOperationAction', 'Close');
constructor() {
super(CancelHIghlightExpensiveOperationAction.ID, CancelHIghlightExpensiveOperationAction.LABEL, Codicon.chromeClose.classNames);
super(CancelHIghlightExpensiveOperationAction.ID, CancelHIghlightExpensiveOperationAction.LABEL, ThemeIcon.asClassName(Codicon.chromeClose));
}
public override async run(context: HighlightExpensiveOperationWidget): Promise<void> {
src/sql/workbench/contrib/executionPlan/browser/widgets/nodeSearchWidget.ts
+9 -4
View File
@@ -17,6 +17,8 @@ import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
import { AzdataGraphView, SearchType } from 'sql/workbench/contrib/executionPlan/browser/azdataGraphView';
import { ExecutionPlanWidgetController } from 'sql/workbench/contrib/executionPlan/browser/executionPlanWidgetController';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
import { ThemeIcon } from 'vs/base/common/themables';
const SELECT_PROPERTY_TITLE = localize('executionPlanSelectPropertyTitle', 'Select property');
const SELECT_SEARCH_TYPE_TITLE = localize('executionPlanSelectSearchTypeTitle', 'Select search type');
@@ -123,7 +125,10 @@ export class NodeSearchWidget extends ExecutionPlanWidgetBase {
}));
// search text input box
this._searchTextInputBox = this._register(new InputBox(this.container, this.contextViewService, {}));
this._searchTextInputBox = this._register(new InputBox(this.container, this.contextViewService,
{
inputBoxStyles: defaultInputBoxStyles
}));
this._searchTextInputBox.setAriaLabel(ENTER_SEARCH_VALUE_TITLE);
this._searchTextInputBox.element.style.marginLeft = '5px';
this._register(attachInputBoxStyler(this._searchTextInputBox, this.themeService));
@@ -204,7 +209,7 @@ export class GoToNextMatchAction extends Action {
public static LABEL = localize('nextSearchItemAction', "Next Match");
constructor() {
super(GoToNextMatchAction.ID, GoToNextMatchAction.LABEL, Codicon.arrowDown.classNames);
super(GoToNextMatchAction.ID, GoToNextMatchAction.LABEL, ThemeIcon.asClassName(Codicon.arrowDown));
}
public override async run(context: NodeSearchWidget): Promise<void> {
@@ -217,7 +222,7 @@ export class GoToPreviousMatchAction extends Action {
public static LABEL = localize('previousSearchItemAction', "Previous Match");
constructor() {
super(GoToPreviousMatchAction.ID, GoToPreviousMatchAction.LABEL, Codicon.arrowUp.classNames);
super(GoToPreviousMatchAction.ID, GoToPreviousMatchAction.LABEL, ThemeIcon.asClassName(Codicon.arrowUp));
}
public override async run(context: NodeSearchWidget): Promise<void> {
@@ -230,7 +235,7 @@ export class CancelSearch extends Action {
public static LABEL = localize('cancelSearchAction', "Close");
constructor() {
super(CancelSearch.ID, CancelSearch.LABEL, Codicon.chromeClose.classNames);
super(CancelSearch.ID, CancelSearch.LABEL, ThemeIcon.asClassName(Codicon.chromeClose));
}
public override async run(context: NodeSearchWidget): Promise<void> {
src/sql/workbench/contrib/extensions/browser/extensions.contribution.ts
+5 -6
View File
@@ -4,18 +4,17 @@
*--------------------------------------------------------------------------------------------*/
import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions } from 'vs/workbench/common/actions';
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import { ExtensionsLabel, IExtensionGalleryService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { IExtensionGalleryService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { OpenExtensionAuthoringDocsAction } from 'sql/workbench/contrib/extensions/browser/extensionsActions';
import { localize } from 'vs/nls';
import { deepClone } from 'vs/base/common/objects';
import { CancellationToken } from 'vs/base/common/cancellation';
import { registerAction2 } from 'vs/platform/actions/common/actions';
// Global Actions
const actionRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchActionExtensions.WorkbenchActions);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(OpenExtensionAuthoringDocsAction), 'Extensions: Author an Extension...', ExtensionsLabel);
registerAction2(OpenExtensionAuthoringDocsAction);
// Register Commands
CommandsRegistry.registerCommand('azdata.extension.open', (accessor: ServicesAccessor, extension: { id: string }) => {
src/sql/workbench/contrib/extensions/browser/extensionsActions.ts
+13 -9
View File
@@ -13,6 +13,8 @@ import { CancellationToken } from 'vs/base/common/cancellation';
import { PagedModel } from 'vs/base/common/paging';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
import { ViewContainerLocation } from 'vs/workbench/common/views';
import { Action2 } from 'vs/platform/actions/common/actions';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
function getScenarioID(scenarioType: string) {
return 'workbench.extensions.action.show' + scenarioType;
@@ -68,21 +70,23 @@ export class InstallRecommendedExtensionsByScenarioAction extends Action {
}
}
export class OpenExtensionAuthoringDocsAction extends Action {
export class OpenExtensionAuthoringDocsAction extends Action2 {
static readonly ID = 'workbench.extensions.action.openExtensionAuthoringDocs';
static readonly LABEL_ORG = "Author an Extension...";
static readonly LABEL = localize('openExtensionAuthoringDocs', "Author an Extension...");
private static readonly extensionAuthoringDocsURI = 'https://docs.microsoft.com/sql/azure-data-studio/extension-authoring';
constructor(
id: string = OpenExtensionAuthoringDocsAction.ID,
label: string = OpenExtensionAuthoringDocsAction.LABEL,
@IOpenerService private readonly openerService: IOpenerService,
) {
super(id, label);
constructor() {
super({
id: OpenExtensionAuthoringDocsAction.ID,
title: { value: OpenExtensionAuthoringDocsAction.LABEL, original: OpenExtensionAuthoringDocsAction.LABEL_ORG },
f1: true,
});
}
override async run(): Promise<void> {
await this.openerService.open(URI.parse(OpenExtensionAuthoringDocsAction.extensionAuthoringDocsURI));
override async run(accessor: ServicesAccessor): Promise<void> {
const openerService = accessor.get(IOpenerService);
await openerService.open(URI.parse(OpenExtensionAuthoringDocsAction.extensionAuthoringDocsURI));
}
}
src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts
+1 -1
View File
@@ -22,7 +22,7 @@ import {
} from 'sql/workbench/contrib/jobManagement/browser/jobHistoryTree';
import { JobStepsViewRow } from 'sql/workbench/contrib/jobManagement/browser/jobStepsViewTree';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { attachListStyler } from 'vs/platform/theme/common/styler';
import { attachListStyler } from 'sql/platform/theme/common/vsstyler';
import { Tree } from 'sql/base/parts/tree/browser/treeImpl';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import 'vs/css!./media/jobStepsView';
import * as nls from 'vs/nls';
import * as dom from 'vs/base/browser/dom';
import { OnInit, Component, Inject, forwardRef, ElementRef, ViewChild, AfterContentChecked } from '@angular/core';
import { attachListStyler } from 'vs/platform/theme/common/styler';
import { attachListStyler } from 'sql/platform/theme/common/vsstyler';
import { Tree } from 'sql/base/parts/tree/browser/treeImpl';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts
+2 -1
View File
@@ -37,6 +37,7 @@ import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
export const JOBSVIEW_SELECTOR: string = 'jobsview-component';
export const ROW_HEIGHT: number = 45;
@@ -188,7 +189,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
});
this.rowDetail = rowDetail;
columns.unshift(this.rowDetail.getColumnDefinition());
let filterPlugin = new HeaderFilter<IItem>(this._contextViewService);
let filterPlugin = new HeaderFilter<IItem>({ buttonStyles: defaultButtonStyles }, this._contextViewService);
this._register(attachTableFilterStyler(filterPlugin, this._themeService));
this.filterPlugin = filterPlugin;
jQuery(this._gridEl.nativeElement).empty();
src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts
+2 -1
View File
@@ -38,6 +38,7 @@ import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IComponentContextService } from 'sql/workbench/services/componentContext/browser/componentContextService';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
export const NOTEBOOKSVIEW_SELECTOR: string = 'notebooksview-component';
@@ -187,7 +188,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
});
this.rowDetail = rowDetail;
columns.unshift(this.rowDetail.getColumnDefinition());
let filterPlugin = new HeaderFilter<IItem>(this._contextViewService);
let filterPlugin = new HeaderFilter<IItem>({ buttonStyles: defaultButtonStyles }, this._contextViewService);
this._register(attachTableFilterStyler(filterPlugin, this._themeService));
this.filterPlugin = filterPlugin;
jQuery(this._gridEl.nativeElement).empty();
src/sql/workbench/contrib/modelView/browser/webview.component.ts
+3 -2
View File
@@ -74,7 +74,8 @@ export default class WebViewComponent extends ComponentBase<WebViewProperties> i
private _createWebview(): void {
this._webview = this.webviewService.createWebviewElement({
id: this.id,
providedViewType: this.id,
title: this.id,
contentOptions: {
allowScripts: true,
},
@@ -117,7 +118,7 @@ export default class WebViewComponent extends ComponentBase<WebViewProperties> i
private setHtml(): void {
if (this._webview && this.html) {
this._renderedHtml = this.html;
this._webview.html = this._renderedHtml;
this._webview.setHtml(this._renderedHtml);
}
}
src/sql/workbench/contrib/notebook/browser/calloutDialog/imageCalloutDialog.ts
+6 -4
View File
@@ -5,7 +5,6 @@
import 'vs/css!./media/imageCalloutDialog';
import * as DOM from 'vs/base/browser/dom';
import * as styler from 'vs/platform/theme/common/styler';
import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
import * as constants from 'sql/workbench/contrib/notebook/browser/calloutDialog/common/constants';
import { URI } from 'vs/base/common/uri';
@@ -27,6 +26,7 @@ import { attachCalloutDialogStyler } from 'sql/workbench/common/styler';
import * as path from 'vs/base/common/path';
import { unquoteText } from 'sql/workbench/contrib/notebook/browser/calloutDialog/common/utils';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
export interface IImageCalloutDialogOptions {
insertTitle?: string,
@@ -149,7 +149,8 @@ export class ImageCalloutDialog extends Modal {
this._contextViewService,
{
placeholder: constants.pathPlaceholder,
ariaLabel: constants.pathInputLabel
ariaLabel: constants.pathInputLabel,
inputBoxStyles: defaultInputBoxStyles
});
let browseButtonContainer = DOM.$('.button-icon');
this._imageBrowseButton = DOM.$('a.codicon.masked-icon.browse-local');
@@ -194,8 +195,9 @@ export class ImageCalloutDialog extends Modal {
}
private registerListeners(): void {
this._register(styler.attachInputBoxStyler(this._imageUrlInputBox, this._themeService));
this._register(styler.attachToggleStyler(this._imageEmbedCheckbox, this._themeService));
// {{SQL CARBON TODO}} - attach styles?
// this._register(styler.attachInputBoxStyler(this._imageUrlInputBox, this._themeService));
// this._register(styler.attachToggleStyler(this._imageEmbedCheckbox, this._themeService));
}
public insert(): void {

Some files were not shown because too many files have changed in this diff Show More