Move python language contribution to textmate-grammars package

Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
eclipse-theia · Mar 6, 2019 · 57185e1 · 57185e1
1 parent 5f82fc5
commit 57185e1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/packages/python/src/browser/python-frontend-module.ts b/packages/python/src/browser/python-frontend-module.ts
@@ -17,12 +17,8 @@
 import { ContainerModule } from 'inversify';
 import { LanguageClientContribution } from '@theia/languages/lib/browser';
 import { PythonClientContribution } from './python-client-contribution';
-import { PythonGrammarContribution } from './python-grammar-contribution';
-import { LanguageGrammarDefinitionContribution } from '@theia/monaco/lib/browser/textmate';
 
 export default new ContainerModule(bind => {
     bind(PythonClientContribution).toSelf().inSingletonScope();
     bind(LanguageClientContribution).toService(PythonClientContribution);
-
-    bind(LanguageGrammarDefinitionContribution).to(PythonGrammarContribution).inSingletonScope();
 });
diff --git a/...s/python/data/MagicPython.tmLanguage.json → ...grammars/data/MagicPython.tmLanguage.json b/...s/python/data/MagicPython.tmLanguage.json → ...grammars/data/MagicPython.tmLanguage.json
diff --git a/...s/python/data/MagicRegExp.tmLanguage.json → ...grammars/data/MagicRegExp.tmLanguage.json b/...s/python/data/MagicRegExp.tmLanguage.json → ...grammars/data/MagicRegExp.tmLanguage.json
diff --git a/...rc/browser/python-grammar-contribution.ts → ...s/textmate-grammars/src/browser/python.ts b/...rc/browser/python-grammar-contribution.ts → ...s/textmate-grammars/src/browser/python.ts
@@ -16,11 +16,10 @@
 
 import { LanguageGrammarDefinitionContribution, TextmateRegistry } from '@theia/monaco/lib/browser/textmate';
 import { injectable } from 'inversify';
-import { PYTHON_LANGUAGE_ID } from '../common';
 
 @injectable()
-export class PythonGrammarContribution implements LanguageGrammarDefinitionContribution {
-
+export class PythonContribution implements LanguageGrammarDefinitionContribution {
+    readonly id = 'python';
     readonly config: monaco.languages.LanguageConfiguration = {
         comments: {
             lineComment: '#'
@@ -60,13 +59,13 @@ export class PythonGrammarContribution implements LanguageGrammarDefinitionContr
 
     registerTextmateLanguage(registry: TextmateRegistry) {
         monaco.languages.register({
-            id: PYTHON_LANGUAGE_ID,
+            id: this.id,
             extensions: ['.py', '.rpy', '.pyw', '.cpy', '.gyp', '.gypi', '.snakefile', '.smk'],
             aliases: ['Python', 'py'],
             firstLine: '^#!\\s*/.*\\bpython[0-9.-]*\\b',
         });
 
-        monaco.languages.setLanguageConfiguration(PYTHON_LANGUAGE_ID, this.config);
+        monaco.languages.setLanguageConfiguration(this.id, this.config);
 
         const platformGrammar = require('../../data/MagicPython.tmLanguage.json');
         registry.registerTextmateGrammarScope('source.python', {
@@ -87,6 +86,6 @@ export class PythonGrammarContribution implements LanguageGrammarDefinitionContr
                 };
             }
         });
-        registry.mapLanguageIdToTextmateGrammar(PYTHON_LANGUAGE_ID, 'source.python');
+        registry.mapLanguageIdToTextmateGrammar(this.id, 'source.python');
     }
 }
diff --git a/packages/textmate-grammars/src/browser/textmate-grammars-frontend-module.ts b/packages/textmate-grammars/src/browser/textmate-grammars-frontend-module.ts
@@ -51,6 +51,7 @@ import { LanguageGrammarDefinitionContribution } from '@theia/monaco/lib/browser
 import { TypescriptContribution } from './ts';
 import { JavascriptContribution } from './js';
 import { JsxTagsContribution } from './jsx-tags';
+import { PythonContribution } from './python';
 
 export default new ContainerModule(bind => {
     bind(BatContribution).toSelf().inSingletonScope();
@@ -157,4 +158,7 @@ export default new ContainerModule(bind => {
 
     bind(JsxTagsContribution).toSelf().inSingletonScope();
     bind(LanguageGrammarDefinitionContribution).toService(JsxTagsContribution);
+
+    bind(PythonContribution).toSelf().inSingletonScope();
+    bind(LanguageGrammarDefinitionContribution).toService(PythonContribution);
 });