@codingame/monaco-vscode-emmet-service-override 25.1.2 → 26.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-emmet-service-override",
-  "version": "25.1.2",
+  "version": "26.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - emmet service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.2"
+    "@codingame/monaco-vscode-api": "26.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.js

@@ -11,23 +11,23 @@ import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 class ExpandAbbreviationAction extends EmmetEditorAction {
     constructor() {
         super({
-            id: 'editor.emmet.action.expandAbbreviation',
-            label: ( localize2(7261, "Emmet: Expand Abbreviation")),
+            id: "editor.emmet.action.expandAbbreviation",
+            label: ( localize2(7572, "Emmet: Expand Abbreviation")),
             precondition: EditorContextKeys.writable,
-            actionName: 'expand_abbreviation',
+            actionName: "expand_abbreviation",
             kbOpts: {
                 primary: KeyCode.Tab,
                 kbExpr: ( ContextKeyExpr.and(
                     EditorContextKeys.editorTextFocus,
                     EditorContextKeys.tabDoesNotMoveFocus,
-                    ( ContextKeyExpr.has('config.emmet.triggerExpansionOnTab'))
+                    ( ContextKeyExpr.has("config.emmet.triggerExpansionOnTab"))
                 )),
                 weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarEditMenu,
-                group: '5_insert',
-                title: ( localize(7262, "Emmet: E&&xpand Abbreviation")),
+                group: "5_insert",
+                title: ( localize(7573, "Emmet: E&&xpand Abbreviation")),
                 order: 3
             }
         });

package/vscode/src/vs/workbench/contrib/emmet/browser/emmetActions.js

@@ -5,15 +5,17 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 
 class GrammarContributions {
-    static { this._grammars = {}; }
+    static {
+        this._grammars = {};
+    }
     constructor(contributions) {
         if (!( Object.keys(GrammarContributions._grammars)).length) {
             this.fillModeScopeMap(contributions);
         }
     }
     fillModeScopeMap(contributions) {
-        contributions.forEach((contribution) => {
-            contribution.value.forEach((grammar) => {
+        contributions.forEach(contribution => {
+            contribution.value.forEach(grammar => {
                 if (grammar.language && grammar.scopeName) {
                     GrammarContributions._grammars[grammar.language] = grammar.scopeName;
                 }
@@ -31,11 +33,28 @@ class EmmetEditorAction extends EditorAction {
         this._lastExtensionService = null;
         this.emmetActionName = opts.actionName;
     }
-    static { this.emmetSupportedModes = ['html', 'css', 'xml', 'xsl', 'haml', 'jade', 'jsx', 'slim', 'scss', 'sass', 'less', 'stylus', 'styl', 'svg']; }
+    static {
+        this.emmetSupportedModes = [
+            "html",
+            "css",
+            "xml",
+            "xsl",
+            "haml",
+            "jade",
+            "jsx",
+            "slim",
+            "scss",
+            "sass",
+            "less",
+            "stylus",
+            "styl",
+            "svg"
+        ];
+    }
     _withGrammarContributions(extensionService) {
         if (this._lastExtensionService !== extensionService) {
             this._lastExtensionService = extensionService;
-            this._lastGrammarContributions = extensionService.readExtensionPointContributions(grammarsExtPoint).then((contributions) => {
+            this._lastGrammarContributions = extensionService.readExtensionPointContributions(grammarsExtPoint).then(contributions => {
                 return ( new GrammarContributions(contributions));
             });
         }
@@ -44,9 +63,12 @@ class EmmetEditorAction extends EditorAction {
     run(accessor, editor) {
         const extensionService = accessor.get(IExtensionService);
         const commandService = accessor.get(ICommandService);
-        return this._withGrammarContributions(extensionService).then((grammarContributions) => {
-            if (this.id === 'editor.emmet.action.expandAbbreviation' && grammarContributions) {
-                return commandService.executeCommand('emmet.expandAbbreviation', EmmetEditorAction.getLanguage(editor, grammarContributions));
+        return this._withGrammarContributions(extensionService).then(grammarContributions => {
+            if (this.id === "editor.emmet.action.expandAbbreviation" && grammarContributions) {
+                return commandService.executeCommand(
+                    "emmet.expandAbbreviation",
+                    EmmetEditorAction.getLanguage(editor, grammarContributions)
+                );
             }
             return undefined;
         });
@@ -60,7 +82,7 @@ class EmmetEditorAction extends EditorAction {
         const position = selection.getStartPosition();
         model.tokenization.tokenizeIfCheap(position.lineNumber);
         const languageId = model.getLanguageIdAtPosition(position.lineNumber, position.column);
-        const syntax = languageId.split('.').pop();
+        const syntax = languageId.split(".").pop();
         if (!syntax) {
             return null;
         }
@@ -69,7 +91,7 @@ class EmmetEditorAction extends EditorAction {
             if (!languageGrammar) {
                 return syntax;
             }
-            const languages = languageGrammar.split('.');
+            const languages = languageGrammar.split(".");
             if (languages.length < 2) {
                 return syntax;
             }