summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIndrajit Raychaudhuri <irc@indrajit.com>2023-12-11 01:20:49 -0400
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2023-12-11 06:33:59 +0000
commitabcea5f2783a8feb2331aacb3b6506c1514be506 (patch)
treeba72a04c2686659c54d92f2cbbc04be1c6b0c427
parent5b2ee47e85b536800897e4f4a475ca3167238254 (diff)
downloadvyos-1x-abcea5f2783a8feb2331aacb3b6506c1514be506.tar.gz
vyos-1x-abcea5f2783a8feb2331aacb3b6506c1514be506.zip
T5803: Migrate vscode settings to new value and clean up .gitattributes
Update VSCode settings for "editor.wordBasedSuggestions". It has changed from boolean to enum. The value "off" is the same as previous value of `false`. Also remove stray duplicate entries in .gitattributes. (cherry picked from commit 75e914c4dff0359988e5f500ae63f882ae6813e7)
-rw-r--r--.gitattributes5
-rw-r--r--.vscode/settings.json2
2 files changed, 1 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index 624e00f03..1d79e0804 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -73,8 +73,3 @@
.gitkeep export-ignore
*.pyc binary export-ignore
*.pyo binary export-ignore
-
-#
-# Enable syntax highlighting for VSCode settings
-#
-.vscode/settings.json linguist-language=jsonc
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ab3af6cf1..27ed4c296 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,7 +10,7 @@
"*.xml.in": "xml",
},
"[jinja]": {
- "editor.wordBasedSuggestions": false
+ "editor.wordBasedSuggestions": "off"
},
// https://code.visualstudio.com/docs/python/settings-reference
"python.analysis.extraPaths": [