Merge pull request #2942 from TomMalbran/tom/debug-extension

jasonsanjose · jasonsanjose · commit 30c2751a8d0d · 2013-02-26T15:13:47.000-08:00
Fix #2902: Externalize debug menu as an extension
diff --git a/src/base-config/keyboard.json b/src/base-config/keyboard.json
@@ -221,24 +221,6 @@
             "displayKey": "Alt-↓"
         }
     ],
-    "debug.showDeveloperTools":  [
-        {
-            "key": "F12"
-        },
-        {
-            "key": "Cmd-Opt-I",
-            "platform": "mac"
-        }
-    ],
-    "debug.refreshWindow":  [
-        {
-            "key": "F5"
-        },
-        {
-            "key": "Cmd-R",
-            "platform": "mac"
-        }
-    ],
     "file.rename":  [
         "F2"
     ]
diff --git a/src/brackets.config.json b/src/brackets.config.json
@@ -4,7 +4,6 @@
         "app_title"         : "Brackets",
         "app_name_about"    : "Brackets",
         "about_icon"        : "styles/images/brackets_icon.svg",
-        "show_debug_menu"   : true,
         "enable_jslint"     : true,
         "update_info_url"   : "https://dev.brackets.io/updates/stable/",
         "how_to_use_url"    : "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets",
