Skip to content

Commit d43e11c

Browse files
authored
Allow trailing whitespace in diff and markdown files (Shopify#1499)
* 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
1 parent 16a780a commit d43e11c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.editorconfig

+5
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ trim_trailing_whitespace = true
1313
# See https://daringfireball.net/projects/markdown/syntax#p
1414
[*.md]
1515
trim_trailing_whitespace = false
16+
17+
# Disable trailing whitespace removal in diff files,
18+
# where whitespace is meaningful
19+
[*.diff]
20+
trim_trailing_whitespace = false

.vscode/settings.json

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
"styles/": true,
2727
"types/": true
2828
},
29-
"files.insertFinalNewline": true,
30-
"files.trimTrailingWhitespace": true,
3129
"javascript.validate.enable": false,
3230
"jest.autoEnable": false,
3331
"prettier.eslintIntegration": true,

0 commit comments

Comments
 (0)