From 72bb6ae67be8e14b06cf6d6cb2d84425ce81a34c Mon Sep 17 00:00:00 2001
From: sergeych <real.sergeych@gmail.com>
Date: Tue, 6 Jan 2026 12:00:04 +0100
Subject: [PATCH] formatter fix on properties

---
 .../net/sergeych/lyng/format/LyngFormatter.kt | 36 ++++++++++++++++---
 .../sergeych/lyng/format/LyngFormatterTest.kt | 27 ++++++++++++++
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/format/LyngFormatter.kt b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/format/LyngFormatter.kt
index ff6e905..b9427da 100644
--- a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/format/LyngFormatter.kt
+++ b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/format/LyngFormatter.kt
@@ -42,6 +42,31 @@ object LyngFormatter {
         return false
     }
 
+    private fun isAccessorRelated(code: String): Boolean {
+        val t = code.trim()
+        if (t.isEmpty()) return false
+        if (isPropertyAccessor(t)) return true
+
+        // If it contains 'fun' or 'fn' as a word, it's probably a function declaration, not an accessor
+        if (Regex("\\b(fun|fn)\\b").containsMatchIn(t)) return false
+
+        val hasDecl = startsWithWord(t, "var") || startsWithWord(t, "val") ||
+                startsWithWord(t, "private") || startsWithWord(t, "protected") ||
+                startsWithWord(t, "override") || startsWithWord(t, "public")
+
+        if (hasDecl) {
+            val getSetMatch = Regex("\\b(get|set)\\b").find(t)
+            if (getSetMatch != null) {
+                // Check it's not part of an assignment to the property itself (e.g. val x = get())
+                val equalIndex = t.indexOf('=')
+                if (equalIndex == -1 || equalIndex > getSetMatch.range.first) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
     /** Returns the input with indentation recomputed from scratch, line by line. */
     fun reindent(text: String, config: LyngFormatConfig = LyngFormatConfig()): String {
         // Normalize tabs to spaces globally before any transformation; results must contain no tabs
@@ -82,7 +107,7 @@ object LyngFormatter {
             if (isIf || isElseIf || isElse) return true
 
             // property accessors ending with ) or =
-            if (isPropertyAccessor(t)) {
+            if (isAccessorRelated(t)) {
                 return if (t.contains('=')) t.endsWith('=') else t.endsWith(')')
             }
             return false
@@ -168,7 +193,8 @@ object LyngFormatter {
             }
             val newBlockLevel = blockLevel
             if (newBlockLevel > oldBlockLevel) {
-                val addedThisLine = (if (applyAwaiting) awaitingExtraIndent else 0) + (if (isAccessor) 1 else 0)
+                val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
+                val addedThisLine = (if (applyAwaiting) awaitingExtraIndent else 0) + (if (isAccessorRelatedLine) 1 else 0)
                 repeat(newBlockLevel - oldBlockLevel) {
                     extraIndents.add(addedThisLine)
                 }
@@ -186,7 +212,8 @@ object LyngFormatter {
                 val endsWithBrace = code.trimEnd().endsWith("{")
                 if (!endsWithBrace && isControlHeaderNoBrace(code)) {
                     // It's another header, increment
-                    awaitingExtraIndent += if (isAccessor) 2 else 1
+                    val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
+                    awaitingExtraIndent += if (isAccessorRelatedLine) 2 else 1
                 } else {
                     // It's the body, reset
                     awaitingExtraIndent = 0
@@ -195,7 +222,8 @@ object LyngFormatter {
                 // start awaiting if current line is a control header without '{'
                 val endsWithBrace = code.trimEnd().endsWith("{")
                 if (!endsWithBrace && isControlHeaderNoBrace(code)) {
-                    awaitingExtraIndent = if (isAccessor) 2 else 1
+                    val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
+                    awaitingExtraIndent = if (isAccessorRelatedLine) 2 else 1
                 }
             }
 
diff --git a/lynglib/src/commonTest/kotlin/net/sergeych/lyng/format/LyngFormatterTest.kt b/lynglib/src/commonTest/kotlin/net/sergeych/lyng/format/LyngFormatterTest.kt
index cc5f3e7..213a5d9 100644
--- a/lynglib/src/commonTest/kotlin/net/sergeych/lyng/format/LyngFormatterTest.kt
+++ b/lynglib/src/commonTest/kotlin/net/sergeych/lyng/format/LyngFormatterTest.kt
@@ -859,4 +859,31 @@ class LyngFormatterTest {
         """.trimIndent()
         assertEquals(expected2, LyngFormatter.reindent(src2, LyngFormatConfig(indentSize = 4)))
     }
+
+    @Test
+    fun mixedPropertyAccessors() {
+        val src = """
+            class X {
+                var x get() {
+                    11
+                }
+                set(value) {
+                }
+            }
+        """.trimIndent()
+
+        val expected = """
+            class X {
+                var x get() {
+                        11
+                    }
+                    set(value) {
+                    }
+            }
+        """.trimIndent()
+
+        val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
+        val out = LyngFormatter.reindent(src, cfg)
+        assertEquals(expected, out)
+    }
 }