diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index cce0ec542c311549f42057a35e8cc77d3e53ecb5..ff8676d5d9f609f76a5c83bd7cf6b0fdab5e6225 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,4 +4,4 @@
         "rust-lang.rust",
         "ms-python.python"
     ]
-}
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 062785fa846c1f6c1557152b0bfa8a7097705b6e..ff197f1420b30bf157cba0ad594d91a36344a81a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,10 +1,13 @@
 {
+  "clang-format.fallbackStyle": "google",
   "editor.detectIndentation": true,
   "editor.formatOnPaste": false,
   "editor.formatOnSave": true,
   "editor.formatOnType": true,
   "editor.insertSpaces": true,
   "editor.tabSize": 4,
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true,
   "rust-client.channel": "nightly",
   // The toolchain is updated from time to time so let's make sure that RLS is updated too
   "rust-client.updateOnStartup": true,
@@ -20,4 +23,4 @@
   "[python]": {
     "editor.tabSize": 2
   },
-}
\ No newline at end of file
+}