Da#302 testing fixes in terminal change indexes problem and workbench save issue

src/commands/indexes/openIndexInformation.ts

@@ -19,20 +19,20 @@ import { MemFS } from "../../util/fileSystemProvider";
 import IndexNode from "../../model/IndexNode";
 
 export const openIndexInfo = async (indexNode: IndexNode, memFs: MemFS) => {
-    try {
-        const uri = vscode.Uri.parse(
-          `couchbase:/${indexNode.bucketName}/${indexNode.scopeName}/Indexes/${indexNode.indexName}.n1ql`
-        );
-        memFs.writeFile(
-          uri,
-          Buffer.from(indexNode.data),
-          { create: true, overwrite: true }
-        );
-        const document = await vscode.workspace.openTextDocument(uri);
-        await vscode.window.showTextDocument(document, { preview: false });
-        return true;
-      } catch (err: any) {
-        logger.error("Failed to open index information");
-        logger.debug(err);
-      }
+  try {
+    const uri = vscode.Uri.parse(
+      `couchbase:/${indexNode.bucketName}/${indexNode.scopeName}/Indexes/${indexNode.indexName}.sqlpp`
+    );
+    memFs.writeFile(
+      uri,
+      Buffer.from(indexNode.data),
+      { create: true, overwrite: true }
+    );
+    const document = await vscode.workspace.openTextDocument(uri);
+    await vscode.window.showTextDocument(document, { preview: false });
+    return true;
+  } catch (err: any) {
+    logger.error("Failed to open index information");
+    logger.debug(err);
+  }
 };

src/commands/queryHistory/applyQuery.ts

@@ -12,6 +12,7 @@ export const applyQuery = async (query: IQuery) => {
         return;
     }
     const activeTextEditor = vscode.window.activeTextEditor;
+    activeTextEditor?.document.save();
         if (
             activeTextEditor &&
             activeTextEditor.document.languageId === "SQL++"

src/model/IndexDirectory.ts

@@ -83,7 +83,7 @@ export class IndexDirectory implements INode {
                         this.connection,
                         this.scopeName,
                         this.bucketName,
-                        `${query.name.substring(1)}_${(query.collectionName ?? "")}`,
+                        `${query.name[0] === '#' ? query.name.substring(1) : query.name}${(query.collectionName ? ("_" + query.collectionName) : "")}`,
                         getIndexDefinition(query),
                         vscode.TreeItemCollapsibleState.None
                     );

src/workbench/controller.ts

@@ -57,8 +57,9 @@ export default class UntitledSqlppDocumentService {
         });
 
         const document = await vscode.workspace.openTextDocument(uri);
+        document.save();
         await vscode.window.showTextDocument(document, { preview: false });
-        return vscode.workspace.openTextDocument(uri);
+        return document;
     }
 
     /**

src/workbench/queryWorkbench.ts

@@ -47,6 +47,7 @@ export class QueryWorkbench {
         }
         // Get the active text editor
         const activeTextEditor = vscode.window.activeTextEditor;
+        activeTextEditor?.document.save();
         if (activeTextEditor && activeTextEditor.document.languageId === "SQL++") {
             // Get the text content of the active text editor.
             const query = activeTextEditor.selection.isEmpty ? activeTextEditor.document.getText() : activeTextEditor.document.getText(activeTextEditor.selection);
@@ -77,7 +78,7 @@ export class QueryWorkbench {
                     size: resultSize ? (resultSize > 1000 ? (resultSize / 1000).toFixed(2) + " KB" : resultSize + " Bytes") : ""
                 };
                 const explainPlan = JSON.stringify(result?.meta.profile.executionTimings);
-                await workbenchWebviewProvider.setQueryResult(
+                workbenchWebviewProvider.setQueryResult(
                     JSON.stringify(result?.rows),
                     queryStatusProps,
                     explainPlan
@@ -118,7 +119,7 @@ export class QueryWorkbench {
                     numDocs: "-",
                     size: "-",
                 };
-                await workbenchWebviewProvider.setQueryResult(
+                workbenchWebviewProvider.setQueryResult(
                     JSON.stringify(errorArray),
                     queryStatusProps,
                     null

src/workbench/workbenchWebviewProvider.ts

@@ -47,7 +47,6 @@ export class WorkbenchWebviewProvider implements vscode.WebviewViewProvider {
         this._view.webview.html = getWebviewContent(reactAppUri, this._context);
         const isDarkTheme: boolean = vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Dark;
         this._view?.webview.postMessage({ command: "theme", isDarkTheme });
-        this._view?.onDidDispose(() => Memory.state.update(Constants.QUERY_RESULT, null));
         this._view?.onDidChangeVisibility(() => {
             if (Memory.state.get<IQueryResultProps>(Constants.QUERY_RESULT)) {
                 this.sendQueryResult(JSON.stringify([{ "status": "Loading last executed result" }]), { queryStatus: QueryStatus.Running }, null);