Skip to content

Commit 93947a9

Browse files
committed
Merge branch 'release/0.11.0'
2 parents 3f1ad78 + b2bbbf4 commit 93947a9

File tree

4 files changed

+135
-166
lines changed

4 files changed

+135
-166
lines changed

.vscode/tasks.json

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@
2424
{
2525
"taskName": "Testing project (1testrunner)",
2626
"args": [
27-
"1testrunner",
27+
"1testrunner",
2828
"-runall",
2929
"${workspaceRoot}/tests"
3030
],
3131
"echoCommand": true,
3232
"showOutput": "always",
3333
"suppressTaskName": true,
34-
// "isBuildCommand": false,
3534
"isTestCommand": false,
3635
"problemMatcher": {
3736
"fileLocation": "absolute",
@@ -46,14 +45,13 @@
4645
{
4746
"taskName": "Testing project (opm test)",
4847
"args": [
49-
"oscript",
50-
"src/opm.os",
48+
"oscript",
49+
"src/opm.os",
5150
"test"
5251
],
5352
"echoCommand": true,
5453
"showOutput": "always",
5554
"suppressTaskName": true,
56-
// "isBuildCommand": false,
5755
"isTestCommand": false,
5856
"problemMatcher": {
5957
"fileLocation": "absolute",
@@ -68,7 +66,7 @@
6866
{
6967
"taskName": "Testing current test-file",
7068
"args": [
71-
"1testrunner",
69+
"1testrunner",
7270
"-run",
7371
"${file}"
7472
],
@@ -90,10 +88,10 @@
9088
{
9189
"taskName": "Exec all features",
9290
"args": [
93-
"1bdd",
91+
"1bdd",
9492
"${workspaceRoot}/features",
95-
"-fail-fast",
96-
"-out",
93+
"-fail-fast",
94+
"-out",
9795
"${workspaceRoot}/exec.log"
9896
],
9997
"echoCommand": true,
@@ -114,10 +112,10 @@
114112
{
115113
"taskName": "Exec feature",
116114
"args": [
117-
"1bdd",
115+
"1bdd",
118116
"${file}",
119-
"-fail-fast",
120-
"-out",
117+
"-fail-fast",
118+
"-out",
121119
"${workspaceRoot}/exec.log"
122120
],
123121
"echoCommand": true,
@@ -128,22 +126,22 @@
128126
"problemMatcher": {
129127
"fileLocation": "absolute",
130128
"pattern": [
131-
{
132-
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
133-
"file": 1,
134-
"location": 2,
135-
"message": 3
136-
}
129+
{
130+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
131+
"file": 1,
132+
"location": 2,
133+
"message": 3
134+
}
137135
]
138136
}
139137
},
140138
{
141139
"taskName": "Exec feature for current step def",
142140
"args": [
143-
"1bdd",
141+
"1bdd",
144142
"${fileDirname}/../${fileBasenameNoExtension}.feature",
145-
"-fail-fast",
146-
"-out",
143+
"-fail-fast",
144+
"-out",
147145
"${workspaceRoot}/exec.log"
148146
],
149147
"echoCommand": true,
@@ -154,22 +152,22 @@
154152
"problemMatcher": {
155153
"fileLocation": "absolute",
156154
"pattern": [
157-
{
158-
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
159-
"file": 1,
160-
"location": 2,
161-
"message": 3
162-
}
155+
{
156+
"regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
157+
"file": 1,
158+
"location": 2,
159+
"message": 3
160+
}
163161
]
164162
}
165163
},
166164
{
167165
"taskName": "Generate feature steps",
168166
"args": [
169-
"1bdd",
167+
"1bdd",
170168
"gen",
171169
"${file}",
172-
"-out",
170+
"-out",
173171
"${workspaceRoot}/exec.log"
174172
],
175173
"echoCommand": true,
@@ -197,13 +195,14 @@
197195
"echoCommand": true,
198196
"showOutput": "always",
199197
"suppressTaskName": true,
200-
"isBuildCommand": false
198+
"isBuildCommand": false,
199+
"problemMatcher": []
201200
},
202201
{
203202
"taskName": "OneScript: compile",
204203
"args": [
205-
"oscript",
206-
"-encoding=utf-8",
204+
"oscript",
205+
"-encoding=utf-8",
207206
"-compile",
208207
"${file}"
209208
],
@@ -215,8 +214,8 @@
215214
{
216215
"taskName": "OneScript: check",
217216
"args": [
218-
"oscript",
219-
"-encoding=utf-8",
217+
"oscript",
218+
"-encoding=utf-8",
220219
"-check",
221220
"${file}"
222221
],
@@ -228,8 +227,8 @@
228227
{
229228
"taskName": "OneScript: make",
230229
"args": [
231-
"oscript",
232-
"-encoding=utf-8",
230+
"oscript",
231+
"-encoding=utf-8",
233232
"-make",
234233
"${file}",
235234
"${fileBasename}.exe"
@@ -242,8 +241,8 @@
242241
{
243242
"taskName": "OneScript: run",
244243
"args": [
245-
"oscript",
246-
"-encoding=utf-8",
244+
"oscript",
245+
"-encoding=utf-8",
247246
"${file}"
248247
],
249248
"echoCommand": true,

0 commit comments

Comments
 (0)