diff --git a/extensions/php/src/phpMain.ts b/extensions/php/src/phpMain.ts index e302d48f727..805a81820c6 100644 --- a/extensions/php/src/phpMain.ts +++ b/extensions/php/src/phpMain.ts @@ -21,7 +21,7 @@ export function activate(context: ExtensionContext): any { let validator = new PHPValidationProvider(); validator.activate(context.subscriptions); - // need to set in the plugin host as well as the completion provider uses it. + // need to set in the extension host as well as the completion provider uses it. languages.setLanguageConfiguration('php', { wordPattern: /(-?\d*\.\d\w*)|([^\-\`\~\!\@\#\%\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g }); diff --git a/src/vs/editor/browser/standalone/simpleServices.ts b/src/vs/editor/browser/standalone/simpleServices.ts index 1c8d62210cb..883dda1a8bd 100644 --- a/src/vs/editor/browser/standalone/simpleServices.ts +++ b/src/vs/editor/browser/standalone/simpleServices.ts @@ -9,21 +9,21 @@ import {EventEmitter} from 'vs/base/common/eventEmitter'; import {IDisposable} from 'vs/base/common/lifecycle'; import {Schemas} from 'vs/base/common/network'; import Severity from 'vs/base/common/severity'; +import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; +import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService'; import {IEditor, IEditorInput, IEditorOptions, IEditorService, IResourceInput, ITextEditorModel, Position} from 'vs/platform/editor/common/editor'; +import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/extensions/common/abstractPluginService'; +import {IPluginDescription} from 'vs/platform/extensions/common/plugins'; import {KeybindingService} from 'vs/platform/keybinding/browser/keybindingServiceImpl'; import {IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; import {ICommandHandler, ICommandsMap, IKeybindingItem} from 'vs/platform/keybinding/common/keybindingService'; import {IConfirmation, IMessageService} from 'vs/platform/message/common/message'; -import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/plugins/common/abstractPluginService'; -import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; import {BaseRequestService} from 'vs/platform/request/common/baseRequestService'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import * as editorCommon from 'vs/editor/common/editorCommon'; import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser'; -import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService'; -import URI from 'vs/base/common/uri'; export class SimpleEditor implements IEditor { diff --git a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts index c2caea97a25..32881d435cb 100644 --- a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts +++ b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts @@ -11,6 +11,7 @@ import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; import {IContextViewService} from 'vs/platform/contextview/browser/contextView'; import {IEditorService} from 'vs/platform/editor/common/editor'; +import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService'; import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; @@ -18,7 +19,6 @@ import {AbstractKeybindingService} from 'vs/platform/keybinding/browser/keybindi import {ICommandHandler, IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {IMarkerService} from 'vs/platform/markers/common/markers'; import {Registry} from 'vs/platform/platform'; -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; import {RemoteTelemetryServiceHelper} from 'vs/platform/telemetry/common/abstractRemoteTelemetryService'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {DefaultConfig} from 'vs/editor/common/config/defaultConfig'; diff --git a/src/vs/editor/browser/standalone/standaloneServices.ts b/src/vs/editor/browser/standalone/standaloneServices.ts index fd74fe993d7..0662240bdc6 100644 --- a/src/vs/editor/browser/standalone/standaloneServices.ts +++ b/src/vs/editor/browser/standalone/standaloneServices.ts @@ -14,6 +14,7 @@ import {ContextViewService} from 'vs/platform/contextview/browser/contextViewSer import {IEditorService} from 'vs/platform/editor/common/editor'; import {IEventService} from 'vs/platform/event/common/event'; import {EventService} from 'vs/platform/event/common/eventService'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; import {IFileService} from 'vs/platform/files/common/files'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService'; @@ -21,7 +22,6 @@ import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingServic import {MainProcessMarkerService} from 'vs/platform/markers/common/markerService'; import {IMarkerService} from 'vs/platform/markers/common/markers'; import {IMessageService} from 'vs/platform/message/common/message'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; import {IProgressService} from 'vs/platform/progress/common/progress'; import {IRequestService} from 'vs/platform/request/common/request'; import {ISearchService} from 'vs/platform/search/common/search'; diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts index ef2d5091c2c..d80b697d4a3 100644 --- a/src/vs/editor/common/services/modeServiceImpl.ts +++ b/src/vs/editor/common/services/modeServiceImpl.ts @@ -12,8 +12,8 @@ import * as objects from 'vs/base/common/objects'; import * as paths from 'vs/base/common/paths'; import {TPromise} from 'vs/base/common/winjs.base'; import {createAsyncDescriptor0, createAsyncDescriptor1} from 'vs/platform/instantiation/common/descriptors'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; -import {IExtensionPointUser, IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; +import {IExtensionPointUser, IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import {IThreadService, Remotable, ThreadAffinity} from 'vs/platform/thread/common/thread'; import * as modes from 'vs/editor/common/modes'; import {FrankensteinMode} from 'vs/editor/common/modes/abstractMode'; diff --git a/src/vs/editor/common/worker/editorWorkerServer.ts b/src/vs/editor/common/worker/editorWorkerServer.ts index e7d3f136820..8a2501e348b 100644 --- a/src/vs/editor/common/worker/editorWorkerServer.ts +++ b/src/vs/editor/common/worker/editorWorkerServer.ts @@ -8,15 +8,14 @@ // include these in the editor bundle because they are widely used by many languages import 'vs/editor/common/languages.common'; import 'vs/editor/common/worker/validationHelper'; - import Severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; import {WorkerServer} from 'vs/base/common/worker/workerServer'; import {EventService} from 'vs/platform/event/common/eventService'; +import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/extensions/common/abstractPluginService'; +import {IPluginDescription} from 'vs/platform/extensions/common/plugins'; import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService'; import {SecondaryMarkerService} from 'vs/platform/markers/common/markerService'; -import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/plugins/common/abstractPluginService'; -import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; import {BaseRequestService} from 'vs/platform/request/common/baseRequestService'; import {WorkerTelemetryService} from 'vs/platform/telemetry/common/workerTelemetryService'; import {WorkerThreadService} from 'vs/platform/thread/common/workerThreadService'; diff --git a/src/vs/editor/node/textMate/TMSnippets.ts b/src/vs/editor/node/textMate/TMSnippets.ts index 48d39c8710e..4414dd24f33 100644 --- a/src/vs/editor/node/textMate/TMSnippets.ts +++ b/src/vs/editor/node/textMate/TMSnippets.ts @@ -9,7 +9,7 @@ import {parse} from 'vs/base/common/json'; import * as paths from 'vs/base/common/paths'; import {TPromise} from 'vs/base/common/winjs.base'; import {readFile} from 'vs/base/node/pfs'; -import {IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import {ISuggestion} from 'vs/editor/common/modes'; import {SnippetsRegistry} from 'vs/editor/common/modes/supports'; import {IModeService} from 'vs/editor/common/services/modeService'; diff --git a/src/vs/editor/node/textMate/TMSyntax.ts b/src/vs/editor/node/textMate/TMSyntax.ts index 387f9d031b7..27f58c15964 100644 --- a/src/vs/editor/node/textMate/TMSyntax.ts +++ b/src/vs/editor/node/textMate/TMSyntax.ts @@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; import {onUnexpectedError} from 'vs/base/common/errors'; import * as paths from 'vs/base/common/paths'; -import {IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import {Bracket, ILineTokens, IMode, IToken, ITokenizationSupport} from 'vs/editor/common/modes'; import {TMState} from 'vs/editor/common/modes/TMState'; import {Token} from 'vs/editor/common/modes/supports'; diff --git a/src/vs/editor/test/common/servicesTestUtils.ts b/src/vs/editor/test/common/servicesTestUtils.ts index 447bb5e67f7..9019b9fb305 100644 --- a/src/vs/editor/test/common/servicesTestUtils.ts +++ b/src/vs/editor/test/common/servicesTestUtils.ts @@ -5,10 +5,16 @@ 'use strict'; import Severity from 'vs/base/common/severity'; +import URI from 'vs/base/common/uri'; +import {TPromise} from 'vs/base/common/winjs.base'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; +import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService'; import {IContextMenuService, IContextViewService} from 'vs/platform/contextview/browser/contextView'; import {IEditorService} from 'vs/platform/editor/common/editor'; import {IEventService} from 'vs/platform/event/common/event'; +import {EventService} from 'vs/platform/event/common/eventService'; +import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/extensions/common/abstractPluginService'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; import {IFileService} from 'vs/platform/files/common/files'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService'; @@ -16,8 +22,6 @@ import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingServic import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; import {IMarkerService} from 'vs/platform/markers/common/markers'; import {IMessageService} from 'vs/platform/message/common/message'; -import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/plugins/common/abstractPluginService'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; import {IProgressService} from 'vs/platform/progress/common/progress'; import {IRequestService} from 'vs/platform/request/common/request'; import {ISearchService} from 'vs/platform/search/common/search'; @@ -25,17 +29,13 @@ import {IStorageService} from 'vs/platform/storage/common/storage'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {NULL_THREAD_SERVICE} from 'vs/platform/test/common/nullThreadService'; import {IThreadService} from 'vs/platform/thread/common/thread'; +import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {IModeService} from 'vs/editor/common/services/modeService'; import {ModeServiceImpl} from 'vs/editor/common/services/modeServiceImpl'; import {IModelService} from 'vs/editor/common/services/modelService'; import {ModelServiceImpl} from 'vs/editor/common/services/modelServiceImpl'; import {IResourceService} from 'vs/editor/common/services/resourceService'; -import {TPromise} from 'vs/base/common/winjs.base'; -import URI from 'vs/base/common/uri'; -import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService'; -import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService'; -import {EventService} from 'vs/platform/event/common/eventService'; export interface IMockPlatformServices { threadService?:IThreadService; diff --git a/src/vs/platform/actions/common/actionsService.ts b/src/vs/platform/actions/common/actionsService.ts index 8606fb9e7e7..aba6963c7b0 100644 --- a/src/vs/platform/actions/common/actionsService.ts +++ b/src/vs/platform/actions/common/actionsService.ts @@ -4,13 +4,13 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; -import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; -import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; -import {IAction, Action} from 'vs/base/common/actions'; import {localize} from 'vs/nls'; -import {IActionsService} from './actions'; +import {Action, IAction} from 'vs/base/common/actions'; import {IJSONSchema} from 'vs/base/common/jsonSchema'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; +import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; +import {IActionsService} from './actions'; interface Commands { commands: Command | Command[]; diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index fef423eba29..dbfc54d9580 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/src/vs/platform/configuration/common/configurationRegistry.ts @@ -9,7 +9,7 @@ import Event, {Emitter} from 'vs/base/common/event'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import platform = require('vs/platform/platform'); import objects = require('vs/base/common/objects'); -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); diff --git a/src/vs/platform/plugins/common/abstractPluginService.ts b/src/vs/platform/extensions/common/abstractPluginService.ts similarity index 98% rename from src/vs/platform/plugins/common/abstractPluginService.ts rename to src/vs/platform/extensions/common/abstractPluginService.ts index 3a183fcbc9d..a03a8b04df5 100644 --- a/src/vs/platform/plugins/common/abstractPluginService.ts +++ b/src/vs/platform/extensions/common/abstractPluginService.ts @@ -8,8 +8,8 @@ import * as nls from 'vs/nls'; import {IDisposable} from 'vs/base/common/lifecycle'; import Severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; -import {IActivationEventListener, IMessage, IPluginDescription, IPluginService, IPluginStatus} from 'vs/platform/plugins/common/plugins'; -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {IActivationEventListener, IMessage, IPluginDescription, IPluginService, IPluginStatus} from 'vs/platform/extensions/common/plugins'; +import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; const hasOwnProperty = Object.hasOwnProperty; diff --git a/src/vs/platform/plugins/common/ipcRemoteCom.ts b/src/vs/platform/extensions/common/ipcRemoteCom.ts similarity index 100% rename from src/vs/platform/plugins/common/ipcRemoteCom.ts rename to src/vs/platform/extensions/common/ipcRemoteCom.ts diff --git a/src/vs/platform/plugins/common/nativePluginService.ts b/src/vs/platform/extensions/common/nativePluginService.ts similarity index 98% rename from src/vs/platform/plugins/common/nativePluginService.ts rename to src/vs/platform/extensions/common/nativePluginService.ts index 73b4456665b..4c04bd5ff50 100644 --- a/src/vs/platform/plugins/common/nativePluginService.ts +++ b/src/vs/platform/extensions/common/nativePluginService.ts @@ -9,10 +9,10 @@ import {IDisposable} from 'vs/base/common/lifecycle'; import * as paths from 'vs/base/common/paths'; import Severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; +import {AbstractPluginService, ActivatedPlugin, IPluginContext, IPluginMemento} from 'vs/platform/extensions/common/abstractPluginService'; +import {IMessage, IPluginDescription, IPluginStatus} from 'vs/platform/extensions/common/plugins'; +import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import {IMessageService} from 'vs/platform/message/common/message'; -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'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IThreadService, Remotable} from 'vs/platform/thread/common/thread'; diff --git a/src/vs/platform/plugins/common/plugins.ts b/src/vs/platform/extensions/common/plugins.ts similarity index 100% rename from src/vs/platform/plugins/common/plugins.ts rename to src/vs/platform/extensions/common/plugins.ts diff --git a/src/vs/platform/plugins/common/pluginsRegistry.ts b/src/vs/platform/extensions/common/pluginsRegistry.ts similarity index 99% rename from src/vs/platform/plugins/common/pluginsRegistry.ts rename to src/vs/platform/extensions/common/pluginsRegistry.ts index 967cabc7af0..11996e8f63c 100644 --- a/src/vs/platform/plugins/common/pluginsRegistry.ts +++ b/src/vs/platform/extensions/common/pluginsRegistry.ts @@ -9,9 +9,9 @@ import {onUnexpectedError} from 'vs/base/common/errors'; import {IJSONSchema} from 'vs/base/common/jsonSchema'; import * as paths from 'vs/base/common/paths'; import Severity from 'vs/base/common/severity'; +import {IActivationEventListener, IMessage, IPluginDescription, IPointListener} from 'vs/platform/extensions/common/plugins'; import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; import {Registry} from 'vs/platform/platform'; -import {IActivationEventListener, IMessage, IPluginDescription, IPointListener} from 'vs/platform/plugins/common/plugins'; export interface IMessageCollector { error(message: any): void; diff --git a/src/vs/platform/plugins/node/pluginVersionValidator.ts b/src/vs/platform/extensions/node/pluginVersionValidator.ts similarity index 96% rename from src/vs/platform/plugins/node/pluginVersionValidator.ts rename to src/vs/platform/extensions/node/pluginVersionValidator.ts index 2597db5e27d..7c1ababfbbb 100644 --- a/src/vs/platform/plugins/node/pluginVersionValidator.ts +++ b/src/vs/platform/extensions/node/pluginVersionValidator.ts @@ -5,9 +5,9 @@ 'use strict'; import * as nls from 'vs/nls'; -import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; -import {isValidPluginDescription as baseIsValidPluginDescription} from 'vs/platform/plugins/common/pluginsRegistry'; -import * as semver from 'semver'; +import {IPluginDescription} from 'vs/platform/extensions/common/plugins'; +import {isValidPluginDescription as baseIsValidPluginDescription} from 'vs/platform/extensions/common/pluginsRegistry'; +import {valid} from 'semver'; export interface IParsedVersion { hasCaret: boolean; @@ -209,7 +209,7 @@ export function isValidPluginDescription(version: string, extensionFolderPath: s return false; } - if (!semver.valid(pluginDescription.version)) { + if (!valid(pluginDescription.version)) { notices.push(nls.localize('notSemver', "Extension version is not semver compatible.")); return false; } diff --git a/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts b/src/vs/platform/extensions/test/node/pluginVersionValidator.test.ts similarity index 99% rename from src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts rename to src/vs/platform/extensions/test/node/pluginVersionValidator.test.ts index 56bb4b860a4..11add19b4e3 100644 --- a/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts +++ b/src/vs/platform/extensions/test/node/pluginVersionValidator.test.ts @@ -5,7 +5,7 @@ 'use strict'; import * as assert from 'assert'; -import {INormalizedVersion, IParsedVersion, IReducedExtensionDescription, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion} from 'vs/platform/plugins/node/pluginVersionValidator'; +import {INormalizedVersion, IParsedVersion, IReducedExtensionDescription, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion} from 'vs/platform/extensions/node/pluginVersionValidator'; suite('Plugin Version Validator', () => { diff --git a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts index d2145759d4e..bd98b4dc6fb 100644 --- a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts +++ b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts @@ -5,7 +5,7 @@ 'use strict'; import nls = require('vs/nls'); -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import {Registry} from 'vs/platform/platform'; import URI from 'vs/base/common/uri'; import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 8dff94709ab..85a5e63abc0 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -29,9 +29,9 @@ import URI from 'vs/base/common/uri'; import Severity from 'vs/base/common/severity'; import {IDisposable} from 'vs/base/common/lifecycle'; import EditorCommon = require('vs/editor/common/editorCommon'); -import {IPluginService, IPluginDescription} from 'vs/platform/plugins/common/plugins'; -import {PluginHostPluginService} from 'vs/platform/plugins/common/nativePluginService'; -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {IPluginService, IPluginDescription} from 'vs/platform/extensions/common/plugins'; +import {PluginHostPluginService} from 'vs/platform/extensions/common/nativePluginService'; +import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; import {TPromise} from 'vs/base/common/winjs.base'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {CancellationTokenSource} from 'vs/base/common/cancellation'; diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts index 9b1256a3470..45fdc848264 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -59,7 +59,7 @@ import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; import {IMessageService} from 'vs/platform/message/common/message'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IThreadService} from 'vs/platform/thread/common/thread'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; import {AbstractThreadService} from 'vs/platform/thread/common/abstractThreadService'; import {IStatusbarService} from 'vs/workbench/services/statusbar/common/statusbarService'; diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index f508ad5eedb..b35f5ca33c9 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -53,7 +53,7 @@ import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService'; import {EditorWorkerServiceImpl} from 'vs/editor/common/services/editorWorkerServiceImpl'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; import {MainProcessVSCodeAPIHelper} from 'vs/workbench/api/node/extHost.api.impl'; -import {MainProcessPluginService} from 'vs/platform/plugins/common/nativePluginService'; +import {MainProcessPluginService} from 'vs/platform/extensions/common/nativePluginService'; import {MainThreadDocuments} from 'vs/workbench/api/node/extHostDocuments'; import {MainProcessTextMateSyntax} from 'vs/editor/node/textMate/TMSyntax'; import {MainProcessTextMateSnippet} from 'vs/editor/node/textMate/TMSnippets'; @@ -91,7 +91,7 @@ import {IRequestService} from 'vs/platform/request/common/request'; import {ISearchService} from 'vs/platform/search/common/search'; import {IThreadService} from 'vs/platform/thread/common/thread'; import {IWorkspaceContextService, IConfiguration, IWorkspace} from 'vs/platform/workspace/common/workspace'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; import {MainThreadModeServiceImpl} from 'vs/editor/common/services/modeServiceImpl'; import {IModeService} from 'vs/editor/common/services/modeService'; import {IUntitledEditorService, UntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService'; diff --git a/src/vs/workbench/node/extensionPoints.ts b/src/vs/workbench/node/extensionPoints.ts index c636ad979b2..bd61bf699ae 100644 --- a/src/vs/workbench/node/extensionPoints.ts +++ b/src/vs/workbench/node/extensionPoints.ts @@ -6,14 +6,14 @@ 'use strict'; import pfs = require('vs/base/node/pfs'); -import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; +import {IPluginDescription} from 'vs/platform/extensions/common/plugins'; import {TPromise} from 'vs/base/common/winjs.base'; import {groupBy, values} from 'vs/base/common/collections'; import paths = require('vs/base/common/paths'); import json = require('vs/base/common/json'); import Types = require('vs/base/common/types'); -import {IPluginsMessageCollector, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; -import {isValidPluginDescription} from 'vs/platform/plugins/node/pluginVersionValidator'; +import {IPluginsMessageCollector, IMessageCollector} from 'vs/platform/extensions/common/pluginsRegistry'; +import {isValidPluginDescription} from 'vs/platform/extensions/node/pluginVersionValidator'; import * as semver from 'semver'; const MANIFEST_FILE = 'package.json'; diff --git a/src/vs/workbench/node/pluginHostMain.ts b/src/vs/workbench/node/pluginHostMain.ts index 6161292c0f8..fc4cdf0efe9 100644 --- a/src/vs/workbench/node/pluginHostMain.ts +++ b/src/vs/workbench/node/pluginHostMain.ts @@ -7,23 +7,20 @@ import nls = require('vs/nls'); -import 'vs/base/common/async'; -import 'vs/base/node/stdFork'; -import 'vs/languages/lib/common/wireProtocol'; import pfs = require('vs/base/node/pfs'); import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; import paths = require('vs/base/common/paths'); -import {IPluginService, IPluginDescription} from 'vs/platform/plugins/common/plugins'; -import {PluginsRegistry, PluginsMessageCollector, IPluginsMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; +import {IPluginService, IPluginDescription} from 'vs/platform/extensions/common/plugins'; +import {PluginsRegistry, PluginsMessageCollector, IPluginsMessageCollector} from 'vs/platform/extensions/common/pluginsRegistry'; import {ExtHostAPIImplementation} from 'vs/workbench/api/node/extHost.api.impl'; -import {IPluginsIPC} from 'vs/platform/plugins/common/ipcRemoteCom'; +import {IPluginsIPC} from 'vs/platform/extensions/common/ipcRemoteCom'; import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments'; import {IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import InstantiationService = require('vs/platform/instantiation/common/instantiationService'); -import {PluginHostPluginService} from 'vs/platform/plugins/common/nativePluginService'; +import {PluginHostPluginService} from 'vs/platform/extensions/common/nativePluginService'; import {PluginHostThreadService} from 'vs/platform/thread/common/pluginHostThreadService'; import {ExtHostTelemetryService} from 'vs/workbench/api/node/extHostTelemetry'; import {BaseRequestService} from 'vs/platform/request/common/baseRequestService'; diff --git a/src/vs/workbench/node/pluginHostProcess.ts b/src/vs/workbench/node/pluginHostProcess.ts index 3bc4b2ec1ce..7d355beb0fc 100644 --- a/src/vs/workbench/node/pluginHostProcess.ts +++ b/src/vs/workbench/node/pluginHostProcess.ts @@ -9,7 +9,7 @@ import {onUnexpectedError} from 'vs/base/common/errors'; import { TPromise } from 'vs/base/common/winjs.base'; import { PluginHostMain, createServices, IInitData, exit } from 'vs/workbench/node/pluginHostMain'; import { Client, connect } from 'vs/base/node/service.net'; -import { create as createIPC, IPluginsIPC } from 'vs/platform/plugins/common/ipcRemoteCom'; +import { create as createIPC, IPluginsIPC } from 'vs/platform/extensions/common/ipcRemoteCom'; import marshalling = require('vs/base/common/marshalling'); interface IRendererConnection { diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index db8071729ee..506f750b34d 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -21,7 +21,7 @@ import editorbrowser = require('vs/editor/browser/editorBrowser'); import { IKeybindingService, IKeybindingContextKey } from 'vs/platform/keybinding/common/keybindingService'; import {IMarkerService} from 'vs/platform/markers/common/markers'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; -import { IPluginService } from 'vs/platform/plugins/common/plugins'; +import { IPluginService } from 'vs/platform/extensions/common/plugins'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IFileService, FileChangesEvent, FileChangeType, EventType } from 'vs/platform/files/common/files'; import { IEventService } from 'vs/platform/event/common/event'; diff --git a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts index 8882f144069..63aefc2573c 100644 --- a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts @@ -12,7 +12,7 @@ import { Schemas } from 'vs/base/common/network'; import paths = require('vs/base/common/paths'); import { IJSONSchema } from 'vs/base/common/jsonSchema'; import editor = require('vs/editor/common/editorCommon'); -import pluginsRegistry = require('vs/platform/plugins/common/pluginsRegistry'); +import pluginsRegistry = require('vs/platform/extensions/common/pluginsRegistry'); import platform = require('vs/platform/platform'); import jsonContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsWidgets.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsWidgets.ts index 66a8c7850d6..8c48dee311c 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsWidgets.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsWidgets.ts @@ -11,7 +11,7 @@ import lifecycle = require('vs/base/common/lifecycle'); import {onUnexpectedError} from 'vs/base/common/errors'; import { Action } from 'vs/base/common/actions'; import statusbar = require('vs/workbench/browser/parts/statusbar/statusbar'); -import { IPluginService, IPluginStatus } from 'vs/platform/plugins/common/plugins'; +import { IPluginService, IPluginStatus } from 'vs/platform/extensions/common/plugins'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/parts/extensions/node/extensionsService.ts b/src/vs/workbench/parts/extensions/node/extensionsService.ts index c9e074bc0c4..2b2fac735a5 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsService.ts @@ -24,7 +24,7 @@ import Event, { Emitter } from 'vs/base/common/event'; import { UserSettings } from 'vs/workbench/node/userSettings'; import * as semver from 'semver'; import { groupBy, values } from 'vs/base/common/collections'; -import { isValidExtensionVersion } from 'vs/platform/plugins/node/pluginVersionValidator'; +import { isValidExtensionVersion } from 'vs/platform/extensions/node/pluginVersionValidator'; function parseManifest(raw: string): TPromise { return new Promise((c, e) => { diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index 14fdc99f21e..5610039b31f 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -38,7 +38,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IConfigurationService, ConfigurationServiceEventTypes } from 'vs/platform/configuration/common/configuration'; import { IFileService, FileChangesEvent, FileChangeType, EventType as FileEventType } from 'vs/platform/files/common/files'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IPluginService } from 'vs/platform/plugins/common/plugins'; +import { IPluginService } from 'vs/platform/extensions/common/plugins'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybindingService'; import { IModeService } from 'vs/editor/common/services/modeService'; diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts index 52c01033b89..2e227f681ab 100644 --- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts @@ -4,25 +4,25 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); -import {TPromise} from 'vs/base/common/winjs.base'; -import {IJSONSchema} from 'vs/base/common/jsonSchema'; +import * as nls from 'vs/nls'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; -import {Registry} from 'vs/platform/platform'; +import {IJSONSchema} from 'vs/base/common/jsonSchema'; +import {Keybinding} from 'vs/base/common/keyCodes'; +import * as platform from 'vs/base/common/platform'; +import {TPromise} from 'vs/base/common/winjs.base'; import {IEventService} from 'vs/platform/event/common/event'; -import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; -import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; -import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; -import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; -import {IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; +import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; import {KeybindingService} from 'vs/platform/keybinding/browser/keybindingServiceImpl'; +import {IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; import {IKeybindingItem, IUserFriendlyKeybinding} from 'vs/platform/keybinding/common/keybindingService'; import {ICommandRule, KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry'; -import {Keybinding} from 'vs/base/common/keyCodes'; -import * as Platform from 'vs/base/common/platform'; +import {Registry} from 'vs/platform/platform'; +import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; +import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; +import {EventType, OptionsChangeEvent} from 'vs/workbench/common/events'; import {getNativeLabelProvider} from 'vs/workbench/services/keybinding/electron-browser/nativeKeymap'; -import {OptionsChangeEvent, EventType} from 'vs/workbench/common/events'; interface ContributedKeyBinding { command: string; @@ -193,7 +193,7 @@ export class WorkbenchKeybindingService extends KeybindingService { } public getElectronAcceleratorFor(keybinding:Keybinding): string { - if (Platform.isWindows) { + if (platform.isWindows) { // electron menus always do the correct rendering on Windows return super.getElectronAcceleratorFor(keybinding); } @@ -309,7 +309,7 @@ let schema : IJSONSchema = { } }; -let schemaRegistry = Registry.as(JSONContributionRegistry.Extensions.JSONContribution); +let schemaRegistry = Registry.as(Extensions.JSONContribution); schemaRegistry.registerSchema(schemaId, schema); schemaRegistry.addSchemaFileAssociation('vscode://defaultsettings/keybindings.json', schemaId); schemaRegistry.addSchemaFileAssociation('%APP_SETTINGS_HOME%/keybindings.json', schemaId); diff --git a/src/vs/workbench/services/themes/node/themeService.ts b/src/vs/workbench/services/themes/node/themeService.ts index bd8794ff4e5..1bb5d62004a 100644 --- a/src/vs/workbench/services/themes/node/themeService.ts +++ b/src/vs/workbench/services/themes/node/themeService.ts @@ -9,8 +9,8 @@ import nls = require('vs/nls'); import Paths = require('vs/base/common/paths'); import Themes = require('vs/platform/theme/common/themes'); import {IThemeExtensionPoint} from 'vs/platform/theme/common/themeExtensionPoint'; -import {IPluginService} from 'vs/platform/plugins/common/plugins'; -import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; +import {IPluginService} from 'vs/platform/extensions/common/plugins'; +import {PluginsRegistry, IMessageCollector} from 'vs/platform/extensions/common/pluginsRegistry'; import {IThemeService, IThemeData, DEFAULT_THEME_ID} from 'vs/workbench/services/themes/common/themeService'; import plist = require('vs/base/node/plist'); diff --git a/src/vs/workbench/services/thread/electron-browser/threadService.ts b/src/vs/workbench/services/thread/electron-browser/threadService.ts index 251b6526886..fd3125d4045 100644 --- a/src/vs/workbench/services/thread/electron-browser/threadService.ts +++ b/src/vs/workbench/services/thread/electron-browser/threadService.ts @@ -9,7 +9,7 @@ import {Action} from 'vs/base/common/actions'; import {TPromise} from 'vs/base/common/winjs.base'; import nls = require('vs/nls'); import {MainThreadService as CommonMainThreadService} from 'vs/platform/thread/common/mainThreadService'; -import pluginsIPC = require('vs/platform/plugins/common/ipcRemoteCom'); +import pluginsIPC = require('vs/platform/extensions/common/ipcRemoteCom'); import marshalling = require('vs/base/common/marshalling'); import strings = require('vs/base/common/strings'); import objects = require('vs/base/common/objects');