fix: dont auto sort markers with invalid positions

1nVitr0 · Dec 16, 2021 · 7695c3d · 7695c3d
1 parent 20177a7
commit 7695c3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/providers/BlockSortActionProvider.ts b/src/providers/BlockSortActionProvider.ts
@@ -183,7 +183,7 @@ export default class BlockSortActionProvider
   private getBlockMarkerRange(document: TextDocument, position: Position): Range | undefined {
     const blockSortProvider = this.blockSortProviders.get(document.uri);
     const blockPosition = FormattingProvider.getNextBlockPosition(document, position);
-    return blockSortProvider?.expandRange(new Selection(blockPosition, blockPosition));
+    return blockPosition ? blockSortProvider?.expandRange(new Selection(blockPosition, blockPosition)) : undefined;
   }
 
   private updateBlockSortMarkers(

diff --git a/src/providers/FormattingProvider.ts b/src/providers/FormattingProvider.ts
@@ -54,11 +54,12 @@ export default class FormattingProvider implements DocumentFormattingEditProvide
     return { sortFunction, sortChildren: depth.includes("inf") ? Infinity : parseInt(depth, 10) };
   }
 
-  public static getNextBlockPosition(document: TextDocument, position: Position): Position {
+  public static getNextBlockPosition(document: TextDocument, position: Position): Position | null {
     let line = document.lineAt(position.line);
     const initialIndent = line.firstNonWhitespaceCharacterIndex;
 
     while (line.firstNonWhitespaceCharacterIndex <= initialIndent) {
+      if (line.lineNumber >= document.lineCount - 1) return null;
       line = document.lineAt(line.lineNumber + 1);
     }
 
@@ -79,17 +80,20 @@ export default class FormattingProvider implements DocumentFormattingEditProvide
     return TextEdit.replace(range, sorted.join("\n"));
   }
 
-  public static mapBlockSortHeaders<T>(
+  public static mapFilterBlockSortHeaders<T>(
     document: TextDocument,
     headers: (TextLine | Position)[],
     callback: (position: Position, options: BlockSortOptions) => T
   ): T[] {
-    return headers.map((line) => {
+    const result = [];
+    for (const line of headers) {
       const position = "range" in line ? line.range.start : line;
       const nextBlockPosition = FormattingProvider.getNextBlockPosition(document, position);
       const options = FormattingProvider.getBlockSortMarkerOptions(document, position);
-      return callback(nextBlockPosition, options);
-    });
+      if (nextBlockPosition) result.push(callback(nextBlockPosition, options));
+    }
+
+    return result;
   }
 
   public provideDocumentFormattingEdits(
@@ -111,7 +115,7 @@ export default class FormattingProvider implements DocumentFormattingEditProvide
   }
 
   public provideBlockMarkerFormattingEdits(document: TextDocument, ...positions: (Position | TextLine)[]): TextEdit[] {
-    return FormattingProvider.mapBlockSortHeaders(
+    return FormattingProvider.mapFilterBlockSortHeaders(
       document,
       positions,
       FormattingProvider.getBlockSortEdit.bind(this, document)