Skip to content

Commit

Permalink
Change indent settings in .editorconfig
Browse files Browse the repository at this point in the history
Generally we seem to use 2-space indents, e.g. in the CSS of Encoding, or the JavaScript of Streams, or the .travis.yml files everywhere. It's only in the Bikeshed file that we use one-space indents. Additionally, per https://www.python.org/dev/peps/pep-0008/#indentation, Python files use four-space indents.

This updates .editorconfig appropriately, and aligns .pr-preview.json files with this new default.
  • Loading branch information
domenic committed Apr 14, 2020
1 parent d78c48d commit 2f30b1b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
9 changes: 6 additions & 3 deletions .editorconfig.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ root = true
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_size = 1
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
max_line_length = 100

[Makefile]
indent_style = tab

[.travis.yml]
indent_size = 2
[*.bs]
indent_size = 1

[*.py]
indent_size = 4
14 changes: 7 additions & 7 deletions .pr-preview.json.template
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"src_file": "@@bs@@.bs",
"type": "bikeshed",
"params": {
"force": 1,
"md-status": "LS-PR",
"md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
}
"src_file": "@@bs@@.bs",
"type": "bikeshed",
"params": {
"force": 1,
"md-status": "LS-PR",
"md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
}
}

0 comments on commit 2f30b1b

Please sign in to comment.