@codingame/monaco-vscode-api 25.1.2 → 26.0.1

package/vscode/src/vs/editor/contrib/snippet/browser/snippetParser.js

@@ -2,7 +2,7 @@
 import { CharCode } from '../../../../base/common/charCode.js';
 
 var TokenType;
-(function (TokenType) {
+(function(TokenType) {
     TokenType[TokenType["Dollar"] = 0] = "Dollar";
     TokenType[TokenType["Colon"] = 1] = "Colon";
     TokenType[TokenType["Comma"] = 2] = "Comma";
@@ -21,29 +21,29 @@ var TokenType;
 })(TokenType || (TokenType = {}));
 class Scanner {
     constructor() {
-        this.value = '';
+        this.value = "";
         this.pos = 0;
     }
-    static { this._table = {
-        [CharCode.DollarSign]: TokenType.Dollar,
-        [CharCode.Colon]: TokenType.Colon,
-        [CharCode.Comma]: TokenType.Comma,
-        [CharCode.OpenCurlyBrace]: TokenType.CurlyOpen,
-        [CharCode.CloseCurlyBrace]: TokenType.CurlyClose,
-        [CharCode.Backslash]: TokenType.Backslash,
-        [CharCode.Slash]: TokenType.Forwardslash,
-        [CharCode.Pipe]: TokenType.Pipe,
-        [CharCode.Plus]: TokenType.Plus,
-        [CharCode.Dash]: TokenType.Dash,
-        [CharCode.QuestionMark]: TokenType.QuestionMark,
-    }; }
+    static {
+        this._table = {
+            [CharCode.DollarSign]: TokenType.Dollar,
+            [CharCode.Colon]: TokenType.Colon,
+            [CharCode.Comma]: TokenType.Comma,
+            [CharCode.OpenCurlyBrace]: TokenType.CurlyOpen,
+            [CharCode.CloseCurlyBrace]: TokenType.CurlyClose,
+            [CharCode.Backslash]: TokenType.Backslash,
+            [CharCode.Slash]: TokenType.Forwardslash,
+            [CharCode.Pipe]: TokenType.Pipe,
+            [CharCode.Plus]: TokenType.Plus,
+            [CharCode.Dash]: TokenType.Dash,
+            [CharCode.QuestionMark]: TokenType.QuestionMark
+        };
+    }
     static isDigitCharacter(ch) {
         return ch >= CharCode.Digit0 && ch <= CharCode.Digit9;
     }
     static isVariableCharacter(ch) {
-        return ch === CharCode.Underline
-            || (ch >= CharCode.a && ch <= CharCode.z)
-            || (ch >= CharCode.A && ch <= CharCode.Z);
+        return ch === CharCode.Underline || (ch >= CharCode.a && ch <= CharCode.z) || (ch >= CharCode.A && ch <= CharCode.Z);
     }
     text(value) {
         this.value = value;
@@ -54,16 +54,24 @@ class Scanner {
     }
     next() {
         if (this.pos >= this.value.length) {
-            return { type: TokenType.EOF, pos: this.pos, len: 0 };
+            return {
+                type: TokenType.EOF,
+                pos: this.pos,
+                len: 0
+            };
         }
         const pos = this.pos;
         let len = 0;
         let ch = this.value.charCodeAt(pos);
         let type;
         type = Scanner._table[ch];
-        if (typeof type === 'number') {
+        if (typeof type === "number") {
             this.pos += 1;
-            return { type, pos, len: 1 };
+            return {
+                type,
+                pos,
+                len: 1
+            };
         }
         if (Scanner.isDigitCharacter(ch)) {
             type = TokenType.Int;
@@ -72,7 +80,11 @@ class Scanner {
                 ch = this.value.charCodeAt(pos + len);
             } while (Scanner.isDigitCharacter(ch));
             this.pos += len;
-            return { type, pos, len };
+            return {
+                type,
+                pos,
+                len
+            };
         }
         if (Scanner.isVariableCharacter(ch)) {
             type = TokenType.VariableName;
@@ -80,19 +92,24 @@ class Scanner {
                 ch = this.value.charCodeAt(pos + (++len));
             } while (Scanner.isVariableCharacter(ch) || Scanner.isDigitCharacter(ch));
             this.pos += len;
-            return { type, pos, len };
+            return {
+                type,
+                pos,
+                len
+            };
         }
         type = TokenType.Format;
         do {
             len += 1;
             ch = this.value.charCodeAt(pos + len);
-        } while (!isNaN(ch)
-            && typeof Scanner._table[ch] === 'undefined'
-            && !Scanner.isDigitCharacter(ch)
-            && !Scanner.isVariableCharacter(ch)
-        );
+        } while (
+        !isNaN(ch) && typeof Scanner._table[ch] === "undefined" && !Scanner.isDigitCharacter(ch) && !Scanner.isVariableCharacter(ch));
         this.pos += len;
-        return { type, pos, len };
+        return {
+            type,
+            pos,
+            len
+        };
     }
 }
 class Marker {
@@ -102,15 +119,16 @@ class Marker {
     appendChild(child) {
         if (child instanceof Text && this._children[this._children.length - 1] instanceof Text) {
             this._children[this._children.length - 1].value += child.value;
-        }
-        else {
+        } else {
             child.parent = this;
             this._children.push(child);
         }
         return this;
     }
     replace(child, others) {
-        const { parent } = child;
+        const {
+            parent
+        } = child;
         const idx = parent.children.indexOf(child);
         const newChildren = parent.children.slice(0);
         newChildren.splice(idx, 1, ...others);
@@ -144,7 +162,7 @@ class Marker {
         }
     }
     toString() {
-        return this.children.reduce((prev, cur) => prev + ( cur.toString()), '');
+        return this.children.reduce((prev, cur) => prev + ( cur.toString()), "");
     }
     len() {
         return 0;
@@ -152,7 +170,7 @@ class Marker {
 }
 class Text extends Marker {
     static escape(value) {
-        return value.replace(/\$|}|\\/g, '\\$&');
+        return value.replace(/\$|}|\\/g, "\\$&");
     }
     constructor(value) {
         super();
@@ -171,26 +189,20 @@ class Text extends Marker {
         return ( new Text(this.value));
     }
 }
-class TransformableMarker extends Marker {
-}
+class TransformableMarker extends Marker {}
 class Placeholder extends TransformableMarker {
     static compareByIndex(a, b) {
         if (a.index === b.index) {
             return 0;
-        }
-        else if (a.isFinalTabstop) {
+        } else if (a.isFinalTabstop) {
             return 1;
-        }
-        else if (b.isFinalTabstop) {
+        } else if (b.isFinalTabstop) {
             return -1;
-        }
-        else if (a.index < b.index) {
+        } else if (a.index < b.index) {
             return -1;
-        }
-        else if (a.index > b.index) {
+        } else if (a.index > b.index) {
             return 1;
-        }
-        else {
+        } else {
             return 0;
         }
     }
@@ -202,26 +214,21 @@ class Placeholder extends TransformableMarker {
         return this.index === 0;
     }
     get choice() {
-        return this._children.length === 1 && this._children[0] instanceof Choice
-            ? this._children[0]
-            : undefined;
+        return this._children.length === 1 && this._children[0] instanceof Choice ? this._children[0] : undefined;
     }
     toTextmateString() {
-        let transformString = '';
+        let transformString = "";
         if (this.transform) {
             transformString = this.transform.toTextmateString();
         }
         if (this.children.length === 0 && !this.transform) {
             return `\$${this.index}`;
-        }
-        else if (this.children.length === 0) {
+        } else if (this.children.length === 0) {
             return `\${${this.index}${transformString}}`;
-        }
-        else if (this.choice) {
+        } else if (this.choice) {
             return `\${${this.index}|${this.choice.toTextmateString()}|${transformString}}`;
-        }
-        else {
-            return `\${${this.index}:${( this.children.map(child => child.toTextmateString())).join('')}${transformString}}`;
+        } else {
+            return `\${${this.index}:${( this.children.map(child => child.toTextmateString())).join("")}${transformString}}`;
         }
     }
     clone() {
@@ -249,9 +256,7 @@ class Choice extends Marker {
         return this.options[0].value;
     }
     toTextmateString() {
-        return ( this.options
-            .map(option => option.value.replace(/\||,|\\/g, '\\$&')))
-            .join(',');
+        return ( this.options.map(option => option.value.replace(/\||,|\\/g, "\\$&"))).join(",");
     }
     len() {
         return this.options[0].len();
@@ -265,12 +270,12 @@ class Choice extends Marker {
 class Transform extends Marker {
     constructor() {
         super(...arguments);
-        this.regexp = ( new RegExp(''));
+        this.regexp = ( new RegExp(""));
     }
     resolve(value) {
         const _this = this;
         let didMatch = false;
-        let ret = value.replace(this.regexp, function () {
+        let ret = value.replace(this.regexp, function() {
             didMatch = true;
             return _this._replace(Array.prototype.slice.call(arguments, 0, -2));
         });
@@ -280,30 +285,29 @@ class Transform extends Marker {
         return ret;
     }
     _replace(groups) {
-        let ret = '';
+        let ret = "";
         for (const marker of this._children) {
             if (marker instanceof FormatString) {
-                let value = groups[marker.index] || '';
+                let value = groups[marker.index] || "";
                 value = marker.resolve(value);
                 ret += value;
-            }
-            else {
+            } else {
                 ret += ( marker.toString());
             }
         }
         return ret;
     }
     toString() {
-        return '';
+        return "";
     }
     toTextmateString() {
-        return `/${this.regexp.source}/${( this.children.map(c => c.toTextmateString()))}/${(this.regexp.ignoreCase ? 'i' : '') + (this.regexp.global ? 'g' : '')}`;
+        return `/${this.regexp.source}/${( this.children.map(c => c.toTextmateString()))}/${(this.regexp.ignoreCase ? "i" : "") + (this.regexp.global ? "g" : "")}`;
     }
     clone() {
         const ret = ( new Transform());
         ret.regexp = ( new RegExp(
             this.regexp.source,
-            '' + (this.regexp.ignoreCase ? 'i' : '') + (this.regexp.global ? 'g' : '')
+            "" + (this.regexp.ignoreCase ? "i" : "") + (this.regexp.global ? "g" : "")
         ));
         ret._children = ( this.children.map(child => child.clone()));
         return ret;
@@ -318,71 +322,56 @@ class FormatString extends Marker {
         this.elseValue = elseValue;
     }
     resolve(value) {
-        if (this.shorthandName === 'upcase') {
-            return !value ? '' : value.toLocaleUpperCase();
-        }
-        else if (this.shorthandName === 'downcase') {
-            return !value ? '' : value.toLocaleLowerCase();
-        }
-        else if (this.shorthandName === 'capitalize') {
-            return !value ? '' : (value[0].toLocaleUpperCase() + value.substr(1));
-        }
-        else if (this.shorthandName === 'pascalcase') {
-            return !value ? '' : this._toPascalCase(value);
-        }
-        else if (this.shorthandName === 'camelcase') {
-            return !value ? '' : this._toCamelCase(value);
-        }
-        else if (this.shorthandName === 'kebabcase') {
-            return !value ? '' : this._toKebabCase(value);
-        }
-        else if (this.shorthandName === 'snakecase') {
-            return !value ? '' : this._toSnakeCase(value);
-        }
-        else if (Boolean(value) && typeof this.ifValue === 'string') {
+        if (this.shorthandName === "upcase") {
+            return !value ? "" : value.toLocaleUpperCase();
+        } else if (this.shorthandName === "downcase") {
+            return !value ? "" : value.toLocaleLowerCase();
+        } else if (this.shorthandName === "capitalize") {
+            return !value ? "" : (value[0].toLocaleUpperCase() + value.substr(1));
+        } else if (this.shorthandName === "pascalcase") {
+            return !value ? "" : this._toPascalCase(value);
+        } else if (this.shorthandName === "camelcase") {
+            return !value ? "" : this._toCamelCase(value);
+        } else if (this.shorthandName === "kebabcase") {
+            return !value ? "" : this._toKebabCase(value);
+        } else if (this.shorthandName === "snakecase") {
+            return !value ? "" : this._toSnakeCase(value);
+        } else if (Boolean(value) && typeof this.ifValue === "string") {
             return this.ifValue;
-        }
-        else if (!Boolean(value) && typeof this.elseValue === 'string') {
+        } else if (!Boolean(value) && typeof this.elseValue === "string") {
             return this.elseValue;
-        }
-        else {
-            return value || '';
+        } else {
+            return value || "";
         }
     }
     _toKebabCase(value) {
-        const match = value.match(/[a-z0-9]+/gi);
+        const match = value.match(/[\p{L}0-9]+/gu);
         if (!match) {
             return value;
         }
-        if (!value.match(/[a-z0-9]/)) {
-            return value
-                .trim()
-                .toLowerCase()
-                .replace(/^_+|_+$/g, '')
-                .replace(/[\s_]+/g, '-');
+        if (!value.match(/[\p{L}0-9]/u)) {
+            return value.trim().toLowerCase().replace(/^_+|_+$/g, "").replace(/[\s_]+/g, "-");
         }
-        const match2 = value
-            .trim()
-            .match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g);
+        const cleaned = value.trim().replace(/^_+|_+$/g, "");
+        const match2 = cleaned.match(
+            /\p{Lu}{2,}(?=\p{Lu}\p{Ll}+[0-9]*|[\s_-]|$)|\p{Lu}?\p{Ll}+[0-9]*|\p{Lu}(?=\p{Lu}\p{Ll})|\p{Lu}(?=[\s_-]|$)|[0-9]+/gu
+        );
         if (!match2) {
-            return value;
+            return ( cleaned.split(/[\s_-]+/).filter(word => word.length > 0).map(word => word.toLowerCase())).join("-");
         }
-        return ( match2
-            .map(x => x.toLowerCase()))
-            .join('-');
+        return ( match2.map(x => x.toLowerCase())).join("-");
     }
     _toPascalCase(value) {
-        const match = value.match(/[a-z0-9]+/gi);
+        const match = value.match(/[\p{L}0-9]+/gu);
         if (!match) {
             return value;
         }
         return ( match.map(word => {
             return word.charAt(0).toUpperCase() + word.substr(1);
-        }))
-            .join('');
+        })).join("");
     }
     _toCamelCase(value) {
-        const match = value.match(/[a-z0-9]+/gi);
+        const match = value.match(/[\p{L}0-9]+/gu);
         if (!match) {
             return value;
         }
@@ -391,30 +380,24 @@ class FormatString extends Marker {
                 return word.charAt(0).toLowerCase() + word.substr(1);
             }
             return word.charAt(0).toUpperCase() + word.substr(1);
-        }))
-            .join('');
+        })).join("");
     }
     _toSnakeCase(value) {
-        return value.replace(/([a-z])([A-Z])/g, '$1_$2')
-            .replace(/[\s\-]+/g, '_')
-            .toLowerCase();
+        return value.replace(/(\p{Ll})(\p{Lu})/gu, "$1_$2").replace(/[\s\-]+/g, "_").toLowerCase();
     }
     toTextmateString() {
-        let value = '${';
+        let value = "${";
         value += this.index;
         if (this.shorthandName) {
             value += `:/${this.shorthandName}`;
-        }
-        else if (this.ifValue && this.elseValue) {
+        } else if (this.ifValue && this.elseValue) {
             value += `:?${this.ifValue}:${this.elseValue}`;
-        }
-        else if (this.ifValue) {
+        } else if (this.ifValue) {
             value += `:+${this.ifValue}`;
-        }
-        else if (this.elseValue) {
+        } else if (this.elseValue) {
             value += `:-${this.elseValue}`;
         }
-        value += '}';
+        value += "}";
         return value;
     }
     clone() {
@@ -430,7 +413,7 @@ class Variable extends TransformableMarker {
     resolve(resolver) {
         let value = resolver.resolve(this);
         if (this.transform) {
-            value = this.transform.resolve(value || '');
+            value = this.transform.resolve(value || "");
         }
         if (value !== undefined) {
             this._children = [( new Text(value))];
@@ -439,15 +422,14 @@ class Variable extends TransformableMarker {
         return false;
     }
     toTextmateString() {
-        let transformString = '';
+        let transformString = "";
         if (this.transform) {
             transformString = this.transform.toTextmateString();
         }
         if (this.children.length === 0) {
             return `\${${this.name}${transformString}}`;
-        }
-        else {
-            return `\${${this.name}:${( this.children.map(child => child.toTextmateString())).join('')}${transformString}}`;
+        } else {
+            return `\${${this.name}:${( this.children.map(child => child.toTextmateString())).join("")}${transformString}}`;
         }
     }
     clone() {
@@ -475,19 +457,24 @@ class TextmateSnippet extends Marker {
         if (!this._placeholders) {
             const all = [];
             let last;
-            this.walk(function (candidate) {
+            this.walk(function(candidate) {
                 if (candidate instanceof Placeholder) {
                     all.push(candidate);
                     last = !last || last.index < candidate.index ? candidate : last;
                 }
                 return true;
             });
-            this._placeholders = { all, last };
+            this._placeholders = {
+                all,
+                last
+            };
         }
         return this._placeholders;
     }
     get placeholders() {
-        const { all } = this.placeholderInfo;
+        const {
+            all
+        } = this.placeholderInfo;
         return all;
     }
     offset(marker) {
@@ -516,7 +503,9 @@ class TextmateSnippet extends Marker {
     }
     enclosingPlaceholders(placeholder) {
         const ret = [];
-        let { parent } = placeholder;
+        let {
+            parent
+        } = placeholder;
         while (parent) {
             if (parent instanceof Placeholder) {
                 ret.push(parent);
@@ -545,7 +534,7 @@ class TextmateSnippet extends Marker {
         return super.replace(child, others);
     }
     toTextmateString() {
-        return this.children.reduce((prev, cur) => prev + cur.toTextmateString(), '');
+        return this.children.reduce((prev, cur) => prev + cur.toTextmateString(), "");
     }
     clone() {
         const ret = ( new TextmateSnippet());
@@ -559,10 +548,14 @@ class TextmateSnippet extends Marker {
 class SnippetParser {
     constructor() {
         this._scanner = ( new Scanner());
-        this._token = { type: TokenType.EOF, pos: 0, len: 0 };
+        this._token = {
+            type: TokenType.EOF,
+            pos: 0,
+            len: 0
+        };
     }
     static escape(value) {
-        return value.replace(/\$|}|\\/g, '\\$&');
+        return value.replace(/\$|}|\\/g, "\\$&");
     }
     static asInsertText(value) {
         return ( ( new SnippetParser()).parse(value).toString());
@@ -580,19 +573,17 @@ class SnippetParser {
         const offset = snippet.children.length;
         this._scanner.text(value);
         this._token = this._scanner.next();
-        while (this._parse(snippet)) {
-        }
+        while (this._parse(snippet))
+            {}
         const placeholderDefaultValues = ( new Map());
         const incompletePlaceholders = [];
         snippet.walk(marker => {
             if (marker instanceof Placeholder) {
                 if (marker.isFinalTabstop) {
                     placeholderDefaultValues.set(0, undefined);
-                }
-                else if (!( placeholderDefaultValues.has(marker.index)) && marker.children.length > 0) {
+                } else if (!( placeholderDefaultValues.has(marker.index)) && marker.children.length > 0) {
                     placeholderDefaultValues.set(marker.index, marker.children);
-                }
-                else {
+                } else {
                     incompletePlaceholders.push(marker);
                 }
             }
@@ -648,35 +639,25 @@ class SnippetParser {
         while (this._token.type !== type) {
             if (this._token.type === TokenType.EOF) {
                 return false;
-            }
-            else if (this._token.type === TokenType.Backslash) {
+            } else if (this._token.type === TokenType.Backslash) {
                 const nextToken = this._scanner.next();
-                if (nextToken.type !== TokenType.Dollar
-                    && nextToken.type !== TokenType.CurlyClose
-                    && nextToken.type !== TokenType.Backslash) {
+                if (nextToken.type !== TokenType.Dollar && nextToken.type !== TokenType.CurlyClose && nextToken.type !== TokenType.Backslash) {
                     return false;
                 }
             }
             this._token = this._scanner.next();
         }
-        const value = this._scanner.value.substring(start.pos, this._token.pos).replace(/\\(\$|}|\\)/g, '$1');
+        const value = this._scanner.value.substring(start.pos, this._token.pos).replace(/\\(\$|}|\\)/g, "$1");
         this._token = this._scanner.next();
         return value;
     }
     _parse(marker) {
-        return this._parseEscaped(marker)
-            || this._parseTabstopOrVariableName(marker)
-            || this._parseComplexPlaceholder(marker)
-            || this._parseComplexVariable(marker)
-            || this._parseAnything(marker);
+        return this._parseEscaped(marker) || this._parseTabstopOrVariableName(marker) || this._parseComplexPlaceholder(marker) || this._parseComplexVariable(marker) || this._parseAnything(marker);
     }
     _parseEscaped(marker) {
         let value;
         if (value = this._accept(TokenType.Backslash, true)) {
-            value = this._accept(TokenType.Dollar, true)
-                || this._accept(TokenType.CurlyClose, true)
-                || this._accept(TokenType.Backslash, true)
-                || value;
+            value = this._accept(TokenType.Dollar, true) || this._accept(TokenType.CurlyClose, true) || this._accept(TokenType.Backslash, true) || value;
             marker.appendChild(( new Text(value)));
             return true;
         }
@@ -685,22 +666,17 @@ class SnippetParser {
     _parseTabstopOrVariableName(parent) {
         let value;
         const token = this._token;
-        const match = this._accept(TokenType.Dollar)
-            && (value = this._accept(TokenType.VariableName, true) || this._accept(TokenType.Int, true));
+        const match = this._accept(TokenType.Dollar) && (value = this._accept(TokenType.VariableName, true) || this._accept(TokenType.Int, true));
         if (!match) {
             return this._backTo(token);
         }
-        parent.appendChild(/^\d+$/.test(value)
-            ? ( new Placeholder(Number(value)))
-            : ( new Variable(value)));
+        parent.appendChild(/^\d+$/.test(value) ? ( new Placeholder(Number(value))) : ( new Variable(value)));
         return true;
     }
     _parseComplexPlaceholder(parent) {
         let index;
         const token = this._token;
-        const match = this._accept(TokenType.Dollar)
-            && this._accept(TokenType.CurlyOpen)
-            && (index = this._accept(TokenType.Int, true));
+        const match = this._accept(TokenType.Dollar) && this._accept(TokenType.CurlyOpen) && (index = this._accept(TokenType.Int, true));
         if (!match) {
             return this._backTo(token);
         }
@@ -714,12 +690,11 @@ class SnippetParser {
                 if (this._parse(placeholder)) {
                     continue;
                 }
-                parent.appendChild(( new Text('${' + index + ':')));
+                parent.appendChild(( new Text("${" + index + ":")));
                 placeholder.children.forEach(parent.appendChild, parent);
                 return true;
             }
-        }
-        else if (placeholder.index > 0 && this._accept(TokenType.Pipe)) {
+        } else if (placeholder.index > 0 && this._accept(TokenType.Pipe)) {
             const choice = ( new Choice());
             while (true) {
                 if (this._parseChoiceElement(choice)) {
@@ -737,20 +712,17 @@ class SnippetParser {
                 this._backTo(token);
                 return false;
             }
-        }
-        else if (this._accept(TokenType.Forwardslash)) {
+        } else if (this._accept(TokenType.Forwardslash)) {
             if (this._parseTransform(placeholder)) {
                 parent.appendChild(placeholder);
                 return true;
             }
             this._backTo(token);
             return false;
-        }
-        else if (this._accept(TokenType.CurlyClose)) {
+        } else if (this._accept(TokenType.CurlyClose)) {
             parent.appendChild(placeholder);
             return true;
-        }
-        else {
+        } else {
             return this._backTo(token);
         }
     }
@@ -763,12 +735,8 @@ class SnippetParser {
             }
             let value;
             if (value = this._accept(TokenType.Backslash, true)) {
-                value = this._accept(TokenType.Comma, true)
-                    || this._accept(TokenType.Pipe, true)
-                    || this._accept(TokenType.Backslash, true)
-                    || value;
-            }
-            else {
+                value = this._accept(TokenType.Comma, true) || this._accept(TokenType.Pipe, true) || this._accept(TokenType.Backslash, true) || value;
+            } else {
                 value = this._accept(undefined, true);
             }
             if (!value) {
@@ -781,15 +749,13 @@ class SnippetParser {
             this._backTo(token);
             return false;
         }
-        parent.appendChild(( new Text(values.join(''))));
+        parent.appendChild(( new Text(values.join(""))));
         return true;
     }
     _parseComplexVariable(parent) {
         let name;
         const token = this._token;
-        const match = this._accept(TokenType.Dollar)
-            && this._accept(TokenType.CurlyOpen)
-            && (name = this._accept(TokenType.VariableName, true));
+        const match = this._accept(TokenType.Dollar) && this._accept(TokenType.CurlyOpen) && (name = this._accept(TokenType.VariableName, true));
         if (!match) {
             return this._backTo(token);
         }
@@ -803,31 +769,28 @@ class SnippetParser {
                 if (this._parse(variable)) {
                     continue;
                 }
-                parent.appendChild(( new Text('${' + name + ':')));
+                parent.appendChild(( new Text("${" + name + ":")));
                 variable.children.forEach(parent.appendChild, parent);
                 return true;
             }
-        }
-        else if (this._accept(TokenType.Forwardslash)) {
+        } else if (this._accept(TokenType.Forwardslash)) {
             if (this._parseTransform(variable)) {
                 parent.appendChild(variable);
                 return true;
             }
             this._backTo(token);
             return false;
-        }
-        else if (this._accept(TokenType.CurlyClose)) {
+        } else if (this._accept(TokenType.CurlyClose)) {
             parent.appendChild(variable);
             return true;
-        }
-        else {
+        } else {
             return this._backTo(token);
         }
     }
     _parseTransform(parent) {
         const transform = ( new Transform());
-        let regexValue = '';
-        let regexOptions = '';
+        let regexValue = "";
+        let regexOptions = "";
         while (true) {
             if (this._accept(TokenType.Forwardslash)) {
                 break;
@@ -871,8 +834,7 @@ class SnippetParser {
         }
         try {
             transform.regexp = ( new RegExp(regexValue, regexOptions));
-        }
-        catch (e) {
+        } catch (e) {
             return false;
         }
         parent.transform = transform;
@@ -891,16 +853,13 @@ class SnippetParser {
         if (!index) {
             this._backTo(token);
             return false;
-        }
-        else if (!complex) {
+        } else if (!complex) {
             parent.appendChild(( new FormatString(Number(index))));
             return true;
-        }
-        else if (this._accept(TokenType.CurlyClose)) {
+        } else if (this._accept(TokenType.CurlyClose)) {
             parent.appendChild(( new FormatString(Number(index))));
             return true;
-        }
-        else if (!this._accept(TokenType.Colon)) {
+        } else if (!this._accept(TokenType.Colon)) {
             this._backTo(token);
             return false;
         }
@@ -909,27 +868,23 @@ class SnippetParser {
             if (!shorthand || !this._accept(TokenType.CurlyClose)) {
                 this._backTo(token);
                 return false;
-            }
-            else {
+            } else {
                 parent.appendChild(( new FormatString(Number(index), shorthand)));
                 return true;
             }
-        }
-        else if (this._accept(TokenType.Plus)) {
+        } else if (this._accept(TokenType.Plus)) {
             const ifValue = this._until(TokenType.CurlyClose);
             if (ifValue) {
                 parent.appendChild(( new FormatString(Number(index), undefined, ifValue, undefined)));
                 return true;
             }
-        }
-        else if (this._accept(TokenType.Dash)) {
+        } else if (this._accept(TokenType.Dash)) {
             const elseValue = this._until(TokenType.CurlyClose);
             if (elseValue) {
                 parent.appendChild(( new FormatString(Number(index), undefined, undefined, elseValue)));
                 return true;
             }
-        }
-        else if (this._accept(TokenType.QuestionMark)) {
+        } else if (this._accept(TokenType.QuestionMark)) {
             const ifValue = this._until(TokenType.Colon);
             if (ifValue) {
                 const elseValue = this._until(TokenType.CurlyClose);
@@ -938,8 +893,7 @@ class SnippetParser {
                     return true;
                 }
             }
-        }
-        else {
+        } else {
             const elseValue = this._until(TokenType.CurlyClose);
             if (elseValue) {
                 parent.appendChild(( new FormatString(Number(index), undefined, undefined, elseValue)));