Skip to content

Commit 27c2e3b

Browse files
committed
Update workspace tasks and launch configurations
1 parent 0afed14 commit 27c2e3b

File tree

2 files changed

+22
-38
lines changed

2 files changed

+22
-38
lines changed

.vscode/launch.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
// "${workspaceFolder}/../als-rt"
2929
// "${workspaceFolder}/integration/vscode/ada/test/TestWorkspace"
3030
],
31-
"preLaunchTask": "npm: compile",
31+
"preLaunchTask": "npm: watch - integration/vscode/ada",
3232
"env": {
3333
// This is necessary to make the "child" vscode inherit the PATH
3434
// variable set in the workspace settings. Without it in some setups
@@ -69,7 +69,7 @@
6969
"MOCHA_TIMEOUT": "0",
7070
"MOCHA_ALS_UPDATE": "${input:updateTestRefs}"
7171
},
72-
"preLaunchTask": "npm: pretest",
72+
"preLaunchTask": "npm: pretest - integration/vscode/ada",
7373
"internalConsoleOptions": "openOnSessionStart"
7474
},
7575
{
@@ -103,7 +103,7 @@
103103
"MOCHA_TIMEOUT": "0",
104104
"MOCHA_ALS_UPDATE": "${input:updateTestRefs}"
105105
},
106-
"preLaunchTask": "npm: pretest",
106+
"preLaunchTask": "npm: pretest - integration/vscode/ada",
107107
// Switch to Debug Console to see test results
108108
"internalConsoleOptions": "openOnSessionStart"
109109
},

.vscode/tasks.json

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,6 @@
1919
"problemMatcher": ["$ada"],
2020
"group": "test"
2121
},
22-
{
23-
"type": "npm",
24-
"script": "compile",
25-
"path": "integration/vscode/ada",
26-
"group": "build",
27-
"problemMatcher": ["$tsc"],
28-
"label": "npm: compile",
29-
"detail": "node ./node_modules/typescript/bin/tsc",
30-
"presentation": {
31-
"echo": true,
32-
"reveal": "silent",
33-
"focus": false,
34-
"panel": "shared",
35-
"showReuseMessage": true,
36-
"clear": false
37-
}
38-
},
39-
{
40-
"type": "npm",
41-
"script": "pretest",
42-
"path": "integration/vscode/ada",
43-
"problemMatcher": [],
44-
"label": "npm: pretest",
45-
"detail": "npm run compile",
46-
"presentation": {
47-
"echo": true,
48-
"reveal": "silent",
49-
"focus": false,
50-
"panel": "shared",
51-
"showReuseMessage": true,
52-
"clear": false
53-
}
54-
},
5522
{
5623
"type": "shell",
5724
"label": "ada: Compile current file",
@@ -79,8 +46,25 @@
7946
}
8047
},
8148
{
82-
"type": "gnat",
83-
"taskKind": "checkFile",
49+
// This task starts a background npm process that monitors changes to
50+
// TS files and recompiles them as needed. It is configured to be run
51+
// before the (vscode)-based launch configurations to make sure the TS
52+
// files are compiled and re-compiled upon changes.
53+
"type": "npm",
54+
"script": "watch",
55+
"path": "integration/vscode/ada",
56+
"group": "build",
57+
"problemMatcher": ["$tsc-watch"],
58+
"label": "npm: watch - integration/vscode/ada",
59+
"detail": "node ./node_modules/typescript/bin/tsc -watch",
60+
"isBackground": true
61+
},
62+
{
63+
"type": "ada",
64+
"configuration": {
65+
"kind": "checkFile",
66+
"projectFile": "${config:ada.projectFile}"
67+
},
8468
"problemMatcher": ["$ada"],
8569
"group": "build",
8670
"label": "ada: Check current file"

0 commit comments

Comments
 (0)