Don't call openTextDocument in debugger (#1042)

Author: isc-bsaviano

src/commands/compile.ts

@@ -405,7 +405,7 @@ function importFiles(files: string[], noCompile = false) {
         vscode.workspace.fs
           .readFile(vscode.Uri.file(file))
           .then((contentBytes) => new TextDecoder().decode(contentBytes))
-          .then((content) => currentFileFromContent(file, content))
+          .then((content) => currentFileFromContent(vscode.Uri.file(file), content))
           .then((curFile) =>
             importFile(curFile).then((data) => {
               outputChannel.appendLine("Imported file: " + curFile.fileName);

src/debug/debugSession.ts

@@ -1,5 +1,5 @@
 import vscode = require("vscode");
-import { currentFile } from "../utils";
+import { currentFile, currentFileFromContent } from "../utils";
 import { Subject } from "await-notify";
 import {
   InitializedEvent,
@@ -19,7 +19,6 @@ import WebSocket = require("ws");
 import { AtelierAPI } from "../api";
 import * as xdebug from "./xdebugConnection";
 import { schemas } from "../extension";
-import * as url from "url";
 import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 import { formatPropertyValue } from "./utils";
 
@@ -40,20 +39,15 @@ interface AttachRequestArguments extends DebugProtocol.AttachRequestArguments {
 /** converts a uri from VS Code to a server-side XDebug file URI with respect to source root settings */
 async function convertClientPathToDebugger(uri: vscode.Uri, namespace: string): Promise<string> {
   const { scheme, path } = uri;
-  const { query } = url.parse(uri.toString(true), true);
+  const params = new URLSearchParams(uri.query);
   let fileName: string;
   if (scheme && schemas.includes(scheme)) {
-    if (query.ns && query.ns !== "") {
-      namespace = query.ns.toString();
+    if (params.has("ns") && params.get("ns") !== "") {
+      namespace = params.get("ns");
     }
     fileName = path.slice(1).replace(/\//g, ".");
   } else {
-    fileName = await vscode.workspace
-      .openTextDocument(uri)
-      .then(currentFile)
-      .then((curFile) => {
-        return curFile.name;
-      });
+    fileName = currentFileFromContent(uri, new TextDecoder().decode(await vscode.workspace.fs.readFile(uri)))?.name;
   }
 
   namespace = encodeURIComponent(namespace);
@@ -294,7 +288,7 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
               currentSymbol.detail.toLowerCase() !== "query"
             ) {
               // This breakpoint is in a method
-              const currentdoc = await vscode.workspace.openTextDocument(uri);
+              const currentdoc = new TextDecoder().decode(await vscode.workspace.fs.readFile(uri)).split(/\r?\n/);
               if (languageServer) {
                 // selectionRange.start.line is the method definition line
                 for (
@@ -303,7 +297,7 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
                   methodlinenum++
                 ) {
                   // Find the offset of this breakpoint in the method
-                  const methodlinetext: string = currentdoc.lineAt(methodlinenum).text.trim();
+                  const methodlinetext: string = currentdoc[methodlinenum].trim();
                   if (methodlinetext.endsWith("{")) {
                     // This is the last line of the method definition, so count from here
                     if (breakpoint.condition) {
@@ -527,15 +521,15 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
               }
             }
             if (currentSymbol !== undefined) {
-              const currentdoc = await vscode.workspace.openTextDocument(fileUri);
+              const currentdoc = new TextDecoder().decode(await vscode.workspace.fs.readFile(fileUri)).split(/\r?\n/);
               if (languageServer) {
                 for (
                   let methodlinenum = currentSymbol.selectionRange.start.line;
                   methodlinenum <= currentSymbol.range.end.line;
                   methodlinenum++
                 ) {
                   // Find the offset of this breakpoint in the method
-                  const methodlinetext: string = currentdoc.lineAt(methodlinenum).text.trim();
+                  const methodlinetext: string = currentdoc[methodlinenum].trim();
                   if (methodlinetext.endsWith("{")) {
                     // This is the last line of the method definition, so count from here
                     line = methodlinenum + stackFrame.methodOffset + 1;

src/utils/index.ts

@@ -1,5 +1,4 @@
 import path = require("path");
-import * as url from "url";
 import { exec } from "child_process";
 import * as vscode from "vscode";
 import { config, schemas, workspaceState, terminals, extensionContext, cspApps } from "../extension";
@@ -141,8 +140,8 @@ export function isImportableLocalFile(file: vscode.TextDocument): boolean {
   }
 }
 
-export function currentFileFromContent(fileName: string, content: string): CurrentFile {
-  const uri = vscode.Uri.file(fileName);
+export function currentFileFromContent(uri: vscode.Uri, content: string): CurrentFile {
+  const fileName = uri.fsPath;
   const workspaceFolder = workspaceFolderOfUri(uri);
   if (!workspaceFolder) {
     // No workspace folders are open
@@ -220,8 +219,8 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
   const content = document.getText();
   let name = "";
   let ext = "";
-  const { query } = url.parse(uri.toString(true), true);
-  const csp = query.csp === "" || query.csp === "1";
+  const params = new URLSearchParams(uri.query);
+  const csp = params.has("csp") && ["", "1"].includes(params.get("csp"));
   if (csp) {
     name = uri.path;
   } else if (fileExt === "cls") {