modesRegistry.isRegisteredMode -> modeService.isRegisteredMode

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

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

src/vs/editor/common/modes/monarch/monarchLexer.ts

@@ -403,7 +403,7 @@ export function createTokenizationSupport(modeService:IModeService, mode:Modes.I
 		getNestedMode: (rawState: Modes.IState): Supports.IEnteringNestedModeData => {
 			var mime = (<MonarchLexer>rawState).embeddedMode;
 
-			if (!modesRegistry.isRegisteredMode(mime)) {
+			if (!modeService.isRegisteredMode(mime)) {
 				// unknown mode
 				return {
 					mode: modeService.getMode('text/plain'),

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

@@ -27,6 +27,8 @@ export interface IModeService {
 	configureAllModes(config:any): void;
 	getConfigurationForMode(modeId:string): any;
 
+	isRegisteredMode(mimetypeOrModeId: string): boolean;
+
 	// --- instantiation
 	lookup(commaSeparatedMimetypesOrCommaSeparatedIds: string): IModeLookupResult[];
 	getMode(commaSeparatedMimetypesOrCommaSeparatedIds: string): Modes.IMode;

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

@@ -87,6 +87,10 @@ export class ModeServiceImpl implements IModeService {
 		});
 	}
 
+	public isRegisteredMode(mimetypeOrModeId: string): boolean {
+		return LanguageExtensions.isRegisteredMode(mimetypeOrModeId);
+	}
+
 	// --- instantiation
 
 	public lookup(commaSeparatedMimetypesOrCommaSeparatedIds: string): IModeLookupResult[]{

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

@@ -12,8 +12,8 @@ import json = require('vs/base/common/json');
 import modesExt = require('vs/editor/common/modes/modesRegistry');
 import paths = require('vs/base/common/paths');
 import {IModelService} from 'vs/editor/common/services/modelService';
+import {IModeService} from 'vs/editor/common/services/modeService';
 import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry';
-import {LanguageExtensions} from 'vs/editor/common/modes/languageExtensionPoint';
 
 import pfs = require('vs/base/node/pfs');
 
@@ -53,11 +53,14 @@ let snippetsExtensionPoint = PluginsRegistry.registerExtensionPoint<ITMSnippetsE
 
 export class MainProcessTextMateSnippet {
 	private _modelService: IModelService;
+	private _modeService: IModeService;
 
 	constructor(
-		@IModelService modelService: IModelService
+		@IModelService modelService: IModelService,
+		@IModeService modeService: IModeService
 	) {
 		this._modelService = modelService;
+		this._modeService = modeService;
 
 		snippetsExtensionPoint.setHandler((extensions) => {
 			for (let i = 0; i < extensions.length; i++) {
@@ -70,7 +73,7 @@ export class MainProcessTextMateSnippet {
 	}
 
 	private _withTMSnippetContribution(extensionFolderPath:string, snippet:ITMSnippetsExtensionPoint, collector:IMessageCollector): void {
-		if (!snippet.language || (typeof snippet.language !== 'string') || !LanguageExtensions.isRegisteredMode(snippet.language)) {
+		if (!snippet.language || (typeof snippet.language !== 'string') || !this._modeService.isRegisteredMode(snippet.language)) {
 			collector.error(nls.localize('invalid.language', "Unknown language in `contributes.{0}.language`. Provided value: {1}", snippetsExtensionPoint.name, String(snippet.language)));
 			return;
 		}

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

@@ -16,7 +16,6 @@ import textMate = require('vscode-textmate');
 import TMState = require('vs/editor/common/modes/TMState');
 import {IModeService} from 'vs/editor/common/services/modeService';
 import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry';
-import {LanguageExtensions} from 'vs/editor/common/modes/languageExtensionPoint';
 
 export interface ITMSyntaxExtensionPoint {
 	language: string;
@@ -75,7 +74,7 @@ export class MainProcessTextMateSyntax {
 	}
 
 	private _handleGrammarExtensionPointUser(extensionFolderPath:string, syntax:ITMSyntaxExtensionPoint, collector: IMessageCollector): void {
-		if (syntax.language && ((typeof syntax.language !== 'string') || !LanguageExtensions.isRegisteredMode(syntax.language))) {
+		if (syntax.language && ((typeof syntax.language !== 'string') || !this._modeService.isRegisteredMode(syntax.language))) {
 			collector.error(nls.localize('invalid.language', "Unknown language in `contributes.{0}.language`. Provided value: {1}", grammarsExtPoint.name, String(syntax.language)));
 			return;
 		}

src/vs/languages/html/common/html.ts

@@ -400,7 +400,7 @@ export class HTMLMode<W extends htmlWorker.HTMLWorker> extends AbstractMode<W> i
 		var missingModePromise: winjs.Promise = null;
 
 		if (htmlState.embeddedContentType !== null) {
-			if (modesRegistry.isRegisteredMode(htmlState.embeddedContentType)) {
+			if (this.modeService.isRegisteredMode(htmlState.embeddedContentType)) {
 				result = this.modeService.getMode(htmlState.embeddedContentType);
 				if (!result) {
 					missingModePromise = this.modeService.getOrCreateMode(htmlState.embeddedContentType);