ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode cfc1ab4c5f816765b91fb7ead3c3427a7c8581a3

Browse Source
This commit is contained in:
ADS Merger
2020-03-11 04:19:23 +00:00
parent 16fab722d5
commit 4c3e48773d
880 changed files with 20441 additions and 11232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/base/browser/ui/actionbar/actionbar.css
View File

@@ -45,6 +45,10 @@
display: inline-block;
}
.monaco-action-bar .action-item .codicon {
vertical-align: middle;
}
.monaco-action-bar .action-label {
font-size: 11px;
margin-right: 4px;

10
src/vs/base/browser/ui/actionbar/actionbar.ts
View File

@@ -104,7 +104,7 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
return this._action.enabled;
}
setActionContext(newContext: any): void {
setActionContext(newContext: unknown): void {
this._context = newContext;
}
@@ -248,7 +248,7 @@ export class ActionViewItem extends BaseActionViewItem {
private cssClass?: string;
constructor(context: any, action: IAction, options: IActionViewItemOptions = {}) {
constructor(context: unknown, action: IAction, options: IActionViewItemOptions = {}) {
super(context, action, options);
this.options = options;
@@ -423,7 +423,7 @@ export class ActionBar extends Disposable implements IActionRunner {
options: IActionBarOptions;
private _actionRunner: IActionRunner;
private _context: any;
private _context: unknown;
// View Items
viewItems: IActionViewItem[];
@@ -821,7 +821,7 @@ export class ActionBar extends Disposable implements IActionRunner {
this._onDidCancel.fire();
}
run(action: IAction, context?: any): Promise<void> {
run(action: IAction, context?: unknown): Promise<void> {
return this._actionRunner.run(action, context);
}
@@ -838,7 +838,7 @@ export class ActionBar extends Disposable implements IActionRunner {
export class SelectActionViewItem extends BaseActionViewItem {
protected selectBox: SelectBox;
constructor(ctx: any, action: IAction, options: ISelectOptionItem[], selected: number, contextViewProvider: IContextViewProvider, selectBoxOptions?: ISelectBoxOptions) {
constructor(ctx: unknown, action: IAction, options: ISelectOptionItem[], selected: number, contextViewProvider: IContextViewProvider, selectBoxOptions?: ISelectBoxOptions) {
super(ctx, action);
this.selectBox = new SelectBox(options, selected, contextViewProvider, undefined, selectBoxOptions);