Fix JSLint/JSHint errors (some of which were on master).

Small docs & formatting tweaks.
Fix merge cruft in Editor-test & CSSUtils-test.

Author: peterflynn

src/editor/EditorManager.js

@@ -332,7 +332,7 @@ define(function (require, exports, module) {
 
         if (!editor) {
             if (!(document instanceof DocumentManager.Document)) {
-                throw new Error("_destroyEditorIfUnneeded() takes a Document arg, not an Editor");
+                throw new Error("_destroyEditorIfUnneeded() should be passed a Document");
             }
             return;
         }
@@ -676,7 +676,7 @@ define(function (require, exports, module) {
                 // an inline widget's editor has focus, so close it
                 PerfUtils.markStart(PerfUtils.INLINE_WIDGET_CLOSE);
                 inlineWidget.close().done(function () {
-                    PerfUtils.addMeasurement(PerfUtils.INLINE_WIDGET_CLOSE);        
+                    PerfUtils.addMeasurement(PerfUtils.INLINE_WIDGET_CLOSE);
                     // return a resolved promise to CommandManager
                     result.resolve(false);
                 });

src/language/LanguageManager.js

@@ -175,7 +175,7 @@ define(function (require, exports, module) {
     /**
      * Resolves a language ID to a Language object.
      * File names have a higher priority than file extensions. 
-     * @param {!string} id Identifier for this language: lowercase letters and digits with _ separators (e.g. "cpp", "foo_bar", "c99")
+     * @param {!string} id Identifier for this language: lowercase letters, digits, and _ separators (e.g. "cpp", "foo_bar", "c99")
      * @return {Language} The language with the provided identifier or undefined
      */
     function getLanguage(id) {
@@ -322,7 +322,7 @@ define(function (require, exports, module) {
 
     /**
      * Sets the identifier for this language or prints an error to the console.
-     * @param {!string} id Identifier for this language: lowercase letters and digits with _ separators (e.g. "cpp", "foo_bar", "c99")
+     * @param {!string} id Identifier for this language: lowercase letters, digits, and _ separators (e.g. "cpp", "foo_bar", "c99")
      * @return {boolean} Whether the ID was valid and set or not
      */
     Language.prototype._setId = function (id) {
@@ -637,11 +637,11 @@ define(function (require, exports, module) {
     /**
      * Defines a language.
      *
-     * @param {!string}               id                        Unique identifier for this language: lowercase letters and digits with _ separators (e.g. "cpp", "foo_bar", "c99")
+     * @param {!string}               id                        Unique identifier for this language: lowercase letters, digits, and _ separators (e.g. "cpp", "foo_bar", "c99")
      * @param {!Object}               definition                An object describing the language
      * @param {!string}               definition.name           Human-readable name of the language, as it's commonly referred to (e.g. "C++")
-     * @param {Array.<string>}        definition.fileExtensions List of file extensions used by this language (e.g. ["php", "php3"]). May contain periods (e.g. ["coffee.md"])
-     * @param {Array.<string>}        definition.fileNames      List of file names (e.g. ["Makefile"] or ["package.json])
+     * @param {Array.<string>}        definition.fileExtensions List of file extensions used by this language (e.g. ["php", "php3"] or ["coffee.md"] - may contain dots)
+     * @param {Array.<string>}        definition.fileNames      List of exact file names (e.g. ["Makefile"] or ["package.json]). Higher precedence than file extension.
      * @param {Array.<string>}        definition.blockComment   Array with two entries defining the block comment prefix and suffix (e.g. ["<!--", "-->"])
      * @param {string|Array.<string>} definition.lineComment    Line comment prefixes (e.g. "//" or ["//", "#"])
      * @param {string|Array.<string>} definition.mode           CodeMirror mode (e.g. "htmlmixed"), optionally with a MIME mode defined by that mode ["clike", "text/x-c++src"]

test/spec/CSSUtils-test.js

@@ -973,10 +973,10 @@ define(function (require, exports, module) {
 
                 // Braces inside string; string inside rule (not inside selector)
                 css = "a::after { content: ' {' attr(href) '}'; } \n" +
-                      ".foo { color:red } \n" +
-                      "a::after { content: \" {\" attr(href) \"}\"; } \n" +
-                      "li::before { content: \"} h4 { color:black }\"; } \n" +
-                      "div { color:green }";
+                    ".foo { color:red } \n" +
+                    "a::after { content: \" {\" attr(href) \"}\"; } \n" +
+                    "li::before { content: \"} h4 { color:black }\"; } \n" +
+                    "div { color:green }";
 
                 result = match(css, { tag: "a" });
                 expect(result.length).toBe(2);
@@ -999,7 +999,7 @@ define(function (require, exports, module) {
                 expect(result.length).toBe(1);
 
                 css = "@import \"null?\\\"{\"; \n" +   // a real-world CSS hack similar to the above case
-                      "div { color: red }";
+                    "div { color: red }";
                 result = match(css, { tag: "div" });
                 expect(result.length).toBe(1);
 
@@ -1051,9 +1051,9 @@ define(function (require, exports, module) {
                 expect(result.length).toBe(1);
 
                 css = ".foo\n" +
-                      "{\n" +
-                      "    color: red;\n" +
-                      "}";
+                    "{\n" +
+                    "    color: red;\n" +
+                    "}";
                 result = match(css, { clazz: "foo" });
                 expect(result.length).toBe(1);
             });
@@ -1425,11 +1425,9 @@ define(function (require, exports, module) {
             });
 
             afterEach(function () {
-                brackets            = null;
                 CSSUtils            = null;
                 DocumentManager     = null;
                 FileViewController  = null;
-                ProjectManager      = null;
                 SpecRunnerUtils.closeTestWindow();
             });
 

test/spec/Editor-test.js

@@ -113,7 +113,6 @@ define(function (require, exports, module) {
 
             it("should set mode based on Document language", function () {
                 createTestEditor(defaultContent, "html");
-                var mode = LanguageManager.getLanguageForPath("only/testing/the/path.css").getMode();
 
                 var htmlLanguage = LanguageManager.getLanguage("html");
                 expect(myEditor.getModeForDocument()).toBe(htmlLanguage.getMode());

test/spec/InstallExtensionDialog-test.js

@@ -522,6 +522,7 @@ define(function (require, exports, module) {
                 });
             });
 
+            // Cancelation vs. successful install race conditions
             it("should keep close button enabled and not throw an exception if install succeeds quickly after cancelation", function () {
                 var deferred = new $.Deferred(),
                     installer = makeInstaller(null, deferred);
@@ -534,7 +535,6 @@ define(function (require, exports, module) {
                     expect(fields.$okButton.prop("disabled")).toBe(false);
                 });
             });
-            
             it("should keep close button enabled and not throw an exception if install succeeds slowly after cancelation", function () {
                 var deferred = new $.Deferred(),
                     installer = makeInstaller(null, deferred);
@@ -567,6 +567,7 @@ define(function (require, exports, module) {
                 });
             });
 
+            // Cancelation vs. failed install race conditions
             it("should keep close button enabled and not throw an exception if install fails quickly after cancelation", function () {
                 var deferred = new $.Deferred(),
                     installer = makeInstaller(null, deferred);
@@ -594,7 +595,6 @@ define(function (require, exports, module) {
                     expect(fields.$okButton.prop("disabled")).toBe(false);
                 });
             });
-            
             it("should stay closed and not throw an exception if install fails after cancelation & force close", function () {
                 var deferred = new $.Deferred(),
                     installer = makeInstaller(null, deferred);
@@ -612,6 +612,7 @@ define(function (require, exports, module) {
                 });
             });
 
+            // Cancelation actually suceeding
             it("should keep close button enabled and not throw an exception if install cancelation completes quickly after cancelation", function () {
                 var deferred = new $.Deferred(),
                     installer = makeInstaller(null, deferred);
@@ -624,7 +625,6 @@ define(function (require, exports, module) {
                     expect(fields.$okButton.prop("disabled")).toBe(false);
                 });
             });
-            
             it("should keep close button enabled and not throw an exception if install cancelation completes slowly after cancelation", function () {
                 var deferred = new $.Deferred(),
                     installer = makeInstaller(null, deferred);
@@ -640,7 +640,6 @@ define(function (require, exports, module) {
                     expect(fields.$okButton.prop("disabled")).toBe(false);
                 });
             });
-            
             it("should stay closed and not throw an exception if install cancelation completes after cancelation & force close", function () {
                 var deferred = new $.Deferred(),
                     installer = makeInstaller(null, deferred);

test/spec/LanguageManager-test.js

@@ -151,7 +151,7 @@ define(function (require, exports, module) {
                 expect(LanguageManager.getLanguageForPath("/only/testing/the/path.css")).toBe(css);      // abs Mac/Linux-style
                 expect(LanguageManager.getLanguageForPath("only/testing/the/path.css")).toBe(css);       // relative
 
-                // Things that aren't extensions
+                // Unknown file types
                 expect(LanguageManager.getLanguageForPath("/code/html")).toBe(unknown);
                 expect(LanguageManager.getLanguageForPath("/code/foo.html.notreally")).toBe(unknown);
             });