diff --git a/.gitignore b/.gitignore
index d7fded1a9..ba592b5dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ yarn-error.log*
 
 # Editor directories.ts and files
 .idea
-.vscode
 *.suo
 *.ntvs*
 *.njsproj
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..1ec61fe7b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+	"editor.tabSize": 4,
+	"files.trimTrailingWhitespace": true,
+	"files.trimFinalNewlines": true,
+	"files.insertFinalNewline": true
+}