modesRegistry.getRegisteredModes -> modeService.getRegisteredModes

src/vs/editor/common/modes/modesRegistry.ts

@@ -28,7 +28,6 @@ export interface IEditorModesRegistry {
 	registerMode(def:ILegacyLanguageDefinition): void;
 
 	// --- reading
-	getRegisteredModes(): string[];
 	getRegisteredMimetypes(): string[];
 	getRegisteredLanguageNames(): string[];
 	getExtensions(alias: string): string[];
@@ -70,10 +69,6 @@ class EditorModesRegistry implements IEditorModesRegistry {
 
 	// --- modes registration
 
-	public getRegisteredModes(): string[] {
-		return LanguageExtensions.getRegisteredModes();
-	}
-
 	public getRegisteredMimetypes(): string[] {
 		return LanguageExtensions.getRegisteredMimetypes();
 	}

src/vs/editor/common/services/modeService.ts

@@ -27,7 +27,9 @@ export interface IModeService {
 	configureAllModes(config:any): void;
 	getConfigurationForMode(modeId:string): any;
 
+	// --- reading
 	isRegisteredMode(mimetypeOrModeId: string): boolean;
+	getRegisteredModes(): string[];
 
 	// --- instantiation
 	lookup(commaSeparatedMimetypesOrCommaSeparatedIds: string): IModeLookupResult[];

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

@@ -79,8 +79,7 @@ export class ModeServiceImpl implements IModeService {
 		if (!config) {
 			return;
 		}
-		var modeRegistry = <IEditorModesRegistry> Registry.as(Extensions.EditorModes);
-		var modes = modeRegistry.getRegisteredModes();
+		var modes = LanguageExtensions.getRegisteredModes();
 		modes.forEach((modeIdentifier) => {
 			var configuration = config[modeIdentifier];
 			this.configureModeById(modeIdentifier, configuration);
@@ -91,6 +90,10 @@ export class ModeServiceImpl implements IModeService {
 		return LanguageExtensions.isRegisteredMode(mimetypeOrModeId);
 	}
 
+	public getRegisteredModes(): string[] {
+		return LanguageExtensions.getRegisteredModes();
+	}
+
 	// --- instantiation
 
 	public lookup(commaSeparatedMimetypesOrCommaSeparatedIds: string): IModeLookupResult[]{

src/vs/workbench/api/node/extHostLanguages.ts

@@ -6,15 +6,15 @@
 
 import {TPromise} from 'vs/base/common/winjs.base';
 import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
-import {IEditorModesRegistry, Extensions} from 'vs/editor/common/modes/modesRegistry';
-import {Registry} from 'vs/platform/platform';
-import {INullService} from 'vs/platform/instantiation/common/instantiation';
+import {IModeService} from 'vs/editor/common/services/modeService';
 
 export class ExtHostLanguages {
 
 	private _proxy: MainThreadLanguages;
 
-	constructor( @IThreadService threadService: IThreadService) {
+	constructor(
+		@IThreadService threadService: IThreadService
+	) {
 		this._proxy = threadService.getRemotable(MainThreadLanguages);
 	}
 
@@ -26,13 +26,15 @@ export class ExtHostLanguages {
 @Remotable.MainContext('MainThreadLanguages')
 export class MainThreadLanguages {
 
-	private _registry: IEditorModesRegistry;
+	private _modeService: IModeService;
 
-	constructor(@INullService ns) {
-		this._registry = Registry.as(Extensions.EditorModes);
+	constructor(
+		@IModeService modeService: IModeService
+	) {
+		this._modeService = modeService;
 	}
 
 	_getLanguages(): TPromise<string[]> {
-		return TPromise.as(this._registry.getRegisteredModes());
+		return TPromise.as(this._modeService.getRegisteredModes());
 	}
 }

src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts

@@ -19,6 +19,7 @@ import {IQuickOpenService, IPickOpenEntry} from 'vs/workbench/services/quickopen
 import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import {IJSONSchema} from 'vs/base/common/jsonSchema';
+import {IModeService} from 'vs/editor/common/services/modeService';
 
 import {ipcRenderer as ipc} from 'electron';
 import fs = require('fs');
@@ -32,7 +33,8 @@ class OpenSnippetsAction extends actions.Action {
 		id: string,
 		label:string,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IQuickOpenService private quickOpenService:IQuickOpenService
+		@IQuickOpenService private quickOpenService:IQuickOpenService,
+		@IModeService private modeService:IModeService
 	) {
 		super(id, label);
 	}
@@ -43,7 +45,7 @@ class OpenSnippetsAction extends actions.Action {
 
 	public run(): winjs.Promise {
 		var modesRegistry = <modesExtensions.IEditorModesRegistry>platform.Registry.as(modesExtensions.Extensions.EditorModes);
-		var modeIds = modesRegistry.getRegisteredModes();
+		var modeIds = this.modeService.getRegisteredModes();
 		var picks: IPickOpenEntry[] = [];
 		modeIds.forEach((modeId) => {
 			var name = modesRegistry.getLanguageName(modeId);