fix

abaplint · May 16, 2024 · ca98600 · ca98600
1 parent b28f1af
commit ca98600
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/server/src/handler.ts b/server/src/handler.ts
@@ -165,9 +165,9 @@ export class Handler {
                                     experimentalFormatting: boolean,
                                     formattingDisabled: string[]): Promise<LServer.TextEdit[]> {
     if (experimentalFormatting === true) {
-      return new Formatting(this.reg).findEdits(params.textDocument);
+      return new Formatting(this.reg).findEdits(params.textDocument, formattingDisabled);
     } else {
-      return new abaplint.LanguageServer(this.reg).documentFormatting({textDocument: params.textDocument}, formattingDisabled);
+      return new abaplint.LanguageServer(this.reg).documentFormatting({textDocument: params.textDocument});
     }
   }
 

diff --git a/server/src/handlers/formatting.ts b/server/src/handlers/formatting.ts
@@ -8,11 +8,15 @@ export class Formatting {
     this.reg = reg;
   }
 
-  public async findEdits(document: LServer.TextDocumentIdentifier): Promise<LServer.TextEdit[]> {
+  public async findEdits(document: LServer.TextDocumentIdentifier, formattingDisabled: string[]): Promise<LServer.TextEdit[]> {
     const edits: LServer.TextEdit[] = [];
 
     const issues = new abaplint.Diagnostics(this.reg).findIssues(document);
     for (const i of issues) {
+      if (formattingDisabled.includes(i.getKey())) {
+        continue;
+      }
+
       const edit = i.getDefaultFix();
       if (edit === undefined) {
         continue;