ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-25 17:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/vs/workbench/node/extensionHostMain.ts
View File

@@ -5,8 +5,8 @@
'use strict';
import nls = require('vs/nls');
import pfs = require('vs/base/node/pfs');
import * as nls from 'vs/nls';
import * as pfs from 'vs/base/node/pfs';
import { TPromise } from 'vs/base/common/winjs.base';
import { join } from 'path';
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
@@ -17,26 +17,24 @@ import { QueryType, ISearchQuery } from 'vs/platform/search/common/search';
import { DiskSearch } from 'vs/workbench/services/search/node/searchService';
import { IInitData, IEnvironment, IWorkspaceData, MainContext } from 'vs/workbench/api/node/extHost.protocol';
import * as errors from 'vs/base/common/errors';
import * as watchdog from 'native-watchdog';
import * as glob from 'vs/base/common/glob';
import { ExtensionActivatedByEvent } from 'vs/workbench/api/node/extHostExtensionActivator';
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
import URI from 'vs/base/common/uri';
import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
// const nativeExit = process.exit.bind(process);
const nativeExit = process.exit.bind(process);
function patchProcess(allowExit: boolean) {
process.exit = function (code) {
process.exit = function (code?: number) {
if (allowExit) {
exit(code);
} else {
const err = new Error('An extension called process.exit() and this was prevented.');
console.warn(err.stack);
}
};
} as (code?: number) => never;
process.crash = function () {
const err = new Error('An extension called process.crash() and this was prevented.');
@@ -44,14 +42,20 @@ function patchProcess(allowExit: boolean) {
};
}
export function exit(code?: number) {
//nativeExit(code);
// TODO@electron
// See https://github.com/Microsoft/vscode/issues/32990
// calling process.exit() does not exit the process when the process is being debugged
// It waits for the debugger to disconnect, but in our version, the debugger does not
// receive an event that the process desires to exit such that it can disconnect.
let watchdog: { exit: (exitCode: number) => void; } = null;
try {
watchdog = require.__$__nodeRequire('native-watchdog');
} catch (err) {
nativeExit(code);
return;
}
// Do exactly what node.js would have done, minus the wait for the debugger part
if (code || code === 0) {
@@ -89,8 +93,7 @@ export class ExtensionHostMain {
// services
const rpcProtocol = new RPCProtocol(protocol);
const environmentService = new EnvironmentService(initData.args, initData.execPath);
this._extHostLogService = new ExtHostLogService(initData.windowId, initData.logLevel, environmentService);
this._extHostLogService = new ExtHostLogService(initData.windowId, initData.logLevel, initData.logsPath);
this.disposables.push(this._extHostLogService);
const extHostWorkspace = new ExtHostWorkspace(rpcProtocol, initData.workspace, this._extHostLogService);
@@ -98,9 +101,10 @@ export class ExtensionHostMain {
this._extHostLogService.trace('initData', initData);
this._extHostConfiguration = new ExtHostConfiguration(rpcProtocol.getProxy(MainContext.MainThreadConfiguration), extHostWorkspace, initData.configuration);
this._extensionService = new ExtHostExtensionService(initData, rpcProtocol, extHostWorkspace, this._extHostConfiguration, this._extHostLogService, environmentService);
this._extensionService = new ExtHostExtensionService(initData, rpcProtocol, extHostWorkspace, this._extHostConfiguration, this._extHostLogService);
// error forwarding and stack trace scanning
Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
const extensionErrors = new WeakMap<Error, IExtensionDescription>();
this._extensionService.getExtensionPathIndex().then(map => {
(<any>Error).prepareStackTrace = (error: Error, stackTrace: errors.V8CallSite[]) => {

2
src/vs/workbench/node/extensionHostProcess.ts
View File

@@ -11,7 +11,7 @@ import { IInitData } from 'vs/workbench/api/node/extHost.protocol';
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
import { Protocol } from 'vs/base/parts/ipc/node/ipc.net';
import { createConnection } from 'net';
import Event, { filterEvent } from 'vs/base/common/event';
import { Event, filterEvent } from 'vs/base/common/event';
interface IRendererConnection {
protocol: IMessagePassingProtocol;