Skip to content

Commit

Permalink
Allow trailing whitespace in diff and markdown files (Shopify#1499)
Browse files Browse the repository at this point in the history
* Ignore trailing whitespace removal in diff and markdown files

* Delegate whitespace management to editorconfig instead of VS Code

* Follow user defaults on trimTrailingWhitespace and insertFinalNewline
  • Loading branch information
kaelig authored Jun 7, 2018
1 parent 16a780a commit d43e11c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ trim_trailing_whitespace = true
# See https://daringfireball.net/projects/markdown/syntax#p
[*.md]
trim_trailing_whitespace = false

# Disable trailing whitespace removal in diff files,
# where whitespace is meaningful
[*.diff]
trim_trailing_whitespace = false
2 changes: 0 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
"styles/": true,
"types/": true
},
"files.insertFinalNewline": true,
"files.trimTrailingWhitespace": true,
"javascript.validate.enable": false,
"jest.autoEnable": false,
"prettier.eslintIntegration": true,
Expand Down

0 comments on commit d43e11c

Please sign in to comment.