Merge remote-tracking branch 'origin/master' into pflynn/block-comment-unittests

* origin/master: (154 commits)
  Made ContextMenu actually call its superclass constructor (instead of assigning a new menu to this.menu, which isn't actually used).
  Increase test timeout when requesting a native file system for a drive.
  Code review: add testcase for nonempty invalid regex; remove unneeded JS dependency.
  Align equals signs
  Code review cleanups
  Code review cleanups
  rename back to copyPath()
  fix jslint errors
  code review comments
  more code review comments
  Small jsdoc fix in _fsErrorToDOMErrorName
  For #2310, consider an empty line number query valid, but show error if the line number is out of range of the editor
  code review comments
  Use scrollTop instead of scrollIntoView for #2130
  Add a few more unit tests for Find. Update unit-test harness files to include this suite.
  Rename _nativeToFileError to _fsErrorToDOMErrorName
  Increase timeout when waiting for a new NativeFileSystem to be created.
  Global FileError.* and error.code refactor
  External NativeFileError
  Fix jsdocs and change _nativeToFileError signature
  ...

Author: peterflynn

.gitignore

@@ -11,3 +11,6 @@ src/extensions/disabled
 
 #OSX .DS_Store files
 .DS_Store
+
+# unit test working directory
+test/temp

README.md

@@ -1,24 +1,24 @@
 Welcome to Brackets!
 -------------------
 
-This is a very early version of Brackets, a code editor for HTML, CSS 
+This is an early version of Brackets, a code editor for HTML, CSS
 and JavaScript that's *built* in HTML, CSS and JavaScript. 
 
 What makes Brackets different from other web code editors?
 * **Tools shouldn't get in your way.** Instead of cluttering up your coding
 environment with lots of panels and icons, the Quick Edit UI in Brackets puts 
 context-specific code and tools inline.
 * **Brackets is in sync with your browser.** With Live Development, Brackets
-works directly with your browser to push code edits instantly, set breakpoints, 
-and jump back and forth between your real source code and the browser view.
+works directly with your browser to push code edits instantly and jump
+back and forth between your real source code and the browser view.
 * **Do it yourself.** Because Brackets is open source, and built with HTML, CSS
 and JavaScript, you can help build the best code editor for the web.
 
 You can see some 
 [screenshots of Brackets](https://github.com/adobe/brackets/wiki/Brackets-Screenshots)
 on the wiki.
 
-Brackets is *very* early in development, so many of the features you would
+Brackets is early in development, so many of the features you would
 expect in a code editor are missing, and some existing features might be
 incomplete or not as useful as you'd want. But if you like the direction
 it's going, please contribute!
@@ -32,7 +32,7 @@ for info on upcoming things we're planning to contribute to CodeMirror.
 How to run Brackets
 -------------------
 
-**Brackets isn't ready for general use yet.** It's still *very* early in
+**Brackets isn't ready for general use yet.** It's still early in
 development, is missing a lot of basic editor features, and *probably*
 has bugs. That said, we've actually been using Brackets to develop Brackets
 for awhile now, so what's there is reasonably stable.
@@ -43,9 +43,11 @@ application in a thin native shell, so that it can access your local files.
 The native shell for Brackets lives in a separate repo, 
 [adobe/brackets-shell](https://github.com/adobe/brackets-shell/).
 
-The Brackets native shell currently runs on Mac and Windows. Since it's based on 
-CEF/Chromium, it could be ported to Linux relatively easily, but that work hasn't 
-been done yet. Stay tuned.
+The Brackets native shell currently runs on Mac and Windows.
+The community has started working on a Linux port, and is making great progress;
+if you're interested, check out the
+[discussion thread](https://groups.google.com/forum/?fromgroups=#!topic/brackets-dev/29vOJ6tvl8A)
+on the brackets-dev Google Group.
 
 You can download "stable" builds of Brackets from the **Download Packages** section of the 
 [downloads page](http://github.com/adobe/brackets/downloads)--make sure you download one
@@ -74,9 +76,9 @@ Brackets bugs are tracked in [the Brackets github issue tracker](https://github.
 When filing a new bug, please remember to include:
 
 * Brackets version/sprint number (or commit SHA if you're pulling directly from the repo)
-* platform/OS version
-* repro steps, actual and expected results
-* link to test files (you can create a gist on [gist.github.com](https://gist.github.com/) 
+* Platform/OS version
+* Steps to reproduce problem with actual and expected results
+* Link to test files (you can create a gist on [gist.github.com](https://gist.github.com/) 
   if that's convenient)       
 
 More details on how to file an issue can be found [here](https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue).     

samples/es/Primeros Pasos/index.html

@@ -91,10 +91,11 @@ <h3>Visualiza cambios CSS en vivo en el navegador</h3>
 </samp>
 
 <p class="note">
-    Actualmente, Brackets sólo soporta Desarrollo en Vivo para CSS. Añadiremos soporte para Desarrollo en
-    Vivo de HTML y JavaScript en próximas versionas. Las actualizaciones automáticas sólo son posibles en
-    Google Chrome en estos momentos. Queremos trasladar esta funcionalidad a todos los grandes navegadores,
-    y estamos deseando poder trabajar con ellos para conseguirlo.
+    Actualmente, Brackets sólo soporta Desarrollo en Vivo para CSS. En estos momentos estamos trabajando en
+    añadir soporte para Desarrollo en Vivo de HTML y JavaScript. En la versión actual, no podrás ver tus cambios
+    en HTML hasta que guardes el archivo. Las actualizaciones automáticas sólo son posibles en Google Chrome en 
+    estos momentos. Queremos trasladar esta funcionalidad a todos los grandes navegadores, y estamos deseando 
+    poder trabajar con ellos para conseguirlo.
 </p>
 
 <!--

samples/root/Getting Started/index.html

@@ -88,10 +88,10 @@ <h3>Preview CSS changes live in the browser</h3>
 </samp>
 
 <p class="note">
-    Today, Brackets only supports Live Preview for CSS. We will be adding Live Preview support for HTML
-    and JavaScript support in a future release. Live previews are only possible with Google Chrome today.
-    We want to bring this functionality to all major browsers, and we're looking forward to working with
-    those vendors.
+    Today, Brackets only supports Live Preview for CSS. We are currently working on Live Preview support
+    for HTML and JavaScript. In the current version, you won't see changes to your HTML file until you save
+    the document. Live previews are only possible with Google Chrome. We want to bring this functionality
+    to all major browsers, and we're looking forward to working with those vendors.
 </p>
 
 <!--

src/LiveDevelopment/Agents/RemoteFunctions.js

@@ -192,7 +192,7 @@ function RemoteFunctions(experimental) {
         this.color = color;
         this.trigger = !!trigger;
         this.elements = [];
-        this.orgColors = [];
+        this.selector = "";
     }
 
     Highlight.prototype = {
@@ -216,27 +216,30 @@ function RemoteFunctions(experimental) {
             var stylesToSet = {
                 "left": _screenOffset(element, "offsetLeft") + "px",
                 "top": _screenOffset(element, "offsetTop") + "px",
-                "width": elementBounds.width + "px",
-                "height": elementBounds.height + "px",
+                "width": (elementBounds.width - 2) + "px",
+                "height": (elementBounds.height - 2) + "px",
                 "z-index": 2000000,
                 "position": "absolute",
                 "pointer-events": "none",
                 "border-top-left-radius": styles.borderTopLeftRadius,
                 "border-top-right-radius": styles.borderTopRightRadius,
                 "border-bottom-left-radius": styles.borderBottomLeftRadius,
-                "border-bottom-right-radius": styles.borderBottomRightRadius
+                "border-bottom-right-radius": styles.borderBottomRightRadius,
+                "border-style": "solid",
+                "border-width": "1px",
+                "border-color": "rgb(94,167,255)"
             };
 
             var animateStartValues = {
                 "opacity": 0,
                 "background": "rgba(94,167,255, 0.5)",
-                "box-shadow": "0 0 2px 1px rgba(94,167,255, 1), inset 0 0 4px 1px rgba(255,255,255,1)"
+                "box-shadow": "0 0 6px 1px rgba(94,167,255, 0.6), inset 0 0 4px 1px rgba(255,255,255,1)"
             };
 
             var animateEndValues = {
                 "opacity": 1,
                 "background": "rgba(94,167,255, 0.1)",
-                "box-shadow": "0 0 1px 1px rgba(94,167,255, 0.6), inset 0 0 4px 1px rgba(255,255,255,0.8)"
+                "box-shadow": "0 0 1px 0 rgba(94,167,255, 0), inset 0 0 4px 1px rgba(255,255,255,0.8)"
             };
 
             var transitionValues = {
@@ -296,10 +299,18 @@ function RemoteFunctions(experimental) {
         },
 
         redraw: function () {
-            var i, highlighted = this.elements.slice(0);
+            var i, highlighted;
+            
+            // When redrawing a selector-based highlight, run a new selector
+            // query to ensure we have the latest set of elements to highlight.
+            if (this.selector) {
+                highlighted = window.document.querySelectorAll(this.selector);
+            } else {
+                highlighted = this.elements.slice(0);
+            }
 
             this.clear();
-            for (i in highlighted) {
+            for (i = 0; i < highlighted.length; i++) {
                 this.add(highlighted[i], false);
             }
         }
@@ -423,6 +434,7 @@ function RemoteFunctions(experimental) {
         for (i = 0; i < nodes.length; i++) {
             highlight(nodes[i]);
         }
+        _remoteHighlight.selector = rule;
     }
 
     // redraw active highlights

src/LiveDevelopment/Documents/CSSDocument.js

@@ -49,6 +49,7 @@ define(function CSSDocumentModule(require, exports, module) {
     "use strict";
 
     var CSSAgent        = require("LiveDevelopment/Agents/CSSAgent"),
+        CSSUtils        = require("language/CSSUtils"),
         EditorManager   = require("editor/EditorManager"),
         HighlightAgent  = require("LiveDevelopment/Agents/HighlightAgent"),
         Inspector       = require("LiveDevelopment/Inspector/Inspector");
@@ -78,7 +79,6 @@ define(function CSSDocumentModule(require, exports, module) {
         if (doc.isDirty) {
             CSSAgent.reloadCSSForDocument(this.doc);
         }
-        this.reloadRules();
 
         this.onActiveEditorChange = this.onActiveEditorChange.bind(this);
         $(EditorManager).on("activeEditorChange", this.onActiveEditorChange);
@@ -146,45 +146,13 @@ define(function CSSDocumentModule(require, exports, module) {
             this.editor = null;
         }
     };
-    
-    // Reload rules
-    CSSDocument.prototype.reloadRules = function () {
-        this.loadRulePromise = this.getStyleSheetFromBrowser().done(function (styleSheet) {
-            this.rules = styleSheet.rules;
-            this.loadRulePromise = null;
-            if (this.pendingCursorActivity) {
-                this.pendingCursorActivity = false;
-                this.onCursorActivity();
-            }
-        }.bind(this));
-    };
-    
-    // find a rule in the given rules
-    CSSDocument.prototype.ruleAtLocation = function ruleAtLocation(location) {
-        var i, rule;
-        for (i in this.rules) {
-            rule = this.rules[i];
-            if (rule.selectorRange.start <= location && location <= rule.style.range.end) {
-                return rule;
-            }
-        }
-        return null;
-    };
 
     CSSDocument.prototype.updateHighlight = function () {
-        if (Inspector.config.highlight) {
-            // If there is an active loadRulePromise, we can't accurately get the rule
-            // at the location. Set a flag here so we can get called again once the
-            // rules have arrived.
-            if (this.loadRulePromise) {
-                this.pendingCursorActivity = true;
-                return;
-            }
+        if (Inspector.config.highlight && this.editor) {
             var codeMirror = this.editor._codeMirror;
-            var location = codeMirror.indexFromPos(codeMirror.getCursor());
-            var rule = this.ruleAtLocation(location);
-            if (rule) {
-                HighlightAgent.rule(rule.selectorText);
+            var selector = CSSUtils.findSelectorAtDocumentPos(this.editor, codeMirror.getCursor());
+            if (selector) {
+                HighlightAgent.rule(selector);
             } else {
                 HighlightAgent.hide();
             }
@@ -202,7 +170,6 @@ define(function CSSDocumentModule(require, exports, module) {
     CSSDocument.prototype.onChange = function onChange(event, editor, change) {
         // brute force: update the CSS
         CSSAgent.reloadCSSForDocument(this.doc);
-        this.reloadRules();
         if (Inspector.config.highlight) {
             HighlightAgent.redraw();
         }

src/LiveDevelopment/LiveDevelopment.js

@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
-/*global define, $, FileError, brackets, window */
+/*global define, $, brackets, window */
 
 /**
  * LiveDevelopment manages the Inspector, all Agents, and the active LiveDocument
@@ -68,6 +68,7 @@ define(function LiveDevelopment(require, exports, module) {
         DocumentManager     = require("document/DocumentManager"),
         EditorManager       = require("editor/EditorManager"),
         FileUtils           = require("file/FileUtils"),
+        NativeFileError     = require("file/NativeFileError"),
         NativeApp           = require("utils/NativeApp"),
         PreferencesDialogs  = require("preferences/PreferencesDialogs"),
         ProjectManager      = require("project/ProjectManager"),
@@ -548,7 +549,7 @@ define(function LiveDevelopment(require, exports, module) {
                 retryCount++;
 
                 if (!browserStarted && exports.status !== STATUS_ERROR) {
-                    url = launcherUrl + '?' + encodeURIComponent(url);
+                    url = launcherUrl + "?" + encodeURIComponent(url);
 
                     // If err === FileError.ERR_NOT_FOUND, it means a remote debugger connection
                     // is available, but the requested URL is not loaded in the browser. In that
@@ -558,7 +559,7 @@ define(function LiveDevelopment(require, exports, module) {
                     // --remote-debugging-port flag set.
                     NativeApp.openLiveBrowser(
                         url,
-                        err !== FileError.ERR_NOT_FOUND
+                        err !== NativeFileError.ERR_NOT_FOUND
                     )
                         .done(function () {
                             browserStarted = true;
@@ -567,7 +568,7 @@ define(function LiveDevelopment(require, exports, module) {
                             var message;
 
                             _setStatus(STATUS_ERROR);
-                            if (err === FileError.NOT_FOUND_ERR) {
+                            if (err === NativeFileError.NOT_FOUND_ERR) {
                                 message = Strings.ERROR_CANT_FIND_CHROME;
                             } else {
                                 message = StringUtils.format(Strings.ERROR_LAUNCHING_BROWSER, err);
@@ -623,6 +624,13 @@ define(function LiveDevelopment(require, exports, module) {
             agents.highlight.hide();
         }
     }
+    
+    /** Redraw highlights **/
+    function redrawHighlight() {
+        if (Inspector.connected() && agents.highlight) {
+            agents.highlight.redraw();
+        }
+    }
 
     /** Triggered by a document change from the DocumentManager */
     function _onDocumentChange() {
@@ -697,5 +705,6 @@ define(function LiveDevelopment(require, exports, module) {
     exports.getLiveDocForPath   = getLiveDocForPath;
     exports.showHighlight       = showHighlight;
     exports.hideHighlight       = hideHighlight;
+    exports.redrawHighlight     = redrawHighlight;
     exports.init                = init;
 });

src/LiveDevelopment/main.js

@@ -211,6 +211,14 @@ define(function main(require, exports, module) {
                 }
             });
         }
+        
+        // Redraw highlights when window gets focus. This ensures that the highlights
+        // will be in sync with any DOM changes that may have occurred.
+        $(window).focus(function () {
+            if (Inspector.connected() && config.highlight) {
+                LiveDevelopment.redrawHighlight();
+            }
+        });
     }
 
     // init prefs