Improved syntax detection

Plugin now registers all available actions, not only those with keybindings

Author: sergeche

dist/emmet.js

@@ -170,8 +170,15 @@ var EmmetEditor = (function () {
 		},
 		getSyntax: {
 			value: function getSyntax() {
-				var syntax = this.context.getOption("mode");
-				return modeMap[syntax] || emmet.utils.action.detectSyntax(this, syntax);
+				var editor = this.context;
+				var pos = editor.posFromIndex(this.getCaretPos());
+				var mode = editor.getModeAt(editor.getCursor());
+				var syntax = mode.name;
+				if (syntax === "xml" && mode.configuration) {
+					syntax = mode.configuration;
+				}
+
+				return syntax || emmet.utils.action.detectSyntax(this, syntax);
 			}
 		},
 		getProfileName: {
@@ -32471,6 +32478,7 @@ define(function(require, exports, module) {
 		require: require,
 
 		// expose some useful data for plugin authors
+		actions: actions,
 		file: file,
 		preferences: preferences,
 		resources: resources,
@@ -44495,9 +44503,9 @@ main.emmet = emmet;
 main.EmmetEditor = EmmetEditor;
 main.setup = function (CodeMirror) {
 	// setup default Emmet actions
-	Object.keys(defaultKeymap).forEach(function (key) {
-		var command = defaultKeymap[key];
-		var action = command.replace(/^emmet\./, "");
+	emmet.actions.getList().forEach(function (obj) {
+		var action = obj.name;
+		var command = "emmet." + action;
 
 		if (!CodeMirror.commands[command]) {
 			CodeMirror.commands[command] = ~singleSelectionActions.indexOf(action) ? actionDecorator(action) : multiSelectionActionDecorator(action);
@@ -44585,7 +44593,9 @@ function runAction(name, editor) {
 		if (!result && name == "insert_formatted_line_break_only") {
 			return noop();
 		}
-	} catch (e) {}
+	} catch (e) {
+		console.error(e);
+	}
 
 	return result;
 }

editor.js

@@ -131,8 +131,15 @@ export default class EmmetEditor {
 	}
 
 	getSyntax() {
-		var syntax = this.context.getOption('mode');
-		return modeMap[syntax] || emmet.utils.action.detectSyntax(this, syntax);
+		var editor = this.context;
+		var pos = editor.posFromIndex(this.getCaretPos());
+		var mode = editor.getModeAt(editor.getCursor());
+		var syntax = mode.name;
+		if (syntax === 'xml' && mode.configuration) {
+			syntax = mode.configuration;
+		}
+
+		return syntax || emmet.utils.action.detectSyntax(this, syntax);
 	}
 
 	/**

index.html

@@ -7,7 +7,7 @@
 	<script src="./node_modules/codemirror/mode/xml/xml.js"></script>
 	<script src="./node_modules/codemirror/mode/css/css.js"></script>
 	<script src="./node_modules/codemirror/mode/htmlmixed/htmlmixed.js"></script>
-	<script src="./dist/plugin.js"></script>
+	<script src="./dist/emmet.js"></script>
 
 	<style>
 	.CodeMirror {
@@ -27,6 +27,11 @@ <h1>Emmet for CodeMirror 4</h1>
   &lt;!-- this is a comment --&gt;
   &lt;head&gt;
     &lt;title&gt;HTML Example&lt;/title&gt;
+    &lt;style&gt;
+    	body {
+    		padding: 10px;
+    	}
+    &lt;/style&gt;
   &lt;/head&gt;
   &lt;body&gt;
     The indentation tries to be &lt;em&gt;somewhat &amp;quot;do what

package.json

@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/emmetio/codemirror",
   "dependencies": {
-    "emmet": "^1.2.3"
+    "emmet": "^1.2.4"
   },
   "devDependencies": {
     "codemirror": "^5.0.0",

plugin.js

@@ -66,9 +66,9 @@ main.emmet = emmet;
 main.EmmetEditor = EmmetEditor;
 main.setup = function(CodeMirror) {
 	// setup default Emmet actions
-	Object.keys(defaultKeymap).forEach(key => {
-		var command = defaultKeymap[key] 
-		var action = command.replace(/^emmet\./, '');
+	emmet.actions.getList().forEach(obj => {
+		var action = obj.name;
+		var command = 'emmet.' + action;
 
 		if (!CodeMirror.commands[command]) {
 			CodeMirror.commands[command] = ~singleSelectionActions.indexOf(action)
@@ -156,7 +156,9 @@ function runAction(name, editor) {
 		if (!result && name == 'insert_formatted_line_break_only') {
 			return noop();
 		}
-	} catch (e) {}
+	} catch (e) {
+		console.error(e);
+	}
 
 	return result;
 }