Fix layer breaker in TMSyntax

src/vs/editor/node/textMate/TMSyntax.ts → src/vs/editor/electron-browser/textMate/TMSyntax.ts

@@ -5,66 +5,19 @@
 'use strict';
 
 import * as nls from 'vs/nls';
+import * as dom from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import * as paths from 'vs/base/common/paths';
 import * as types from 'vs/base/common/types';
 import Event, { Emitter } from 'vs/base/common/event';
-import { IExtensionPoint, ExtensionMessageCollector, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
+import { ExtensionMessageCollector } from 'vs/platform/extensions/common/extensionsRegistry';
 import { ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/modes';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { INITIAL, StackElement, IGrammar, Registry, IEmbeddedLanguagesMap as IEmbeddedLanguagesMap2 } from 'vscode-textmate';
-import { languagesExtPoint } from 'vs/editor/common/services/modeServiceImpl';
 import { IThemeService } from 'vs/workbench/services/themes/common/themeService';
 import { ITextMateService } from 'vs/editor/node/textMate/textMateService';
-
-export interface IEmbeddedLanguagesMap {
-	[scopeName: string]: string;
-}
-
-export interface ITMSyntaxExtensionPoint {
-	language: string;
-	scopeName: string;
-	path: string;
-	embeddedLanguages: IEmbeddedLanguagesMap;
-	injectTo: string[];
-}
-
-export const grammarsExtPoint: IExtensionPoint<ITMSyntaxExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<ITMSyntaxExtensionPoint[]>('grammars', [languagesExtPoint], {
-	description: nls.localize('vscode.extension.contributes.grammars', 'Contributes textmate tokenizers.'),
-	type: 'array',
-	defaultSnippets: [{ body: [{ language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' }] }],
-	items: {
-		type: 'object',
-		defaultSnippets: [{ body: { language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' } }],
-		properties: {
-			language: {
-				description: nls.localize('vscode.extension.contributes.grammars.language', 'Language identifier for which this syntax is contributed to.'),
-				type: 'string'
-			},
-			scopeName: {
-				description: nls.localize('vscode.extension.contributes.grammars.scopeName', 'Textmate scope name used by the tmLanguage file.'),
-				type: 'string'
-			},
-			path: {
-				description: nls.localize('vscode.extension.contributes.grammars.path', 'Path of the tmLanguage file. The path is relative to the extension folder and typically starts with \'./syntaxes/\'.'),
-				type: 'string'
-			},
-			embeddedLanguages: {
-				description: nls.localize('vscode.extension.contributes.grammars.embeddedLanguages', 'A map of scope name to language id if this grammar contains embedded languages.'),
-				type: 'object'
-			},
-			injectTo: {
-				description: nls.localize('vscode.extension.contributes.grammars.injectTo', 'List of language scope names to which this grammar is injected to.'),
-				type: 'array',
-				items: {
-					type: 'string'
-				}
-			}
-		},
-		required: ['scopeName', 'path']
-	}
-});
+import { grammarsExtPoint, IEmbeddedLanguagesMap, ITMSyntaxExtensionPoint } from 'vs/editor/node/textMate/TMGrammars';
 
 export class TMScopeRegistry {
 
@@ -133,14 +86,6 @@ export class TMLanguageRegistration {
 	}
 }
 
-function createStyleSheet(): HTMLStyleElement {
-	let style = document.createElement('style');
-	style.type = 'text/css';
-	style.media = 'screen';
-	document.getElementsByTagName('head')[0].appendChild(style);
-	return style;
-}
-
 export class MainProcessTextMateSyntax implements ITextMateService {
 	public _serviceBrand: any;
 
@@ -158,7 +103,7 @@ export class MainProcessTextMateSyntax implements ITextMateService {
 		@IModeService modeService: IModeService,
 		@IThemeService themeService: IThemeService
 	) {
-		this._styleElement = createStyleSheet();
+		this._styleElement = dom.createStyleSheet();
 		this._styleElement.className = 'vscode-tokens-styles';
 		this._modeService = modeService;
 		this._themeService = themeService;

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

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as nls from 'vs/nls';
+import { IExtensionPoint, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
+import { languagesExtPoint } from 'vs/editor/common/services/modeServiceImpl';
+
+export interface IEmbeddedLanguagesMap {
+	[scopeName: string]: string;
+}
+
+export interface ITMSyntaxExtensionPoint {
+	language: string;
+	scopeName: string;
+	path: string;
+	embeddedLanguages: IEmbeddedLanguagesMap;
+	injectTo: string[];
+}
+
+export const grammarsExtPoint: IExtensionPoint<ITMSyntaxExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<ITMSyntaxExtensionPoint[]>('grammars', [languagesExtPoint], {
+	description: nls.localize('vscode.extension.contributes.grammars', 'Contributes textmate tokenizers.'),
+	type: 'array',
+	defaultSnippets: [{ body: [{ language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' }] }],
+	items: {
+		type: 'object',
+		defaultSnippets: [{ body: { language: '${1:id}', scopeName: 'source.${2:id}', path: './syntaxes/${3:id}.tmLanguage.' } }],
+		properties: {
+			language: {
+				description: nls.localize('vscode.extension.contributes.grammars.language', 'Language identifier for which this syntax is contributed to.'),
+				type: 'string'
+			},
+			scopeName: {
+				description: nls.localize('vscode.extension.contributes.grammars.scopeName', 'Textmate scope name used by the tmLanguage file.'),
+				type: 'string'
+			},
+			path: {
+				description: nls.localize('vscode.extension.contributes.grammars.path', 'Path of the tmLanguage file. The path is relative to the extension folder and typically starts with \'./syntaxes/\'.'),
+				type: 'string'
+			},
+			embeddedLanguages: {
+				description: nls.localize('vscode.extension.contributes.grammars.embeddedLanguages', 'A map of scope name to language id if this grammar contains embedded languages.'),
+				type: 'object'
+			},
+			injectTo: {
+				description: nls.localize('vscode.extension.contributes.grammars.injectTo', 'List of language scope names to which this grammar is injected to.'),
+				type: 'array',
+				items: {
+					type: 'string'
+				}
+			}
+		},
+		required: ['scopeName', 'path']
+	}
+});

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

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as assert from 'assert';
-import { TMScopeRegistry } from 'vs/editor/node/textMate/TMSyntax';
-
-suite('TextMate.TMScopeRegistry', () => {
-	test('getFilePath', () => {
-		let registry = new TMScopeRegistry();
-
-		registry.register('source.a', './grammar/a.tmLanguage');
-		assert.equal(registry.getFilePath('source.a'), './grammar/a.tmLanguage');
-		assert.equal(registry.getFilePath('a'), null);
-		assert.equal(registry.getFilePath('source.b'), null);
-		assert.equal(registry.getFilePath('b'), null);
-
-		registry.register('source.b', './grammar/b.tmLanguage');
-		assert.equal(registry.getFilePath('source.a'), './grammar/a.tmLanguage');
-		assert.equal(registry.getFilePath('a'), null);
-		assert.equal(registry.getFilePath('source.b'), './grammar/b.tmLanguage');
-		assert.equal(registry.getFilePath('b'), null);
-
-		registry.register('source.a', './grammar/ax.tmLanguage');
-		assert.equal(registry.getFilePath('source.a'), './grammar/ax.tmLanguage');
-		assert.equal(registry.getFilePath('a'), null);
-		assert.equal(registry.getFilePath('source.b'), './grammar/b.tmLanguage');
-		assert.equal(registry.getFilePath('b'), null);
-	});
-});

src/vs/workbench/electron-browser/shell.ts

@@ -92,7 +92,7 @@ import { ExtensionHostProcessWorker } from 'vs/workbench/electron-browser/extens
 import { ITimerService } from 'vs/workbench/services/timer/common/timerService';
 import { remote } from 'electron';
 import { ITextMateService } from 'vs/editor/node/textMate/textMateService';
-import { MainProcessTextMateSyntax } from 'vs/editor/node/textMate/TMSyntax';
+import { MainProcessTextMateSyntax } from 'vs/editor/electron-browser/textMate/TMSyntax';
 import 'vs/platform/opener/browser/opener.contribution';
 
 /**

src/vs/workbench/parts/emmet/node/emmetActions.ts

@@ -10,7 +10,7 @@ import { ICommonCodeEditor, EditorContextKeys } from 'vs/editor/common/editorCom
 import { EditorAction, ServicesAccessor } from 'vs/editor/common/editorCommonExtensions';
 import { ICommandKeybindingsOptions } from 'vs/editor/common/config/config';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/editor/node/textMate/TMSyntax';
+import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/editor/node/textMate/TMGrammars';
 import { IModeService } from 'vs/editor/common/services/modeService';
 
 import { EditorAccessor, IGrammarContributions } from 'vs/workbench/parts/emmet/node/editorAccessor';