Place the dedent after first new line

eclipse-langium · Oct 2, 2024 · 048d76d · 048d76d
1 parent 1919efa
commit 048d76d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/langium/src/parser/indentation-aware.ts b/packages/langium/src/parser/indentation-aware.ts
@@ -312,13 +312,14 @@ export class IndentationAwareTokenBuilder<Terminals extends string = string, Key
         }
 
         const numberOfDedents = this.indentationStack.length - matchIndentIndex - 1;
+        const newlinesBeforeDedent = text.substring(0, offset).match(/[\r\n]+$/)?.[0].length ?? 1;
 
         for (let i = 0; i < numberOfDedents; i++) {
             const token = this.createIndentationTokenInstance(
                 this.dedentTokenType,
                 text,
                 '',  // Dedents are 0-width tokens
-                offset,
+                offset - (newlinesBeforeDedent - 1), // Place the dedent after the first new line character
             );
             tokens.push(token);
             this.indentationStack.pop();