Merge with master

Author: TomMalbran

.gitmodules

@@ -12,10 +12,10 @@
 	url = https://github.com/janl/mustache.js.git
 [submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/tern"]
 	path = src/extensions/default/JavaScriptCodeHints/thirdparty/tern
-	url = https://github.com/dangoor/tern.git
+	url = https://github.com/marijnh/tern.git
 [submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/acorn"]
 	path = src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
-	url = https://github.com/dangoor/acorn.git
+	url = https://github.com/marijnh/acorn.git
 [submodule "src/thirdparty/requirejs"]
 	path = src/thirdparty/requirejs
 	url = https://github.com/jrburke/requirejs.git

README.md

@@ -34,11 +34,11 @@ what's missing!
 
 #### Download
 
-Installers for the latest stable build for Mac and Windows can be [downloaded here](http://download.brackets.io/).
-
-A Linux port is in the works; check out the
-[Linux wiki page](https://github.com/adobe/brackets/wiki/Linux-Version).
+Installers for the latest stable build for Mac, Windows and Linux (Debian/Ubuntu) can be [downloaded here](http://download.brackets.io/).
 
+The Linux version has most of the features of the Mac and Windows versions, but
+is still missing a few things. See the [Linux wiki page](https://github.com/adobe/brackets/wiki/Linux-Version)
+for a list of known issues and to find out how you can help.
 
 #### Usage
 
@@ -53,8 +53,9 @@ for a list of new features and known issues in each build.
 
 In addition to the core features built into Brackets, there is a large and growing
 community of developers building extensions that add all sorts of useful functionality.
-See the [extensions wiki page](https://github.com/adobe/brackets/wiki/Brackets-Extensions)
-for a list of extensions and instructions on how to install them.
+See the [Brackets Extension Registry](https://brackets-registry.aboutweb.com/)
+for a list of available extensions. For installation instructions,
+see the [extensions wiki page](https://github.com/adobe/brackets/wiki/Brackets-Extensions).
 
 #### Need help?
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Brackets",
-    "version": "0.29.0-0",
-    "apiVersion": "0.29.0",
+    "version": "0.30.0-0",
+    "apiVersion": "0.30.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"

src/command/CommandManager.js

@@ -237,7 +237,7 @@ define(function (require, exports, module) {
 
         if (command) {
             try {
-                $(exports).triggerHandler("beforeExecuteCommand");
+                $(exports).triggerHandler("beforeExecuteCommand", id);
             } catch (err) {
                 console.error(err);
             }

src/config.json

@@ -17,8 +17,8 @@
         "extension_url": "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip"
     },
     "name": "Brackets",
-    "version": "0.29.0-0",
-    "apiVersion": "0.29.0",
+    "version": "0.30.0-0",
+    "apiVersion": "0.30.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"

src/editor/Editor.js

@@ -705,7 +705,7 @@ define(function (require, exports, module) {
     /**
      * Gets the current cursor position within the editor. If there is a selection, returns whichever
      * end of the range the cursor lies at.
-     * @param {boolean} expandTabs If true, return the actual visual column number instead of the character offset in
+     * @param {boolean} expandTabs  If true, return the actual visual column number instead of the character offset in
      *      the "ch" property.
      * @return !{line:number, ch:number}
      */
@@ -721,7 +721,7 @@ define(function (require, exports, module) {
     /**
      * Returns the display column (zero-based) for a given string-based pos. Differs from pos.ch only
      * when the line contains preceding \t chars. Result depends on the current tab size setting.
-     * @param {!{line:number, ch:number}}
+     * @param {!{line:number, ch:number}} pos
      * @return {number}
      */
     Editor.prototype.getColOffset = function (pos) {
@@ -742,11 +742,16 @@ define(function (require, exports, module) {
 
     /**
      * Sets the cursor position within the editor. Removes any selection.
-     * @param {number} line The 0 based line number.
+     * @param {number} line  The 0 based line number.
      * @param {number} ch  The 0 based character position; treated as 0 if unspecified.
-     * @param {boolean} center  true if the view should be centered on the new cursor position
+     * @param {boolean=} center  True if the view should be centered on the new cursor position.
+     * @param {boolean=} expandTabs  If true, use the actual visual column number instead of the character offset as
+     *      the "ch" parameter.
      */
-    Editor.prototype.setCursorPos = function (line, ch, center) {
+    Editor.prototype.setCursorPos = function (line, ch, center, expandTabs) {
+        if (expandTabs) {
+            ch = this.getColOffset({line: line, ch: ch});
+        }
         this._codeMirror.setCursor(line, ch);
         if (center) {
             this.centerOnCursor();

src/extensibility/ExtensionManager.js

@@ -334,6 +334,14 @@ define(function (require, exports, module) {
                 brackets.fs.unlink(filename, function () { });
             }
         });
+        _idsToUpdate = {};
+    }
+    
+    /**
+     * Unmarks all extensions marked for removal.
+     */
+    function unmarkAllForRemoval() {
+        _idsToRemove = {};
     }
 
     /**
@@ -469,6 +477,7 @@ define(function (require, exports, module) {
     exports.cleanupUpdates = cleanupUpdates;
     exports.markForRemoval = markForRemoval;
     exports.isMarkedForRemoval = isMarkedForRemoval;
+    exports.unmarkAllForRemoval = unmarkAllForRemoval;
     exports.hasExtensionsToRemove = hasExtensionsToRemove;
     exports.updateFromDownload = updateFromDownload;
     exports.removeUpdate = removeUpdate;

src/extensibility/ExtensionManagerDialog.js

@@ -131,6 +131,7 @@ define(function (require, exports, module) {
                             });
                     } else {
                         ExtensionManager.cleanupUpdates();
+                        ExtensionManager.unmarkAllForRemoval();
                     }
                 });
         }

src/extensions/default/CSSCodeHints/CSSProperties.json

@@ -189,6 +189,7 @@
     "white-space":                 {"values": ["normal", "nowrap", "pre", "pre-line", "pre-wrap", "inherit"]},
     "widows":                      {"values": ["inherit"]},
     "width":                       {"values": ["auto", "inherit"]},
+    "word-break":                  {"values": ["normal", "break-all", "keep-all"]},
     "word-spacing":                {"values": ["normal", "inherit"]},
     "word-wrap":                   {"values": ["break-word", "normal"]},
     "z-index":                     {"values": ["auto", "inherit"]}

src/extensions/default/DebugCommands/main.js

@@ -188,10 +188,8 @@ define(function (require, exports, module) {
                 });
 
                 var template = Mustache.render(LanguageDialogTemplate, {languages: languages, Strings: Strings});
-                Dialogs.showModalDialogUsingTemplate(template).done(function () {
-                    if (locale === undefined) {
-                        return;
-                    } else if (locale !== curLocale) {
+                Dialogs.showModalDialogUsingTemplate(template).done(function (id) {
+                    if (id === Dialogs.DIALOG_BTN_OK && locale !== curLocale) {
                         brackets.setLocale(locale);
                         CommandManager.execute(DEBUG_REFRESH_WINDOW);
                     }