Fix TextSearchProvider for csp folders (#896)

Author: isc-bsaviano

src/providers/DocumentContentProvider.ts

@@ -61,7 +61,7 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
         .join(/cls|mac|int|inc/i.test(fileExt) ? "/" : ".");
       name = fileName + "." + fileExt;
       uri = wFolderUri.with({
-        path: `/${name}`,
+        path: !name.startsWith("/") ? `/${name}` : name,
       });
       vfs = true;
       scheme = wFolderUri.scheme;
@@ -136,17 +136,25 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
         });
       }
     }
+    const params = new URLSearchParams(uri.query);
     if (namespace && namespace !== "") {
       if (isCsp) {
-        uri = uri.with({
-          query: `ns=${namespace}&csp=1`,
-        });
+        if (params.has("csp")) {
+          params.set("ns", namespace);
+          uri = uri.with({
+            query: params.toString(),
+          });
+        } else {
+          uri = uri.with({
+            query: `ns=${namespace}&csp=1`,
+          });
+        }
       } else {
         uri = uri.with({
           query: `ns=${namespace}`,
         });
       }
-    } else if (isCsp) {
+    } else if (isCsp && !params.has("csp")) {
       uri = uri.with({
         query: "csp=1",
       });

src/providers/FileSystemProvider/TextSearchProvider.ts

@@ -168,7 +168,7 @@ export class TextSearchProvider implements vscode.TextSearchProvider {
                       }
                     }
                   }
-                  return typeof line === "number" ? line : null;
+                  return typeof line === "number" ? (file.doc.includes("/") ? line - 1 : line) : null;
                 })
                 .filter(notNull);
               // Filter out duplicates and compute all matches for each one

src/utils/FileProviderUtil.ts

@@ -34,7 +34,7 @@ export function fileSpecFromURI(uri: vscode.Uri, overrideType?: string): string
     }
   } // otherwise, reference the type to get the desired files.
   else if (csp) {
-    specOpts = "*";
+    specOpts = folder.length > 1 ? "*" : "*.cspall";
   } else if (type === "rtn") {
     specOpts = "*.inc,*.mac,*.int";
   } else if (type === "cls") {