code folding

Author: daimor

Diff for: CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [0.7.2]
 
 - Fixed outline's regions
+- Better code folding
 
 ## [0.7.0]
 

Diff for: extension.ts

@@ -9,6 +9,8 @@ import { exportAll, exportExplorerItem } from './commands/export';
 import { ObjectScriptClassSymbolProvider } from './providers/ObjectScriptClassSymbolProvider';
 import { ObjectScriptRoutineSymbolProvider } from './providers/ObjectScriptRoutineSymbolProvider';
 import { DocumentContentProvider } from './providers/DocumentContentProvider';
+import { ObjectScriptClassFoldingRangeProvider } from './providers/ObjectScriptClassFoldingRangeProvider';
+import { ObjectScriptFoldingRangeProvider } from './providers/ObjectScriptFoldingRangeProvider';
 
 import { ObjectScriptExplorerProvider } from './explorer/explorer';
 import { outputChannel } from './utils';
@@ -82,7 +84,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     vscode.languages.registerDocumentSymbolProvider(
       { language: 'objectscript' },
       new ObjectScriptRoutineSymbolProvider()
-    )
+    ),
+    vscode.languages.registerFoldingRangeProvider(
+      { language: 'objectscript-class' },
+      new ObjectScriptClassFoldingRangeProvider()
+    ),
+    vscode.languages.registerFoldingRangeProvider({ language: 'objectscript' }, new ObjectScriptFoldingRangeProvider())
   );
 }
 

Diff for: providers/ObjectScriptClassFoldingRangeProvider.ts

@@ -0,0 +1,54 @@
+import * as vscode from 'vscode';
+
+export class ObjectScriptClassFoldingRangeProvider implements vscode.FoldingRangeProvider {
+  provideFoldingRanges(
+    document: vscode.TextDocument,
+    context: vscode.FoldingContext,
+    token: vscode.CancellationToken
+  ): vscode.ProviderResult<vscode.FoldingRange[]> {
+    let ranges: vscode.FoldingRange[] = [];
+
+    for (let i = 0; i < document.lineCount; i++) {
+      let line = document.lineAt(i);
+      let prevLine = i > 0 ? document.lineAt(i - 1) : { text: '' };
+
+      // Documenation block
+      const docPattern = /\/{3}/;
+      if (line.text.match(docPattern)) {
+        const start = i;
+        while (i++ && i < document.lineCount) {
+          let line = document.lineAt(i);
+          if (!line.text.match(docPattern)) {
+            i--;
+            break;
+          }
+        }
+        const end = i;
+        ranges.push({
+          start,
+          end,
+          kind: vscode.FoldingRangeKind.Comment
+        });
+        continue;
+      }
+      if (line.text.match('^{') && !prevLine.text.match(/^\bClass\b/i)) {
+        const start = i - 1;
+        while (i++ && i < document.lineCount) {
+          let line = document.lineAt(i);
+          if (line.text.match(/^}/)) {
+            break;
+          }
+        }
+        const end = i;
+        ranges.push({
+          start,
+          end,
+          kind: vscode.FoldingRangeKind.Region
+        });
+        continue;
+      }
+    }
+
+    return ranges;
+  }
+}

Diff for: providers/ObjectScriptFoldingRangeProvider.ts

@@ -0,0 +1,35 @@
+import * as vscode from 'vscode';
+
+export class ObjectScriptFoldingRangeProvider implements vscode.FoldingRangeProvider {
+  provideFoldingRanges(
+    document: vscode.TextDocument,
+    context: vscode.FoldingContext,
+    token: vscode.CancellationToken
+  ): vscode.ProviderResult<vscode.FoldingRange[]> {
+    let ranges: vscode.FoldingRange[] = [];
+
+    for (let i = 0; i < document.lineCount; i++) {
+      let line = document.lineAt(i);
+
+      if (line.text.match(/^\b\w+\b/) && !line.text.match(/^\bROUTINE\b/)) {
+        const start = i;
+        while (i++ && i < document.lineCount) {
+          let line = document.lineAt(i);
+          if (line.text.match(/^\b\w+\b/)) {
+            break;
+          }
+        }
+        i--;
+        const end = i;
+        ranges.push({
+          start,
+          end,
+          kind: vscode.FoldingRangeKind.Region
+        });
+        continue;
+      }
+    }
+
+    return ranges;
+  }
+}