Merge pull request #650 from atom/as-ns/fix-auto-indent

Fix auto-indent when the previous line ends with a comment with a quote

Author: Antonio Scandurra

settings/language-javascript.cson

@@ -4,9 +4,9 @@
     'commentStart': '// '
     'foldEndPattern': '^\\s*\\}|^\\s*\\]|^\\s*\\)'
     'increaseIndentPattern': '(?x)
-        \\{ [^}"\']* $
-      | \\[ [^\\]"\']* $
-      | \\( [^)"\']* $
+        \\{ [^}"\']*(//.*)? $
+      | \\[ [^\\]"\']*(//.*)? $
+      | \\( [^)"\']*(//.*)? $
       '
     'decreaseIndentPattern': '(?x)
         ^ \\s* (\\s* /[*] .* [*]/ \\s*)* [}\\])]

spec/javascript-spec.coffee

@@ -2202,7 +2202,7 @@ describe "JavaScript grammar", ->
     it "indents non-allman-style curly braces", ->
       expectPreservedIndentation """
         if (true) {
-          for (;;) {
+          for (;;) { // "
             while (true) {
               x();
             }
@@ -2226,7 +2226,7 @@ describe "JavaScript grammar", ->
 
     it "indents collection literals", ->
       expectPreservedIndentation """
-        [
+        [ // "
           {
             a: b,
             c: d
@@ -2239,7 +2239,7 @@ describe "JavaScript grammar", ->
     it "indents function arguments", ->
       expectPreservedIndentation """
         f(
-          g(
+          g( // "
             h,
             i
           ),