Skip to content

Commit 07b3df7

Browse files
alexdimaalexdima
committed
src/vs/platform/plugins -> src/vs/platform/extensions
1 parent 77e25ac commit 07b3df7

33 files changed

Lines changed: 75 additions & 79 deletions

File tree

‎extensions/php/src/phpMain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export function activate(context: ExtensionContext): any {
2121
let validator = new PHPValidationProvider();
2222
validator.activate(context.subscriptions);
2323

24-
// need to set in the plugin host as well as the completion provider uses it.
24+
// need to set in the extension host as well as the completion provider uses it.
2525
languages.setLanguageConfiguration('php', {
2626
wordPattern: /(-?\d*\.\d\w*)|([^\-\`\~\!\@\#\%\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g
2727
});

‎src/vs/editor/browser/standalone/simpleServices.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ import {EventEmitter} from 'vs/base/common/eventEmitter';
99
import {IDisposable} from 'vs/base/common/lifecycle';
1010
import {Schemas} from 'vs/base/common/network';
1111
import Severity from 'vs/base/common/severity';
12+
import URI from 'vs/base/common/uri';
1213
import {TPromise} from 'vs/base/common/winjs.base';
14+
import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService';
1315
import {IEditor, IEditorInput, IEditorOptions, IEditorService, IResourceInput, ITextEditorModel, Position} from 'vs/platform/editor/common/editor';
16+
import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/extensions/common/abstractPluginService';
17+
import {IPluginDescription} from 'vs/platform/extensions/common/plugins';
1418
import {KeybindingService} from 'vs/platform/keybinding/browser/keybindingServiceImpl';
1519
import {IOSupport} from 'vs/platform/keybinding/common/keybindingResolver';
1620
import {ICommandHandler, ICommandsMap, IKeybindingItem} from 'vs/platform/keybinding/common/keybindingService';
1721
import {IConfirmation, IMessageService} from 'vs/platform/message/common/message';
18-
import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/plugins/common/abstractPluginService';
19-
import {IPluginDescription} from 'vs/platform/plugins/common/plugins';
2022
import {BaseRequestService} from 'vs/platform/request/common/baseRequestService';
2123
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
2224
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
2325
import * as editorCommon from 'vs/editor/common/editorCommon';
2426
import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser';
25-
import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService';
26-
import URI from 'vs/base/common/uri';
2727

2828
export class SimpleEditor implements IEditor {
2929

‎src/vs/editor/browser/standalone/standaloneCodeEditor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import URI from 'vs/base/common/uri';
1111
import {TPromise} from 'vs/base/common/winjs.base';
1212
import {IContextViewService} from 'vs/platform/contextview/browser/contextView';
1313
import {IEditorService} from 'vs/platform/editor/common/editor';
14+
import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry';
1415
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
1516
import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService';
1617
import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
1718
import {AbstractKeybindingService} from 'vs/platform/keybinding/browser/keybindingServiceImpl';
1819
import {ICommandHandler, IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
1920
import {IMarkerService} from 'vs/platform/markers/common/markers';
2021
import {Registry} from 'vs/platform/platform';
21-
import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
2222
import {RemoteTelemetryServiceHelper} from 'vs/platform/telemetry/common/abstractRemoteTelemetryService';
2323
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
2424
import {DefaultConfig} from 'vs/editor/common/config/defaultConfig';

‎src/vs/editor/browser/standalone/standaloneServices.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import {ContextViewService} from 'vs/platform/contextview/browser/contextViewSer
1414
import {IEditorService} from 'vs/platform/editor/common/editor';
1515
import {IEventService} from 'vs/platform/event/common/event';
1616
import {EventService} from 'vs/platform/event/common/eventService';
17+
import {IPluginService} from 'vs/platform/extensions/common/plugins';
1718
import {IFileService} from 'vs/platform/files/common/files';
1819
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
1920
import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService';
2021
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
2122
import {MainProcessMarkerService} from 'vs/platform/markers/common/markerService';
2223
import {IMarkerService} from 'vs/platform/markers/common/markers';
2324
import {IMessageService} from 'vs/platform/message/common/message';
24-
import {IPluginService} from 'vs/platform/plugins/common/plugins';
2525
import {IProgressService} from 'vs/platform/progress/common/progress';
2626
import {IRequestService} from 'vs/platform/request/common/request';
2727
import {ISearchService} from 'vs/platform/search/common/search';

‎src/vs/editor/common/services/modeServiceImpl.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import * as objects from 'vs/base/common/objects';
1212
import * as paths from 'vs/base/common/paths';
1313
import {TPromise} from 'vs/base/common/winjs.base';
1414
import {createAsyncDescriptor0, createAsyncDescriptor1} from 'vs/platform/instantiation/common/descriptors';
15-
import {IPluginService} from 'vs/platform/plugins/common/plugins';
16-
import {IExtensionPointUser, IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
15+
import {IPluginService} from 'vs/platform/extensions/common/plugins';
16+
import {IExtensionPointUser, IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry';
1717
import {IThreadService, Remotable, ThreadAffinity} from 'vs/platform/thread/common/thread';
1818
import * as modes from 'vs/editor/common/modes';
1919
import {FrankensteinMode} from 'vs/editor/common/modes/abstractMode';

‎src/vs/editor/common/worker/editorWorkerServer.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
// include these in the editor bundle because they are widely used by many languages
99
import 'vs/editor/common/languages.common';
1010
import 'vs/editor/common/worker/validationHelper';
11-
1211
import Severity from 'vs/base/common/severity';
1312
import {TPromise} from 'vs/base/common/winjs.base';
1413
import {WorkerServer} from 'vs/base/common/worker/workerServer';
1514
import {EventService} from 'vs/platform/event/common/eventService';
15+
import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/extensions/common/abstractPluginService';
16+
import {IPluginDescription} from 'vs/platform/extensions/common/plugins';
1617
import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService';
1718
import {SecondaryMarkerService} from 'vs/platform/markers/common/markerService';
18-
import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/plugins/common/abstractPluginService';
19-
import {IPluginDescription} from 'vs/platform/plugins/common/plugins';
2019
import {BaseRequestService} from 'vs/platform/request/common/baseRequestService';
2120
import {WorkerTelemetryService} from 'vs/platform/telemetry/common/workerTelemetryService';
2221
import {WorkerThreadService} from 'vs/platform/thread/common/workerThreadService';

‎src/vs/editor/node/textMate/TMSnippets.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {parse} from 'vs/base/common/json';
99
import * as paths from 'vs/base/common/paths';
1010
import {TPromise} from 'vs/base/common/winjs.base';
1111
import {readFile} from 'vs/base/node/pfs';
12-
import {IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
12+
import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry';
1313
import {ISuggestion} from 'vs/editor/common/modes';
1414
import {SnippetsRegistry} from 'vs/editor/common/modes/supports';
1515
import {IModeService} from 'vs/editor/common/services/modeService';

‎src/vs/editor/node/textMate/TMSyntax.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import * as nls from 'vs/nls';
88
import {onUnexpectedError} from 'vs/base/common/errors';
99
import * as paths from 'vs/base/common/paths';
10-
import {IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
10+
import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry';
1111
import {Bracket, ILineTokens, IMode, IToken, ITokenizationSupport} from 'vs/editor/common/modes';
1212
import {TMState} from 'vs/editor/common/modes/TMState';
1313
import {Token} from 'vs/editor/common/modes/supports';

‎src/vs/editor/test/common/servicesTestUtils.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@
55
'use strict';
66

77
import Severity from 'vs/base/common/severity';
8+
import URI from 'vs/base/common/uri';
9+
import {TPromise} from 'vs/base/common/winjs.base';
810
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
11+
import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService';
912
import {IContextMenuService, IContextViewService} from 'vs/platform/contextview/browser/contextView';
1013
import {IEditorService} from 'vs/platform/editor/common/editor';
1114
import {IEventService} from 'vs/platform/event/common/event';
15+
import {EventService} from 'vs/platform/event/common/eventService';
16+
import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/extensions/common/abstractPluginService';
17+
import {IPluginService} from 'vs/platform/extensions/common/plugins';
1218
import {IFileService} from 'vs/platform/files/common/files';
1319
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
1420
import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService';
1521
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
1622
import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
1723
import {IMarkerService} from 'vs/platform/markers/common/markers';
1824
import {IMessageService} from 'vs/platform/message/common/message';
19-
import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/plugins/common/abstractPluginService';
20-
import {IPluginService} from 'vs/platform/plugins/common/plugins';
2125
import {IProgressService} from 'vs/platform/progress/common/progress';
2226
import {IRequestService} from 'vs/platform/request/common/request';
2327
import {ISearchService} from 'vs/platform/search/common/search';
2428
import {IStorageService} from 'vs/platform/storage/common/storage';
2529
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
2630
import {NULL_THREAD_SERVICE} from 'vs/platform/test/common/nullThreadService';
2731
import {IThreadService} from 'vs/platform/thread/common/thread';
32+
import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService';
2833
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
2934
import {IModeService} from 'vs/editor/common/services/modeService';
3035
import {ModeServiceImpl} from 'vs/editor/common/services/modeServiceImpl';
3136
import {IModelService} from 'vs/editor/common/services/modelService';
3237
import {ModelServiceImpl} from 'vs/editor/common/services/modelServiceImpl';
3338
import {IResourceService} from 'vs/editor/common/services/resourceService';
34-
import {TPromise} from 'vs/base/common/winjs.base';
35-
import URI from 'vs/base/common/uri';
36-
import {ConfigurationService, IContent, IStat} from 'vs/platform/configuration/common/configurationService';
37-
import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService';
38-
import {EventService} from 'vs/platform/event/common/eventService';
3939

4040
export interface IMockPlatformServices {
4141
threadService?:IThreadService;

‎src/vs/platform/actions/common/actionsService.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import {IPluginService} from 'vs/platform/plugins/common/plugins';
8-
import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry';
9-
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
10-
import {IAction, Action} from 'vs/base/common/actions';
117
import {localize} from 'vs/nls';
12-
import {IActionsService} from './actions';
8+
import {Action, IAction} from 'vs/base/common/actions';
139
import {IJSONSchema} from 'vs/base/common/jsonSchema';
10+
import {IPluginService} from 'vs/platform/extensions/common/plugins';
11+
import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry';
12+
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
13+
import {IActionsService} from './actions';
1414

1515
interface Commands {
1616
commands: Command | Command[];

0 commit comments

Comments
 (0)