Skip to content

Commit 37cdec2

Browse files
committed
Updated tasks.json and launch.json
External extensions are enabled since we need the C++ extension for VSCode to launch without throwing an error. The tasks.json has been updated to call directly scripts from package.
1 parent fd6c177 commit 37cdec2

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

.vscode/launch.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,21 @@
1414
"outFiles": [
1515
"${workspaceFolder}/out/src/**/*.js"
1616
],
17-
"preLaunchTask": "npm: watch",
17+
"preLaunchTask": "npm: watch-dev",
1818
},
1919
{
2020
"name": "Launch Tests",
2121
"type": "extensionHost",
2222
"request": "launch",
23-
"env": {
24-
"CODE_TESTS_WORKSPACE": "./"
25-
},
23+
"runtimeExecutable": "${execPath}",
2624
"args": [
27-
"${workspaceFolder}/test/resources/sample.f90",
28-
"--disable-extensions",
2925
"--extensionDevelopmentPath=${workspaceFolder}",
3026
"--extensionTestsPath=${workspaceFolder}/out/test"
3127
],
3228
"outFiles": [
3329
"${workspaceFolder}/out/test/**/*.js"
3430
],
35-
"preLaunchTask": "npm: compile",
31+
"preLaunchTask": "npm: pretest setup",
3632
},
3733
]
3834
}

.vscode/tasks.json

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,48 @@
1-
// Available variables which can be used inside of strings.
2-
// ${workspaceRoot}: the root folder of the team
3-
// ${file}: the current opened file
4-
// ${fileBasename}: the current opened file's basename
5-
// ${fileDirname}: the current opened file's dirname
6-
// ${fileExtname}: the current opened file's extension
7-
// ${cwd}: the current working directory of the spawned process
8-
// A task runner that calls a custom npm script that compiles the extension.
91
{
102
"version": "2.0.0",
113
"tasks": [
124
{
13-
"label": "npm: watch",
14-
"type": "shell",
15-
"command": "npm",
16-
"args": [
17-
"run",
18-
"watch",
19-
"--loglevel",
20-
"silent"
21-
],
22-
"isBackground": true,
23-
"problemMatcher": "$tsc-watch",
5+
"label": "npm: watch-dev",
6+
"type": "npm",
7+
"script": "watch-dev",
248
"group": {
259
"kind": "build",
2610
"isDefault": true
27-
}
11+
},
12+
"isBackground": true,
13+
"problemMatcher": "$tsc-watch",
14+
"detail": "tsc -watch -p tsconfig.json"
15+
},
16+
{
17+
"label": "npm: compile-dev",
18+
"type": "npm",
19+
"script": "compile-dev",
20+
"group": "build",
21+
"problemMatcher": "$tsc",
22+
"detail": "tsc -p tsconfig.json"
23+
},
24+
{
25+
"label": "npm: pretest",
26+
"type": "npm",
27+
"script": "pretest",
28+
"group": "test",
29+
"problemMatcher": "$tsc",
30+
"detail": "tsc -p tsconfig.test.json"
2831
},
2932
{
30-
"label": "npm: compile",
33+
"label": "npm: pretest setup",
3134
"type": "shell",
32-
"command": "npm",
33-
"args": [
34-
"run",
35-
"compile",
36-
"--loglevel",
37-
"silent"
35+
"dependsOn": [
36+
"npm: compile-dev",
37+
"npm: pretest"
3838
],
39-
"isBackground": true,
40-
"problemMatcher": "$tsc-watch",
41-
"group": "build"
39+
"dependsOrder": "sequence",
40+
"group": {
41+
"kind": "test",
42+
"isDefault": true
43+
},
44+
"detail": "setup for test launch"
45+
4246
}
4347
]
4448
}

0 commit comments

Comments
 (0)