Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sandy081/machineOverridable

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-08-19 17:22:13 +02:00
parent 64875aa7c6 90a35ecc5d
commit da827fefed
66 changed files with 601 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/common/extHostRequireInterceptor.ts
View File

@@ -21,12 +21,12 @@ import { platform } from 'vs/base/common/process';
interface LoadFunction {
(request: string, parent: { filename: string; }, isMain: any): any;
(request: string): any;
}
interface INodeModuleFactory {
readonly nodeModuleName: string | string[];
load(request: string, parent: URI, isMain: any, original: LoadFunction): any;
load(request: string, parent: URI, original: LoadFunction): any;
alternativeModuleName?(name: string): string | undefined;
}
@@ -245,7 +245,7 @@ class OpenNodeModuleFactory implements INodeModuleFactory {
};
}
public load(request: string, parent: URI, isMain: any, original: LoadFunction): any {
public load(request: string, parent: URI, original: LoadFunction): any {
// get extension id from filename and api for extension
const extension = this._extensionPaths.findSubstr(parent.fsPath);
if (extension) {
@@ -253,7 +253,7 @@ class OpenNodeModuleFactory implements INodeModuleFactory {
this.sendShimmingTelemetry();
}
this._original = original(request, { filename: parent.fsPath }, isMain);
this._original = original(request);
return this._impl;
}

20
src/vs/workbench/api/common/menusExtensionPoint.ts
View File

@@ -12,7 +12,7 @@ import { IExtensionPointUser, ExtensionMessageCollector, ExtensionsRegistry } fr
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { MenuId, MenuRegistry, ILocalizedString, IMenuItem } from 'vs/platform/actions/common/actions';
import { URI } from 'vs/base/common/uri';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
namespace schema {
@@ -329,7 +329,7 @@ namespace schema {
};
}
let _commandRegistrations: IDisposable[] = [];
const _commandRegistrations = new DisposableStore();
export const commandsExtensionPoint = ExtensionsRegistry.registerExtensionPoint<schema.IUserFriendlyCommand | schema.IUserFriendlyCommand[]>({
extensionPoint: 'commands',
@@ -338,7 +338,7 @@ export const commandsExtensionPoint = ExtensionsRegistry.registerExtensionPoint<
commandsExtensionPoint.setHandler(extensions => {
function handleCommand(userFriendlyCommand: schema.IUserFriendlyCommand, extension: IExtensionPointUser<any>, disposables: IDisposable[]) {
function handleCommand(userFriendlyCommand: schema.IUserFriendlyCommand, extension: IExtensionPointUser<any>) {
if (!schema.isValidCommand(userFriendlyCommand, extension.collector)) {
return;
@@ -368,20 +368,20 @@ commandsExtensionPoint.setHandler(extensions => {
precondition: ContextKeyExpr.deserialize(enablement),
iconLocation: absoluteIcon
});
disposables.push(registration);
_commandRegistrations.add(registration);
}
// remove all previous command registrations
_commandRegistrations = dispose(_commandRegistrations);
_commandRegistrations.clear();
for (let extension of extensions) {
for (const extension of extensions) {
const { value } = extension;
if (Array.isArray<schema.IUserFriendlyCommand>(value)) {
for (let command of value) {
handleCommand(command, extension, _commandRegistrations);
if (Array.isArray(value)) {
for (const command of value) {
handleCommand(command, extension);
}
} else {
handleCommand(value, extension, _commandRegistrations);
handleCommand(value, extension);
}
}
});