Merge pull request #275 from KxSystems/multiple-sp

[WIP] KXI-38369: Multiple scratchpads and workspace data sources UI
KxSystems · May 8, 2024 · ff3a8a6 · ff3a8a6
2 parents 51f5e4d + 9a3e40c
commit ff3a8a6
Show file tree

Hide file tree

Showing 22 changed files with 1,904 additions and 835 deletions.
diff --git a/package.json b/package.json
diff --git a/resources/datasource-active.svg b/resources/datasource-active.svg
diff --git a/resources/datasource-connected.svg b/resources/datasource-connected.svg
diff --git a/resources/datasource.svg b/resources/datasource.svg
diff --git a/resources/scratchpad-active.svg b/resources/scratchpad-active.svg
diff --git a/resources/scratchpad-connected.svg b/resources/scratchpad-connected.svg
diff --git a/resources/scratchpad.svg b/resources/scratchpad.svg
diff --git a/src/commands/buildToolsCommand.ts b/src/commands/buildToolsCommand.ts
@@ -259,8 +259,8 @@ export async function connectBuildTools() {
     }
   });
 
-  if (window.activeTextEditor) {
-    const document = window.activeTextEditor.document;
+  if (ext.activeTextEditor) {
+    const document = ext.activeTextEditor.document;
     if (isAutoLintingSupported(document)) {
       await setDiagnostics(document);
     }

diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts
@@ -366,7 +366,7 @@ export async function executeQuery(
 
 export function getQueryContext(lineNum?: number): string {
   let context = ".";
-  const editor = window.activeTextEditor;
+  const editor = ext.activeTextEditor;
   const fullText = typeof lineNum !== "number";
 
   if (editor) {
@@ -413,7 +413,7 @@ export function getConextForRerunQuery(query: string): string {
 }
 
 export function runQuery(type: ExecutionTypes, rerunQuery?: string) {
-  const editor = window.activeTextEditor;
+  const editor = ext.activeTextEditor;
   if (!editor) {
     return false;
   }