Merge branch 'release/v1.8.0'

artbear · Sep 24, 2018 · 1473dc4 · 1473dc4
2 parents b0116ab + 307bbb7
commit 1473dc4
Show file tree

Hide file tree

Showing 10 changed files with 1,026 additions and 182 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Отладка 1Script",
+            "type": "oscript",
+            "request": "launch",
+            "program": "${workspaceRoot}/src/bdd.os",
+            "args": ["${workspaceRoot}/features\\core\\ПроверкаГенерации.feature"],
+            "cwd": "${workspaceRoot}",
+            "runtimeExecutable": null,
+            "debugPort": 2801
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,29 +1,54 @@
 {
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
     "version": "2.0.0",
-    "_runner": "terminal",
+    // "_runner": "terminal",
     "windows": {
         "command": "cmd",
-        "args": ["/c", "chcp 65001 ;"]
+        "args": ["/c", "chcp 65001 && "]
     },
     "linux": {
         "command": "sh",
         "args": ["-c"]
     },
-    "isShellCommand": true,
-    "showOutput": "silent",
+    "type": "shell",
+    "suppressTaskName": true,
     "tasks": [
         {
-            "taskName": "Testing project",
+            "label": "Full testing",
+            "args": [
+                 "oscript",
+                "${workspaceRoot}/tasks/test.os"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            // "presentation": {
+            //     "echo": true,
+            //     "reveal": "always",
+            //     "focus": false,
+            //     "panel": "shared",
+            //     "showReuseMessage": true
+            // },
+            "problemMatcher": {
+                "fileLocation": "absolute",
+                "pattern": {
+                    "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
+                    "file": 1,
+                    "location": 2,
+                    "message": 3
+                }
+            }
+        },
+        {
+            "label": "Testing project",
+            "type": "shell",
             "args": [
                  "1testrunner",
                 "-runall",
                 "${workspaceRoot}/tests"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -35,7 +60,8 @@
             }
         },
         {
-            "taskName": "Exec all features",
+            "label": "Exec all features",
+            "type": "shell",
             "args": [
                  "oscript",
                 "${workspaceRoot}/src/bdd.os",
@@ -44,11 +70,6 @@
                 "-out", 
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": true,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -60,7 +81,8 @@
             }
         },
         {
-            "taskName": "Exec feature",
+            "label": "Exec feature",
+            "type": "shell",
             "args": [
                  "oscript",
                 "${workspaceRoot}/src/bdd.os",
@@ -71,11 +93,6 @@
                 "-junit-out", 
                 "${workspaceRoot}/./tests/junit-log.xml"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": true,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": [
@@ -98,7 +115,8 @@
             }
         },
         {
-            "taskName": "Exec feature + debug",
+            "label": "Exec feature + debug",
+            "type": "shell",
             "args": [
                  "oscript",
                 "${workspaceRoot}/src/bdd.os",
@@ -109,11 +127,6 @@
                 "-out", 
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -125,19 +138,15 @@
             }
         },
         {
-            "taskName": "Exec feature for current step def",
+            "label": "Exec feature for current step def",
+            "type": "shell",
             "args": [
                  "1bdd",
                 "${fileDirname}/../${fileBasenameNoExtension}.feature",
                 "-fail-fast", 
                 "-out", 
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false,
-            "isTestCommand": true,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": [
@@ -151,7 +160,8 @@
             }
         },
         {
-            "taskName": "Generate feature steps",
+            "label": "Generate feature steps",
+            "type": "shell",
             "args": [
                  "oscript",
                 "${workspaceRoot}/src/bdd.os",
@@ -162,11 +172,6 @@
                 "-out", 
                 "${workspaceRoot}/exec.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -178,7 +183,8 @@
             }
         },
         {
-            "taskName": "Generate feature steps + debug",
+            "label": "Generate feature steps + debug",
+            "type": "shell",
             "args": [
                  "oscript",
                 "${workspaceRoot}/src/bdd.os",
@@ -189,11 +195,6 @@
                 "-out", 
                 "${workspaceRoot}/gen.log"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -205,18 +206,14 @@
             }
         },
         {
-            "taskName": "Test current test-file",
+            "label": "Test current test-file",
+            "type": "shell",
             "args": [
                  "oscript",
                 "${workspaceRoot}/../oscript-library/src/1testrunner/testrunner.os",
                 "-run",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            // "isBuildCommand": false,
-            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -228,68 +225,53 @@
             }
         },
         {
-            "taskName": "Opm: package build",
+            "label": "Opm: package build",
+            "type": "shell",
             "args": [
                  "opm",
                 "build",
                 "${workspaceRoot}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
         },
         {
-            "taskName": "OneScript: compile",
+            "label": "OneScript: compile",
+            "type": "shell",
             "args": [
                  "oscript",
                  "-encoding=utf-8",
                 "-compile",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
         },
         {
-            "taskName": "OneScript: check",
+            "label": "OneScript: check",
+            "type": "shell",
             "args": [
                  "oscript",
                  "-encoding=utf-8",
                 "-check",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
         },
         {
-            "taskName": "OneScript: make",
+            "label": "OneScript: make",
+            "type": "shell",
             "args": [
                  "oscript",
                  "-encoding=utf-8",
                 "-make",
                 "${file}",
                 "${fileBasename}.exe"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": false
         },
         {
-            "taskName": "OneScript: run",
+            "label": "OneScript: run",
+            "type": "shell",
             "args": [
                  "oscript",
                  "-encoding=utf-8",
                 "${file}"
             ],
-            "echoCommand": true,
-            "showOutput": "always",
-            "suppressTaskName": true,
-            "isBuildCommand": true,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -301,4 +283,4 @@
             }
         }
     ]
-}
+}