From e13e1dbf560732c4e87c077380ef2d6a00d229b8 Mon Sep 17 00:00:00 2001
From: Christian Fritz <christian.fritz@gmail.com>
Date: Sun, 10 Jan 2016 19:32:47 -0800
Subject: [PATCH 1/2] Updated regex's for indentation

This is intended for use with the new language-mode logic of atom/atom
commit 544112516e362f8741f418a9876b36d9261dd13b.

Fixes #4983 (when used with the above mentioned commit in atom/atom).
---
 settings/language-javascript.cson | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/settings/language-javascript.cson b/settings/language-javascript.cson
index 8d1243e7..ed54ff98 100644
--- a/settings/language-javascript.cson
+++ b/settings/language-javascript.cson
@@ -2,11 +2,6 @@
   'editor':
     'commentStart': '// '
     'foldEndPattern': '^\\s*\\}|^\\s*\\]|^\\s*\\)'
-    'increaseIndentPattern': '(?x)
-        \\{ [^}"\']* $
-      | \\[ [^\\]"\']* $
-      | \\( [^)"\']* $
-      '
-    'decreaseIndentPattern': '(?x)
-        ^ \\s* (\\s* /[*] .* [*]/ \\s*)* [}\\])]
-      '
+    'decreaseIndentPattern': "^\\s*[\\}\\]\\)]"
+    'decreaseNextIndentPattern': "[\\}\\]\\)]"
+    'increaseIndentPattern': "[\\{\\[\\(]"

From 700240d070027f5a5f2fd24bbd319620683751bd Mon Sep 17 00:00:00 2001
From: Christian Fritz <christian.fritz@gmail.com>
Date: Sun, 10 Jan 2016 21:04:20 -0800
Subject: [PATCH 2/2] Fixed regexes for indentation

Sorry, previously had missed to copy back things from my local config
file into the language settings.
---
 settings/language-javascript.cson | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/language-javascript.cson b/settings/language-javascript.cson
index ed54ff98..e172aeaa 100644
--- a/settings/language-javascript.cson
+++ b/settings/language-javascript.cson
@@ -2,6 +2,6 @@
   'editor':
     'commentStart': '// '
     'foldEndPattern': '^\\s*\\}|^\\s*\\]|^\\s*\\)'
-    'decreaseIndentPattern': "^\\s*[\\}\\]\\)]"
-    'decreaseNextIndentPattern': "[\\}\\]\\)]"
-    'increaseIndentPattern': "[\\{\\[\\(]"
+    decreaseThisIndentPattern: "^\\s*[\\}\\]\\)]"
+    decreaseIndentPattern: "[\\}\\]\\)]"
+    increaseIndentPattern: "[\\{\\[\\(]"