From 7650b584d0667d6db95b15a28c465bf5aa470bd0 Mon Sep 17 00:00:00 2001
From: Ives van Hoorne <i.vanhoorne@catawiki.nl>
Date: Wed, 21 Feb 2018 13:12:28 +0100
Subject: [PATCH] Enable our old emmet mechanism as well

---
 .../CodeEditor/Monaco/enable-combi-emmet.js   | 77 +++++++++++++++++++
 .../CodeEditor/Monaco/enable-emmet.js         |  3 +
 2 files changed, 80 insertions(+)
 create mode 100644 packages/app/src/app/components/CodeEditor/Monaco/enable-combi-emmet.js

diff --git a/packages/app/src/app/components/CodeEditor/Monaco/enable-combi-emmet.js b/packages/app/src/app/components/CodeEditor/Monaco/enable-combi-emmet.js
new file mode 100644
index 00000000000..9b0bb298bd4
--- /dev/null
+++ b/packages/app/src/app/components/CodeEditor/Monaco/enable-combi-emmet.js
@@ -0,0 +1,77 @@
+import extractAbbreviation from '@emmetio/extract-abbreviation';
+import { expand } from '@emmetio/expand-abbreviation';
+
+const field = () => '';
+
+const expandAbbreviation = (source, language) =>
+  expand(source.abbreviation, {
+    field,
+    syntax: language,
+    addons: {
+      jsx: true,
+    },
+  });
+
+const enableEmmet = (editor, monaco) => {
+  if (!editor) {
+    throw new Error('Must provide monaco-editor instance.');
+  }
+
+  editor.addAction({
+    // An unique identifier of the contributed action.
+    id: 'emmet-abbr',
+
+    // A label of the action that will be presented to the user.
+    label: 'Emmet: Expand abbreviation',
+
+    // An optional array of keybindings for the action.
+    keybindings: [monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_E], // eslint-disable-line no-bitwise
+
+    // A precondition for this action.
+    precondition: null,
+
+    // A rule to evaluate on top of the precondition in order to dispatch the keybindings.
+    keybindingContext: null,
+
+    contextMenuGroupId: 'navigation',
+
+    contextMenuOrder: 1.5,
+
+    // Method that will be executed when the action is triggered.
+    // @param editor The editor instance is passed in as a convenience
+    run: () => {
+      let word = editor.model.getValueInRange(editor.getSelection());
+      const pos = editor.getPosition();
+      if (!word) {
+        const lineContent = editor.model.getLineContent(pos.lineNumber);
+        word = extractAbbreviation(lineContent.substring(0, pos.column));
+      }
+      if (word) {
+        // Get expand text
+        const expandText = expandAbbreviation(word, 'html');
+        if (expandText) {
+          // replace range content: pos.column , pos.column -word.length;
+          const range = new monaco.Range(
+            pos.lineNumber,
+            pos.column - word.abbreviation.length,
+            pos.lineNumber,
+            pos.column
+          );
+          const id = { major: 1, minor: 1 };
+          const op = {
+            identifier: id,
+            range,
+            text: expandText,
+            forceMoveMarkers: true,
+          };
+          editor.executeEdits('', [op]);
+          return null;
+        }
+        return false;
+      }
+      return false;
+    },
+  });
+};
+
+export default enableEmmet;
diff --git a/packages/app/src/app/components/CodeEditor/Monaco/enable-emmet.js b/packages/app/src/app/components/CodeEditor/Monaco/enable-emmet.js
index 9d0d1c2f1e4..dc44100d08f 100644
--- a/packages/app/src/app/components/CodeEditor/Monaco/enable-emmet.js
+++ b/packages/app/src/app/components/CodeEditor/Monaco/enable-emmet.js
@@ -1,10 +1,13 @@
 import { expand } from '@emmetio/expand-abbreviation';
+import enableCombiEmmet from './enable-combi-emmet';
 
 const enableEmmet = (editor, monaco) => {
   if (!editor) {
     throw new Error('Must provide monaco-editor instance.');
   }
 
+  enableCombiEmmet(editor, monaco);
+
   let cursor;
   let emmetText;
   let expandText;