Merge pull request #1411 from ajaxorg/emmet

Emmet bugfix

lib/ace/ext/emmet.js

@@ -318,10 +318,15 @@ function runEmmetCommand(editor) {
     editorProxy.setupContext(editor);
     if (editorProxy.getSyntax() == "php")
         return false;
-    var actions = emmet.require("actions")
+    var actions = emmet.require("actions");
+
+    if (this.action == "expand_abbreviation_with_tab") {
+        if (!editor.selection.isEmpty())
+            return false;
+    }
     
     try {
-        var result = actions.run(this.name, editorProxy);
+        var result = actions.run(this.action, editorProxy);
     } catch(e) {
         editor._signal("changeStatus", typeof e == "string" ? e : e.message);
         console.log(e);
@@ -331,9 +336,11 @@ function runEmmetCommand(editor) {
 
 for (var command in keymap) {
     exports.commands.addCommand({
-        name: command,
+        name: "emmet:" + command,
+        action: command,
         bindKey: keymap[command],
-        exec: runEmmetCommand
+        exec: runEmmetCommand,
+        multiSelectAction: "forEach"
     });
 }
 

lib/ace/ext/keybinding_menu.js

@@ -60,8 +60,9 @@ define(function(require, exports, module) {
             var kb = getEditorKeybordShortcuts(editor);
             var el = document.createElement('div');
             var commands = kb.reduce(function(previous, current) {
-                return previous + '<div class="ace_optionsMenuEntry"><b>' + current.command + '</b> : ' +
+                return previous + '<div class="ace_optionsMenuEntry"><span class="ace_optionsMenuCommand">' 
-                current.key + '</div>';
+                    + current.command + '</span> : '
+                    + '<span class="ace_optionsMenuKey">' + current.key + '</span></div>';
             }, '');
 
             el.id = 'kbshortcutmenu';

lib/ace/ext/menu_tools/get_editor_keyboard_shortcuts.js

@@ -44,6 +44,8 @@
 
 define(function(require, exports, module) {
 "use strict";
+var keys = require("../../lib/keys");
+
 /**
  * Gets a map of keyboard shortcuts to command names for the current platform.
  * @author <a href="mailto:matthewkastor@gmail.com">
@@ -60,27 +62,39 @@ define(function(require, exports, module) {
  * //     {'command' : aCommand, 'key' : 'Control-d'}
  * // ]
  */
-module.exports.getEditorKeybordShortcuts = function getEditorKeybordShortcuts (editor) {
+module.exports.getEditorKeybordShortcuts = function(editor) {
-    var commands = editor.commands.byName;
+    var KEY_MODS = keys.KEY_MODS;
-    var commandName;
+    var keybindings = [];
-    var key;
+    var commandMap = {};
-    var platform = editor.commands.platform;
+    editor.keyBinding.$handlers.forEach(function(handler) {
-    var kb = [];
+        var ckb = handler.commmandKeyBinding;
-    for (commandName in commands) {
+        for (var i in ckb) {
-        try {
+            var modifier = parseInt(i);
-            key = commands[commandName].bindKey[platform];
+            if (modifier == -1) {
-            if (key) {
+                modifier = "";
-               kb.push({
+            } else if(isNaN(modifier)) {
-                    'command' : commandName,
+                modifier = i;
-                    'key' : key
+            } else {
-               });
+                modifier = "" +
+                    (modifier & KEY_MODS.command ? "Cmd-"   : "") +
+                    (modifier & KEY_MODS.ctrl    ? "Ctrl-"  : "") +
+                    (modifier & KEY_MODS.alt     ? "Alt-"   : "") +
+                    (modifier & KEY_MODS.shift   ? "Shift-" : "");
+            }
+            for (var key in ckb[i]) {
+                var command = ckb[i][key]
+                if (typeof command != "string")
+                    command  = command.name
+                if (commandMap[command]) {
+                    commandMap[command].key += "|" + modifier + key;
+                } else {
+                    commandMap[command] = {key: modifier+key, command: command};
+                    keybindings.push(commandMap[command]);
+                }
             }
-        } catch (e) {
-            // errors on properties without bindKey we don't want them
-            // so the errors don't need handling.
         }
-    }
+    });
-    return kb;
+    return keybindings;
 };
 
 });

lib/ace/ext/menu_tools/settings_menu.css

@@ -38,3 +38,11 @@
 .ace_closeButton{
     background: rgba(245, 146, 146, 0.9);
 }
+.ace_optionsMenuKey {
+    color: darkslateblue;
+    font-weight: bold;
+}
+.ace_optionsMenuCommand {
+    color: darkcyan;
+    font-weight: normal;
+}

lib/ace/lib/event_emitter.js

@@ -85,12 +85,37 @@ EventEmitter.once = function(eventName, callback) {
 
 
 EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
+    var handlers = this._defaultHandlers
+    if (!handlers)
+        handlers = this._defaultHandlers = {_disabled_: {}};
     
-    if (this._defaultHandlers[eventName])
+    if (handlers[eventName]) {
-        throw new Error("The default handler for '" + eventName + "' is already set");
+        var old = handlers[eventName];
+        var disabled = handlers._disabled_[eventName];
+        if (!disabled)
+            handlers._disabled_[eventName] = disabled = [];
+        disabled.push(old);
+        var i = disabled.indexOf(callback);
+        if (i != -1) 
+            disabled.splice(i, 1);
+    }
+    handlers[eventName] = callback;
+};
+EventEmitter.removeDefaultHandler = function(eventName, callback) {
+    var handlers = this._defaultHandlers
+    if (!handlers)
+        return;
+    var disabled = handlers._disabled_[eventName];
     
-    this._defaultHandlers[eventName] = callback;
+    if (handlers[eventName] == callback) {
+        var old = handlers[eventName];
+        if (disabled)
+            this.setDefaultHandler(eventName, disabled.pop());
+    } else if (disabled) {
+        var i = disabled.indexOf(callback);
+        if (i != -1)
+            disabled.splice(i, 1);
+    }
 };
 
 EventEmitter.on =

lib/ace/multi_select.js

@@ -420,7 +420,7 @@ var Editor = require("./editor").Editor;
 
         this.setStyle("ace_multiselect");
         this.keyBinding.addKeyboardHandler(commands.keyboardHandler);
-        this.commands.on("exec", this.$onMultiSelectExec);
+        this.commands.setDefaultHandler("exec", this.$onMultiSelectExec);
 
         this.renderer.updateCursor();
         this.renderer.updateBackMarkers();
@@ -434,7 +434,7 @@ var Editor = require("./editor").Editor;
         this.unsetStyle("ace_multiselect");
         this.keyBinding.removeKeyboardHandler(commands.keyboardHandler);
 
-        this.commands.removeEventListener("exec", this.$onMultiSelectExec);
+        this.commands.removeDefaultHandler("exec", this.$onMultiSelectExec);
         this.renderer.updateCursor();
         this.renderer.updateBackMarkers();
     };
@@ -445,20 +445,20 @@ var Editor = require("./editor").Editor;
         if (!editor.multiSelect)
             return;
         if (!command.multiSelectAction) {
-            command.exec(editor, e.args || {});
+            var result = command.exec(editor, e.args || {});
             editor.multiSelect.addRange(editor.multiSelect.toOrientedRange());
             editor.multiSelect.mergeOverlappingRanges();
         } else if (command.multiSelectAction == "forEach") {
-            editor.forEachSelection(command, e.args);
+            result = editor.forEachSelection(command, e.args);
         } else if (command.multiSelectAction == "forEachLine") {
-            editor.forEachSelection(command, e.args, true);
+            result = editor.forEachSelection(command, e.args, true);
         } else if (command.multiSelectAction == "single") {
             editor.exitMultiSelectMode();
-            command.exec(editor, e.args || {});
+            result = command.exec(editor, e.args || {});
         } else {
-            command.multiSelectAction(editor, e.args || {});
+            result = command.multiSelectAction(editor, e.args || {});
         }
-        e.preventDefault();
+        return result;
     };
 
     /** 
@@ -474,6 +474,7 @@ var Editor = require("./editor").Editor;
         var session = this.session;
         var selection = this.selection;
         var rangeList = selection.rangeList;
+        var result;
         
         var reg = selection._eventRegistry;
         selection._eventRegistry = {};
@@ -487,7 +488,9 @@ var Editor = require("./editor").Editor;
             }
             tmpSel.fromOrientedRange(rangeList.ranges[i]);
             this.selection = session.selection = tmpSel;
-            cmd.exec(this, args || {});
+            var cmdResult = cmd.exec(this, args || {});
+            if (!result == undefined)
+                result = cmdResult;
             tmpSel.toOrientedRange(rangeList.ranges[i]);
         }
         tmpSel.detach();
@@ -499,6 +502,7 @@ var Editor = require("./editor").Editor;
 
         this.onCursorChange();
         this.onSelectionChange();
+        return result;
     };
 
     /** 

lib/ace/snippets.js

@@ -760,8 +760,7 @@ var TabstopManager = function(editor) {
         "Esc": function(ed) {
             ed.tabstopManager.detach();
         },
-        // todo multiselectExec doesn't handle command return values
+        "Return": function(ed) {
-        "!Return": function(ed) {
             //ed.tabstopManager.tabNext(1);
             return false;
         }