Remove support for isAMD since php is now also commonjs

alexdima · alexdima · commit 3dfbf9058c7c · 2016-03-01T11:40:20.000+01:00
diff --git a/src/vs/platform/plugins/common/abstractPluginService.ts b/src/vs/platform/plugins/common/abstractPluginService.ts
@@ -233,11 +233,3 @@ export abstract class AbstractPluginService<T extends ActivatedPlugin> implement
 
 	protected abstract _actualActivatePlugin(pluginDescription: IPluginDescription): TPromise<T>;
 }
-
-export function loadAMDModule<T>(moduleId: string): TPromise<T> {
-	return new TPromise<T>((c, e, p) => {
-		require([moduleId], (r: T) => {
-			c(r);
-		}, e);
-	});
-}
diff --git a/src/vs/platform/plugins/common/nativePluginService.ts b/src/vs/platform/plugins/common/nativePluginService.ts
@@ -10,7 +10,7 @@ import * as paths from 'vs/base/common/paths';
 import Severity from 'vs/base/common/severity';
 import {TPromise} from 'vs/base/common/winjs.base';
 import {IMessageService} from 'vs/platform/message/common/message';
-import {AbstractPluginService, ActivatedPlugin, IPluginContext, IPluginMemento, loadAMDModule} from 'vs/platform/plugins/common/abstractPluginService';
+import {AbstractPluginService, ActivatedPlugin, IPluginContext, IPluginMemento} from 'vs/platform/plugins/common/abstractPluginService';
 import {IMessage, IPluginDescription, IPluginStatus} from 'vs/platform/plugins/common/plugins';
 import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
 import {PluginHostStorage} from 'vs/platform/storage/common/remotable.storage';
@@ -339,10 +339,6 @@ export class PluginHostPluginService extends AbstractPluginService<ExtHostPlugin
 	}
 
 	protected _loadPluginModule(pluginDescription: IPluginDescription): TPromise<IPluginModule> {
-		if (pluginDescription.isAMD) {
-			return loadAMDModule(uriFromPath(pluginDescription.main));
-		}
-
 		return loadCommonJSModule(pluginDescription.main);
 	}
 
@@ -429,18 +425,3 @@ function loadCommonJSModule<T>(modulePath: string): TPromise<T> {
 	}
 	return TPromise.as(r);
 }
-
-
-// TODO@Alex: Duplicated in:
-// * src\bootstrap.js
-// * src\vs\workbench\electron-main\bootstrap.js
-// * src\vs\platform\plugins\common\nativePluginService.ts
-function uriFromPath(_path) {
-	let pathName = _path.replace(/\\/g, '/');
-
-	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-		pathName = '/' + pathName;
-	}
-
-	return encodeURI('file://' + pathName);
-}
diff --git a/src/vs/platform/plugins/common/plugins.ts b/src/vs/platform/plugins/common/plugins.ts
@@ -22,7 +22,6 @@ export interface IPluginDescription {
 	};
 	main?: string;
 	contributes?: { [point: string]: any; };
-	isAMD: boolean;
 }
 
 export interface IActivationEventListener {
diff --git a/src/vs/platform/plugins/common/pluginsRegistry.ts b/src/vs/platform/plugins/common/pluginsRegistry.ts
@@ -360,10 +360,6 @@ const schema: IJSONSchema = {
 				// extensions will fill in
 			},
 			default: {}
-		},
-		isAMD: {
-			description: nls.localize('vscode.extension.isAMD', 'Indicated whether VS Code should load your code as AMD or CommonJS. Default: false.'),
-			type: 'boolean'
 		}
 	}
 };

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ export interface IPluginDescription {`
`22`	`22`	`};`
`23`	`23`	`main?: string;`
`24`	`24`	`contributes?: { [point: string]: any; };`
`25`		`- isAMD: boolean;`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`export interface IActivationEventListener {`
Original file line number	Diff line number	Diff line change
`@@ -360,10 +360,6 @@ const schema: IJSONSchema = {`
`360`	`360`	`// extensions will fill in`
`361`	`361`	`},`
`362`	`362`	`default: {}`
`363`		`- },`
`364`		`- isAMD: {`
`365`		`- description: nls.localize('vscode.extension.isAMD', 'Indicated whether VS Code should load your code as AMD or CommonJS. Default: false.'),`
`366`		`- type: 'boolean'`
`367`	`363`	`}`
`368`	`364`	`}`
`369`	`365`	`};`