Merge branch 'main' into fix-formatter

eclipse-langium · Aug 14, 2024 · 09fa930 · 09fa930
2 parents a22fbfc + 245336b
commit 09fa930
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/packages/langium/src/lsp/formatter.ts b/packages/langium/src/lsp/formatter.ts
@@ -361,6 +361,11 @@ export abstract class AbstractFormatter implements Formatter {
         if (b.hidden) {
             return this.createHiddenTextEdits(a, b, formatting, context);
         }
+        // Ignore the edit if the previous node ends after the current node starts
+        if (a && (a.range.end.line > b.range.start.line ||
+            (a.range.end.line === b.range.start.line && a.range.end.character > b.range.start.character))) {
+            return [];
+        }
         const betweenRange: Range = {
             start: a?.range.end ?? {
                 character: 0,

diff --git a/packages/langium/test/grammar/lsp/grammar-formatter.test.ts b/packages/langium/test/grammar/lsp/grammar-formatter.test.ts
@@ -88,4 +88,16 @@ describe('Grammar Formatter', () => {
         expect(edits.length).toBe(0);
     });
 
+    test('Formats parser rule definitions with alternatives', async () => {
+        await formatting({
+            before: expandToString`
+                Type:
+                DataType | Entity;
+            `,
+            after: expandToString`
+                Type:
+                    DataType | Entity;
+            `
+        });
+    });
 });