xmlui 0.10.19 → 0.10.21

package/dist/scripts/src/components-core/xmlui-parser.js

@@ -5,6 +5,7 @@ exports.errReportMessage = errReportMessage;
 exports.errReportComponent = errReportComponent;
 exports.errReportScriptError = errReportScriptError;
 exports.errReportModuleErrors = errReportModuleErrors;
+exports.createDocumentCursor = createDocumentCursor;
 const parser_1 = require("../parsers/xmlui-parser/parser");
 const transform_1 = require("../parsers/xmlui-parser/transform");
 const diagnostics_1 = require("../parsers/xmlui-parser/diagnostics");
@@ -18,13 +19,7 @@ function xmlUiMarkupToComponent(source, fileId = 0) {
     const { parse, getText } = (0, parser_1.createXmlUiParser)(source);
     const { node, errors } = parse();
     if (errors.length > 0) {
-        const newlinePositions = [];
-        for (let i = 0; i < source.length; ++i) {
-            if (source[i] === "\n") {
-                newlinePositions.push(i);
-            }
-        }
-        const errorsForDisplay = addDisplayFieldsToErrors(errors, source, newlinePositions);
+        const errorsForDisplay = addDisplayFieldsToErrors(errors, source);
         const erroneousCompoundComponentName = getCompoundCompName(node, getText);
         return { component: null, errors: errorsForDisplay, erroneousCompoundComponentName };
     }
@@ -483,27 +478,6 @@ function errReportModuleErrors(errors, fileName) {
     comp.component = createModuleErrorsComponent(errors, fileName);
     return comp;
 }
-/**
- * Converts a position in a string to a line and column number.
- * @param offset the offset of the position in the string
- * @param newlinePositions the offsets of the newlines in the string in ascending order
- */
-function offsetToPosition(offset, newlinePositions) {
-    let left = 0;
-    let right = newlinePositions.length;
-    while (left < right) {
-        const mid = Math.floor((left + right) / 2);
-        if (newlinePositions[mid] < offset) {
-            left = mid + 1;
-        }
-        else {
-            right = mid;
-        }
-    }
-    let line = left + 1;
-    let col = left === 0 ? offset + 1 : offset - newlinePositions[left - 1];
-    return { line, col };
-}
 function getCompoundCompName(node, getText) {
     var _a, _b, _c, _d, _e, _f;
     const rootTag = (_a = node === null || node === void 0 ? void 0 : node.children) === null || _a === void 0 ? void 0 : _a[0];
@@ -521,12 +495,54 @@ function getCompoundCompName(node, getText) {
     }
     return undefined;
 }
-function addDisplayFieldsToErrors(errors, source, newlinePositions) {
+function addDisplayFieldsToErrors(errors, source) {
+    const { offsetToPosForDisplay } = createDocumentCursor(source);
     return errors.map((err) => {
-        const { line: errPosLine, col: errPosCol } = offsetToPosition(err.pos, newlinePositions);
-        const { line: contextStartLine } = offsetToPosition(err.contextPos, newlinePositions);
+        const { line: errPosLine, character: errPosCol } = offsetToPosForDisplay(err.pos);
+        const { line: contextStartLine } = offsetToPosForDisplay(err.contextPos);
         return Object.assign(Object.assign({}, err), { errPosLine,
             errPosCol,
             contextStartLine, contextSource: source.substring(err.contextPos, err.contextEnd) });
     });
 }
+function createDocumentCursor(text) {
+    const newlinePositions = [];
+    for (let i = 0; i < text.length; ++i) {
+        if (text[i] === "\n") {
+            newlinePositions.push(i);
+        }
+    }
+    return {
+        offsetToPos,
+        offsetToPosForDisplay,
+    };
+    /**
+     * Converts a position in a string to 0 based line and column number.
+     * @param offset the 0 based offset into the string
+     */
+    function offsetToPos(offset) {
+        let left = 0;
+        let right = newlinePositions.length;
+        while (left < right) {
+            const mid = Math.floor((left + right) / 2);
+            if (newlinePositions[mid] < offset) {
+                left = mid + 1;
+            }
+            else {
+                right = mid;
+            }
+        }
+        let col = left === 0 ? offset : offset - newlinePositions[left - 1] - 1;
+        return { line: left, character: col };
+    }
+    /**
+     * Converts a position in a string to base 1 line and column number.
+     * @param offset the 0 based offset into the string
+     */
+    function offsetToPosForDisplay(offset) {
+        let pos = offsetToPos(offset);
+        pos.line += 1;
+        pos.character += 1;
+        return pos;
+    }
+}

package/dist/scripts/src/language-server/server-common.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,7 +23,7 @@ function start(connection) {
     let hasWorkspaceFolderCapability = false;
     let hasDiagnosticRelatedInformationCapability = false;
     connection.onInitialize((params) => {
-        connection.console.log("initing!");
+        connection.console.log("Initializing!");
         const capabilities = params.capabilities;
         // Does the client support the `workspace/configuration` request?
         // If not, we fall back using global settings.
@@ -50,13 +41,13 @@ function start(connection) {
                 },
                 hoverProvider: true,
                 documentFormattingProvider: true,
-            }
+            },
         };
         if (hasWorkspaceFolderCapability) {
             result.capabilities.workspace = {
                 workspaceFolders: {
-                    supported: true
-                }
+                    supported: true,
+                },
             };
         }
         return result;
@@ -64,22 +55,27 @@ function start(connection) {
     connection.onInitialized(() => {
         if (hasConfigurationCapability) {
             // Register for all configuration changes.
-            connection.client.register(vscode_languageserver_1.DidChangeConfigurationNotification.type, undefined);
+            void connection.client.register(vscode_languageserver_1.DidChangeConfigurationNotification.type, undefined);
         }
         if (hasWorkspaceFolderCapability) {
-            connection.workspace.onDidChangeWorkspaceFolders(_event => {
-                connection.console.log('Workspace folder change event received.');
+            connection.workspace.onDidChangeWorkspaceFolders((_event) => {
+                connection.console.log("Workspace folder change event received.");
             });
         }
     });
-    connection.onCompletion((_a) => __awaiter(this, [_a], void 0, function* ({ position, textDocument }) {
+    connection.onCompletion(({ position, textDocument }) => {
         const document = documents.get(textDocument.uri);
         if (!document) {
             return [];
         }
         const parseResult = parseDocument(document);
-        return (0, completion_1.handleCompletion)({ parseResult: parseResult.parseResult, getText: parseResult.getText, metaByComp: metadataProvider }, document.offsetAt(position));
-    }));
+        return (0, completion_1.handleCompletion)({
+            parseResult: parseResult.parseResult,
+            getText: parseResult.getText,
+            metaByComp: metadataProvider,
+            offsetToPos: (offset) => document.positionAt(offset),
+        }, document.offsetAt(position));
+    });
     connection.onCompletionResolve((completionItem) => {
         return (0, completion_1.handleCompletionResolve)({ metaByComp: metadataProvider, item: completionItem });
     });
@@ -93,7 +89,7 @@ function start(connection) {
             node: parseResult.node,
             getText,
             metaByComp: metadataProvider,
-            offsetToPosition: (offset) => document.positionAt(offset)
+            offsetToPosition: (offset) => document.positionAt(offset),
         };
         return (0, hover_1.handleHover)(ctx, document.offsetAt(position));
     });
@@ -102,8 +98,13 @@ function start(connection) {
         if (!document) {
             return null;
         }
-        const { parseResult: { node }, getText } = parseDocument(document);
-        return (0, format_1.handleDocumentFormatting)({ node, getText, options, offsetToPosition: (offset) => document.positionAt(offset) });
+        const { parseResult: { node }, getText, } = parseDocument(document);
+        return (0, format_1.handleDocumentFormatting)({
+            node,
+            getText,
+            options,
+            offsetToPosition: (offset) => document.positionAt(offset),
+        });
     });
     const parsedDocuments = new Map();
     function parseDocument(document) {
@@ -136,10 +137,10 @@ function start(connection) {
             offsetToPos: (offset) => document.positionAt(offset),
         };
         const diagnostics = (0, diagnostic_1.getDiagnostics)(ctx);
-        connection.sendDiagnostics({
+        void connection.sendDiagnostics({
             version: document.version,
             uri: document.uri,
-            diagnostics
+            diagnostics,
         });
     }
     // Make the text document manager listen on the connection

package/dist/scripts/src/language-server/services/common/lsp-utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.offsetToPosRange = offsetToPosRange;
-function offsetToPosRange(offsetToPos, range) {
+exports.offsetRangeToPosRange = offsetRangeToPosRange;
+function offsetRangeToPosRange(offsetToPos, range) {
     return {
         start: offsetToPos(range.pos),
         end: offsetToPos(range.end),

package/dist/scripts/src/language-server/services/completion.js

@@ -60,7 +60,7 @@ function handleCompletionResolve({ item, metaByComp: metaByComp, }) {
     }
     return item;
 }
-function handleCompletion({ parseResult: { node }, getText, metaByComp }, position) {
+function handleCompletion({ parseResult: { node }, getText, metaByComp, offsetToPos }, position) {
     const findRes = (0, utils_1.findTokenAtPos)(node, position);
     if (!findRes) {
         return null;
@@ -81,7 +81,7 @@ function handleCompletion({ parseResult: { node }, getText, metaByComp }, positi
                 const compName = getNameFromElement(matchingNode, getText);
                 if (!compName)
                     return defaultCompNames;
-                const compNameSuggestion = componentCompletionItem("/" + compName, 0);
+                const compNameSuggestion = closingComponentCompletionItem(compName, offsetToPos, position);
                 return [compNameSuggestion, ...defaultCompNames.map((c) => (Object.assign(Object.assign({}, c), { sortText: "1" })))];
             }
             return defaultCompNames;
@@ -247,6 +247,24 @@ function componentCompletionItem(componentName, sortingOrder) {
         },
     };
 }
+function closingComponentCompletionItem(componentName, offsetToPos, cursorOffset) {
+    const cursorPos = offsetToPos(cursorOffset);
+    const updatedText = /* TODO globals.clientSupports.insertReplaceEdit ? Handle this case : */ {
+        newText: `/${componentName}>`,
+        range: { start: cursorPos, end: cursorPos },
+    };
+    return {
+        label: `/${componentName}`,
+        kind: vscode_languageserver_1.CompletionItemKind.Constructor,
+        sortText: "0",
+        textEdit: updatedText,
+        data: {
+            metadataAccessInfo: {
+                componentName,
+            },
+        },
+    };
+}
 function markupContent(content) {
     return {
         kind: vscode_languageserver_1.MarkupKind.Markdown,

package/dist/scripts/src/language-server/services/diagnostic.js

@@ -12,7 +12,7 @@ function getDiagnostics(ctx) {
 function errorToLspDiag(e, offsetToPos) {
     return {
         severity: e.category,
-        range: (0, lsp_utils_1.offsetToPosRange)(offsetToPos, e),
+        range: (0, lsp_utils_1.offsetRangeToPosRange)(offsetToPos, e),
         message: e.message,
         code: e.code,
     };

package/dist/scripts/src/language-server/services/hover.js

@@ -60,7 +60,7 @@ function handleHoverCore({ node, getText, metaByComp }, position) {
                         metaByComp: metaByComp,
                         tagNameNode: parentNode,
                         identNode: atNode,
-                        getText
+                        getText,
                     });
                 }
                 case syntax_kind_1.SyntaxKind.AttributeKeyNode: {
@@ -87,7 +87,7 @@ function handleHover(ctx, position) {
             kind: vscode_languageserver_1.MarkupKind.Markdown,
             value,
         },
-        range: (0, lsp_utils_1.offsetToPosRange)(ctx.offsetToPosition, range)
+        range: (0, lsp_utils_1.offsetRangeToPosRange)(ctx.offsetToPosition, range),
     };
 }
 function hoverAttr({ metaByComp, attrKeyNode, parentStack, getText, }) {

package/dist/scripts/src/parsers/common/utils.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepFreeze = deepFreeze;
 function deepFreeze(o) {
     Object.freeze(o);
-    var oIsFunction = typeof o === "function";
-    var hasOwnProp = Object.prototype.hasOwnProperty;
+    let oIsFunction = typeof o === "function";
+    let hasOwnProp = Object.prototype.hasOwnProperty;
     Object.getOwnPropertyNames(o).forEach(function (prop) {
         if (hasOwnProp.call(o, prop)
             && (oIsFunction ? prop !== 'caller' && prop !== 'callee' && prop !== 'arguments' : true)

package/dist/scripts/src/parsers/scripting/Lexer.js

@@ -183,7 +183,6 @@ class Lexer {
      */
     fetch() {
         // --- Captured constants used in nested functions
-        const lexer = this;
         const input = this.input;
         const startPos = this._prefetchedPos || input.position;
         const line = input.line;
@@ -197,6 +196,17 @@ class Lexer {
         let lastEndColumn = input.column;
         let ch = null;
         let useResolver = false;
+        /**
+         * Appends the last character to the token, and manages positions
+         */
+        const appendTokenChar = () => {
+            text += ch;
+            this._prefetched = null;
+            this._prefetchedPos = null;
+            this._prefetchedColumn = null;
+            lastEndPos = input.position;
+            lastEndColumn = input.position;
+        };
         // --- Start from the beginning
         let phase = this.getStartingPhaseThenReset();
         // --- Process all token characters
@@ -588,7 +598,8 @@ class Lexer {
                     if (isDecimalDigit(ch) || ch === "_") {
                         break;
                     }
-                    else if (ch === "." && (this.input.peek() === null || isDecimalDigit(this.input.peek()))) {
+                    else if (ch === "." &&
+                        (this.input.peek() === null || isDecimalDigit(this.input.peek()))) {
                         phase = LexerPhase.RealFractionalFirst;
                         tokenType = TokenType_1.TokenType.Unknown;
                     }
@@ -875,17 +886,6 @@ class Lexer {
             appendTokenChar();
             // --- Go on with parsing the next character
         }
-        /**
-         * Appends the last character to the token, and manages positions
-         */
-        function appendTokenChar() {
-            text += ch;
-            lexer._prefetched = null;
-            lexer._prefetchedPos = null;
-            lexer._prefetchedColumn = null;
-            lastEndPos = input.position;
-            lastEndColumn = input.position;
-        }
         /**
          * Packs the specified type of token to send back
          */
@@ -893,7 +893,9 @@ class Lexer {
             var _a;
             if (useResolver) {
                 tokenType =
-                    (_a = resolverHash.get(text)) !== null && _a !== void 0 ? _a : (isIdStart(text[0]) && text[text.length - 1] !== "'" ? TokenType_1.TokenType.Identifier : TokenType_1.TokenType.Unknown);
+                    (_a = resolverHash.get(text)) !== null && _a !== void 0 ? _a : (isIdStart(text[0]) && text[text.length - 1] !== "'"
+                        ? TokenType_1.TokenType.Identifier
+                        : TokenType_1.TokenType.Unknown);
             }
             return {
                 text,
@@ -1059,7 +1061,11 @@ function isIdStart(ch) {
  * @param ch Character to test
  */
 function isIdContinuation(ch) {
-    return (ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z") || (ch >= "0" && ch <= "9") || ch === "_" || ch === "$";
+    return ((ch >= "a" && ch <= "z") ||
+        (ch >= "A" && ch <= "Z") ||
+        (ch >= "0" && ch <= "9") ||
+        ch === "_" ||
+        ch === "$");
 }
 /**
  * Tests if a character is a binary digit

package/dist/scripts/src/parsers/scripting/Parser.js

@@ -831,9 +831,16 @@ class Parser {
      *   : "finally" blockStatement
      */
     parseTryStatement() {
+        const getBlock = () => {
+            const nextToken = this._lexer.peek();
+            if (nextToken.type !== TokenType_1.TokenType.LBrace) {
+                this.reportError("W012", nextToken);
+                return null;
+            }
+            return this.parseBlockStatement();
+        };
         const startToken = this._lexer.peek();
         let endToken = this._lexer.get();
-        const parser = this;
         // --- Get "try" block
         const tryB = getBlock();
         let catchB;
@@ -888,14 +895,6 @@ class Parser {
             catchV,
             finallyB,
         }, startToken, endToken);
-        function getBlock() {
-            const nextToken = parser._lexer.peek();
-            if (nextToken.type !== TokenType_1.TokenType.LBrace) {
-                parser.reportError("W012", nextToken);
-                return null;
-            }
-            return parser.parseBlockStatement();
-        }
     }
     /**
      * Parses a switch statement

package/dist/scripts/src/parsers/style-parser/StyleLexer.js

@@ -94,7 +94,6 @@ class StyleLexer {
      */
     fetch() {
         // --- Captured constants used in nested functions
-        const lexer = this;
         const input = this.input;
         const startPos = this._prefetchedPos || input.position;
         this._lastFetchPosition = this.input.position;
@@ -105,6 +104,25 @@ class StyleLexer {
         let ch = null;
         let useResolver = false;
         let stringWrapper = "";
+        /**
+         * Appends the last character to the token, and manages positions
+         */
+        const appendTokenChar = () => {
+            text += ch;
+            this._prefetched = null;
+            this._prefetchedPos = null;
+            lastEndPos = input.position;
+        };
+        /**
+         * Fetches the next character from the input stream
+         */
+        const fetchNextChar = () => {
+            if (!this._prefetched) {
+                this._prefetchedPos = input.position;
+                this._prefetched = input.get();
+            }
+            return this._prefetched;
+        };
         // --- Start from the beginning
         let phase = LexerPhase.Start;
         // --- Process all token characters
@@ -246,32 +264,14 @@ class StyleLexer {
             appendTokenChar();
             // --- Go on with parsing the next character
         }
-        /**
-         * Appends the last character to the token, and manages positions
-         */
-        function appendTokenChar() {
-            text += ch;
-            lexer._prefetched = null;
-            lexer._prefetchedPos = null;
-            lastEndPos = input.position;
-        }
-        /**
-         * Fetches the next character from the input stream
-         */
-        function fetchNextChar() {
-            if (!lexer._prefetched) {
-                lexer._prefetchedPos = input.position;
-                lexer._prefetched = input.get();
-            }
-            return lexer._prefetched;
-        }
         /**
          * Packs the specified type of token to send back
          */
         function makeToken() {
             var _a;
             if (useResolver) {
-                tokenType = (_a = exports.styleKeywords[text]) !== null && _a !== void 0 ? _a : (isIdStart(text[0]) ? tokens_1.StyleTokenType.Identifier : tokens_1.StyleTokenType.Unknown);
+                tokenType =
+                    (_a = exports.styleKeywords[text]) !== null && _a !== void 0 ? _a : (isIdStart(text[0]) ? tokens_1.StyleTokenType.Identifier : tokens_1.StyleTokenType.Unknown);
             }
             return {
                 text,
@@ -313,7 +313,7 @@ function isWs(t) {
  * @param ch Character to test
  */
 function isIdStart(ch) {
-    return (ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z") || ch === "-" || ch === "_" || ch === "$";
+    return ((ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z") || ch === "-" || ch === "_" || ch === "$");
 }
 /**
  * Tests if a character is an identifier continuation character