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

Merge from vscode 8a997f7321ae6612fc0e6eb3eac4f358a6233bfb

Browse Source
This commit is contained in:
ADS Merger
2020-02-11 07:08:19 +00:00
parent 0f934081e1
commit 085752f111
217 changed files with 2561 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/services/extensions/browser/extensionService.ts
View File

@@ -140,8 +140,10 @@ export class ExtensionService extends AbstractExtensionService implements IExten
}
public _onExtensionHostExit(code: number): void {
console.log(`vscode:exit`, code);
// ipc.send('vscode:exit', code);
// We log the exit code to the console. Do NOT remove this
// code as the automated integration tests in browser rely
// on this message to exit properly.
console.log(`vscode:exit ${code}`);
}
}

2
src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts
View File

@@ -395,7 +395,7 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
id: 'editor.action.measureExtHostLatency',
title: {
value: nls.localize('measureExtHostLatency', "Measure Extension Host Latency"),
original: 'Developer: Measure Extension Host Latency'
original: 'Measure Extension Host Latency'
},
category: nls.localize('developer', "Developer"),
f1: true

4
src/vs/workbench/services/extensions/common/rpcProtocol.ts
View File

@@ -180,8 +180,8 @@ export class RPCProtocol extends Disposable implements IRPCProtocol {
private _createProxy<T>(rpcId: number): T {
let handler = {
get: (target: any, name: string) => {
if (!target[name] && name.charCodeAt(0) === CharCode.DollarSign) {
get: (target: any, name: PropertyKey) => {
if (typeof name === 'string' && !target[name] && name.charCodeAt(0) === CharCode.DollarSign) {
target[name] = (...myArgs: any[]) => {
return this._remoteCall(rpcId, name, myArgs);
};

6
src/vs/workbench/services/extensions/node/proxyResolver.ts
View File

@@ -340,7 +340,7 @@ function patches(originals: typeof http | typeof https, resolveProxy: ReturnType
options = options || {};
if (options.socketPath) {
return original.apply(null, arguments as unknown as any[]);
return original.apply(null, arguments as any);
}
const originalAgent = options.agent;
@@ -376,7 +376,7 @@ function patches(originals: typeof http | typeof https, resolveProxy: ReturnType
return original(options, callback);
}
return original.apply(null, arguments as unknown as any[]);
return original.apply(null, arguments as any);
}
return patched;
}
@@ -389,7 +389,7 @@ function tlsPatches(originals: typeof tls) {
function patch(original: typeof tls.createSecureContext): typeof tls.createSecureContext {
return function (details: tls.SecureContextOptions): ReturnType<typeof tls.createSecureContext> {
const context = original.apply(null, arguments as unknown as any[]);
const context = original.apply(null, arguments as any);
const certs = (details as any)._vscodeAdditionalCaCerts;
if (certs) {
for (const cert of certs) {

2
src/vs/workbench/services/extensions/worker/extHost.services.ts
View File

@@ -43,7 +43,7 @@ function NotImplementedProxy<T>(name: ServiceIdentifier<T>): { new(): T } {
return <any>class {
constructor() {
return new Proxy({}, {
get(target: any, prop: string | number) {
get(target: any, prop: PropertyKey) {
if (target[prop]) {
return target[prop];
}