From 536a579f2e36fdfccb399ae3b0590bf1d0496063 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sun, 24 Feb 2019 13:41:19 +0100 Subject: simplify watch patterns --- editors/code/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editors/code/package.json b/editors/code/package.json index 47eaac878..2177d875d 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -215,11 +215,11 @@ "${workspaceRoot}" ], "background": { - "beginsPattern": "^\\[Running ", - "endsPattern": "^(\\[Finished running\\]|To learn more, run the command again with --verbose\\.)$" + "beginsPattern": "^\\[Running\\b", + "endsPattern": "^\\[Finished running\\b" }, "pattern": "$rustc" } ] } -} +} \ No newline at end of file -- cgit v1.2.3 From fe1df18a6e1ee61d18a2b78bfd084ef382814f6a Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sun, 10 Mar 2019 13:54:18 +0100 Subject: add cargo watch tasks use extension problemMatcher --- .vscode/tasks.json | 57 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 045cee326..d64e28717 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -10,38 +10,51 @@ "problemMatcher": { "owner": "typescript", "pattern": "$tsc", - "fileLocation": ["relative", "${workspaceRoot}/editors/code"] + "fileLocation": [ + "relative", + "${workspaceRoot}/editors/code" + ] }, "path": "editors/code/" }, { "label": "Build Lsp", "type": "shell", - "command": "cargo build", - "problemMatcher": { - "owner": "rust", - "fileLocation": ["relative", "${workspaceRoot}"], - "pattern": [ - { - "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$", - "severity": 1, - "code": 2, - "message": 3 - }, - { - "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$", - "file": 1, - "line": 2, - "column": 3 - } - ] - } + "command": "cargo check", + "problemMatcher": "$rustc" }, { "label": "Build All", "group": "build", - "dependsOn": ["Build Extension", "Build Lsp"], + "dependsOn": [ + "Build Extension", + "Build Lsp" + ], "problemMatcher": [] + }, + { + "label": "cargo watch", + "group": "build", + "isBackground": true, + "type": "shell", + "command": "cargo", + "args": [ + "watch" + ], + "problemMatcher": "$rustc-watch" + }, + { + "label": "cargo watch tests", + "group": "build", + "isBackground": true, + "type": "shell", + "command": "cargo", + "args": [ + "watch", + "-x", + "check --tests" + ], + "problemMatcher": "$rustc-watch" } ] -} +} \ No newline at end of file -- cgit v1.2.3 From 1926d76a6acf091f349bf3523522bbae232f5113 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sun, 10 Mar 2019 14:57:30 +0100 Subject: revert change to "check" since "build" is intentional --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d64e28717..063cbd174 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -20,7 +20,7 @@ { "label": "Build Lsp", "type": "shell", - "command": "cargo check", + "command": "cargo build", "problemMatcher": "$rustc" }, { -- cgit v1.2.3 From 7cf9c34f66471d7220d50c4e3226d7289bdab688 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sun, 10 Mar 2019 15:20:27 +0100 Subject: prettier format --- editors/code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editors/code/package.json b/editors/code/package.json index 2177d875d..0a1e84b4a 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -222,4 +222,4 @@ } ] } -} \ No newline at end of file +} -- cgit v1.2.3