Skip to content

Seanmcm/fix insiders debugging #2871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2018
Merged

Seanmcm/fix insiders debugging #2871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5022abd
Fix debugging with VS Code Insiders and other Lint fixes.
sean-mcmanus Nov 27, 2018
09cd7e2
Fix.
sean-mcmanus Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Extension/.vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"outFiles": [
"${workspaceFolder}/out/**/*.js"
],
"preLaunchTask": "compile",
"preLaunchTask": "TypeScript Compile",
},
{
"name": "Launch Tests",
Expand All @@ -31,7 +31,7 @@
"outFiles": [
"${workspaceFolder}/out/test/**/*.js"
],
"preLaunchTask": "compile"
"preLaunchTask": "TypeScript Compile"
},
{
"name": "Node Attach",
Expand Down
4 changes: 1 addition & 3 deletions Extension/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"tasks": [
{
"label": "TypeScript Compile",
"identifier": "compile",
Copy link
Contributor Author

@sean-mcmanus sean-mcmanus Nov 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was causing debugging to not work with VS Code Insiders.

"group": {
"kind": "build",
"isDefault": true
Expand All @@ -29,7 +28,6 @@
},
{
"label": "TypeScript Lint",
"identifier": "tslint",
"group": "build",
"isBackground": false,
"type": "shell",
Expand All @@ -53,7 +51,7 @@
]
},
"dependsOn": [
"compile"
"TypeScript Compile"
]
}
]
Expand Down
5 changes: 5 additions & 0 deletions Extension/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,6 +1407,7 @@
"vscode": "^1.1.18"
},
"dependencies": {
"@types/minimatch": "^3.0.3",
"http-proxy-agent": "~2.1.0",
"https-proxy-agent": "~2.2.0",
"jsonc-parser": "^1.0.0",
Expand Down
12 changes: 6 additions & 6 deletions Extension/test/integrationTests/debug.integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
import * as vscode from 'vscode';
import * as assert from 'assert';

suite(`Debug Integration Test: `, function() {
suiteSetup(async function() {
let extension = vscode.extensions.getExtension("ms-vscode.cpptools");
if (!extension.isActive) {
suite(`Debug Integration Test: `, function(): void {
suiteSetup(async function(): Promise<void> {
let extension: vscode.Extension<any> = vscode.extensions.getExtension("ms-vscode.cpptools");
if (!extension.isActive) {
await extension.activate();
}
});

test("Starting (gdb) Launch from the workspace root should create an Active Debug Session", async () => {
await vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], "(gdb) Launch");

let debugSessionTerminated = new Promise(resolve => {
let debugSessionTerminated: Promise<void> = new Promise(resolve => {
vscode.debug.onDidTerminateDebugSession((e) => resolve());
});

try {
assert.equal(vscode.debug.activeDebugSession.type, "cppdbg");
} catch (e) {
assert.fail("Debugger failed to launch. Did the extension activate correctly?")
assert.fail("Debugger failed to launch. Did the extension activate correctly?");
}

await debugSessionTerminated;
Expand Down
38 changes: 28 additions & 10 deletions Extension/test/integrationTests/testAssets/SimpleCppProject/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
{
"version": "0.1.0",
"version": "2.0.0",
"tasks": [
{
"taskName": "build",
"command": "g++",
"isShellCommand": true,
"args": ["main.cpp", "-g", "-o", "program"],
"showOutput": "always",
"isBuildCommand": true,
"windows": {
"command": "C:\\MinGW\\bin\\g++.exe"
}
"label": "build",
"command": "g++",
"type": "shell",
"args": [
"main.cpp",
"-g",
"-o",
"program"
],
"group":{
"kind": "build",
"isDefault": true
},
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": false
},
"windows": {
"command": "C:\\MinGW\\bin\\g++.exe"
},
"problemMatcher": [
"$gcc"
]
}
]
}
8 changes: 6 additions & 2 deletions Extension/tools/OptionsSchema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,12 @@
"type": "object",
"default": {},
"properties": {
"name": "string",
"value": "string"
"name": {
"type": "string"
},
"value": {
"type": "string"
}
}
},
"CppdbgLaunchOptions": {
Expand Down