diff --git a/src/brackets.js b/src/brackets.js
@@ -98,7 +98,6 @@ define(function (require, exports, module) {
     require("document/ChangedDocumentTracker");
     require("editor/EditorCommandHandlers");
     require("view/ViewCommandHandlers");
-    require("debug/DebugCommandHandlers");
     require("help/HelpCommandHandlers");
     require("search/FindInFiles");
     require("search/FindReplace");
diff --git a/src/command/Commands.js b/src/command/Commands.js
@@ -95,17 +95,6 @@ define(function (require, exports, module) {
     exports.QUICK_EDIT_NEXT_MATCH       = "navigate.nextMatch";
     exports.QUICK_EDIT_PREV_MATCH       = "navigate.previousMatch";
 
-    // Debug
-    exports.DEBUG_REFRESH_WINDOW        = "debug.refreshWindow"; // string must MATCH string in native code (brackets_extensions)
-    exports.DEBUG_SHOW_DEVELOPER_TOOLS  = "debug.showDeveloperTools";
-    exports.DEBUG_RUN_UNIT_TESTS        = "debug.runUnitTests";
-    exports.DEBUG_SHOW_PERF_DATA        = "debug.showPerfData";
-    exports.DEBUG_NEW_BRACKETS_WINDOW   = "debug.newBracketsWindow";
-    exports.DEBUG_SWITCH_LANGUAGE       = "debug.switchLanguage";
-    exports.DEBUG_ENABLE_NODE_DEBUGGER  = "debug.enableNodeDebugger";
-    exports.DEBUG_LOG_NODE_STATE        = "debug.logNodeState";
-    exports.DEBUG_RESTART_NODE          = "debug.restartNode";
-
     // Help
     exports.HELP_CHECK_FOR_UPDATE       = "help.checkForUpdate";
     exports.HELP_HOW_TO_USE_BRACKETS    = "help.howToUseBrackets";
diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -48,7 +48,6 @@ define(function (require, exports, module) {
         EDIT_MENU       : "edit-menu",
         VIEW_MENU       : "view-menu",
         NAVIGATE_MENU   : "navigate-menu",
-        DEBUG_MENU      : "debug-menu",     // Note: not present in some configurations of Brackets (getMenu() will return null)
         HELP_MENU       : "help-menu"
     };
 
@@ -1074,25 +1073,6 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.QUICK_EDIT_PREV_MATCH);
         menu.addMenuItem(Commands.QUICK_EDIT_NEXT_MATCH);
 
-        /*
-         * Debug menu
-         */
-        if (brackets.config.show_debug_menu) {
-            menu = addMenu(Strings.DEBUG_MENU, AppMenuBar.DEBUG_MENU);
-            menu.addMenuItem(Commands.DEBUG_SHOW_DEVELOPER_TOOLS);
-            menu.addMenuItem(Commands.DEBUG_REFRESH_WINDOW);
-            menu.addMenuItem(Commands.DEBUG_NEW_BRACKETS_WINDOW);
-            menu.addMenuDivider();
-            menu.addMenuItem(Commands.DEBUG_SWITCH_LANGUAGE);
-            menu.addMenuDivider();
-            menu.addMenuItem(Commands.DEBUG_RUN_UNIT_TESTS);
-            menu.addMenuItem(Commands.DEBUG_SHOW_PERF_DATA);
-            menu.addMenuDivider();
-            menu.addMenuItem(Commands.DEBUG_ENABLE_NODE_DEBUGGER);
-            menu.addMenuItem(Commands.DEBUG_LOG_NODE_STATE);
-            menu.addMenuItem(Commands.DEBUG_RESTART_NODE);
-        }
-
         /*
          * Help menu
          */
diff --git a/src/config.json b/src/config.json
@@ -3,7 +3,6 @@
         "app_title": "Brackets",
         "app_name_about": "Brackets",
         "about_icon": "styles/images/brackets_icon.svg",
-        "show_debug_menu": true,
         "enable_jslint": true,
         "update_info_url": "https://dev.brackets.io/updates/stable/",
         "how_to_use_url": "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets",
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, brackets, PathUtils, WebSocket, window */
+/*global define, $, brackets, PathUtils, window */
 
 define(function (require, exports, module) {
     "use strict";
@@ -508,43 +508,6 @@ define(function (require, exports, module) {
         return result.promise();
     }
     
-
-    /**
-     * Disables Brackets' cache via the remote debugging protocol.
-     * @return {$.Promise} A jQuery promise that will be resolved when the cache is disabled and be rejected in any other case
-     */
-    function _disableCache() {
-        var result = new $.Deferred();
-        
-        if (brackets.inBrowser) {
-            result.resolve();
-        } else {
-            var Inspector = require("LiveDevelopment/Inspector/Inspector");
-            Inspector.getAvailableSockets("127.0.0.1", "9234")
-                .fail(result.reject)
-                .done(function (response) {
-                    var page = response[0];
-                    if (!page || !page.webSocketDebuggerUrl) {
-                        result.reject();
-                        return;
-                    }
-                    var _socket = new WebSocket(page.webSocketDebuggerUrl);
-                    // Disable the cache
-                    _socket.onopen = function _onConnect() {
-                        _socket.send(JSON.stringify({ id: 1, method: "Network.setCacheDisabled", params: { "cacheDisabled": true } }));
-                    };
-                    // The first message will be the confirmation => disconnected to allow remote debugging of Brackets
-                    _socket.onmessage = function _onMessage(e) {
-                        _socket.close();
-                        result.resolve();
-                    };
-                    // In case of an error
-                    _socket.onerror = result.reject;
-                });
-        }
-            
-        return result.promise();
-    }
     
     /**
      * Closes the specified file: removes it from the working set, and closes the main editor if one
@@ -721,14 +684,14 @@ define(function (require, exports, module) {
     }
     
     /**
-    * @private - tracks our closing state if we get called again
-    */
+     * @private - tracks our closing state if we get called again
+     */
     var _windowGoingAway = false;
     
     /**
-    * @private
-    * Common implementation for close/quit/reload which all mostly
-    * the same except for the final step
+     * @private
+     * Common implementation for close/quit/reload which all mostly
+     * the same except for the final step
     */
     function _handleWindowGoingAway(commandData, postCloseHandler, failHandler) {
         if (_windowGoingAway) {
@@ -759,11 +722,11 @@ define(function (require, exports, module) {
                 }
             });
     }
-
+	
     /**
-    * @private
-    * Implementation for abortQuit callback to reset quit sequence settings
-    */
+     * @private
+     * Implementation for abortQuit callback to reset quit sequence settings
+     */
     function _handleAbortQuit() {
         _windowGoingAway = false;
     }
@@ -813,16 +776,6 @@ define(function (require, exports, module) {
         );
     }
 
-    /** Does a full reload of the browser window */
-    function handleFileReload(commandData) {
-        return _handleWindowGoingAway(commandData, function () {
-            // Disable the cache to make reloads work
-            _disableCache().always(function () {
-                window.location.reload(true);
-            });
-        });
-    }
-    
     
     /** Are we already listening for a keyup to call detectDocumentNavEnd()? */
     var _addedNavKeyHandler = false;
@@ -900,8 +853,6 @@ define(function (require, exports, module) {
         CommandManager.register(Strings.CMD_QUIT,           Commands.FILE_QUIT, handleFileQuit);
     }
 
-    CommandManager.register(Strings.CMD_REFRESH_WINDOW,     Commands.DEBUG_REFRESH_WINDOW, handleFileReload)
-        .setEnabled(brackets.config.show_debug_menu);
     CommandManager.register(Strings.CMD_ABORT_QUIT,         Commands.APP_ABORT_QUIT, _handleAbortQuit);
     
     CommandManager.register(Strings.CMD_NEXT_DOC,           Commands.NAVIGATE_NEXT_DOC, handleGoNextDoc);
@@ -911,5 +862,5 @@ define(function (require, exports, module) {
     // Listen for changes that require updating the editor titlebar
     $(DocumentManager).on("dirtyFlagChange", handleDirtyChange);
     $(DocumentManager).on("currentDocumentChange fileNameChange", updateDocumentTitle);
-});
 
+});
diff --git a/src/extensions/default/DebugCommands/NodeDebugUtils.js b/src/extensions/default/DebugCommands/NodeDebugUtils.js
@@ -27,7 +27,7 @@
 define(function (require, exports, module) {
     "use strict";
     
-    var NodeConnection = require("utils/NodeConnection");
+    var NodeConnection = brackets.getModule("utils/NodeConnection");
     
     /**
      * @private
diff --git a/src/extensions/default/DebugCommands/keyboard.json b/src/extensions/default/DebugCommands/keyboard.json
@@ -0,0 +1,20 @@
+{
+    "showDeveloperTools":  [
+        {
+            "key": "F12"
+        },
+        {
+            "key": "Cmd-Opt-I",
+            "platform": "mac"
+        }
+    ],
+    "refreshWindow":  [
+        {
+            "key": "F5"
+        },
+        {
+            "key": "Cmd-R",
+            "platform": "mac"
+        }
+    ]
+}
diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js
