definition to get added to the bottom of

Author: arpitkuriyal

language-server/src/features/codeAction/extractSubschema.js

@@ -49,7 +49,7 @@ export class ExtractSubSchemaToDefs {
         return [];
       }
 
-      const dialectUri = /** @type {string} */ (node.root.dialectUri);
+      const dialectUri = /** @type {string} */(node.root.dialectUri);
       const definitionsKeyword = getKeywordName(dialectUri, "https://json-schema.org/keyword/definitions");
 
       const definitionsNode = SchemaNode.step(definitionsKeyword, node.root);
@@ -69,7 +69,10 @@ export class ExtractSubSchemaToDefs {
       const newDefName = `def${highestDefNumber + 1}`;
       const extractedDef = schemaDocument.textDocument.getText(range);
       const settings = await this.configuration.get();
-
+      const lastDefinition = definitionsNode?.children.at(-1);
+      const lastDefinitionPosition = (lastDefinition?.offset && lastDefinition?.textLength)
+        ? lastDefinition.offset + lastDefinition.textLength
+        : /** @type {number} */ (definitionsNode?.offset) + 1;
       /** @type {CodeAction} */
       const codeAction = {
         title: `Extract '${newDefName}' to ${definitionsKeyword}`,
@@ -84,10 +87,10 @@ export class ExtractSubSchemaToDefs {
               definitionsNode
                 ? withFormatting(schemaDocument.textDocument, {
                     range: {
-                      start: schemaDocument.textDocument.positionAt(definitionsNode.offset + 1),
-                      end: schemaDocument.textDocument.positionAt(definitionsNode.offset + 1)
+                      start: schemaDocument.textDocument.positionAt(lastDefinitionPosition),
+                      end: schemaDocument.textDocument.positionAt(lastDefinitionPosition)
                     },
-                    newText: `\n"${newDefName}": ${extractedDef},`
+                    newText: lastDefinition ? `,\n"${newDefName}": ${extractedDef}` : `\n"${newDefName}": ${extractedDef}`
                   }, settings)
                 : withFormatting(schemaDocument.textDocument, {
                     range: {