ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 09:38:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2f984aad710215f4e4684a035bb02f55d1a9e2cc (#9819)

Browse Source
This commit is contained in:
Anthony Dresser
2020-04-01 00:44:39 -07:00
committed by GitHub
parent 0e27aaa61f
commit 0bfbdc62ed
247 changed files with 5402 additions and 3311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
View File

@@ -36,6 +36,7 @@ import { IViewDescriptorService } from 'vs/workbench/common/views';
import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
const $ = dom.$;
@@ -76,7 +77,7 @@ export class BreakpointsView extends ViewPane {
) {
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
this.minimumBodySize = this.maximumBodySize = getExpandedBodySize(this.debugService.getModel());
this.updateSize();
this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.onBreakpointsChange()));
}
@@ -227,12 +228,15 @@ export class BreakpointsView extends ViewPane {
];
}
private updateSize(): void {
// Adjust expanded body size
this.minimumBodySize = this.orientation === Orientation.VERTICAL ? getExpandedBodySize(this.debugService.getModel()) : 170;
this.maximumBodySize = this.orientation === Orientation.VERTICAL ? this.minimumBodySize : Number.POSITIVE_INFINITY;
}
private onBreakpointsChange(): void {
if (this.isBodyVisible()) {
this.minimumBodySize = getExpandedBodySize(this.debugService.getModel());
if (this.maximumBodySize < Number.POSITIVE_INFINITY) {
this.maximumBodySize = this.minimumBodySize;
}
this.updateSize();
if (this.list) {
this.list.splice(0, this.list.length, this.elements);
this.needsRefresh = false;

5
src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts
View File

@@ -13,7 +13,6 @@ import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService'
import { IChannel } from 'vs/base/parts/ipc/common/ipc';
import { Event } from 'vs/base/common/event';
import { URI } from 'vs/base/common/uri';
import { mapToSerializable } from 'vs/base/common/map';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { IWorkspaceProvider, IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
import { IProcessEnvironment } from 'vs/base/common/platform';
@@ -107,8 +106,8 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
// Open debug window as new window. Pass ParsedArgs over.
return this.workspaceProvider.open(debugWorkspace, {
reuse: false, // debugging always requires a new window
payload: mapToSerializable(environment) // mandatory properties to enable debugging
reuse: false, // debugging always requires a new window
payload: Array.from(environment.entries()) // mandatory properties to enable debugging
});
}