From 42f2c91363a7ce7f8b42af80d66309895d6eca23 Mon Sep 17 00:00:00 2001
From: Diego Rey Mendez <diegoreymendez@gmail.com>
Date: Thu, 5 Apr 2018 12:20:29 -0300
Subject: [PATCH 1/2] Updates gitignore. Adds vscode settings.

---
 .gitignore              | 7 +++++--
 .vscode/extensions.json | 6 ++++++
 .vscode/settings.json   | 3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index f458583632492f..e22a09e5b36c73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,5 +53,8 @@ DerivedData
 *.xcuserstatee
 
 # VSCode local config dir
-.vscode/
-
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000000000..072d01d8507c4b
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+    	"flowtype.flow-for-vscode",
+        "ms-vscode.js-atom-grammar"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000000..bc377a0dd17ac1
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "flow.useNPMPackagedFlow": true
+}
\ No newline at end of file

From 65613c6f0e9b3cfbe97a3de6d0bda742a723943c Mon Sep 17 00:00:00 2001
From: Diego Rey Mendez <diegoreymendez@gmail.com>
Date: Thu, 5 Apr 2018 14:06:04 -0300
Subject: [PATCH 2/2] Changes the flow plugin and modifies the required
 settings.

---
 .vscode/extensions.json | 5 ++---
 .vscode/settings.json   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 072d01d8507c4b..f0e066806b5f81 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,5 @@
 {
     "recommendations": [
-    	"flowtype.flow-for-vscode",
-        "ms-vscode.js-atom-grammar"
+    	"gcazaciuc.vscode-flow-ide"
     ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bc377a0dd17ac1..ab7667da395c36 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "flow.useNPMPackagedFlow": true
+    "javascript.validate.enable": false
 }
\ No newline at end of file