Skip to content

Commit

Permalink
Cleanly apply editorconfig
Browse files Browse the repository at this point in the history
JS and TS are formatted with Prettier, which works off editorconfig
configuration, but doesn't _always_ indent by a multiple of the
configured value for ternaries or block comments.

Prettier is doing the right thing, so leave it to it.

Signed-off-by: Andrew Aylett <andrew@aylett.co.uk>
  • Loading branch information
andrewaylett committed Sep 4, 2022
1 parent b4c91b7 commit 935930a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
10 changes: 8 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
],
"rules": {
"prettier/prettier": 2,
"@typescript-eslint/no-unused-vars": ["error", { "destructuredArrayIgnorePattern": "^_", "varsIgnorePattern": "^_" }]
}
"@typescript-eslint/no-unused-vars": [
"error",
{
"destructuredArrayIgnorePattern": "^_",
"varsIgnorePattern": "^_"
}
]
}
}
9 changes: 4 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ repos:
rev: 2.4.0
hooks:
- id: editorconfig-checker
types_or:
- ts
- json
exclude_types:
- javascript
- toml
- yaml
- ts
- markdown
exclude: LICENSE
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.0
hooks:
Expand Down

0 comments on commit 935930a

Please sign in to comment.