Skip to content

Commit 6fa7757

Browse files
author
Dave Bartolomeo
committed
Merge branch 'dbartol/debug-adapter' of https://github.com/github/vscode-codeql into dbartol/debug-adapter
2 parents 60fd868 + 14a4247 commit 6fa7757

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

extensions/ql-vscode/src/run-queries-shared.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ export async function getQuickEvalContext(
455455
const quickEvalPosition = await getSelectedPosition(editor, range);
456456
let quickEvalText: string;
457457
if (!editor.selection?.isEmpty) {
458-
quickEvalText = editor.document.getText(editor.selection);
458+
quickEvalText = editor.document.getText(editor.selection).trim();
459459
} else {
460460
// capture the entire line if the user didn't select anything
461461
const line = editor.document.lineAt(editor.selection.active.line);

extensions/ql-vscode/test/vscode-tests/cli-integration/debug-controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export class DebugController
211211

212212
public async createLaunchJson(config: QLDebugConfiguration): Promise<void> {
213213
const launchJsonPath = join(
214-
workspace.workspaceFolders![0].uri.fsPath,
214+
getOnDiskWorkspaceFolders()[0],
215215
".vscode/launch.json",
216216
);
217217

0 commit comments

Comments
 (0)