Merge branch 'ds/vscode-settings' into maint

* ds/vscode-settings: vscode: improve tab size and wrapping
3 years ago · 619a4382fa
1 changed files with 6 additions and 2 deletions
--- a/contrib/vscode/init.sh
+++ b/contrib/vscode/init.sh
@ -25,8 +25,12 @@ cat >.vscode/settings.json.new <<\EOF ||
				@@ -25,8 +25,12 @@ cat >.vscode/settings.json.new <<\EOF ||
        "editor.detectIndentation": false,
        "editor.insertSpaces": false,
        "editor.tabSize": 8,
-        "editor.wordWrap": "wordWrapColumn",
-        "editor.wordWrapColumn": 80,
+        "files.trimTrailingWhitespace": true
+    },
+    "[txt]": {
+        "editor.detectIndentation": false,
+        "editor.insertSpaces": false,
+        "editor.tabSize": 8,
        "files.trimTrailingWhitespace": true
    },
    "files.associations": {