From f770d8186fcddaf3f435efe0eb9b0c6c46f122ef Mon Sep 17 00:00:00 2001
From: Simon Fessehaye <fessehay@ualberta.ca>
Date: Tue, 29 Jun 2021 12:24:59 -0600
Subject: [PATCH] Added endofline settings to workspace

---
 .gitignore            | 2 --
 .prettierignore       | 2 +-
 .prettierrc           | 2 +-
 .vscode/settings.json | 8 ++++++++
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index ae8033991..dfa7fbb19 100755
--- a/.gitignore
+++ b/.gitignore
@@ -126,8 +126,6 @@ cypress/screenshots
 translations.tar
 translations_github_commit_*
 
-# VSCode  project config
-.vscode/settings.json
 
 # Localization testing SSH keys
 wagtail-localize-key*
diff --git a/.prettierignore b/.prettierignore
index 0b84df0f0..2d19fc766 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1 @@
-*.html
\ No newline at end of file
+*.html
diff --git a/.prettierrc b/.prettierrc
index f8169a003..99a6aa00a 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,4 +4,4 @@
     "trailingComma": "es5",
     "useTabs": false,
     "embeddedLanguageFormatting": "off"
-}
\ No newline at end of file
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..b784e997b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+  "editor.formatOnPaste": true,
+  "editor.formatOnSave": true,
+  "emmet.includeLanguages": {
+    "javascript": "javascriptreact"
+  },
+  "files.insertFinalNewline": true
+}