From d826f8f591ae338fe79184387b26fd8a5721d29d Mon Sep 17 00:00:00 2001
From: Christian Fritz <christian.fritz@gmail.com>
Date: Sun, 21 Oct 2018 21:14:54 -0700
Subject: [PATCH 1/2] Adding configuration for new, tree-sitter based
 indentation logic in core

See this PR in atom/atom: https://github.com/atom/atom/pull/18321.

Once the other PR is merged, this one then fixes https://github.com/atom/language-javascript/issues/594.

Updated: now without the need for a callback function as part of configuration
---
 settings/language-javascript.cson | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/settings/language-javascript.cson b/settings/language-javascript.cson
index f7bc48f6..d14f1bc8 100644
--- a/settings/language-javascript.cson
+++ b/settings/language-javascript.cson
@@ -11,3 +11,31 @@
     'decreaseIndentPattern': '(?x)
         ^ \\s* (\\s* /[*] .* [*]/ \\s*)* [}\\])]
       '
+    scopes:
+      indent:
+        array: true
+        object: true
+        arguments: true
+        statement_block: true
+        class_body: true
+        parenthesized_expression: true
+        jsx_element: true
+        jsx_opening_element: true
+        jsx_expression: true
+        switch_body: true
+        comment: true
+      indentExceptFirst:
+        member_expression: true
+        assignment_expression: true
+        expression_statement: true
+        variable_declarator: true
+        lexical_declaration: true
+        binary_expression: true
+        jsx_self_closing_element: true
+      indentExceptFirstOrBlock:
+        if_statement: true
+        while_statement: true
+      types:
+        indent: {}
+        outdent:
+          else: true

From b73b939514c3186a5372cbd4b244f9896bde3147 Mon Sep 17 00:00:00 2001
From: Christian Fritz <christian.fritz@gmail.com>
Date: Mon, 31 May 2021 15:24:59 -0700
Subject: [PATCH 2/2] Updated scopes for tree-sitter-indentation for newer
 versions of atom

---
 settings/language-javascript.cson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/language-javascript.cson b/settings/language-javascript.cson
index d14f1bc8..c1faf435 100644
--- a/settings/language-javascript.cson
+++ b/settings/language-javascript.cson
@@ -23,7 +23,6 @@
         jsx_opening_element: true
         jsx_expression: true
         switch_body: true
-        comment: true
       indentExceptFirst:
         member_expression: true
         assignment_expression: true
@@ -36,6 +35,7 @@
         if_statement: true
         while_statement: true
       types:
-        indent: {}
+        indent:
+          description: true
         outdent:
           else: true