ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 08:40:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/vs/workbench/contrib/debug/browser/debugActions.ts
View File

@@ -14,6 +14,8 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { deepClone } from 'vs/base/common/objects';
import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
import { ThemeIcon } from 'vs/platform/theme/common/themeService';
export abstract class AbstractDebugAction extends Action {
@@ -64,7 +66,7 @@ export class ConfigureAction extends AbstractDebugAction {
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
@IQuickInputService private readonly quickInputService: IQuickInputService
) {
super(id, label, 'debug-action codicon codicon-gear', debugService, keybindingService);
super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.debugConfigure), debugService, keybindingService);
this._register(debugService.getConfigurationManager().onDidSelectConfiguration(() => this.updateClass()));
this.updateClass();
}
@@ -79,7 +81,7 @@ export class ConfigureAction extends AbstractDebugAction {
private updateClass(): void {
const configurationManager = this.debugService.getConfigurationManager();
this.class = configurationManager.selectedConfiguration.name ? 'debug-action codicon codicon-gear' : 'debug-action codicon codicon-gear notification';
this.class = configurationManager.selectedConfiguration.name ? 'debug-action' + ThemeIcon.asClassName(icons.debugConfigure) : 'debug-action ' + ThemeIcon.asClassName(icons.debugConfigure) + ' notification';
}
async run(): Promise<any> {
@@ -132,7 +134,8 @@ export class StartAction extends AbstractDebugAction {
}
async run(): Promise<boolean> {
let { launch, name, config } = this.debugService.getConfigurationManager().selectedConfiguration;
let { launch, name, getConfig } = this.debugService.getConfigurationManager().selectedConfiguration;
const config = await getConfig();
const clonedConfig = deepClone(config);
return this.debugService.startDebugging(launch, clonedConfig || name, { noDebug: this.isNoDebug() });
}
@@ -147,10 +150,10 @@ export class StartAction extends AbstractDebugAction {
if (debugService.state === State.Initializing) {
return false;
}
let { name, config } = debugService.getConfigurationManager().selectedConfiguration;
let nameToStart = name || config?.name;
let { name, launch } = debugService.getConfigurationManager().selectedConfiguration;
let nameToStart = name;
if (sessions.some(s => s.configuration.name === nameToStart)) {
if (sessions.some(s => s.configuration.name === nameToStart && s.root === launch?.workspace)) {
// There is already a debug session running and we do not have any launch configuration selected
return false;
}
@@ -209,7 +212,7 @@ export class RemoveAllBreakpointsAction extends AbstractDebugAction {
static readonly LABEL = nls.localize('removeAllBreakpoints', "Remove All Breakpoints");
constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
super(id, label, 'debug-action codicon-close-all', debugService, keybindingService);
super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.breakpointsRemoveAll), debugService, keybindingService);
this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.updateEnablement()));
}
@@ -267,7 +270,7 @@ export class ToggleBreakpointsActivatedAction extends AbstractDebugAction {
static readonly DEACTIVATE_LABEL = nls.localize('deactivateBreakpoints', "Deactivate Breakpoints");
constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
super(id, label, 'debug-action codicon-activate-breakpoints', debugService, keybindingService);
super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.breakpointsActivate), debugService, keybindingService);
this.updateLabel(this.debugService.getModel().areBreakpointsActivated() ? ToggleBreakpointsActivatedAction.DEACTIVATE_LABEL : ToggleBreakpointsActivatedAction.ACTIVATE_LABEL);
this._register(this.debugService.getModel().onDidChangeBreakpoints(() => {
@@ -310,7 +313,7 @@ export class AddFunctionBreakpointAction extends AbstractDebugAction {
static readonly LABEL = nls.localize('addFunctionBreakpoint', "Add Function Breakpoint");
constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
super(id, label, 'debug-action codicon-add', debugService, keybindingService);
super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.watchExpressionsAddFuncBreakpoint), debugService, keybindingService);
this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.updateEnablement()));
}
@@ -319,7 +322,7 @@ export class AddFunctionBreakpointAction extends AbstractDebugAction {
}
protected isEnabled(_: State): boolean {
return !this.debugService.getViewModel().getSelectedFunctionBreakpoint()
return !this.debugService.getViewModel().getSelectedBreakpoint()
&& this.debugService.getModel().getFunctionBreakpoints().every(fbp => !!fbp.name);
}
}
@@ -329,7 +332,7 @@ export class AddWatchExpressionAction extends AbstractDebugAction {
static readonly LABEL = nls.localize('addWatchExpression', "Add Expression");
constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
super(id, label, 'debug-action codicon-add', debugService, keybindingService);
super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.watchExpressionsAdd), debugService, keybindingService);
this._register(this.debugService.getModel().onDidChangeWatchExpressions(() => this.updateEnablement()));
this._register(this.debugService.getViewModel().onDidSelectExpression(() => this.updateEnablement()));
}
@@ -349,7 +352,7 @@ export class RemoveAllWatchExpressionsAction extends AbstractDebugAction {
static readonly LABEL = nls.localize('removeAllWatchExpressions', "Remove All Expressions");
constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
super(id, label, 'debug-action codicon-close-all', debugService, keybindingService);
super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.watchExpressionsRemoveAll), debugService, keybindingService);
this._register(this.debugService.getModel().onDidChangeWatchExpressions(() => this.updateEnablement()));
}