Merge branch 'dbartol/debug-adapter' of https://github.com/github/vscode-codeql into dbartol/debug-adapter

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

@@ -455,7 +455,7 @@ export async function getQuickEvalContext(
   const quickEvalPosition = await getSelectedPosition(editor, range);
   let quickEvalText: string;
   if (!editor.selection?.isEmpty) {
-    quickEvalText = editor.document.getText(editor.selection);
+    quickEvalText = editor.document.getText(editor.selection).trim();
   } else {
     // capture the entire line if the user didn't select anything
     const line = editor.document.lineAt(editor.selection.active.line);

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

@@ -211,7 +211,7 @@ export class DebugController
 
   public async createLaunchJson(config: QLDebugConfiguration): Promise<void> {
     const launchJsonPath = join(
-      workspace.workspaceFolders![0].uri.fsPath,
+     getOnDiskWorkspaceFolders()[0],
       ".vscode/launch.json",
     );