Merge pull request #223 from denisw/fix/sort-nested-property

Fix sorting error in case of nested trailing comma
microsoft · Mar 4, 2024 · e140c73 · e140c73
2 parents bbba2d5 + 87b872e
commit e140c73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/test/sort.test.ts b/src/test/sort.test.ts
@@ -53,7 +53,7 @@ suite('Sort JSON', () => {
             '"hobbies" : ["volleyball","drawing","hiking"],',
             '"friends" : {',
             '"Marc" : {"hobbies" : ["kayaking", "mountaineering"],',
-            '"age" : 35},',
+            '"age" : 35,},',
             '"Leila" : {"hobbies" : ["watching movies",',
             '"reading books"], "age" : 32}}}'
         ].join('\n');

diff --git a/src/utils/sort.ts b/src/utils/sort.ts
@@ -222,16 +222,17 @@ function findJsoncPropertyTree(formattedDocument: TextDocument) {
                 endLineNumber = scanner.getTokenStartLine();
                 currentContainerStack.pop();
 
-                // If we are not inside of an empty object and current property end line number has not yet been defined, define it
-                if (lastNonTriviaNonCommentToken !== SyntaxKind.OpenBraceToken
-                    && currentProperty!.endLineNumber === undefined) {
-
-                    currentProperty!.endLineNumber = endLineNumber - 1;
-                    // The current property is also the last property
-                    currentProperty!.lastProperty = true;
-                    // The last property of an object is associated with the line and index of where to add the comma, in case after sorting, it is no longer the last property
-                    currentProperty!.lineWhereToAddComma = lineOfLastNonTriviaNonCommentToken;
-                    currentProperty!.indexWhereToAddComa = endIndexOfLastNonTriviaNonCommentToken;
+                // If we are not inside of an empty object
+                if (lastNonTriviaNonCommentToken !== SyntaxKind.OpenBraceToken) {
+                    // If current property end line number has not yet been defined, define it
+                    if (currentProperty!.endLineNumber === undefined) {
+                        currentProperty!.endLineNumber = endLineNumber - 1;
+                        // The current property is also the last property
+                        currentProperty!.lastProperty = true;
+                        // The last property of an object is associated with the line and index of where to add the comma, in case after sorting, it is no longer the last property
+                        currentProperty!.lineWhereToAddComma = lineOfLastNonTriviaNonCommentToken;
+                        currentProperty!.indexWhereToAddComa = endIndexOfLastNonTriviaNonCommentToken;
+                    }
                     lastProperty = currentProperty;
                     currentProperty = currentProperty ? currentProperty.parent : undefined;
                     currentTree = currentProperty;