feat: recursive Folding Block

client/src/commands/run.ts

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 import {
   EventEmitter,
-  Position,
   ProgressLocation,
   Selection,
   Uri,
@@ -25,15 +24,9 @@ import {
   RunResult,
   getSession,
 } from "../connection";
+import { getSelectedRegions } from "../utils/utils";
 import { profileConfig, switchProfile } from "./profile";
 
-interface FoldingBlock {
-  startLine: number;
-  startCol: number;
-  endLine: number;
-  endCol: number;
-}
-
 let running = false;
 
 function getCode(selected = false, uri?: Uri): string {
@@ -76,57 +69,6 @@ function getCode(selected = false, uri?: Uri): string {
   return wrapCodeWithOutputHtml(code);
 }
 
-async function getSelectedRegions(
-  client: BaseLanguageClient,
-): Promise<Selection[]> {
-  const result: string[] = [];
-
-  async function pushBlock(line: number, col: number) {
-    const block = await client.sendRequest<FoldingBlock>(
-      "sas/getFoldingBlock",
-      {
-        textDocument: { uri: window.activeTextEditor.document.uri.toString() },
-        line,
-        col,
-      },
-    );
-    if (block) {
-      const start = doc.offsetAt(new Position(block.startLine, block.startCol));
-      const end = doc.offsetAt(new Position(block.endLine, block.endCol));
-      const key = `${start}-${end}`;
-      if (result.indexOf(key) === -1) {
-        result.push(key);
-      }
-      return end;
-    }
-  }
-
-  const editor = window.activeTextEditor;
-  const doc = editor.document;
-  for (const selection of editor.selections) {
-    const start = doc.offsetAt(selection.start);
-    let end = doc.offsetAt(selection.end);
-    const selectedText = doc.getText(selection);
-    if (selectedText.endsWith("\n")) {
-      --end;
-    }
-    for (let i = start; i <= end; i++) {
-      const pos = doc.positionAt(i);
-      const blockEnd = await pushBlock(pos.line, pos.character);
-      if (blockEnd && blockEnd > i) {
-        i = blockEnd;
-      }
-    }
-  }
-  return result.map((key) => {
-    const [start, end] = key.split("-");
-    return new Selection(
-      doc.positionAt(parseInt(start)),
-      doc.positionAt(parseInt(end)),
-    );
-  });
-}
-
 async function runCode(selected?: boolean, uri?: Uri) {
   if (profileConfig.getActiveProfile() === "") {
     switchProfile();
@@ -193,7 +135,15 @@ export async function runSelected(uri: Uri): Promise<void> {
 
 export async function runRegion(client: BaseLanguageClient): Promise<void> {
   const selections = await getSelectedRegions(client);
-  window.activeTextEditor.selections = selections;
+  const editor = window.activeTextEditor;
+  const doc = editor.document;
+  if (selections.length === 0) {
+    editor.selections = [
+      new Selection(doc.positionAt(0), doc.positionAt(doc.getText().length)),
+    ];
+  } else {
+    editor.selections = selections;
+  }
   await _run(true);
 }
 

client/src/node/extension.ts

@@ -48,6 +48,7 @@ import { NotebookSerializer } from "../components/notebook/Serializer";
 import { ConnectionType } from "../components/profile";
 import { SasTaskProvider } from "../components/tasks/SasTaskProvider";
 import { SAS_TASK_TYPE } from "../components/tasks/SasTasks";
+import { getSelectedRegions } from "../utils/utils";
 
 let client: LanguageClient;
 // Create Profile status bar item
@@ -131,6 +132,7 @@ export function activate(context: ExtensionContext): void {
       "SAS",
       new SASAuthProvider(context.secrets),
     ),
+
     languages.registerDocumentSemanticTokensProvider(
       { language: "sas-log" },
       LogTokensProvider,

client/src/utils/utils.ts

@@ -0,0 +1,60 @@
+import { Position, Selection, window } from "vscode";
+import { BaseLanguageClient } from "vscode-languageclient";
+
+interface FoldingBlock {
+  startLine: number;
+  startCol: number;
+  endLine: number;
+  endCol: number;
+}
+
+export async function getSelectedRegions(
+  client: BaseLanguageClient,
+): Promise<Selection[]> {
+  const result: string[] = [];
+
+  async function pushBlock(line: number, col: number) {
+    const block = await client.sendRequest<FoldingBlock>(
+      "sas/getFoldingBlock",
+      {
+        textDocument: { uri: window.activeTextEditor.document.uri.toString() },
+        line,
+        col,
+      },
+    );
+    if (block) {
+      const start = doc.offsetAt(new Position(block.startLine, block.startCol));
+      const end = doc.offsetAt(new Position(block.endLine, block.endCol));
+      const key = `${start}-${end}`;
+      if (result.indexOf(key) === -1) {
+        result.push(key);
+      }
+      return end;
+    }
+  }
+
+  const editor = window.activeTextEditor;
+  const doc = editor.document;
+  for (const selection of editor.selections) {
+    const start = doc.offsetAt(selection.start);
+    let end = doc.offsetAt(selection.end);
+    const selectedText = doc.getText(selection);
+    if (selectedText.endsWith("\n")) {
+      --end;
+    }
+    for (let i = start; i <= end; i++) {
+      const pos = doc.positionAt(i);
+      const blockEnd = await pushBlock(pos.line, pos.character);
+      if (blockEnd && blockEnd > i) {
+        i = blockEnd;
+      }
+    }
+  }
+  return result.map((key) => {
+    const [start, end] = key.split("-");
+    return new Selection(
+      doc.positionAt(parseInt(start)),
+      doc.positionAt(parseInt(end)),
+    );
+  });
+}

server/src/sas/CodeZoneManager.ts

@@ -808,6 +808,9 @@ export class CodeZoneManager {
       block = this._syntaxProvider.getFoldingBlock(
         tmpContext.line,
         tmpContext.col,
+        false,
+        true,
+        true,
       );
       if (block) {
         if (this._inBlock(block, token)! < 0 && !this._endedReally(block)) {
@@ -2428,7 +2431,13 @@ export class CodeZoneManager {
     const tmpLine = pos.line,
       tmpCol = pos.col;
     let token = this._token(tmpLine, tmpCol)!;
-    const block = this._syntaxProvider.getFoldingBlock(tmpLine, tmpCol);
+    const block = this._syntaxProvider.getFoldingBlock(
+      tmpLine,
+      tmpCol,
+      false,
+      true,
+      true,
+    );
     /* first check type to determine zone, some special conditions
      * 1) for bringing up auto completion popup by shortcut,
      * 2) input at the end of a line in comment or literal

server/src/sas/FormatOnTypeProvider.ts

@@ -95,7 +95,13 @@ export class FormatOnTypeProvider {
     }
     // Otherwise, need to decrease indent of current line
     const foldingBlock: FoldingBlock | null =
-      this.syntaxProvider.getFoldingBlock(line, semicolonCol);
+      this.syntaxProvider.getFoldingBlock(
+        line,
+        semicolonCol,
+        false,
+        true,
+        true,
+      );
     let blockStartLine;
     if (!foldingBlock) {
       const lastNotEmptyLine = this._getLastNotEmptyLine(line - 1);