From 7cc51035aa55a7dd9a315330eb57a12ed6e1aa4c Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 26 Jun 2017 18:13:09 +0300
Subject: [PATCH] Add "Upload and Monitor" task for VSCode

---
 .../ide/tpls/vscode/.vscode/extensions.json.tpl  |  9 ---------
 .../ide/tpls/vscode/.vscode/tasks.json.tpl       | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 platformio/ide/tpls/vscode/.vscode/extensions.json.tpl

diff --git a/platformio/ide/tpls/vscode/.vscode/extensions.json.tpl b/platformio/ide/tpls/vscode/.vscode/extensions.json.tpl
deleted file mode 100644
index 7315e95d..00000000
--- a/platformio/ide/tpls/vscode/.vscode/extensions.json.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-        "ms-vscode.cpptools",
-        "webfreak.debug"
-    ]
-}
\ No newline at end of file
diff --git a/platformio/ide/tpls/vscode/.vscode/tasks.json.tpl b/platformio/ide/tpls/vscode/.vscode/tasks.json.tpl
index a30289e3..870cb566 100644
--- a/platformio/ide/tpls/vscode/.vscode/tasks.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/tasks.json.tpl
@@ -77,6 +77,22 @@
                 }
             }
         },
+        {
+            "taskName": "PlatformIO: Upload and Monitor",
+            "args": ["run", "-t", "upload", "-t", "monitor"],
+            "problemMatcher": {
+                "owner": "cpp",
+                "fileLocation": ["relative", "${workspaceRoot}"],
+                "pattern": {
+                    "regexp": "^([^:\\n]+):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            }
+        },
         {
             "taskName": "PlatformIO: Test",
             "args": ["test"],