Merge pull request #110 from 1nVitr0/109-typescript-case-statements-not-sorting

109-typescript-case-statements-not-sorting

Author: 1nVitr0

src/providers/BlockSortFormattingProvider.ts

@@ -121,7 +121,9 @@ export default class BlockSortFormattingProvider
   ): Range {
     if (!this.isAttached(document)) this.attachDocument(document, token);
     const blockSort = this.blockSortProviders.get(document.uri)!;
-    const initialRange = "start" in selection ? selection : new Range(selection, selection);
+    const initialRange = blockSort.trimRange(
+      "start" in selection ? selection : new Range(selection, selection)
+    );
 
     if (options.expandSelection === false) return initialRange;
 

src/providers/BlockSortProvider.ts

@@ -338,6 +338,9 @@ export default class BlockSortProvider implements Disposable {
     let start = selection.start.line;
     let end = selection.end.line;
 
+    if (start < end && selection.start.character >= this.document.lineAt(start).text.length) start++;
+    if (end > start && selection.end.character === 0) end--;
+
     while (start < end && this.document.lineAt(start).isEmptyOrWhitespace) start++;
     while (end > start && this.document.lineAt(end).isEmptyOrWhitespace) end--;
 

src/test/fixtures/cancellation.ts

@@ -5,6 +5,6 @@ export const cancelSortTests: CancellationTest[] = [
   {
     file: "cancellation.json.fixture",
     ranges: [new Range(3, 0, 1500, 7)],
-    performanceThreshold: 3,
+    performanceThreshold: 2,
   },
 ];

src/test/fixtures/sort.ts

@@ -5,7 +5,7 @@ export const sortTests: CompareTest[] = [
   {
     file: "block.typescript.fixture",
     compareFile: "block.typescript.expect",
-    ranges: [new Range(3, 0, 13, 22), new Range(19, 0, 33, 8), new Range(39, 0, 47, 8)],
+    ranges: [new Range(3, 0, 13, 22), new Range(19, 0, 33, 8), new Range(39, 0, 47, 8), new Range(87, 0, 95, 7)],
   },
   {
     file: "block.cpp.fixture",

test/fixtures/block.typescript.expect

@@ -82,4 +82,18 @@ class Test {
       }
     };
   }
+
+  testFencedSwitchCase() {
+    switch ('foo') {
+      case 'alpha': {
+        return 'something';
+      }
+      case 'beta': {
+        return 'something';
+      }
+      case 'gamma': {
+        return 'something';
+      }
+    }
+  }
 }

test/fixtures/block.typescript.fixture

@@ -82,4 +82,18 @@ class Test {
       }
     };
   }
+
+  testFencedSwitchCase() {
+    switch ('foo') {
+      case 'beta': {
+        return 'something';
+      }
+      case 'alpha': {
+        return 'something';
+      }
+      case 'gamma': {
+        return 'something';
+      }
+    }
+  }
 }