From 2a64797c1a801a487ba4fe100b44c56817c8604c Mon Sep 17 00:00:00 2001
From: Karan <karanlokchandani@protonmail.com>
Date: Wed, 7 Jan 2026 03:22:19 +0530
Subject: [PATCH] Add more edge cases

---
 .../ConvertJSONToCodableStruct.swift          |  5 +-
 .../SyntaxRefactorTests.swift                 | 76 +++++++++++++++----
 2 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/Sources/SwiftLanguageService/CodeActions/ConvertJSONToCodableStruct.swift b/Sources/SwiftLanguageService/CodeActions/ConvertJSONToCodableStruct.swift
index 99d3fa0b..69a1eb2a 100644
--- a/Sources/SwiftLanguageService/CodeActions/ConvertJSONToCodableStruct.swift
+++ b/Sources/SwiftLanguageService/CodeActions/ConvertJSONToCodableStruct.swift
@@ -110,9 +110,10 @@ package struct ConvertJSONToCodableStruct: EditRefactoringProvider {
     let baseIndentation = getBaseIndentation(from: jsonNode)
 
     let format = BasicFormat(indentationWidth: indentation, initialIndentation: baseIndentation)
-    let indentedDecls = topLevelObject.asDeclSyntax(name: "JSONValue")
+    var formattedDecls = topLevelObject.asDeclSyntax(name: "JSONValue")
       .formatted(using: format)
-      .description
+    formattedDecls.leadingTrivia = []
+    let indentedDecls = formattedDecls.description
 
     // Render the change into a set of source edits.
     switch preflight {
diff --git a/Tests/SourceKitLSPTests/SyntaxRefactorTests.swift b/Tests/SourceKitLSPTests/SyntaxRefactorTests.swift
index 637cdeac..80c49b02 100644
--- a/Tests/SourceKitLSPTests/SyntaxRefactorTests.swift
+++ b/Tests/SourceKitLSPTests/SyntaxRefactorTests.swift
@@ -202,22 +202,22 @@ final class SyntaxRefactorTests: SourceKitLSPTestCase {
           range: AbsolutePosition(utf8Offset: 0)..<AbsolutePosition(utf8Offset: 931),
           replacement: """
             struct JSONValue: Codable {
-              var name: String
-              var shelves: [Shelves]
-
-              struct Shelves: Codable {
                 var name: String
-                var product: Product
+                var shelves: [Shelves]
 
-                struct Product: Codable {
-                  var categories: [String]
-                  var delicious: String
-                  var description: String?
-                  var healthy: Bool
-                  var name: String
-                  var points: Double
+                struct Shelves: Codable {
+                    var name: String
+                    var product: Product
+
+                    struct Product: Codable {
+                        var categories: [String]
+                        var delicious: String
+                        var description: String?
+                        var healthy: Bool
+                        var name: String
+                        var points: Double
+                    }
                 }
-              }
             }
             """
         )
@@ -225,6 +225,56 @@ final class SyntaxRefactorTests: SourceKitLSPTestCase {
     )
   }
 
+  func testConvertJSONToCodableStructIndentation() throws {
+    try assertRefactor(
+      """
+      func test() {
+          1️⃣{
+              "a": 1
+          }
+      }
+      """,
+      context: (),
+      provider: ConvertJSONToCodableStruct.self,
+      expected: [
+        SourceEdit(
+          range: AbsolutePosition(utf8Offset: 18)..<AbsolutePosition(utf8Offset: 40),
+          replacement: """
+            struct JSONValue: Codable {
+                    var a: Double
+                }
+            """
+        )
+      ]
+    )
+    func testJSONIndentedWith4SpacesButFileWith2Spaces() throws {
+      try assertRefactor(
+        """
+        func test() {
+          if true {
+            1️⃣{
+                   "a": 1
+               }
+          }
+        }
+        """,
+        context: (),
+        provider: ConvertJSONToCodableStruct.self,
+        expected: [
+          SourceEdit(
+            range: AbsolutePosition(utf8Offset: 30)..<AbsolutePosition(utf8Offset: 52),
+            replacement: """
+              struct JSONValue: Codable {
+                var a: Double
+              }
+              """
+          )
+        ]
+      )
+    }
+
+  }
+
 }
 
 func assertRefactor<R: EditRefactoringProvider>(