fix: fix selections with empty lines

1nVitr0 · Mar 21, 2021 · d6195cd · d6195cd
1 parent 2354e32
commit d6195cd
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/providers/BlockSortProvider.ts b/src/providers/BlockSortProvider.ts
@@ -46,7 +46,12 @@ export default class BlockSortProvider {
     let lastStart = 0;
     let currentEnd = 0;
     for (const line of lines) {
-      if (this.isValidLine(line) && this.getIndent(line) === initialIndent && !this.hasFolding(folding)) {
+      if (
+        this.isValidLine(line) &&
+        !this.isIndentIgnoreLine(line) &&
+        this.getIndent(line) === initialIndent &&
+        !this.hasFolding(folding)
+      ) {
         blocks.push(
           this.document.validateRange(
             new Range(range.start.line + lastStart, 0, range.start.line + currentEnd, Infinity)
@@ -116,6 +121,14 @@ export default class BlockSortProvider {
       range = new Range(range.start.line, 0, range.end.line + 1, Infinity);
     range = new Range(range.start.line, 0, range.end.line - 1, Infinity);
 
+    while (
+      range.start.line <= range.end.line &&
+      this.isIndentIgnoreLine(
+        this.document.getText(range.with(range.start, range.start.with(range.start.line, Infinity)))
+      )
+    )
+      range = range.with(range.start.with(range.start.line + 1, 0));
+
     return this.document.validateRange(range);
   }
 
@@ -127,6 +140,7 @@ export default class BlockSortProvider {
     let max = 0;
 
     for (const line of lines) {
+      if (this.isIndentIgnoreLine(line)) continue;
       const indent = this.getIndent(line, indentWidth);
       if (indent < min) min = indent;
       if (indent > max) max = indent;
@@ -177,6 +191,10 @@ export default class BlockSortProvider {
     return Array.from(first).pop() === ',';
   }
 
+  private isIndentIgnoreLine(line: string): boolean {
+    return /^\s*$/.test(line) || /^\s*(private|protected|public):\s*(\/\/.*|\/\*\.*\*\/)?/.test(line);
+  }
+
   private isValidLine(line: string): boolean {
     return !/^\s*$/.test(line) && !/^\s*(@|{)/.test(line);
   }