Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit 99f24f3

Browse files
committed
Moved TreeIndenter config to code as suggested
This is to have it all in one place.
1 parent 955bc72 commit 99f24f3

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

lib/main.js

+29-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,36 @@ exports.activate = function () {
6262
})
6363
}
6464

65-
// This feels hacky. Better suggestions welcome.
6665
const grammar = atom.grammars.grammarForId('source.js')
66+
67+
grammar.scopes = {
68+
indent: {
69+
array: true,
70+
object: true,
71+
arguments: true,
72+
statement_block: true,
73+
class_body: true,
74+
parenthesized_expression: true,
75+
jsx_element: true,
76+
jsx_opening_element: true,
77+
jsx_expression: true,
78+
switch_body: true,
79+
comment: true },
80+
indentExceptFirst: {
81+
member_expression: true,
82+
assignment_expression: true,
83+
expression_statement: true,
84+
variable_declarator: true,
85+
lexical_declaration: true,
86+
binary_expression: true },
87+
types: {
88+
indent: {},
89+
outdent: {
90+
access_specifier: true
91+
}
92+
}
93+
}
94+
6795
grammar.precedingRowConditions = (node) => (
6896
(node.parent.type == 'while_statement' && node.type != 'statement_block')
6997
|| (node.parent.type == 'jsx_self_closing_element' && node.type != '/')

settings/language-javascript.cson

-24
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,3 @@
1111
'decreaseIndentPattern': '(?x)
1212
^ \\s* (\\s* /[*] .* [*]/ \\s*)* [}\\])]
1313
'
14-
scopes:
15-
indent:
16-
array: true
17-
object: true
18-
arguments: true
19-
statement_block: true
20-
class_body: true
21-
parenthesized_expression: true
22-
jsx_element: true
23-
jsx_opening_element: true
24-
jsx_expression: true
25-
switch_body: true
26-
comment: true
27-
indentExceptFirst:
28-
member_expression: true
29-
assignment_expression: true
30-
expression_statement: true
31-
variable_declarator: true
32-
lexical_declaration: true
33-
binary_expression: true
34-
types:
35-
indent: {}
36-
outdent:
37-
access_specifier: true

0 commit comments

Comments
 (0)