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 4d91d96e5e121b38d33508cdef17868bab255eae

Browse Source
This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/issue/common/issue.ts
View File

@@ -88,7 +88,7 @@ export interface ProcessExplorerData extends WindowData {
}
export interface ICommonIssueService {
_serviceBrand: undefined;
readonly _serviceBrand: undefined;
openReporter(data: IssueReporterData): Promise<void>;
openProcessExplorer(data: ProcessExplorerData): Promise<void>;
getSystemStatus(): Promise<string>;

8
src/vs/platform/issue/electron-main/issueMainService.ts
View File

@@ -28,7 +28,7 @@ export const IIssueMainService = createDecorator<IIssueMainService>('issueMainSe
export interface IIssueMainService extends ICommonIssueService { }
export class IssueMainService implements ICommonIssueService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
_issueWindow: BrowserWindow | null = null;
_issueParentWindow: BrowserWindow | null = null;
_processExplorerWindow: BrowserWindow | null = null;
@@ -196,7 +196,8 @@ export class IssueMainService implements ICommonIssueService {
webPreferences: {
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
nodeIntegration: true,
enableWebSQL: false
enableWebSQL: false,
nativeWindowOpen: true
}
});
@@ -247,7 +248,8 @@ export class IssueMainService implements ICommonIssueService {
webPreferences: {
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
nodeIntegration: true,
enableWebSQL: false
enableWebSQL: false,
nativeWindowOpen: true
}
});