diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e7f2152594817c40a96dcd56937882dd7fa07175..9ee9e5ee11d78ea9f6523284257db5cdc7dc656c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,12 +3,34 @@ "tasks": [ { "type": "npm", - "script": "watchd", - "label": "Build VS Code", - "group": { - "kind": "build", - "isDefault": true + "script": "watch-clientd", + "label": "Build VS Code Core", + "isBackground": true, + "presentation": { + "reveal": "never" }, + "problemMatcher": { + "owner": "typescript", + "applyTo": "closedDocuments", + "fileLocation": [ + "absolute" + ], + "pattern": { + "regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$", + "file": 1, + "location": 2, + "message": 3 + }, + "background": { + "beginsPattern": "Starting compilation", + "endsPattern": "Finished compilation" + } + } + }, + { + "type": "npm", + "script": "watch-extensionsd", + "label": "Build VS Code Extensions", "isBackground": true, "presentation": { "reveal": "never" @@ -26,11 +48,22 @@ "message": 3 }, "background": { - "beginsPattern": "\\[watch-client\\].*Starting compilation", - "endsPattern": "\\[watch-client\\].*Finished compilation" + "beginsPattern": "Starting compilation", + "endsPattern": "Finished compilation" } } }, + { + "label": "Build VS Code", + "dependsOn": [ + "Build VS Code Core", + "Build VS Code Extensions" + ], + "group": { + "kind": "build", + "isDefault": true + } + }, { "type": "npm", "script": "kill-watchd", diff --git a/package.json b/package.json index 243566889f7fd3304f44924f759c9a2121970107..60451b9e741b08f429eac63e3192b47218a121e0 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,9 @@ "restart-watchd": "deemon --restart yarn watch", "restart-watch-webd": "deemon --restart yarn watch-web", "watch-client": "gulp watch-client --max_old_space_size=4095", + "watch-clientd": "deemon yarn watch-client", "watch-extensions": "gulp watch-extensions --max_old_space_size=4095", + "watch-extensionsd": "deemon yarn watch-extensions", "mocha": "mocha test/unit/node/all.js --delay", "precommit": "node build/gulpfile.hygiene.js", "gulp": "gulp --max_old_space_size=8192",