fix vscode tasks

chalharu · Dec 27, 2018 · be5efff · be5efff
1 parent 7dac144
commit be5efff
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,29 +5,34 @@
             "type": "lldb",
             "request": "launch",
             "name": "Debug Test",
-            "program": "${workspaceRoot}/target/debug/deps/compression-33f748de75300242",
-            "args": [
-                "--nocapture"
-            ],
-            "cwd": "${workspaceRoot}",
+            "cargo": {
+                "args": [
+                    "+nightly",
+                    "test",
+                    "--no-run",
+                ]
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}",
             "sourceLanguages": [
                 "rust"
-            ],
-            "preLaunchTask": "cargo build test",
-            "internalConsoleOptions": "openOnSessionStart"
+            ]
         },
         {
             "type": "lldb",
             "request": "launch",
             "name": "Debug",
-            "program": "${workspaceRoot}/target/debug/chfft",
+            "cargo": {
+                "args": [
+                    "+nightly",
+                    "build"
+                ]
+            },
             "args": [],
-            "cwd": "${workspaceRoot}",
+            "cwd": "${workspaceFolder}",
             "sourceLanguages": [
                 "rust"
-            ],
-            "preLaunchTask": "cargo build",
-            "internalConsoleOptions": "openOnSessionStart"
+            ]
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,12 +1,12 @@
 {
     "version": "2.0.0",
     "presentation": {
-        "reveal": "always",
-        "panel": "new"
+        "panel": "dedicated",
+        "clear": true
     },
     "tasks": [
         {
-            "taskName": "cargo build",
+            "label": "cargo build",
             "type": "shell",
             "command": "cargo",
             "args": [
@@ -19,7 +19,7 @@
             "problemMatcher": "$rustc"
         },
         {
-            "taskName": "cargo build test",
+            "label": "cargo build test",
             "type": "shell",
             "command": "cargo",
             "args": [
@@ -30,7 +30,7 @@
             "problemMatcher": "$rustc"
         },
         {
-            "taskName": "cargo run",
+            "label": "cargo run",
             "type": "shell",
             "command": "cargo",
             "args": [
@@ -39,7 +39,7 @@
             "problemMatcher": "$rustc"
         },
         {
-            "taskName": "cargo test",
+            "label": "cargo test",
             "type": "shell",
             "command": "cargo",
             "args": [
@@ -49,7 +49,7 @@
             "problemMatcher": "$rustc"
         },
         {
-            "taskName": "cargo clean",
+            "label": "cargo clean",
             "type": "shell",
             "command": "cargo",
             "args": [