@herb-tools/language-server 0.8.10 → 0.9.1

package/dist/diagnostics.js

@@ -1,6 +1,3 @@
-import { DiagnosticSeverity, DiagnosticTag } from "vscode-languageserver/node";
-import { Visitor } from "@herb-tools/core";
-import { isHTMLTextNode } from "@herb-tools/core";
 export class Diagnostics {
     constructor(connection, documentService, parserService, linterService, configService) {
         this.diagnostics = new Map();
@@ -18,21 +15,14 @@ export class Diagnostics {
         else {
             const parseResult = this.parserService.parseDocument(textDocument);
             const lintResult = await this.linterService.lintDocument(textDocument);
-            const unreachableCodeDiagnostics = this.getUnreachableCodeDiagnostics(parseResult.document);
             allDiagnostics = [
                 ...parseResult.diagnostics,
                 ...lintResult.diagnostics,
-                ...unreachableCodeDiagnostics,
             ];
         }
         this.diagnostics.set(textDocument, allDiagnostics);
         this.sendDiagnosticsFor(textDocument);
     }
-    getUnreachableCodeDiagnostics(document) {
-        const collector = new UnreachableCodeCollector();
-        collector.visit(document);
-        return collector.diagnostics;
-    }
     async refreshDocument(document) {
         await this.validate(document);
     }
@@ -49,227 +39,4 @@ export class Diagnostics {
         this.diagnostics.delete(textDocument);
     }
 }
-export class UnreachableCodeCollector extends Visitor {
-    constructor() {
-        super(...arguments);
-        this.diagnostics = [];
-        this.processedIfNodes = new Set();
-        this.processedElseNodes = new Set();
-    }
-    visitERBCaseNode(node) {
-        this.checkUnreachableChildren(node.children);
-        this.checkAndMarkElseClause(node.else_clause);
-        this.visitChildNodes(node);
-    }
-    visitERBCaseMatchNode(node) {
-        this.checkUnreachableChildren(node.children);
-        this.checkAndMarkElseClause(node.else_clause);
-        this.visitChildNodes(node);
-    }
-    visitERBIfNode(node) {
-        if (this.processedIfNodes.has(node)) {
-            return;
-        }
-        this.markIfChainAsProcessed(node);
-        this.markElseNodesInIfChain(node);
-        const entireChainEmpty = this.isEntireIfChainEmpty(node);
-        if (entireChainEmpty) {
-            this.checkEmptyStatements(node, node.statements, "if");
-        }
-        else {
-            this.checkIfChainParts(node);
-        }
-        this.visitChildNodes(node);
-    }
-    visitERBElseNode(node) {
-        if (this.processedElseNodes.has(node)) {
-            this.visitChildNodes(node);
-            return;
-        }
-        this.checkEmptyStatements(node, node.statements, "else");
-        this.visitChildNodes(node);
-    }
-    visitERBUnlessNode(node) {
-        const unlessHasContent = this.statementsHaveContent(node.statements);
-        const elseHasContent = node.else_clause && this.statementsHaveContent(node.else_clause.statements);
-        if (node.else_clause) {
-            this.processedElseNodes.add(node.else_clause);
-        }
-        const entireBlockEmpty = !unlessHasContent && !elseHasContent;
-        if (entireBlockEmpty) {
-            this.checkEmptyStatements(node, node.statements, "unless");
-        }
-        else {
-            if (!unlessHasContent) {
-                this.checkEmptyStatementsWithEndLocation(node, node.statements, "unless", node.else_clause);
-            }
-            if (node.else_clause && !elseHasContent) {
-                this.checkEmptyStatements(node.else_clause, node.else_clause.statements, "else");
-            }
-        }
-        this.visitChildNodes(node);
-    }
-    visitERBForNode(node) {
-        this.checkEmptyStatements(node, node.statements, "for");
-        this.visitChildNodes(node);
-    }
-    visitERBWhileNode(node) {
-        this.checkEmptyStatements(node, node.statements, "while");
-        this.visitChildNodes(node);
-    }
-    visitERBUntilNode(node) {
-        this.checkEmptyStatements(node, node.statements, "until");
-        this.visitChildNodes(node);
-    }
-    visitERBWhenNode(node) {
-        if (!node.then_keyword) {
-            this.checkEmptyStatements(node, node.statements, "when");
-        }
-        this.visitChildNodes(node);
-    }
-    visitERBBeginNode(node) {
-        this.checkEmptyStatements(node, node.statements, "begin");
-        this.visitChildNodes(node);
-    }
-    visitERBRescueNode(node) {
-        this.checkEmptyStatements(node, node.statements, "rescue");
-        this.visitChildNodes(node);
-    }
-    visitERBEnsureNode(node) {
-        this.checkEmptyStatements(node, node.statements, "ensure");
-        this.visitChildNodes(node);
-    }
-    visitERBBlockNode(node) {
-        this.checkEmptyStatements(node, node.body, "block");
-        this.visitChildNodes(node);
-    }
-    visitERBInNode(node) {
-        if (!node.then_keyword) {
-            this.checkEmptyStatements(node, node.statements, "in");
-        }
-        this.visitChildNodes(node);
-    }
-    checkUnreachableChildren(children) {
-        for (const child of children) {
-            if (isHTMLTextNode(child) && child.content.trim() === "") {
-                continue;
-            }
-            this.addDiagnostic(child.location, "Unreachable code: content between case and when/in is never executed");
-        }
-    }
-    checkEmptyStatements(node, statements, blockType) {
-        this.checkEmptyStatementsWithEndLocation(node, statements, blockType, null);
-    }
-    checkEmptyStatementsWithEndLocation(node, statements, blockType, subsequentNode) {
-        if (this.statementsHaveContent(statements)) {
-            return;
-        }
-        const startLocation = node.location.start;
-        const endLocation = subsequentNode
-            ? subsequentNode.location.start
-            : node.location.end;
-        this.addDiagnostic({ start: startLocation, end: endLocation }, `Empty ${blockType} block: this control flow statement has no content`);
-    }
-    addDiagnostic(location, message) {
-        const diagnostic = {
-            range: {
-                start: {
-                    line: this.toZeroBased(location.start.line),
-                    character: location.start.column
-                },
-                end: {
-                    line: this.toZeroBased(location.end.line),
-                    character: location.end.column
-                }
-            },
-            message,
-            severity: DiagnosticSeverity.Hint,
-            tags: [DiagnosticTag.Unnecessary],
-            source: "Herb Language Server"
-        };
-        this.diagnostics.push(diagnostic);
-    }
-    statementsHaveContent(statements) {
-        return statements.some(statement => {
-            if (isHTMLTextNode(statement)) {
-                return statement.content.trim() !== "";
-            }
-            return true;
-        });
-    }
-    checkAndMarkElseClause(elseClause) {
-        if (!elseClause) {
-            return;
-        }
-        this.processedElseNodes.add(elseClause);
-        if (!this.statementsHaveContent(elseClause.statements)) {
-            this.checkEmptyStatements(elseClause, elseClause.statements, "else");
-        }
-    }
-    markIfChainAsProcessed(node) {
-        this.processedIfNodes.add(node);
-        this.traverseSubsequentNodes(node.subsequent, (current) => {
-            if (current.type === 'AST_ERB_IF_NODE') {
-                this.processedIfNodes.add(current);
-            }
-        });
-    }
-    markElseNodesInIfChain(node) {
-        this.traverseSubsequentNodes(node.subsequent, (current) => {
-            if (current.type === 'AST_ERB_ELSE_NODE') {
-                this.processedElseNodes.add(current);
-            }
-        });
-    }
-    traverseSubsequentNodes(startNode, callback) {
-        let current = startNode;
-        while (current) {
-            callback(current);
-            if ('subsequent' in current) {
-                current = current.subsequent;
-            }
-            else {
-                break;
-            }
-        }
-    }
-    checkIfChainParts(node) {
-        if (!this.statementsHaveContent(node.statements)) {
-            this.checkEmptyStatementsWithEndLocation(node, node.statements, "if", node.subsequent);
-        }
-        this.traverseSubsequentNodes(node.subsequent, (current) => {
-            if (!('statements' in current) || !Array.isArray(current.statements)) {
-                return;
-            }
-            if (this.statementsHaveContent(current.statements)) {
-                return;
-            }
-            const blockType = current.type === 'AST_ERB_IF_NODE' ? 'elsif' : 'else';
-            const nextSubsequent = 'subsequent' in current ? current.subsequent : null;
-            if (nextSubsequent) {
-                this.checkEmptyStatementsWithEndLocation(current, current.statements, blockType, nextSubsequent);
-            }
-            else {
-                this.checkEmptyStatements(current, current.statements, blockType);
-            }
-        });
-    }
-    isEntireIfChainEmpty(node) {
-        if (this.statementsHaveContent(node.statements)) {
-            return false;
-        }
-        let hasContent = false;
-        this.traverseSubsequentNodes(node.subsequent, (current) => {
-            if ('statements' in current && Array.isArray(current.statements)) {
-                if (this.statementsHaveContent(current.statements)) {
-                    hasContent = true;
-                }
-            }
-        });
-        return !hasContent;
-    }
-    toZeroBased(line) {
-        return line - 1;
-    }
-}
 //# sourceMappingURL=diagnostics.js.map

package/dist/diagnostics.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,WAAW;IAQtB,YACE,UAAsB,EACtB,eAAgC,EAChC,aAA4B,EAC5B,aAA4B,EAC5B,aAA4B;QAPtB,gBAAW,GAAoC,IAAI,GAAG,EAAE,CAAA;QAS9D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,YAA0B;QACvC,IAAI,cAAc,GAAiB,EAAE,CAAA;QAErC,IAAI,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3C,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QAC1E,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;YAClE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;YAEtE,cAAc,GAAG;gBACf,GAAG,WAAW,CAAC,WAAW;gBAC1B,GAAG,UAAU,CAAC,WAAW;aAC1B,CAAA;QACH,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;QAClD,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;IACvC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAsB;QAC1C,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAA;QAC/C,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IAC9E,CAAC;IAEO,kBAAkB,CAAC,YAA0B;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;QAE5D,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;YAC9B,GAAG,EAAE,YAAY,CAAC,GAAG;YACrB,WAAW;SACZ,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IACvC,CAAC;CACF"}

package/dist/document_highlight_service.js

@@ -0,0 +1,196 @@
+import { DocumentHighlight, DocumentHighlightKind } from "vscode-languageserver/node";
+import { Visitor } from "@herb-tools/core";
+import { isERBIfNode, isERBElseNode, isHTMLOpenTagNode } from "@herb-tools/core";
+import { erbTagToRange, tokenToRange, nodeToRange, openTagRanges, isPositionInRange, rangeSize } from "./range_utils";
+export class DocumentHighlightCollector extends Visitor {
+    constructor() {
+        super(...arguments);
+        this.groups = [];
+        this.processedIfNodes = new Set();
+    }
+    visitERBNode(node) {
+        if ('end_node' in node && node.end_node) {
+            this.addGroup([erbTagToRange(node), erbTagToRange(node.end_node)]);
+        }
+    }
+    visitERBContentNode(node) {
+        this.addGroup([tokenToRange(node.tag_opening), tokenToRange(node.tag_closing)]);
+        this.visitChildNodes(node);
+    }
+    visitHTMLCommentNode(node) {
+        this.addGroup([tokenToRange(node.comment_start), tokenToRange(node.comment_end)]);
+        this.visitChildNodes(node);
+    }
+    visitHTMLElementNode(node) {
+        const ranges = [];
+        if (node.open_tag && isHTMLOpenTagNode(node.open_tag)) {
+            ranges.push(...openTagRanges(node.open_tag));
+        }
+        else if (node.open_tag) {
+            ranges.push(nodeToRange(node.open_tag));
+        }
+        if (node.close_tag) {
+            ranges.push(nodeToRange(node.close_tag));
+        }
+        this.addGroup(ranges);
+        this.visitChildNodes(node);
+    }
+    visitHTMLAttributeNode(node) {
+        const ranges = [];
+        if (node.name) {
+            ranges.push(nodeToRange(node.name));
+        }
+        if (node.equals) {
+            ranges.push(tokenToRange(node.equals));
+        }
+        if (node.value) {
+            ranges.push(nodeToRange(node.value));
+        }
+        this.addGroup(ranges);
+        this.visitChildNodes(node);
+    }
+    visitHTMLConditionalElementNode(node) {
+        const ranges = [];
+        if (node.open_conditional) {
+            ranges.push(erbTagToRange(node.open_conditional));
+        }
+        if (node.open_tag) {
+            ranges.push(...openTagRanges(node.open_tag));
+        }
+        if (node.close_tag) {
+            ranges.push(nodeToRange(node.close_tag));
+        }
+        if (node.close_conditional) {
+            ranges.push(erbTagToRange(node.close_conditional));
+        }
+        this.addGroup(ranges);
+        this.visitChildNodes(node);
+    }
+    visitERBIfNode(node) {
+        if (this.processedIfNodes.has(node)) {
+            this.visitChildNodes(node);
+            return;
+        }
+        this.markIfChainAsProcessed(node);
+        const ranges = [];
+        ranges.push(erbTagToRange(node));
+        let current = node.subsequent;
+        while (current) {
+            if (isERBIfNode(current)) {
+                ranges.push(erbTagToRange(current));
+                current = current.subsequent;
+            }
+            else if (isERBElseNode(current)) {
+                ranges.push(erbTagToRange(current));
+                break;
+            }
+            else {
+                break;
+            }
+        }
+        if (node.end_node) {
+            ranges.push(erbTagToRange(node.end_node));
+        }
+        this.addGroup(ranges);
+        this.visitChildNodes(node);
+    }
+    visitERBUnlessNode(node) {
+        const ranges = [];
+        ranges.push(erbTagToRange(node));
+        if (node.else_clause) {
+            ranges.push(erbTagToRange(node.else_clause));
+        }
+        if (node.end_node) {
+            ranges.push(erbTagToRange(node.end_node));
+        }
+        this.addGroup(ranges);
+        this.visitChildNodes(node);
+    }
+    visitERBCaseNode(node) {
+        this.visitERBAnyCaseNode(node);
+    }
+    visitERBCaseMatchNode(node) {
+        this.visitERBAnyCaseNode(node);
+    }
+    visitERBAnyCaseNode(node) {
+        const ranges = [];
+        ranges.push(erbTagToRange(node));
+        for (const condition of node.conditions) {
+            ranges.push(erbTagToRange(condition));
+        }
+        if (node.else_clause) {
+            ranges.push(erbTagToRange(node.else_clause));
+        }
+        if (node.end_node) {
+            ranges.push(erbTagToRange(node.end_node));
+        }
+        this.addGroup(ranges);
+        this.visitChildNodes(node);
+    }
+    visitERBBeginNode(node) {
+        const ranges = [];
+        ranges.push(erbTagToRange(node));
+        let rescue = node.rescue_clause;
+        while (rescue) {
+            ranges.push(erbTagToRange(rescue));
+            rescue = rescue.subsequent;
+        }
+        if (node.else_clause) {
+            ranges.push(erbTagToRange(node.else_clause));
+        }
+        if (node.ensure_clause) {
+            ranges.push(erbTagToRange(node.ensure_clause));
+        }
+        if (node.end_node) {
+            ranges.push(erbTagToRange(node.end_node));
+        }
+        this.addGroup(ranges);
+        this.visitChildNodes(node);
+    }
+    markIfChainAsProcessed(node) {
+        this.processedIfNodes.add(node);
+        let current = node.subsequent;
+        while (current) {
+            if (isERBIfNode(current)) {
+                this.processedIfNodes.add(current);
+                current = current.subsequent;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    addGroup(ranges) {
+        const filtered = ranges.filter((r) => r !== null);
+        if (filtered.length >= 2) {
+            this.groups.push(filtered);
+        }
+    }
+}
+export class DocumentHighlightService {
+    constructor(parserService) {
+        this.parserService = parserService;
+    }
+    getDocumentHighlights(textDocument, position) {
+        const parseResult = this.parserService.parseDocument(textDocument);
+        const collector = new DocumentHighlightCollector();
+        collector.visit(parseResult.document);
+        let bestGroup = null;
+        let bestSize = Infinity;
+        for (const group of collector.groups) {
+            const matchingRange = group.find(range => isPositionInRange(position, range));
+            if (matchingRange) {
+                const size = rangeSize(matchingRange);
+                if (size < bestSize) {
+                    bestSize = size;
+                    bestGroup = group;
+                }
+            }
+        }
+        if (bestGroup) {
+            return bestGroup.map(range => DocumentHighlight.create(range, DocumentHighlightKind.Text));
+        }
+        return [];
+    }
+}
+//# sourceMappingURL=document_highlight_service.js.map

package/dist/document_highlight_service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"document_highlight_service.js","sourceRoot":"","sources":["../src/document_highlight_service.ts"],"names":[],"mappings":"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"}

package/dist/document_save_service.js

@@ -1,5 +1,13 @@
 export class DocumentSaveService {
     constructor(connection, settings, autofixService, formattingService) {
+        /**
+         * Tracks documents that were recently autofixed via applyFixesAndFormatting
+         * (triggered by onDocumentFormatting). When editor.formatOnSave is enabled,
+         * onDocumentFormatting fires BEFORE willSaveWaitUntil. If applyFixesAndFormatting
+         * already applied autofix, applyFixes must skip to avoid conflicting edits
+         * (since this.documents hasn't been updated between the two events).
+         */
+        this.recentlyAutofixedViaFormatting = new Set();
         this.connection = connection;
         this.settings = settings;
         this.autofixService = autofixService;
@@ -16,6 +24,10 @@ export class DocumentSaveService {
         this.connection.console.log(`[DocumentSave] applyFixes fixOnSave=${fixOnSave}`);
         if (!fixOnSave)
             return [];
+        if (this.recentlyAutofixedViaFormatting.delete(document.uri)) {
+            this.connection.console.log(`[DocumentSave] applyFixes skipping: already autofixed via formatting`);
+            return [];
+        }
         return this.autofixService.autofix(document);
     }
     /**
@@ -31,18 +43,16 @@ export class DocumentSaveService {
         let autofixEdits = [];
         if (fixOnSave) {
             autofixEdits = await this.autofixService.autofix(document);
+            if (autofixEdits.length > 0) {
+                this.recentlyAutofixedViaFormatting.add(document.uri);
+            }
         }
         if (!formatterEnabled)
             return autofixEdits;
         if (autofixEdits.length === 0) {
             return this.formattingService.formatOnSave(document, reason);
         }
-        const autofixedDocument = {
-            ...document,
-            uri: document.uri,
-            getText: () => autofixEdits[0].newText,
-        };
-        return this.formattingService.formatOnSave(autofixedDocument, reason);
+        return this.formattingService.formatOnSave(document, reason, autofixEdits[0].newText);
     }
 }
 //# sourceMappingURL=document_save_service.js.map

package/dist/document_save_service.js.map

@@ -1 +1 @@
-{"version":3,"file":"document_save_service.js","sourceRoot":"","sources":["../src/document_save_service.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,mBAAmB;IAM9B,YAAY,UAAsB,EAAE,QAAkB,EAAE,cAA8B,EAAE,iBAAoC;QAC1H,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC5C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,UAAU,CAAC,QAAsB;;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACtE,MAAM,SAAS,GAAG,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,SAAS,MAAK,KAAK,CAAA;QAEvD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAA;QAE/E,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAA;QAEzB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC9C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,uBAAuB,CAAC,QAAsB,EAAE,MAA8B;;QAClF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACtE,MAAM,SAAS,GAAG,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,SAAS,MAAK,KAAK,CAAA;QACvD,MAAM,gBAAgB,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,0CAAE,OAAO,mCAAI,KAAK,CAAA;QAE9D,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,oDAAoD,SAAS,sBAAsB,gBAAgB,EAAE,CAAC,CAAA;QAElI,IAAI,YAAY,GAAe,EAAE,CAAA;QAEjC,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC5D,CAAC;QAED,IAAI,CAAC,gBAAgB;YAAE,OAAO,YAAY,CAAA;QAE1C,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9D,CAAC;QAED,MAAM,iBAAiB,GAAiB;YACtC,GAAG,QAAQ;YACX,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO;SACvC,CAAA;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IACvE,CAAC;CACF"}
+{"version":3,"file":"document_save_service.js","sourceRoot":"","sources":["../src/document_save_service.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,mBAAmB;IAe9B,YAAY,UAAsB,EAAE,QAAkB,EAAE,cAA8B,EAAE,iBAAoC;QAT5H;;;;;;WAMG;QACK,mCAA8B,GAAG,IAAI,GAAG,EAAU,CAAA;QAGxD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC5C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,UAAU,CAAC,QAAsB;;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACtE,MAAM,SAAS,GAAG,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,SAAS,MAAK,KAAK,CAAA;QAEvD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAA;QAE/E,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAA;QAEzB,IAAI,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7D,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,sEAAsE,CAAC,CAAA;YACnG,OAAO,EAAE,CAAA;QACX,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC9C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,uBAAuB,CAAC,QAAsB,EAAE,MAA8B;;QAClF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACtE,MAAM,SAAS,GAAG,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,SAAS,MAAK,KAAK,CAAA;QACvD,MAAM,gBAAgB,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,0CAAE,OAAO,mCAAI,KAAK,CAAA;QAE9D,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,oDAAoD,SAAS,sBAAsB,gBAAgB,EAAE,CAAC,CAAA;QAElI,IAAI,YAAY,GAAe,EAAE,CAAA;QAEjC,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YAE1D,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;YACvD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,gBAAgB;YAAE,OAAO,YAAY,CAAA;QAE1C,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9D,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IACvF,CAAC;CACF"}