Merge pull request #300 from BalticAmadeus/299-define-formatter-wrong…

…fully-impacts-other-formatters 299 define formatter wrongfully impacts other formatters
BalticAmadeus · Jan 23, 2025 · 8a89282 · 8a89282
2 parents d86bb62 + 8434057
commit 8a89282
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/v2/formatters/enum/EnumFormatter.ts b/src/v2/formatters/enum/EnumFormatter.ts
@@ -13,7 +13,6 @@ import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 export class EnumFormatter extends AFormatter implements IFormatter {
     public static readonly formatterLabel = "enumFormatting";
     private readonly settings: EnumSettings;
-    private startColumn = 0;
     private alignColumn = 0;
 
     public constructor(configurationManager: IConfigurationManager) {
@@ -38,10 +37,6 @@ export class EnumFormatter extends AFormatter implements IFormatter {
         node: SyntaxNode,
         fullText: Readonly<FullText>
     ): string {
-        this.startColumn = FormatterHelper.getActualStatementIndentation(
-            node,
-            fullText
-        );
         let foundFirstMember = false;
         let resultString = "";
         node.children.forEach((child) => {
@@ -52,8 +47,7 @@ export class EnumFormatter extends AFormatter implements IFormatter {
             );
             if (!foundFirstMember && child.type === SyntaxNodeType.EnumMember) {
                 foundFirstMember = true;
-                this.alignColumn =
-                    this.startColumn + resultString.trim().length + 1; // +1 for space between member and DEFINE ENUM
+                this.alignColumn = resultString.trim().length + 1; // +1 for space between member and DEFINE ENUM
             }
             resultString = resultString.concat(childString);
         });

diff --git a/src/v2/formatters/property/PropertyFormatter.ts b/src/v2/formatters/property/PropertyFormatter.ts
@@ -53,6 +53,7 @@ export class PropertyFormatter extends AFormatter implements IFormatter {
             node,
             fullText
         );
+
         this.propertyBodyValue = this.getPropertyBlock(node, fullText);
     }
 
@@ -87,7 +88,9 @@ export class PropertyFormatter extends AFormatter implements IFormatter {
                     );
                 const statement = FormatterHelper.addIndentation(
                     FormatterHelper.getCurrentText(node, fullText).trim(),
-                    -firstLineWhitespace + this.settings.tabSize(),
+                    -firstLineWhitespace +
+                        this.settings.tabSize() +
+                        this.startColumn,
                     fullText.eolDelimiter
                 );
                 newString =