Update LKG.

2025-11-18 17:21:48 +00:00 · 2018-10-29 14:48:37 -07:00
parent 626303e6df
commit 9733858944
10 changed files with 726 additions and 958 deletions
@@ -61,7 +61,8 @@ declare namespace ts.server.protocol {
        GetApplicableRefactors = "getApplicableRefactors",
        GetEditsForRefactor = "getEditsForRefactor",
        OrganizeImports = "organizeImports",
-        GetEditsForFileRename = "getEditsForFileRename"
+        GetEditsForFileRename = "getEditsForFileRename",
+        ConfigurePlugin = "configurePlugin"
    }
    /**
     * A TypeScript Server message
@@ -1006,6 +1007,14 @@ declare namespace ts.server.protocol {
     */
    interface ConfigureResponse extends Response {
    }
+    interface ConfigurePluginRequestArguments {
+        pluginName: string;
+        configuration: any;
+    }
+    interface ConfigurePluginRequest extends Request {
+        command: CommandTypes.ConfigurePlugin;
+        arguments: ConfigurePluginRequestArguments;
+    }
    /**
     *  Information found in an "open" request.
     */
@@ -60,7 +60,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
 var ts;
 (function (ts) {
    ts.versionMajorMinor = "3.1";
-    ts.version = ts.versionMajorMinor + ".3";
+    ts.version = ts.versionMajorMinor + ".4";
 })(ts || (ts = {}));
 (function (ts) {
    ts.emptyArray = [];
@@ -4136,6 +4136,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
    function tokenIsIdentifierOrKeyword(token) {
        return token >= 71;
    }
@@ -4144,136 +4145,85 @@ var ts;
        return token === 29 || tokenIsIdentifierOrKeyword(token);
    }
    ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
-    var textToToken = ts.createMapFromTemplate({
-        "abstract": 117,
-        "any": 119,
-        "as": 118,
-        "boolean": 122,
-        "break": 72,
-        "case": 73,
-        "catch": 74,
-        "class": 75,
-        "continue": 77,
-        "const": 76,
-        "constructor": 123,
-        "debugger": 78,
-        "declare": 124,
-        "default": 79,
-        "delete": 80,
-        "do": 81,
-        "else": 82,
-        "enum": 83,
-        "export": 84,
-        "extends": 85,
-        "false": 86,
-        "finally": 87,
-        "for": 88,
-        "from": 143,
-        "function": 89,
-        "get": 125,
-        "if": 90,
-        "implements": 108,
-        "import": 91,
-        "in": 92,
-        "infer": 126,
-        "instanceof": 93,
-        "interface": 109,
-        "is": 127,
-        "keyof": 128,
-        "let": 110,
-        "module": 129,
-        "namespace": 130,
-        "never": 131,
-        "new": 94,
-        "null": 95,
-        "number": 134,
-        "object": 135,
-        "package": 111,
-        "private": 112,
-        "protected": 113,
-        "public": 114,
-        "readonly": 132,
-        "require": 133,
-        "global": 144,
-        "return": 96,
-        "set": 136,
-        "static": 115,
-        "string": 137,
-        "super": 97,
-        "switch": 98,
-        "symbol": 138,
-        "this": 99,
-        "throw": 100,
-        "true": 101,
-        "try": 102,
-        "type": 139,
-        "typeof": 103,
-        "undefined": 140,
-        "unique": 141,
-        "unknown": 142,
-        "var": 104,
-        "void": 105,
-        "while": 106,
-        "with": 107,
-        "yield": 116,
-        "async": 120,
-        "await": 121,
-        "of": 145,
-        "{": 17,
-        "}": 18,
-        "(": 19,
-        ")": 20,
-        "[": 21,
-        "]": 22,
-        ".": 23,
-        "...": 24,
-        ";": 25,
-        ",": 26,
-        "<": 27,
-        ">": 29,
-        "<=": 30,
-        ">=": 31,
-        "==": 32,
-        "!=": 33,
-        "===": 34,
-        "!==": 35,
-        "=>": 36,
-        "+": 37,
-        "-": 38,
-        "**": 40,
-        "*": 39,
-        "/": 41,
-        "%": 42,
-        "++": 43,
-        "--": 44,
-        "<<": 45,
-        "</": 28,
-        ">>": 46,
-        ">>>": 47,
-        "&": 48,
-        "|": 49,
-        "^": 50,
-        "!": 51,
-        "~": 52,
-        "&&": 53,
-        "||": 54,
-        "?": 55,
-        ":": 56,
-        "=": 58,
-        "+=": 59,
-        "-=": 60,
-        "*=": 61,
-        "**=": 62,
-        "/=": 63,
-        "%=": 64,
-        "<<=": 65,
-        ">>=": 66,
-        ">>>=": 67,
-        "&=": 68,
-        "|=": 69,
-        "^=": 70,
-        "@": 57,
-    });
+    var textToKeywordObj = (_a = {
+            abstract: 117,
+            any: 119,
+            as: 118,
+            boolean: 122,
+            break: 72,
+            case: 73,
+            catch: 74,
+            class: 75,
+            continue: 77,
+            const: 76
+        },
+        _a["" + "constructor"] = 123,
+        _a.debugger = 78,
+        _a.declare = 124,
+        _a.default = 79,
+        _a.delete = 80,
+        _a.do = 81,
+        _a.else = 82,
+        _a.enum = 83,
+        _a.export = 84,
+        _a.extends = 85,
+        _a.false = 86,
+        _a.finally = 87,
+        _a.for = 88,
+        _a.from = 143,
+        _a.function = 89,
+        _a.get = 125,
+        _a.if = 90,
+        _a.implements = 108,
+        _a.import = 91,
+        _a.in = 92,
+        _a.infer = 126,
+        _a.instanceof = 93,
+        _a.interface = 109,
+        _a.is = 127,
+        _a.keyof = 128,
+        _a.let = 110,
+        _a.module = 129,
+        _a.namespace = 130,
+        _a.never = 131,
+        _a.new = 94,
+        _a.null = 95,
+        _a.number = 134,
+        _a.object = 135,
+        _a.package = 111,
+        _a.private = 112,
+        _a.protected = 113,
+        _a.public = 114,
+        _a.readonly = 132,
+        _a.require = 133,
+        _a.global = 144,
+        _a.return = 96,
+        _a.set = 136,
+        _a.static = 115,
+        _a.string = 137,
+        _a.super = 97,
+        _a.switch = 98,
+        _a.symbol = 138,
+        _a.this = 99,
+        _a.throw = 100,
+        _a.true = 101,
+        _a.try = 102,
+        _a.type = 139,
+        _a.typeof = 103,
+        _a.undefined = 140,
+        _a.unique = 141,
+        _a.unknown = 142,
+        _a.var = 104,
+        _a.void = 105,
+        _a.while = 106,
+        _a.with = 107,
+        _a.yield = 116,
+        _a.async = 120,
+        _a.await = 121,
+        _a.of = 145,
+        _a);
+    var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 17, "}": 18, "(": 19, ")": 20, "[": 21, "]": 22, ".": 23, "...": 24, ";": 25, ",": 26, "<": 27, ">": 29, "<=": 30, ">=": 31, "==": 32, "!=": 33, "===": 34, "!==": 35, "=>": 36, "+": 37, "-": 38, "**": 40, "*": 39, "/": 41, "%": 42, "++": 43, "--": 44, "<<": 45, "</": 28, ">>": 46, ">>>": 47, "&": 48, "|": 49, "^": 50, "!": 51, "~": 52, "&&": 53, "||": 54, "?": 55, ":": 56, "=": 58, "+=": 59, "-=": 60, "*=": 61, "**=": 62, "/=": 63, "%=": 64, "<<=": 65, ">>=": 66, ">>>=": 67, "&=": 68, "|=": 69, "^=": 70, "@": 57 }));
    var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
    var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
    var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
@@ -5132,9 +5082,9 @@ var ts;
            if (len >= 2 && len <= 11) {
                var ch = tokenValue.charCodeAt(0);
                if (ch >= 97 && ch <= 122) {
-                    token = textToToken.get(tokenValue);
-                    if (token !== undefined) {
-                        return token;
+                    var keyword = textToKeyword.get(tokenValue);
+                    if (keyword !== undefined) {
+                        return token = keyword;
                    }
                }
            }
@@ -5778,7 +5728,7 @@ var ts;
                    pos++;
                }
                tokenValue = text.substring(tokenPos, pos);
-                return token = 71;
+                return token = getIdentifierToken();
            }
            else {
                return token = 0;
@@ -17202,7 +17152,7 @@ var ts;
            }
            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
            function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(281, scanner.getTokenPos());
+                var result = createNode(281);
                var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(17);
                result.type = doInsideOfContext(2097152, parseJSDocType);
                if (!mayOmitBraces || hasBrace) {
@@ -17369,7 +17319,7 @@ var ts;
                        nextJSDocToken();
                    }
                }
-                function skipWhitespaceOrAsterisk(next) {
+                function skipWhitespaceOrAsterisk() {
                    if (token() === 5 || token() === 4) {
                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
                            return;
@@ -17383,7 +17333,7 @@ var ts;
                        else if (token() === 39) {
                            precedingLineBreak = false;
                        }
-                        next();
+                        nextJSDocToken();
                    }
                }
                function parseTag(indent) {
@@ -17391,8 +17341,8 @@ var ts;
                    var atToken = createNode(57, scanner.getTokenPos());
                    atToken.end = scanner.getTextPos();
                    nextJSDocToken();
-                    var tagName = parseJSDocIdentifierName(undefined, nextToken);
-                    skipWhitespaceOrAsterisk(nextToken);
+                    var tagName = parseJSDocIdentifierName(undefined);
+                    skipWhitespaceOrAsterisk();
                    var tag;
                    switch (tagName.escapedText) {
                        case "augments":
@@ -17522,7 +17472,7 @@ var ts;
                    tagsEnd = tag.end;
                }
                function tryParseTypeExpression() {
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    return token() === 17 ? parseJSDocTypeExpression() : undefined;
                }
                function parseBracketNameInPropertyAndParamTag() {
@@ -17553,7 +17503,7 @@ var ts;
                function parseParameterOrPropertyTag(atToken, tagName, target, indent) {
                    var typeExpression = tryParseTypeExpression();
                    var isNameFirst = !typeExpression;
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
                    skipWhitespace();
                    if (isNameFirst) {
@@ -17672,7 +17622,7 @@ var ts;
                }
                function parseTypedefTag(atToken, tagName, indent) {
                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var typedefTag = createNode(302, atToken.pos);
                    typedefTag.atToken = atToken;
                    typedefTag.tagName = tagName;
@@ -17900,8 +17850,7 @@ var ts;
                    }
                    return entity;
                }
-                function parseJSDocIdentifierName(message, next) {
-                    if (next === void 0) { next = nextJSDocToken; }
+                function parseJSDocIdentifierName(message) {
                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
                        return createMissingNode(71, !message, message || ts.Diagnostics.Identifier_expected);
                    }
@@ -17910,7 +17859,7 @@ var ts;
                    var result = createNode(71, pos);
                    result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                    finishNode(result, end);
-                    next();
+                    nextJSDocToken();
                    return result;
                }
            }
@@ -88,7 +88,7 @@ var ts;
    // If changing the text in this section, be sure to test `configureNightly` too.
    ts.versionMajorMinor = "3.1";
    /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".3";
+    ts.version = ts.versionMajorMinor + ".4";
 })(ts || (ts = {}));
 (function (ts) {
    /* @internal */
@@ -6094,6 +6094,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
    /* @internal */
    function tokenIsIdentifierOrKeyword(token) {
        return token >= 71 /* Identifier */;
@@ -6104,136 +6105,85 @@ var ts;
        return token === 29 /* GreaterThanToken */ || tokenIsIdentifierOrKeyword(token);
    }
    ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
-    var textToToken = ts.createMapFromTemplate({
-        "abstract": 117 /* AbstractKeyword */,
-        "any": 119 /* AnyKeyword */,
-        "as": 118 /* AsKeyword */,
-        "boolean": 122 /* BooleanKeyword */,
-        "break": 72 /* BreakKeyword */,
-        "case": 73 /* CaseKeyword */,
-        "catch": 74 /* CatchKeyword */,
-        "class": 75 /* ClassKeyword */,
-        "continue": 77 /* ContinueKeyword */,
-        "const": 76 /* ConstKeyword */,
-        "constructor": 123 /* ConstructorKeyword */,
-        "debugger": 78 /* DebuggerKeyword */,
-        "declare": 124 /* DeclareKeyword */,
-        "default": 79 /* DefaultKeyword */,
-        "delete": 80 /* DeleteKeyword */,
-        "do": 81 /* DoKeyword */,
-        "else": 82 /* ElseKeyword */,
-        "enum": 83 /* EnumKeyword */,
-        "export": 84 /* ExportKeyword */,
-        "extends": 85 /* ExtendsKeyword */,
-        "false": 86 /* FalseKeyword */,
-        "finally": 87 /* FinallyKeyword */,
-        "for": 88 /* ForKeyword */,
-        "from": 143 /* FromKeyword */,
-        "function": 89 /* FunctionKeyword */,
-        "get": 125 /* GetKeyword */,
-        "if": 90 /* IfKeyword */,
-        "implements": 108 /* ImplementsKeyword */,
-        "import": 91 /* ImportKeyword */,
-        "in": 92 /* InKeyword */,
-        "infer": 126 /* InferKeyword */,
-        "instanceof": 93 /* InstanceOfKeyword */,
-        "interface": 109 /* InterfaceKeyword */,
-        "is": 127 /* IsKeyword */,
-        "keyof": 128 /* KeyOfKeyword */,
-        "let": 110 /* LetKeyword */,
-        "module": 129 /* ModuleKeyword */,
-        "namespace": 130 /* NamespaceKeyword */,
-        "never": 131 /* NeverKeyword */,
-        "new": 94 /* NewKeyword */,
-        "null": 95 /* NullKeyword */,
-        "number": 134 /* NumberKeyword */,
-        "object": 135 /* ObjectKeyword */,
-        "package": 111 /* PackageKeyword */,
-        "private": 112 /* PrivateKeyword */,
-        "protected": 113 /* ProtectedKeyword */,
-        "public": 114 /* PublicKeyword */,
-        "readonly": 132 /* ReadonlyKeyword */,
-        "require": 133 /* RequireKeyword */,
-        "global": 144 /* GlobalKeyword */,
-        "return": 96 /* ReturnKeyword */,
-        "set": 136 /* SetKeyword */,
-        "static": 115 /* StaticKeyword */,
-        "string": 137 /* StringKeyword */,
-        "super": 97 /* SuperKeyword */,
-        "switch": 98 /* SwitchKeyword */,
-        "symbol": 138 /* SymbolKeyword */,
-        "this": 99 /* ThisKeyword */,
-        "throw": 100 /* ThrowKeyword */,
-        "true": 101 /* TrueKeyword */,
-        "try": 102 /* TryKeyword */,
-        "type": 139 /* TypeKeyword */,
-        "typeof": 103 /* TypeOfKeyword */,
-        "undefined": 140 /* UndefinedKeyword */,
-        "unique": 141 /* UniqueKeyword */,
-        "unknown": 142 /* UnknownKeyword */,
-        "var": 104 /* VarKeyword */,
-        "void": 105 /* VoidKeyword */,
-        "while": 106 /* WhileKeyword */,
-        "with": 107 /* WithKeyword */,
-        "yield": 116 /* YieldKeyword */,
-        "async": 120 /* AsyncKeyword */,
-        "await": 121 /* AwaitKeyword */,
-        "of": 145 /* OfKeyword */,
-        "{": 17 /* OpenBraceToken */,
-        "}": 18 /* CloseBraceToken */,
-        "(": 19 /* OpenParenToken */,
-        ")": 20 /* CloseParenToken */,
-        "[": 21 /* OpenBracketToken */,
-        "]": 22 /* CloseBracketToken */,
-        ".": 23 /* DotToken */,
-        "...": 24 /* DotDotDotToken */,
-        ";": 25 /* SemicolonToken */,
-        ",": 26 /* CommaToken */,
-        "<": 27 /* LessThanToken */,
-        ">": 29 /* GreaterThanToken */,
-        "<=": 30 /* LessThanEqualsToken */,
-        ">=": 31 /* GreaterThanEqualsToken */,
-        "==": 32 /* EqualsEqualsToken */,
-        "!=": 33 /* ExclamationEqualsToken */,
-        "===": 34 /* EqualsEqualsEqualsToken */,
-        "!==": 35 /* ExclamationEqualsEqualsToken */,
-        "=>": 36 /* EqualsGreaterThanToken */,
-        "+": 37 /* PlusToken */,
-        "-": 38 /* MinusToken */,
-        "**": 40 /* AsteriskAsteriskToken */,
-        "*": 39 /* AsteriskToken */,
-        "/": 41 /* SlashToken */,
-        "%": 42 /* PercentToken */,
-        "++": 43 /* PlusPlusToken */,
-        "--": 44 /* MinusMinusToken */,
-        "<<": 45 /* LessThanLessThanToken */,
-        "</": 28 /* LessThanSlashToken */,
-        ">>": 46 /* GreaterThanGreaterThanToken */,
-        ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */,
-        "&": 48 /* AmpersandToken */,
-        "|": 49 /* BarToken */,
-        "^": 50 /* CaretToken */,
-        "!": 51 /* ExclamationToken */,
-        "~": 52 /* TildeToken */,
-        "&&": 53 /* AmpersandAmpersandToken */,
-        "||": 54 /* BarBarToken */,
-        "?": 55 /* QuestionToken */,
-        ":": 56 /* ColonToken */,
-        "=": 58 /* EqualsToken */,
-        "+=": 59 /* PlusEqualsToken */,
-        "-=": 60 /* MinusEqualsToken */,
-        "*=": 61 /* AsteriskEqualsToken */,
-        "**=": 62 /* AsteriskAsteriskEqualsToken */,
-        "/=": 63 /* SlashEqualsToken */,
-        "%=": 64 /* PercentEqualsToken */,
-        "<<=": 65 /* LessThanLessThanEqualsToken */,
-        ">>=": 66 /* GreaterThanGreaterThanEqualsToken */,
-        ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */,
-        "&=": 68 /* AmpersandEqualsToken */,
-        "|=": 69 /* BarEqualsToken */,
-        "^=": 70 /* CaretEqualsToken */,
-        "@": 57 /* AtToken */,
-    });
+    var textToKeywordObj = (_a = {
+            abstract: 117 /* AbstractKeyword */,
+            any: 119 /* AnyKeyword */,
+            as: 118 /* AsKeyword */,
+            boolean: 122 /* BooleanKeyword */,
+            break: 72 /* BreakKeyword */,
+            case: 73 /* CaseKeyword */,
+            catch: 74 /* CatchKeyword */,
+            class: 75 /* ClassKeyword */,
+            continue: 77 /* ContinueKeyword */,
+            const: 76 /* ConstKeyword */
+        },
+        _a["" + "constructor"] = 123 /* ConstructorKeyword */,
+        _a.debugger = 78 /* DebuggerKeyword */,
+        _a.declare = 124 /* DeclareKeyword */,
+        _a.default = 79 /* DefaultKeyword */,
+        _a.delete = 80 /* DeleteKeyword */,
+        _a.do = 81 /* DoKeyword */,
+        _a.else = 82 /* ElseKeyword */,
+        _a.enum = 83 /* EnumKeyword */,
+        _a.export = 84 /* ExportKeyword */,
+        _a.extends = 85 /* ExtendsKeyword */,
+        _a.false = 86 /* FalseKeyword */,
+        _a.finally = 87 /* FinallyKeyword */,
+        _a.for = 88 /* ForKeyword */,
+        _a.from = 143 /* FromKeyword */,
+        _a.function = 89 /* FunctionKeyword */,
+        _a.get = 125 /* GetKeyword */,
+        _a.if = 90 /* IfKeyword */,
+        _a.implements = 108 /* ImplementsKeyword */,
+        _a.import = 91 /* ImportKeyword */,
+        _a.in = 92 /* InKeyword */,
+        _a.infer = 126 /* InferKeyword */,
+        _a.instanceof = 93 /* InstanceOfKeyword */,
+        _a.interface = 109 /* InterfaceKeyword */,
+        _a.is = 127 /* IsKeyword */,
+        _a.keyof = 128 /* KeyOfKeyword */,
+        _a.let = 110 /* LetKeyword */,
+        _a.module = 129 /* ModuleKeyword */,
+        _a.namespace = 130 /* NamespaceKeyword */,
+        _a.never = 131 /* NeverKeyword */,
+        _a.new = 94 /* NewKeyword */,
+        _a.null = 95 /* NullKeyword */,
+        _a.number = 134 /* NumberKeyword */,
+        _a.object = 135 /* ObjectKeyword */,
+        _a.package = 111 /* PackageKeyword */,
+        _a.private = 112 /* PrivateKeyword */,
+        _a.protected = 113 /* ProtectedKeyword */,
+        _a.public = 114 /* PublicKeyword */,
+        _a.readonly = 132 /* ReadonlyKeyword */,
+        _a.require = 133 /* RequireKeyword */,
+        _a.global = 144 /* GlobalKeyword */,
+        _a.return = 96 /* ReturnKeyword */,
+        _a.set = 136 /* SetKeyword */,
+        _a.static = 115 /* StaticKeyword */,
+        _a.string = 137 /* StringKeyword */,
+        _a.super = 97 /* SuperKeyword */,
+        _a.switch = 98 /* SwitchKeyword */,
+        _a.symbol = 138 /* SymbolKeyword */,
+        _a.this = 99 /* ThisKeyword */,
+        _a.throw = 100 /* ThrowKeyword */,
+        _a.true = 101 /* TrueKeyword */,
+        _a.try = 102 /* TryKeyword */,
+        _a.type = 139 /* TypeKeyword */,
+        _a.typeof = 103 /* TypeOfKeyword */,
+        _a.undefined = 140 /* UndefinedKeyword */,
+        _a.unique = 141 /* UniqueKeyword */,
+        _a.unknown = 142 /* UnknownKeyword */,
+        _a.var = 104 /* VarKeyword */,
+        _a.void = 105 /* VoidKeyword */,
+        _a.while = 106 /* WhileKeyword */,
+        _a.with = 107 /* WithKeyword */,
+        _a.yield = 116 /* YieldKeyword */,
+        _a.async = 120 /* AsyncKeyword */,
+        _a.await = 121 /* AwaitKeyword */,
+        _a.of = 145 /* OfKeyword */,
+        _a);
+    var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 17 /* OpenBraceToken */, "}": 18 /* CloseBraceToken */, "(": 19 /* OpenParenToken */, ")": 20 /* CloseParenToken */, "[": 21 /* OpenBracketToken */, "]": 22 /* CloseBracketToken */, ".": 23 /* DotToken */, "...": 24 /* DotDotDotToken */, ";": 25 /* SemicolonToken */, ",": 26 /* CommaToken */, "<": 27 /* LessThanToken */, ">": 29 /* GreaterThanToken */, "<=": 30 /* LessThanEqualsToken */, ">=": 31 /* GreaterThanEqualsToken */, "==": 32 /* EqualsEqualsToken */, "!=": 33 /* ExclamationEqualsToken */, "===": 34 /* EqualsEqualsEqualsToken */, "!==": 35 /* ExclamationEqualsEqualsToken */, "=>": 36 /* EqualsGreaterThanToken */, "+": 37 /* PlusToken */, "-": 38 /* MinusToken */, "**": 40 /* AsteriskAsteriskToken */, "*": 39 /* AsteriskToken */, "/": 41 /* SlashToken */, "%": 42 /* PercentToken */, "++": 43 /* PlusPlusToken */, "--": 44 /* MinusMinusToken */, "<<": 45 /* LessThanLessThanToken */, "</": 28 /* LessThanSlashToken */, ">>": 46 /* GreaterThanGreaterThanToken */, ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */, "&": 48 /* AmpersandToken */, "|": 49 /* BarToken */, "^": 50 /* CaretToken */, "!": 51 /* ExclamationToken */, "~": 52 /* TildeToken */, "&&": 53 /* AmpersandAmpersandToken */, "||": 54 /* BarBarToken */, "?": 55 /* QuestionToken */, ":": 56 /* ColonToken */, "=": 58 /* EqualsToken */, "+=": 59 /* PlusEqualsToken */, "-=": 60 /* MinusEqualsToken */, "*=": 61 /* AsteriskEqualsToken */, "**=": 62 /* AsteriskAsteriskEqualsToken */, "/=": 63 /* SlashEqualsToken */, "%=": 64 /* PercentEqualsToken */, "<<=": 65 /* LessThanLessThanEqualsToken */, ">>=": 66 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 68 /* AmpersandEqualsToken */, "|=": 69 /* BarEqualsToken */, "^=": 70 /* CaretEqualsToken */, "@": 57 /* AtToken */ }));
    /*
        As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
        IdentifierStart ::
@@ -7239,9 +7189,9 @@ var ts;
            if (len >= 2 && len <= 11) {
                var ch = tokenValue.charCodeAt(0);
                if (ch >= 97 /* a */ && ch <= 122 /* z */) {
-                    token = textToToken.get(tokenValue);
-                    if (token !== undefined) {
-                        return token;
+                    var keyword = textToKeyword.get(tokenValue);
+                    if (keyword !== undefined) {
+                        return token = keyword;
                    }
                }
            }
@@ -7921,7 +7871,7 @@ var ts;
                    pos++;
                }
                tokenValue = text.substring(tokenPos, pos);
-                return token = 71 /* Identifier */;
+                return token = getIdentifierToken();
            }
            else {
                return token = 0 /* Unknown */;
@@ -21435,7 +21385,7 @@ var ts;
            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
            // Parses out a JSDoc type expression.
            function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(281 /* JSDocTypeExpression */, scanner.getTokenPos());
+                var result = createNode(281 /* JSDocTypeExpression */);
                var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(17 /* OpenBraceToken */);
                result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                if (!mayOmitBraces || hasBrace) {
@@ -21630,7 +21580,7 @@ var ts;
                        nextJSDocToken();
                    }
                }
-                function skipWhitespaceOrAsterisk(next) {
+                function skipWhitespaceOrAsterisk() {
                    if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
@@ -21644,7 +21594,7 @@ var ts;
                        else if (token() === 39 /* AsteriskToken */) {
                            precedingLineBreak = false;
                        }
-                        next();
+                        nextJSDocToken();
                    }
                }
                function parseTag(indent) {
@@ -21652,9 +21602,8 @@ var ts;
                    var atToken = createNode(57 /* AtToken */, scanner.getTokenPos());
                    atToken.end = scanner.getTextPos();
                    nextJSDocToken();
-                    // Use 'nextToken' instead of 'nextJsDocToken' so we can parse a type like 'number' in `@enum number`
-                    var tagName = parseJSDocIdentifierName(/*message*/ undefined, nextToken);
-                    skipWhitespaceOrAsterisk(nextToken);
+                    var tagName = parseJSDocIdentifierName(/*message*/ undefined);
+                    skipWhitespaceOrAsterisk();
                    var tag;
                    switch (tagName.escapedText) {
                        case "augments":
@@ -21791,7 +21740,7 @@ var ts;
                    tagsEnd = tag.end;
                }
                function tryParseTypeExpression() {
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    return token() === 17 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                }
                function parseBracketNameInPropertyAndParamTag() {
@@ -21825,7 +21774,7 @@ var ts;
                function parseParameterOrPropertyTag(atToken, tagName, target, indent) {
                    var typeExpression = tryParseTypeExpression();
                    var isNameFirst = !typeExpression;
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
                    skipWhitespace();
                    if (isNameFirst) {
@@ -21944,7 +21893,7 @@ var ts;
                }
                function parseTypedefTag(atToken, tagName, indent) {
                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var typedefTag = createNode(302 /* JSDocTypedefTag */, atToken.pos);
                    typedefTag.atToken = atToken;
                    typedefTag.tagName = tagName;
@@ -22177,8 +22126,7 @@ var ts;
                    }
                    return entity;
                }
-                function parseJSDocIdentifierName(message, next) {
-                    if (next === void 0) { next = nextJSDocToken; }
+                function parseJSDocIdentifierName(message) {
                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
                        return createMissingNode(71 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                    }
@@ -22187,7 +22135,7 @@ var ts;
                    var result = createNode(71 /* Identifier */, pos);
                    result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                    finishNode(result, end);
-                    next();
+                    nextJSDocToken();
                    return result;
                }
            }
@@ -23864,7 +23812,7 @@ var ts;
                                    i++;
                                    break;
                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    var result = parseListTypeOption(opt, args[i], errors); // tslint:disable-line no-unnecessary-type-assertion
                                    options[opt.name] = result || [];
                                    if (result) {
                                        i++;
@@ -24398,7 +24346,7 @@ var ts;
                return undefined;
            }
            else if (optionDefinition.type === "list") {
-                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+                return getCustomTypeMapOfCommandLineOption(optionDefinition.element); // tslint:disable-line no-unnecessary-type-assertion
            }
            else {
                return optionDefinition.type;
@@ -24461,7 +24409,7 @@ var ts;
                case "object":
                    return {};
                default:
-                    return option.type.keys().next().value;
+                    return option.type.keys().next().value; // tslint:disable-line no-unnecessary-type-assertion
            }
        }
        function makePadding(paddingLength) {
@@ -24941,7 +24889,7 @@ var ts;
        if (isNullOrUndefined(value))
            return undefined;
        if (option.type === "list") {
-            var listOption_1 = option;
+            var listOption_1 = option; // tslint:disable-line no-unnecessary-type-assertion
            if (listOption_1.element.isFilePath || !ts.isString(listOption_1.element.type)) {
                return ts.filter(ts.map(value, function (v) { return normalizeOptionValue(listOption_1.element, basePath, v); }), function (v) { return !!v; });
            }
@@ -25285,7 +25233,7 @@ var ts;
            case "boolean":
                return typeof value === "boolean" ? value : "";
            case "list":
-                var elementType_1 = option.element;
+                var elementType_1 = option.element; // tslint:disable-line no-unnecessary-type-assertion
                return ts.isArray(value) ? value.map(function (v) { return getOptionValueWithEmptyStrings(v, elementType_1); }) : "";
            default:
                return ts.forEachEntry(option.type, function (optionEnumValue, optionStringValue) {
@@ -98154,7 +98102,7 @@ var ts;
                case "compilerOptions":
                    forEachProperty(property.initializer, function (property, propertyName) {
                        var option = ts.getOptionFromName(propertyName);
-                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) {
+                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) { // tslint:disable-line no-unnecessary-type-assertion
                            updatePaths(property);
                        }
                        else if (propertyName === "paths") {
@@ -117641,6 +117589,7 @@ var ts;
                CommandTypes["OrganizeImportsFull"] = "organizeImports-full";
                CommandTypes["GetEditsForFileRename"] = "getEditsForFileRename";
                CommandTypes["GetEditsForFileRenameFull"] = "getEditsForFileRename-full";
+                CommandTypes["ConfigurePlugin"] = "configurePlugin";
            })(CommandTypes = protocol.CommandTypes || (protocol.CommandTypes = {}));
            var IndentStyle;
            (function (IndentStyle) {
@@ -118521,10 +118470,10 @@ var ts;
            Project.prototype.getExternalFiles = function () {
                var _this = this;
                return server.toSortedArray(ts.flatMap(this.plugins, function (plugin) {
-                    if (typeof plugin.getExternalFiles !== "function")
+                    if (typeof plugin.module.getExternalFiles !== "function")
                        return;
                    try {
-                        return plugin.getExternalFiles(_this);
+                        return plugin.module.getExternalFiles(_this);
                    }
                    catch (e) {
                        _this.projectService.logger.info("A plugin threw an exception in getExternalFiles: " + e);
@@ -118955,7 +118904,7 @@ var ts;
                ts.orderedRemoveItem(this.rootFiles, info);
                this.rootFilesMap.delete(info.path);
            };
-            Project.prototype.enableGlobalPlugins = function (options) {
+            Project.prototype.enableGlobalPlugins = function (options, pluginConfigOverrides) {
                var host = this.projectService.host;
                if (!host.require) {
                    this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
@@ -118969,7 +118918,7 @@ var ts;
                        if (options.plugins && options.plugins.some(function (p) { return p.name === globalPluginName; }))
                            return "continue";
                        this_1.projectService.logger.info("Loading global plugin " + globalPluginName);
-                        this_1.enablePlugin({ name: globalPluginName, global: true }, searchPaths);
+                        this_1.enablePlugin({ name: globalPluginName, global: true }, searchPaths, pluginConfigOverrides);
                    };
                    var this_1 = this;
                    for (var _i = 0, _a = this.projectService.globalPlugins; _i < _a.length; _i++) {
@@ -118978,7 +118927,7 @@ var ts;
                    }
                }
            };
-            Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths) {
+            Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                var _this = this;
                this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
                var log = function (message) {
@@ -118988,15 +118937,18 @@ var ts;
                    return Project.resolveModule(pluginConfigEntry.name, searchPath, _this.projectService.host, log);
                });
                if (resolvedModule) {
+                    var configurationOverride = pluginConfigOverrides && pluginConfigOverrides.get(pluginConfigEntry.name);
+                    if (configurationOverride) {
+                        var pluginName = pluginConfigEntry.name;
+                        pluginConfigEntry = configurationOverride;
+                        pluginConfigEntry.name = pluginName;
+                    }
                    this.enableProxy(resolvedModule, pluginConfigEntry);
                }
                else {
                    this.projectService.logger.info("Couldn't find " + pluginConfigEntry.name);
                }
            };
-            Project.prototype.refreshDiagnostics = function () {
-                this.projectService.sendProjectsUpdatedInBackgroundEvent();
-            };
            Project.prototype.enableProxy = function (pluginModuleFactory, configEntry) {
                try {
                    if (typeof pluginModuleFactory !== "function") {
@@ -119021,25 +118973,35 @@ var ts;
                    }
                    this.projectService.logger.info("Plugin validation succeded");
                    this.languageService = newLS;
-                    this.plugins.push(pluginModule);
+                    this.plugins.push({ name: configEntry.name, module: pluginModule });
                }
                catch (e) {
                    this.projectService.logger.info("Plugin activation failed: " + e);
                }
            };
+            Project.prototype.onPluginConfigurationChanged = function (pluginName, configuration) {
+                this.plugins.filter(function (plugin) { return plugin.name === pluginName; }).forEach(function (plugin) {
+                    if (plugin.module.onConfigurationChanged) {
+                        plugin.module.onConfigurationChanged(configuration);
+                    }
+                });
+            };
+            Project.prototype.refreshDiagnostics = function () {
+                this.projectService.sendProjectsUpdatedInBackgroundEvent();
+            };
            return Project;
        }());
        server.Project = Project;
        var InferredProject = (function (_super) {
            __extends(InferredProject, _super);
-            function InferredProject(projectService, documentRegistry, compilerOptions, projectRootPath, currentDirectory) {
+            function InferredProject(projectService, documentRegistry, compilerOptions, projectRootPath, currentDirectory, pluginConfigOverrides) {
                var _this = _super.call(this, InferredProject.newName(), ProjectKind.Inferred, projectService, documentRegistry, undefined, undefined, compilerOptions, false, projectService.host, currentDirectory) || this;
                _this._isJsInferredProject = false;
                _this.projectRootPath = projectRootPath && projectService.toCanonicalFileName(projectRootPath);
                if (!projectRootPath && !projectService.useSingleInferredProject) {
                    _this.canonicalCurrentDirectory = projectService.toCanonicalFileName(_this.currentDirectory);
                }
-                _this.enableGlobalPlugins(_this.getCompilerOptions());
+                _this.enableGlobalPlugins(_this.getCompilerOptions(), pluginConfigOverrides);
                return _this;
            }
            InferredProject.prototype.toggleJsInferredProject = function (isJsInferredProject) {
@@ -119154,10 +119116,7 @@ var ts;
                var program = this.getCurrentProgram();
                return program && program.getResolvedProjectReferences();
            };
-            ConfiguredProject.prototype.enablePlugins = function () {
-                this.enablePluginsWithOptions(this.getCompilerOptions());
-            };
-            ConfiguredProject.prototype.enablePluginsWithOptions = function (options) {
+            ConfiguredProject.prototype.enablePluginsWithOptions = function (options, pluginConfigOverrides) {
                var host = this.projectService.host;
                if (!host.require) {
                    this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
@@ -119172,10 +119131,10 @@ var ts;
                if (options.plugins) {
                    for (var _i = 0, _a = options.plugins; _i < _a.length; _i++) {
                        var pluginConfigEntry = _a[_i];
-                        this.enablePlugin(pluginConfigEntry, searchPaths);
+                        this.enablePlugin(pluginConfigEntry, searchPaths, pluginConfigOverrides);
                    }
                }
-                this.enableGlobalPlugins(options);
+                this.enableGlobalPlugins(options, pluginConfigOverrides);
            };
            ConfiguredProject.prototype.getGlobalProjectErrors = function () {
                return ts.filter(this.projectErrors, function (diagnostic) { return !diagnostic.file; }) || server.emptyArray;
@@ -120304,7 +120263,7 @@ var ts;
                    project.enableLanguageService();
                    project.watchWildcards(ts.createMapFromTemplate(parsedCommandLine.wildcardDirectories));
                }
-                project.enablePluginsWithOptions(compilerOptions);
+                project.enablePluginsWithOptions(compilerOptions, this.currentPluginConfigOverrides);
                var filesToAdd = parsedCommandLine.fileNames.concat(project.getExternalFiles());
                this.updateRootAndOptionsOfNonInferredProject(project, filesToAdd, fileNamePropertyReader, compilerOptions, parsedCommandLine.typeAcquisition, parsedCommandLine.compileOnSave);
            };
@@ -120441,7 +120400,7 @@ var ts;
            };
            ProjectService.prototype.createInferredProject = function (currentDirectory, isSingleInferredProject, projectRootPath) {
                var compilerOptions = projectRootPath && this.compilerOptionsForInferredProjectsPerProjectRoot.get(projectRootPath) || this.compilerOptionsForInferredProjects;
-                var project = new server.InferredProject(this, this.documentRegistry, compilerOptions, projectRootPath, currentDirectory);
+                var project = new server.InferredProject(this, this.documentRegistry, compilerOptions, projectRootPath, currentDirectory, this.currentPluginConfigOverrides);
                if (isSingleInferredProject) {
                    this.inferredProjects.unshift(project);
                }
@@ -121184,6 +121143,11 @@ var ts;
                }
                return false;
            };
+            ProjectService.prototype.configurePlugin = function (args) {
+                this.forEachEnabledProject(function (project) { return project.onPluginConfigurationChanged(args.pluginName, args.configuration); });
+                this.currentPluginConfigOverrides = this.currentPluginConfigOverrides || ts.createMap();
+                this.currentPluginConfigOverrides.set(args.pluginName, args.configuration);
+            };
            ProjectService.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
            return ProjectService;
        }());
@@ -121824,6 +121788,10 @@ var ts;
                    _a[server.CommandNames.GetEditsForFileRenameFull] = function (request) {
                        return _this.requiredResponse(_this.getEditsForFileRename(request.arguments, false));
                    },
+                    _a[server.CommandNames.ConfigurePlugin] = function (request) {
+                        _this.configurePlugin(request.arguments);
+                        return _this.notRequired();
+                    },
                    _a));
                this.host = opts.host;
                this.cancellationToken = opts.cancellationToken;
@@ -123044,6 +123012,9 @@ var ts;
                var checkList = sortedFiles.map(function (fileName) { return ({ fileName: fileName, project: project }); });
                this.updateErrorCheck(next, checkList, delay, false);
            };
+            Session.prototype.configurePlugin = function (args) {
+                this.projectService.configurePlugin(args);
+            };
            Session.prototype.getCanonicalFileName = function (fileName) {
                var name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
                return ts.normalizePath(name);
@@ -69,7 +69,8 @@ declare namespace ts {
        pos: number;
        end: number;
    }
-    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown;
+    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
    type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
    enum SyntaxKind {
        Unknown = 0,
@@ -5672,7 +5673,8 @@ declare namespace ts.server.protocol {
        GetApplicableRefactors = "getApplicableRefactors",
        GetEditsForRefactor = "getEditsForRefactor",
        OrganizeImports = "organizeImports",
-        GetEditsForFileRename = "getEditsForFileRename"
+        GetEditsForFileRename = "getEditsForFileRename",
+        ConfigurePlugin = "configurePlugin"
    }
    /**
     * A TypeScript Server message
@@ -6617,6 +6619,14 @@ declare namespace ts.server.protocol {
     */
    interface ConfigureResponse extends Response {
    }
+    interface ConfigurePluginRequestArguments {
+        pluginName: string;
+        configuration: any;
+    }
+    interface ConfigurePluginRequest extends Request {
+        command: CommandTypes.ConfigurePlugin;
+        arguments: ConfigurePluginRequestArguments;
+    }
    /**
     *  Information found in an "open" request.
     */
@@ -8043,6 +8053,11 @@ declare namespace ts.server {
    interface PluginModule {
        create(createInfo: PluginCreateInfo): LanguageService;
        getExternalFiles?(proj: Project): string[];
+        onConfigurationChanged?(config: any): void;
+    }
+    interface PluginModuleWithName {
+        name: string;
+        module: PluginModule;
    }
    type PluginModuleFactory = (mod: {
        typescript: typeof ts;
@@ -8181,11 +8196,11 @@ declare namespace ts.server {
        filesToString(writeProjectFileNames: boolean): string;
        setCompilerOptions(compilerOptions: CompilerOptions): void;
        protected removeRoot(info: ScriptInfo): void;
-        protected enableGlobalPlugins(options: CompilerOptions): void;
-        protected enablePlugin(pluginConfigEntry: PluginImport, searchPaths: string[]): void;
+        protected enableGlobalPlugins(options: CompilerOptions, pluginConfigOverrides: Map<any> | undefined): void;
+        protected enablePlugin(pluginConfigEntry: PluginImport, searchPaths: string[], pluginConfigOverrides: Map<any> | undefined): void;
+        private enableProxy;
        /** Starts a new check for diagnostics. Call this if some file has updated that would cause diagnostics to be changed. */
        refreshDiagnostics(): void;
-        private enableProxy;
    }
    /**
     * If a file is opened and no tsconfig (or jsconfig) is found,
@@ -8226,7 +8241,6 @@ declare namespace ts.server {
        getConfigFilePath(): NormalizedPath;
        getProjectReferences(): ReadonlyArray<ProjectReference>;
        updateReferences(refs: ReadonlyArray<ProjectReference> | undefined): void;
-        enablePlugins(): void;
        /**
         * Get the errors that dont have any file name associated
         */
@@ -8471,6 +8485,7 @@ declare namespace ts.server {
        readonly globalPlugins: ReadonlyArray<string>;
        readonly pluginProbeLocations: ReadonlyArray<string>;
        readonly allowLocalPluginLoads: boolean;
+        private currentPluginConfigOverrides;
        readonly typesMapLocation: string | undefined;
        readonly syntaxOnly?: boolean;
        /** Tracks projects that we have already sent telemetry for. */
@@ -8646,6 +8661,7 @@ declare namespace ts.server {
        applySafeList(proj: protocol.ExternalProject): NormalizedPath[];
        openExternalProject(proj: protocol.ExternalProject): void;
        hasDeferredExtension(): boolean;
+        configurePlugin(args: protocol.ConfigurePluginRequestArguments): void;
    }
 }
 declare namespace ts.server {
@@ -8816,6 +8832,7 @@ declare namespace ts.server {
        private convertTextChangeToCodeEdit;
        private getBraceMatching;
        private getDiagnosticsForProject;
+        private configurePlugin;
        getCanonicalFileName(fileName: string): string;
        exit(): void;
        private notRequired;
@@ -84,7 +84,7 @@ var ts;
    // If changing the text in this section, be sure to test `configureNightly` too.
    ts.versionMajorMinor = "3.1";
    /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".3";
+    ts.version = ts.versionMajorMinor + ".4";
 })(ts || (ts = {}));
 (function (ts) {
    /* @internal */
@@ -6090,6 +6090,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
    /* @internal */
    function tokenIsIdentifierOrKeyword(token) {
        return token >= 71 /* Identifier */;
@@ -6100,136 +6101,85 @@ var ts;
        return token === 29 /* GreaterThanToken */ || tokenIsIdentifierOrKeyword(token);
    }
    ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
-    var textToToken = ts.createMapFromTemplate({
-        "abstract": 117 /* AbstractKeyword */,
-        "any": 119 /* AnyKeyword */,
-        "as": 118 /* AsKeyword */,
-        "boolean": 122 /* BooleanKeyword */,
-        "break": 72 /* BreakKeyword */,
-        "case": 73 /* CaseKeyword */,
-        "catch": 74 /* CatchKeyword */,
-        "class": 75 /* ClassKeyword */,
-        "continue": 77 /* ContinueKeyword */,
-        "const": 76 /* ConstKeyword */,
-        "constructor": 123 /* ConstructorKeyword */,
-        "debugger": 78 /* DebuggerKeyword */,
-        "declare": 124 /* DeclareKeyword */,
-        "default": 79 /* DefaultKeyword */,
-        "delete": 80 /* DeleteKeyword */,
-        "do": 81 /* DoKeyword */,
-        "else": 82 /* ElseKeyword */,
-        "enum": 83 /* EnumKeyword */,
-        "export": 84 /* ExportKeyword */,
-        "extends": 85 /* ExtendsKeyword */,
-        "false": 86 /* FalseKeyword */,
-        "finally": 87 /* FinallyKeyword */,
-        "for": 88 /* ForKeyword */,
-        "from": 143 /* FromKeyword */,
-        "function": 89 /* FunctionKeyword */,
-        "get": 125 /* GetKeyword */,
-        "if": 90 /* IfKeyword */,
-        "implements": 108 /* ImplementsKeyword */,
-        "import": 91 /* ImportKeyword */,
-        "in": 92 /* InKeyword */,
-        "infer": 126 /* InferKeyword */,
-        "instanceof": 93 /* InstanceOfKeyword */,
-        "interface": 109 /* InterfaceKeyword */,
-        "is": 127 /* IsKeyword */,
-        "keyof": 128 /* KeyOfKeyword */,
-        "let": 110 /* LetKeyword */,
-        "module": 129 /* ModuleKeyword */,
-        "namespace": 130 /* NamespaceKeyword */,
-        "never": 131 /* NeverKeyword */,
-        "new": 94 /* NewKeyword */,
-        "null": 95 /* NullKeyword */,
-        "number": 134 /* NumberKeyword */,
-        "object": 135 /* ObjectKeyword */,
-        "package": 111 /* PackageKeyword */,
-        "private": 112 /* PrivateKeyword */,
-        "protected": 113 /* ProtectedKeyword */,
-        "public": 114 /* PublicKeyword */,
-        "readonly": 132 /* ReadonlyKeyword */,
-        "require": 133 /* RequireKeyword */,
-        "global": 144 /* GlobalKeyword */,
-        "return": 96 /* ReturnKeyword */,
-        "set": 136 /* SetKeyword */,
-        "static": 115 /* StaticKeyword */,
-        "string": 137 /* StringKeyword */,
-        "super": 97 /* SuperKeyword */,
-        "switch": 98 /* SwitchKeyword */,
-        "symbol": 138 /* SymbolKeyword */,
-        "this": 99 /* ThisKeyword */,
-        "throw": 100 /* ThrowKeyword */,
-        "true": 101 /* TrueKeyword */,
-        "try": 102 /* TryKeyword */,
-        "type": 139 /* TypeKeyword */,
-        "typeof": 103 /* TypeOfKeyword */,
-        "undefined": 140 /* UndefinedKeyword */,
-        "unique": 141 /* UniqueKeyword */,
-        "unknown": 142 /* UnknownKeyword */,
-        "var": 104 /* VarKeyword */,
-        "void": 105 /* VoidKeyword */,
-        "while": 106 /* WhileKeyword */,
-        "with": 107 /* WithKeyword */,
-        "yield": 116 /* YieldKeyword */,
-        "async": 120 /* AsyncKeyword */,
-        "await": 121 /* AwaitKeyword */,
-        "of": 145 /* OfKeyword */,
-        "{": 17 /* OpenBraceToken */,
-        "}": 18 /* CloseBraceToken */,
-        "(": 19 /* OpenParenToken */,
-        ")": 20 /* CloseParenToken */,
-        "[": 21 /* OpenBracketToken */,
-        "]": 22 /* CloseBracketToken */,
-        ".": 23 /* DotToken */,
-        "...": 24 /* DotDotDotToken */,
-        ";": 25 /* SemicolonToken */,
-        ",": 26 /* CommaToken */,
-        "<": 27 /* LessThanToken */,
-        ">": 29 /* GreaterThanToken */,
-        "<=": 30 /* LessThanEqualsToken */,
-        ">=": 31 /* GreaterThanEqualsToken */,
-        "==": 32 /* EqualsEqualsToken */,
-        "!=": 33 /* ExclamationEqualsToken */,
-        "===": 34 /* EqualsEqualsEqualsToken */,
-        "!==": 35 /* ExclamationEqualsEqualsToken */,
-        "=>": 36 /* EqualsGreaterThanToken */,
-        "+": 37 /* PlusToken */,
-        "-": 38 /* MinusToken */,
-        "**": 40 /* AsteriskAsteriskToken */,
-        "*": 39 /* AsteriskToken */,
-        "/": 41 /* SlashToken */,
-        "%": 42 /* PercentToken */,
-        "++": 43 /* PlusPlusToken */,
-        "--": 44 /* MinusMinusToken */,
-        "<<": 45 /* LessThanLessThanToken */,
-        "</": 28 /* LessThanSlashToken */,
-        ">>": 46 /* GreaterThanGreaterThanToken */,
-        ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */,
-        "&": 48 /* AmpersandToken */,
-        "|": 49 /* BarToken */,
-        "^": 50 /* CaretToken */,
-        "!": 51 /* ExclamationToken */,
-        "~": 52 /* TildeToken */,
-        "&&": 53 /* AmpersandAmpersandToken */,
-        "||": 54 /* BarBarToken */,
-        "?": 55 /* QuestionToken */,
-        ":": 56 /* ColonToken */,
-        "=": 58 /* EqualsToken */,
-        "+=": 59 /* PlusEqualsToken */,
-        "-=": 60 /* MinusEqualsToken */,
-        "*=": 61 /* AsteriskEqualsToken */,
-        "**=": 62 /* AsteriskAsteriskEqualsToken */,
-        "/=": 63 /* SlashEqualsToken */,
-        "%=": 64 /* PercentEqualsToken */,
-        "<<=": 65 /* LessThanLessThanEqualsToken */,
-        ">>=": 66 /* GreaterThanGreaterThanEqualsToken */,
-        ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */,
-        "&=": 68 /* AmpersandEqualsToken */,
-        "|=": 69 /* BarEqualsToken */,
-        "^=": 70 /* CaretEqualsToken */,
-        "@": 57 /* AtToken */,
-    });
+    var textToKeywordObj = (_a = {
+            abstract: 117 /* AbstractKeyword */,
+            any: 119 /* AnyKeyword */,
+            as: 118 /* AsKeyword */,
+            boolean: 122 /* BooleanKeyword */,
+            break: 72 /* BreakKeyword */,
+            case: 73 /* CaseKeyword */,
+            catch: 74 /* CatchKeyword */,
+            class: 75 /* ClassKeyword */,
+            continue: 77 /* ContinueKeyword */,
+            const: 76 /* ConstKeyword */
+        },
+        _a["" + "constructor"] = 123 /* ConstructorKeyword */,
+        _a.debugger = 78 /* DebuggerKeyword */,
+        _a.declare = 124 /* DeclareKeyword */,
+        _a.default = 79 /* DefaultKeyword */,
+        _a.delete = 80 /* DeleteKeyword */,
+        _a.do = 81 /* DoKeyword */,
+        _a.else = 82 /* ElseKeyword */,
+        _a.enum = 83 /* EnumKeyword */,
+        _a.export = 84 /* ExportKeyword */,
+        _a.extends = 85 /* ExtendsKeyword */,
+        _a.false = 86 /* FalseKeyword */,
+        _a.finally = 87 /* FinallyKeyword */,
+        _a.for = 88 /* ForKeyword */,
+        _a.from = 143 /* FromKeyword */,
+        _a.function = 89 /* FunctionKeyword */,
+        _a.get = 125 /* GetKeyword */,
+        _a.if = 90 /* IfKeyword */,
+        _a.implements = 108 /* ImplementsKeyword */,
+        _a.import = 91 /* ImportKeyword */,
+        _a.in = 92 /* InKeyword */,
+        _a.infer = 126 /* InferKeyword */,
+        _a.instanceof = 93 /* InstanceOfKeyword */,
+        _a.interface = 109 /* InterfaceKeyword */,
+        _a.is = 127 /* IsKeyword */,
+        _a.keyof = 128 /* KeyOfKeyword */,
+        _a.let = 110 /* LetKeyword */,
+        _a.module = 129 /* ModuleKeyword */,
+        _a.namespace = 130 /* NamespaceKeyword */,
+        _a.never = 131 /* NeverKeyword */,
+        _a.new = 94 /* NewKeyword */,
+        _a.null = 95 /* NullKeyword */,
+        _a.number = 134 /* NumberKeyword */,
+        _a.object = 135 /* ObjectKeyword */,
+        _a.package = 111 /* PackageKeyword */,
+        _a.private = 112 /* PrivateKeyword */,
+        _a.protected = 113 /* ProtectedKeyword */,
+        _a.public = 114 /* PublicKeyword */,
+        _a.readonly = 132 /* ReadonlyKeyword */,
+        _a.require = 133 /* RequireKeyword */,
+        _a.global = 144 /* GlobalKeyword */,
+        _a.return = 96 /* ReturnKeyword */,
+        _a.set = 136 /* SetKeyword */,
+        _a.static = 115 /* StaticKeyword */,
+        _a.string = 137 /* StringKeyword */,
+        _a.super = 97 /* SuperKeyword */,
+        _a.switch = 98 /* SwitchKeyword */,
+        _a.symbol = 138 /* SymbolKeyword */,
+        _a.this = 99 /* ThisKeyword */,
+        _a.throw = 100 /* ThrowKeyword */,
+        _a.true = 101 /* TrueKeyword */,
+        _a.try = 102 /* TryKeyword */,
+        _a.type = 139 /* TypeKeyword */,
+        _a.typeof = 103 /* TypeOfKeyword */,
+        _a.undefined = 140 /* UndefinedKeyword */,
+        _a.unique = 141 /* UniqueKeyword */,
+        _a.unknown = 142 /* UnknownKeyword */,
+        _a.var = 104 /* VarKeyword */,
+        _a.void = 105 /* VoidKeyword */,
+        _a.while = 106 /* WhileKeyword */,
+        _a.with = 107 /* WithKeyword */,
+        _a.yield = 116 /* YieldKeyword */,
+        _a.async = 120 /* AsyncKeyword */,
+        _a.await = 121 /* AwaitKeyword */,
+        _a.of = 145 /* OfKeyword */,
+        _a);
+    var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 17 /* OpenBraceToken */, "}": 18 /* CloseBraceToken */, "(": 19 /* OpenParenToken */, ")": 20 /* CloseParenToken */, "[": 21 /* OpenBracketToken */, "]": 22 /* CloseBracketToken */, ".": 23 /* DotToken */, "...": 24 /* DotDotDotToken */, ";": 25 /* SemicolonToken */, ",": 26 /* CommaToken */, "<": 27 /* LessThanToken */, ">": 29 /* GreaterThanToken */, "<=": 30 /* LessThanEqualsToken */, ">=": 31 /* GreaterThanEqualsToken */, "==": 32 /* EqualsEqualsToken */, "!=": 33 /* ExclamationEqualsToken */, "===": 34 /* EqualsEqualsEqualsToken */, "!==": 35 /* ExclamationEqualsEqualsToken */, "=>": 36 /* EqualsGreaterThanToken */, "+": 37 /* PlusToken */, "-": 38 /* MinusToken */, "**": 40 /* AsteriskAsteriskToken */, "*": 39 /* AsteriskToken */, "/": 41 /* SlashToken */, "%": 42 /* PercentToken */, "++": 43 /* PlusPlusToken */, "--": 44 /* MinusMinusToken */, "<<": 45 /* LessThanLessThanToken */, "</": 28 /* LessThanSlashToken */, ">>": 46 /* GreaterThanGreaterThanToken */, ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */, "&": 48 /* AmpersandToken */, "|": 49 /* BarToken */, "^": 50 /* CaretToken */, "!": 51 /* ExclamationToken */, "~": 52 /* TildeToken */, "&&": 53 /* AmpersandAmpersandToken */, "||": 54 /* BarBarToken */, "?": 55 /* QuestionToken */, ":": 56 /* ColonToken */, "=": 58 /* EqualsToken */, "+=": 59 /* PlusEqualsToken */, "-=": 60 /* MinusEqualsToken */, "*=": 61 /* AsteriskEqualsToken */, "**=": 62 /* AsteriskAsteriskEqualsToken */, "/=": 63 /* SlashEqualsToken */, "%=": 64 /* PercentEqualsToken */, "<<=": 65 /* LessThanLessThanEqualsToken */, ">>=": 66 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 68 /* AmpersandEqualsToken */, "|=": 69 /* BarEqualsToken */, "^=": 70 /* CaretEqualsToken */, "@": 57 /* AtToken */ }));
    /*
        As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
        IdentifierStart ::
@@ -7235,9 +7185,9 @@ var ts;
            if (len >= 2 && len <= 11) {
                var ch = tokenValue.charCodeAt(0);
                if (ch >= 97 /* a */ && ch <= 122 /* z */) {
-                    token = textToToken.get(tokenValue);
-                    if (token !== undefined) {
-                        return token;
+                    var keyword = textToKeyword.get(tokenValue);
+                    if (keyword !== undefined) {
+                        return token = keyword;
                    }
                }
            }
@@ -7917,7 +7867,7 @@ var ts;
                    pos++;
                }
                tokenValue = text.substring(tokenPos, pos);
-                return token = 71 /* Identifier */;
+                return token = getIdentifierToken();
            }
            else {
                return token = 0 /* Unknown */;
@@ -21431,7 +21381,7 @@ var ts;
            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
            // Parses out a JSDoc type expression.
            function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(281 /* JSDocTypeExpression */, scanner.getTokenPos());
+                var result = createNode(281 /* JSDocTypeExpression */);
                var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(17 /* OpenBraceToken */);
                result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                if (!mayOmitBraces || hasBrace) {
@@ -21626,7 +21576,7 @@ var ts;
                        nextJSDocToken();
                    }
                }
-                function skipWhitespaceOrAsterisk(next) {
+                function skipWhitespaceOrAsterisk() {
                    if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
@@ -21640,7 +21590,7 @@ var ts;
                        else if (token() === 39 /* AsteriskToken */) {
                            precedingLineBreak = false;
                        }
-                        next();
+                        nextJSDocToken();
                    }
                }
                function parseTag(indent) {
@@ -21648,9 +21598,8 @@ var ts;
                    var atToken = createNode(57 /* AtToken */, scanner.getTokenPos());
                    atToken.end = scanner.getTextPos();
                    nextJSDocToken();
-                    // Use 'nextToken' instead of 'nextJsDocToken' so we can parse a type like 'number' in `@enum number`
-                    var tagName = parseJSDocIdentifierName(/*message*/ undefined, nextToken);
-                    skipWhitespaceOrAsterisk(nextToken);
+                    var tagName = parseJSDocIdentifierName(/*message*/ undefined);
+                    skipWhitespaceOrAsterisk();
                    var tag;
                    switch (tagName.escapedText) {
                        case "augments":
@@ -21787,7 +21736,7 @@ var ts;
                    tagsEnd = tag.end;
                }
                function tryParseTypeExpression() {
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    return token() === 17 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                }
                function parseBracketNameInPropertyAndParamTag() {
@@ -21821,7 +21770,7 @@ var ts;
                function parseParameterOrPropertyTag(atToken, tagName, target, indent) {
                    var typeExpression = tryParseTypeExpression();
                    var isNameFirst = !typeExpression;
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
                    skipWhitespace();
                    if (isNameFirst) {
@@ -21940,7 +21889,7 @@ var ts;
                }
                function parseTypedefTag(atToken, tagName, indent) {
                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var typedefTag = createNode(302 /* JSDocTypedefTag */, atToken.pos);
                    typedefTag.atToken = atToken;
                    typedefTag.tagName = tagName;
@@ -22173,8 +22122,7 @@ var ts;
                    }
                    return entity;
                }
-                function parseJSDocIdentifierName(message, next) {
-                    if (next === void 0) { next = nextJSDocToken; }
+                function parseJSDocIdentifierName(message) {
                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
                        return createMissingNode(71 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                    }
@@ -22183,7 +22131,7 @@ var ts;
                    var result = createNode(71 /* Identifier */, pos);
                    result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                    finishNode(result, end);
-                    next();
+                    nextJSDocToken();
                    return result;
                }
            }
@@ -23860,7 +23808,7 @@ var ts;
                                    i++;
                                    break;
                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    var result = parseListTypeOption(opt, args[i], errors); // tslint:disable-line no-unnecessary-type-assertion
                                    options[opt.name] = result || [];
                                    if (result) {
                                        i++;
@@ -24394,7 +24342,7 @@ var ts;
                return undefined;
            }
            else if (optionDefinition.type === "list") {
-                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+                return getCustomTypeMapOfCommandLineOption(optionDefinition.element); // tslint:disable-line no-unnecessary-type-assertion
            }
            else {
                return optionDefinition.type;
@@ -24457,7 +24405,7 @@ var ts;
                case "object":
                    return {};
                default:
-                    return option.type.keys().next().value;
+                    return option.type.keys().next().value; // tslint:disable-line no-unnecessary-type-assertion
            }
        }
        function makePadding(paddingLength) {
@@ -24937,7 +24885,7 @@ var ts;
        if (isNullOrUndefined(value))
            return undefined;
        if (option.type === "list") {
-            var listOption_1 = option;
+            var listOption_1 = option; // tslint:disable-line no-unnecessary-type-assertion
            if (listOption_1.element.isFilePath || !ts.isString(listOption_1.element.type)) {
                return ts.filter(ts.map(value, function (v) { return normalizeOptionValue(listOption_1.element, basePath, v); }), function (v) { return !!v; });
            }
@@ -25281,7 +25229,7 @@ var ts;
            case "boolean":
                return typeof value === "boolean" ? value : "";
            case "list":
-                var elementType_1 = option.element;
+                var elementType_1 = option.element; // tslint:disable-line no-unnecessary-type-assertion
                return ts.isArray(value) ? value.map(function (v) { return getOptionValueWithEmptyStrings(v, elementType_1); }) : "";
            default:
                return ts.forEachEntry(option.type, function (optionEnumValue, optionStringValue) {
@@ -98468,7 +98416,7 @@ var ts;
                case "compilerOptions":
                    forEachProperty(property.initializer, function (property, propertyName) {
                        var option = ts.getOptionFromName(propertyName);
-                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) {
+                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) { // tslint:disable-line no-unnecessary-type-assertion
                            updatePaths(property);
                        }
                        else if (propertyName === "paths") {
@@ -117627,6 +117575,7 @@ var ts;
                CommandTypes["GetEditsForFileRename"] = "getEditsForFileRename";
                /* @internal */
                CommandTypes["GetEditsForFileRenameFull"] = "getEditsForFileRename-full";
+                CommandTypes["ConfigurePlugin"] = "configurePlugin";
                // NOTE: If updating this, be sure to also update `allCommandNames` in `harness/unittests/session.ts`.
            })(CommandTypes = protocol.CommandTypes || (protocol.CommandTypes = {}));
            var IndentStyle;
@@ -118628,10 +118577,10 @@ var ts;
            Project.prototype.getExternalFiles = function () {
                var _this = this;
                return server.toSortedArray(ts.flatMap(this.plugins, function (plugin) {
-                    if (typeof plugin.getExternalFiles !== "function")
+                    if (typeof plugin.module.getExternalFiles !== "function")
                        return;
                    try {
-                        return plugin.getExternalFiles(_this);
+                        return plugin.module.getExternalFiles(_this);
                    }
                    catch (e) {
                        _this.projectService.logger.info("A plugin threw an exception in getExternalFiles: " + e);
@@ -119123,7 +119072,7 @@ var ts;
                ts.orderedRemoveItem(this.rootFiles, info);
                this.rootFilesMap.delete(info.path);
            };
-            Project.prototype.enableGlobalPlugins = function (options) {
+            Project.prototype.enableGlobalPlugins = function (options, pluginConfigOverrides) {
                var host = this.projectService.host;
                if (!host.require) {
                    this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
@@ -119142,7 +119091,7 @@ var ts;
                            return "continue";
                        // Provide global: true so plugins can detect why they can't find their config
                        this_2.projectService.logger.info("Loading global plugin " + globalPluginName);
-                        this_2.enablePlugin({ name: globalPluginName, global: true }, searchPaths);
+                        this_2.enablePlugin({ name: globalPluginName, global: true }, searchPaths, pluginConfigOverrides);
                    };
                    var this_2 = this;
                    // Enable global plugins with synthetic configuration entries
@@ -119152,7 +119101,7 @@ var ts;
                    }
                }
            };
-            Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths) {
+            Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                var _this = this;
                this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
                var log = function (message) {
@@ -119162,16 +119111,19 @@ var ts;
                    return Project.resolveModule(pluginConfigEntry.name, searchPath, _this.projectService.host, log);
                });
                if (resolvedModule) {
+                    var configurationOverride = pluginConfigOverrides && pluginConfigOverrides.get(pluginConfigEntry.name);
+                    if (configurationOverride) {
+                        // Preserve the name property since it's immutable
+                        var pluginName = pluginConfigEntry.name;
+                        pluginConfigEntry = configurationOverride;
+                        pluginConfigEntry.name = pluginName;
+                    }
                    this.enableProxy(resolvedModule, pluginConfigEntry);
                }
                else {
                    this.projectService.logger.info("Couldn't find " + pluginConfigEntry.name);
                }
            };
-            /** Starts a new check for diagnostics. Call this if some file has updated that would cause diagnostics to be changed. */
-            Project.prototype.refreshDiagnostics = function () {
-                this.projectService.sendProjectsUpdatedInBackgroundEvent();
-            };
            Project.prototype.enableProxy = function (pluginModuleFactory, configEntry) {
                try {
                    if (typeof pluginModuleFactory !== "function") {
@@ -119196,12 +119148,24 @@ var ts;
                    }
                    this.projectService.logger.info("Plugin validation succeded");
                    this.languageService = newLS;
-                    this.plugins.push(pluginModule);
+                    this.plugins.push({ name: configEntry.name, module: pluginModule });
                }
                catch (e) {
                    this.projectService.logger.info("Plugin activation failed: " + e);
                }
            };
+            /*@internal*/
+            Project.prototype.onPluginConfigurationChanged = function (pluginName, configuration) {
+                this.plugins.filter(function (plugin) { return plugin.name === pluginName; }).forEach(function (plugin) {
+                    if (plugin.module.onConfigurationChanged) {
+                        plugin.module.onConfigurationChanged(configuration);
+                    }
+                });
+            };
+            /** Starts a new check for diagnostics. Call this if some file has updated that would cause diagnostics to be changed. */
+            Project.prototype.refreshDiagnostics = function () {
+                this.projectService.sendProjectsUpdatedInBackgroundEvent();
+            };
            return Project;
        }());
        server.Project = Project;
@@ -119212,7 +119176,7 @@ var ts;
        var InferredProject = /** @class */ (function (_super) {
            __extends(InferredProject, _super);
            /*@internal*/
-            function InferredProject(projectService, documentRegistry, compilerOptions, projectRootPath, currentDirectory) {
+            function InferredProject(projectService, documentRegistry, compilerOptions, projectRootPath, currentDirectory, pluginConfigOverrides) {
                var _this = _super.call(this, InferredProject.newName(), ProjectKind.Inferred, projectService, documentRegistry, 
                // TODO: GH#18217
                /*files*/ undefined, 
@@ -119223,7 +119187,7 @@ var ts;
                if (!projectRootPath && !projectService.useSingleInferredProject) {
                    _this.canonicalCurrentDirectory = projectService.toCanonicalFileName(_this.currentDirectory);
                }
-                _this.enableGlobalPlugins(_this.getCompilerOptions());
+                _this.enableGlobalPlugins(_this.getCompilerOptions(), pluginConfigOverrides);
                return _this;
            }
            InferredProject.prototype.toggleJsInferredProject = function (isJsInferredProject) {
@@ -119360,11 +119324,8 @@ var ts;
                var program = this.getCurrentProgram();
                return program && program.getResolvedProjectReferences();
            };
-            ConfiguredProject.prototype.enablePlugins = function () {
-                this.enablePluginsWithOptions(this.getCompilerOptions());
-            };
            /*@internal*/
-            ConfiguredProject.prototype.enablePluginsWithOptions = function (options) {
+            ConfiguredProject.prototype.enablePluginsWithOptions = function (options, pluginConfigOverrides) {
                var host = this.projectService.host;
                if (!host.require) {
                    this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
@@ -119382,10 +119343,10 @@ var ts;
                if (options.plugins) {
                    for (var _i = 0, _a = options.plugins; _i < _a.length; _i++) {
                        var pluginConfigEntry = _a[_i];
-                        this.enablePlugin(pluginConfigEntry, searchPaths);
+                        this.enablePlugin(pluginConfigEntry, searchPaths, pluginConfigOverrides);
                    }
                }
-                this.enableGlobalPlugins(options);
+                this.enableGlobalPlugins(options, pluginConfigOverrides);
            };
            /**
             * Get the errors that dont have any file name associated
@@ -120803,7 +120764,7 @@ var ts;
                    project.enableLanguageService();
                    project.watchWildcards(ts.createMapFromTemplate(parsedCommandLine.wildcardDirectories)); // TODO: GH#18217
                }
-                project.enablePluginsWithOptions(compilerOptions);
+                project.enablePluginsWithOptions(compilerOptions, this.currentPluginConfigOverrides);
                var filesToAdd = parsedCommandLine.fileNames.concat(project.getExternalFiles());
                this.updateRootAndOptionsOfNonInferredProject(project, filesToAdd, fileNamePropertyReader, compilerOptions, parsedCommandLine.typeAcquisition, parsedCommandLine.compileOnSave); // TODO: GH#18217
            };
@@ -120978,7 +120939,7 @@ var ts;
            };
            ProjectService.prototype.createInferredProject = function (currentDirectory, isSingleInferredProject, projectRootPath) {
                var compilerOptions = projectRootPath && this.compilerOptionsForInferredProjectsPerProjectRoot.get(projectRootPath) || this.compilerOptionsForInferredProjects;
-                var project = new server.InferredProject(this, this.documentRegistry, compilerOptions, projectRootPath, currentDirectory);
+                var project = new server.InferredProject(this, this.documentRegistry, compilerOptions, projectRootPath, currentDirectory, this.currentPluginConfigOverrides);
                if (isSingleInferredProject) {
                    this.inferredProjects.unshift(project);
                }
@@ -121873,6 +121834,14 @@ var ts;
                }
                return false;
            };
+            ProjectService.prototype.configurePlugin = function (args) {
+                // For any projects that already have the plugin loaded, configure the plugin
+                this.forEachEnabledProject(function (project) { return project.onPluginConfigurationChanged(args.pluginName, args.configuration); });
+                // Also save the current configuration to pass on to any projects that are yet to be loaded.
+                // If a plugin is configured twice, only the latest configuration will be remembered.
+                this.currentPluginConfigOverrides = this.currentPluginConfigOverrides || ts.createMap();
+                this.currentPluginConfigOverrides.set(args.pluginName, args.configuration);
+            };
            /** Makes a filename safe to insert in a RegExp */
            ProjectService.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
            return ProjectService;
@@ -122546,6 +122515,10 @@ var ts;
                    _a[server.CommandNames.GetEditsForFileRenameFull] = function (request) {
                        return _this.requiredResponse(_this.getEditsForFileRename(request.arguments, /*simplifiedResult*/ false));
                    },
+                    _a[server.CommandNames.ConfigurePlugin] = function (request) {
+                        _this.configurePlugin(request.arguments);
+                        return _this.notRequired();
+                    },
                    _a));
                this.host = opts.host;
                this.cancellationToken = opts.cancellationToken;
@@ -123809,6 +123782,9 @@ var ts;
                // doesn't require the file to be opened
                this.updateErrorCheck(next, checkList, delay, /*requireOpen*/ false);
            };
+            Session.prototype.configurePlugin = function (args) {
+                this.projectService.configurePlugin(args);
+            };
            Session.prototype.getCanonicalFileName = function (fileName) {
                var name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
                return ts.normalizePath(name);
@@ -69,7 +69,8 @@ declare namespace ts {
        pos: number;
        end: number;
    }
-    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown;
+    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
    type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
    enum SyntaxKind {
        Unknown = 0,
@@ -75,7 +75,7 @@ var ts;
    // If changing the text in this section, be sure to test `configureNightly` too.
    ts.versionMajorMinor = "3.1";
    /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".3";
+    ts.version = ts.versionMajorMinor + ".4";
 })(ts || (ts = {}));
 (function (ts) {
    /* @internal */
@@ -6081,6 +6081,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
    /* @internal */
    function tokenIsIdentifierOrKeyword(token) {
        return token >= 71 /* Identifier */;
@@ -6091,136 +6092,85 @@ var ts;
        return token === 29 /* GreaterThanToken */ || tokenIsIdentifierOrKeyword(token);
    }
    ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
-    var textToToken = ts.createMapFromTemplate({
-        "abstract": 117 /* AbstractKeyword */,
-        "any": 119 /* AnyKeyword */,
-        "as": 118 /* AsKeyword */,
-        "boolean": 122 /* BooleanKeyword */,
-        "break": 72 /* BreakKeyword */,
-        "case": 73 /* CaseKeyword */,
-        "catch": 74 /* CatchKeyword */,
-        "class": 75 /* ClassKeyword */,
-        "continue": 77 /* ContinueKeyword */,
-        "const": 76 /* ConstKeyword */,
-        "constructor": 123 /* ConstructorKeyword */,
-        "debugger": 78 /* DebuggerKeyword */,
-        "declare": 124 /* DeclareKeyword */,
-        "default": 79 /* DefaultKeyword */,
-        "delete": 80 /* DeleteKeyword */,
-        "do": 81 /* DoKeyword */,
-        "else": 82 /* ElseKeyword */,
-        "enum": 83 /* EnumKeyword */,
-        "export": 84 /* ExportKeyword */,
-        "extends": 85 /* ExtendsKeyword */,
-        "false": 86 /* FalseKeyword */,
-        "finally": 87 /* FinallyKeyword */,
-        "for": 88 /* ForKeyword */,
-        "from": 143 /* FromKeyword */,
-        "function": 89 /* FunctionKeyword */,
-        "get": 125 /* GetKeyword */,
-        "if": 90 /* IfKeyword */,
-        "implements": 108 /* ImplementsKeyword */,
-        "import": 91 /* ImportKeyword */,
-        "in": 92 /* InKeyword */,
-        "infer": 126 /* InferKeyword */,
-        "instanceof": 93 /* InstanceOfKeyword */,
-        "interface": 109 /* InterfaceKeyword */,
-        "is": 127 /* IsKeyword */,
-        "keyof": 128 /* KeyOfKeyword */,
-        "let": 110 /* LetKeyword */,
-        "module": 129 /* ModuleKeyword */,
-        "namespace": 130 /* NamespaceKeyword */,
-        "never": 131 /* NeverKeyword */,
-        "new": 94 /* NewKeyword */,
-        "null": 95 /* NullKeyword */,
-        "number": 134 /* NumberKeyword */,
-        "object": 135 /* ObjectKeyword */,
-        "package": 111 /* PackageKeyword */,
-        "private": 112 /* PrivateKeyword */,
-        "protected": 113 /* ProtectedKeyword */,
-        "public": 114 /* PublicKeyword */,
-        "readonly": 132 /* ReadonlyKeyword */,
-        "require": 133 /* RequireKeyword */,
-        "global": 144 /* GlobalKeyword */,
-        "return": 96 /* ReturnKeyword */,
-        "set": 136 /* SetKeyword */,
-        "static": 115 /* StaticKeyword */,
-        "string": 137 /* StringKeyword */,
-        "super": 97 /* SuperKeyword */,
-        "switch": 98 /* SwitchKeyword */,
-        "symbol": 138 /* SymbolKeyword */,
-        "this": 99 /* ThisKeyword */,
-        "throw": 100 /* ThrowKeyword */,
-        "true": 101 /* TrueKeyword */,
-        "try": 102 /* TryKeyword */,
-        "type": 139 /* TypeKeyword */,
-        "typeof": 103 /* TypeOfKeyword */,
-        "undefined": 140 /* UndefinedKeyword */,
-        "unique": 141 /* UniqueKeyword */,
-        "unknown": 142 /* UnknownKeyword */,
-        "var": 104 /* VarKeyword */,
-        "void": 105 /* VoidKeyword */,
-        "while": 106 /* WhileKeyword */,
-        "with": 107 /* WithKeyword */,
-        "yield": 116 /* YieldKeyword */,
-        "async": 120 /* AsyncKeyword */,
-        "await": 121 /* AwaitKeyword */,
-        "of": 145 /* OfKeyword */,
-        "{": 17 /* OpenBraceToken */,
-        "}": 18 /* CloseBraceToken */,
-        "(": 19 /* OpenParenToken */,
-        ")": 20 /* CloseParenToken */,
-        "[": 21 /* OpenBracketToken */,
-        "]": 22 /* CloseBracketToken */,
-        ".": 23 /* DotToken */,
-        "...": 24 /* DotDotDotToken */,
-        ";": 25 /* SemicolonToken */,
-        ",": 26 /* CommaToken */,
-        "<": 27 /* LessThanToken */,
-        ">": 29 /* GreaterThanToken */,
-        "<=": 30 /* LessThanEqualsToken */,
-        ">=": 31 /* GreaterThanEqualsToken */,
-        "==": 32 /* EqualsEqualsToken */,
-        "!=": 33 /* ExclamationEqualsToken */,
-        "===": 34 /* EqualsEqualsEqualsToken */,
-        "!==": 35 /* ExclamationEqualsEqualsToken */,
-        "=>": 36 /* EqualsGreaterThanToken */,
-        "+": 37 /* PlusToken */,
-        "-": 38 /* MinusToken */,
-        "**": 40 /* AsteriskAsteriskToken */,
-        "*": 39 /* AsteriskToken */,
-        "/": 41 /* SlashToken */,
-        "%": 42 /* PercentToken */,
-        "++": 43 /* PlusPlusToken */,
-        "--": 44 /* MinusMinusToken */,
-        "<<": 45 /* LessThanLessThanToken */,
-        "</": 28 /* LessThanSlashToken */,
-        ">>": 46 /* GreaterThanGreaterThanToken */,
-        ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */,
-        "&": 48 /* AmpersandToken */,
-        "|": 49 /* BarToken */,
-        "^": 50 /* CaretToken */,
-        "!": 51 /* ExclamationToken */,
-        "~": 52 /* TildeToken */,
-        "&&": 53 /* AmpersandAmpersandToken */,
-        "||": 54 /* BarBarToken */,
-        "?": 55 /* QuestionToken */,
-        ":": 56 /* ColonToken */,
-        "=": 58 /* EqualsToken */,
-        "+=": 59 /* PlusEqualsToken */,
-        "-=": 60 /* MinusEqualsToken */,
-        "*=": 61 /* AsteriskEqualsToken */,
-        "**=": 62 /* AsteriskAsteriskEqualsToken */,
-        "/=": 63 /* SlashEqualsToken */,
-        "%=": 64 /* PercentEqualsToken */,
-        "<<=": 65 /* LessThanLessThanEqualsToken */,
-        ">>=": 66 /* GreaterThanGreaterThanEqualsToken */,
-        ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */,
-        "&=": 68 /* AmpersandEqualsToken */,
-        "|=": 69 /* BarEqualsToken */,
-        "^=": 70 /* CaretEqualsToken */,
-        "@": 57 /* AtToken */,
-    });
+    var textToKeywordObj = (_a = {
+            abstract: 117 /* AbstractKeyword */,
+            any: 119 /* AnyKeyword */,
+            as: 118 /* AsKeyword */,
+            boolean: 122 /* BooleanKeyword */,
+            break: 72 /* BreakKeyword */,
+            case: 73 /* CaseKeyword */,
+            catch: 74 /* CatchKeyword */,
+            class: 75 /* ClassKeyword */,
+            continue: 77 /* ContinueKeyword */,
+            const: 76 /* ConstKeyword */
+        },
+        _a["" + "constructor"] = 123 /* ConstructorKeyword */,
+        _a.debugger = 78 /* DebuggerKeyword */,
+        _a.declare = 124 /* DeclareKeyword */,
+        _a.default = 79 /* DefaultKeyword */,
+        _a.delete = 80 /* DeleteKeyword */,
+        _a.do = 81 /* DoKeyword */,
+        _a.else = 82 /* ElseKeyword */,
+        _a.enum = 83 /* EnumKeyword */,
+        _a.export = 84 /* ExportKeyword */,
+        _a.extends = 85 /* ExtendsKeyword */,
+        _a.false = 86 /* FalseKeyword */,
+        _a.finally = 87 /* FinallyKeyword */,
+        _a.for = 88 /* ForKeyword */,
+        _a.from = 143 /* FromKeyword */,
+        _a.function = 89 /* FunctionKeyword */,
+        _a.get = 125 /* GetKeyword */,
+        _a.if = 90 /* IfKeyword */,
+        _a.implements = 108 /* ImplementsKeyword */,
+        _a.import = 91 /* ImportKeyword */,
+        _a.in = 92 /* InKeyword */,
+        _a.infer = 126 /* InferKeyword */,
+        _a.instanceof = 93 /* InstanceOfKeyword */,
+        _a.interface = 109 /* InterfaceKeyword */,
+        _a.is = 127 /* IsKeyword */,
+        _a.keyof = 128 /* KeyOfKeyword */,
+        _a.let = 110 /* LetKeyword */,
+        _a.module = 129 /* ModuleKeyword */,
+        _a.namespace = 130 /* NamespaceKeyword */,
+        _a.never = 131 /* NeverKeyword */,
+        _a.new = 94 /* NewKeyword */,
+        _a.null = 95 /* NullKeyword */,
+        _a.number = 134 /* NumberKeyword */,
+        _a.object = 135 /* ObjectKeyword */,
+        _a.package = 111 /* PackageKeyword */,
+        _a.private = 112 /* PrivateKeyword */,
+        _a.protected = 113 /* ProtectedKeyword */,
+        _a.public = 114 /* PublicKeyword */,
+        _a.readonly = 132 /* ReadonlyKeyword */,
+        _a.require = 133 /* RequireKeyword */,
+        _a.global = 144 /* GlobalKeyword */,
+        _a.return = 96 /* ReturnKeyword */,
+        _a.set = 136 /* SetKeyword */,
+        _a.static = 115 /* StaticKeyword */,
+        _a.string = 137 /* StringKeyword */,
+        _a.super = 97 /* SuperKeyword */,
+        _a.switch = 98 /* SwitchKeyword */,
+        _a.symbol = 138 /* SymbolKeyword */,
+        _a.this = 99 /* ThisKeyword */,
+        _a.throw = 100 /* ThrowKeyword */,
+        _a.true = 101 /* TrueKeyword */,
+        _a.try = 102 /* TryKeyword */,
+        _a.type = 139 /* TypeKeyword */,
+        _a.typeof = 103 /* TypeOfKeyword */,
+        _a.undefined = 140 /* UndefinedKeyword */,
+        _a.unique = 141 /* UniqueKeyword */,
+        _a.unknown = 142 /* UnknownKeyword */,
+        _a.var = 104 /* VarKeyword */,
+        _a.void = 105 /* VoidKeyword */,
+        _a.while = 106 /* WhileKeyword */,
+        _a.with = 107 /* WithKeyword */,
+        _a.yield = 116 /* YieldKeyword */,
+        _a.async = 120 /* AsyncKeyword */,
+        _a.await = 121 /* AwaitKeyword */,
+        _a.of = 145 /* OfKeyword */,
+        _a);
+    var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 17 /* OpenBraceToken */, "}": 18 /* CloseBraceToken */, "(": 19 /* OpenParenToken */, ")": 20 /* CloseParenToken */, "[": 21 /* OpenBracketToken */, "]": 22 /* CloseBracketToken */, ".": 23 /* DotToken */, "...": 24 /* DotDotDotToken */, ";": 25 /* SemicolonToken */, ",": 26 /* CommaToken */, "<": 27 /* LessThanToken */, ">": 29 /* GreaterThanToken */, "<=": 30 /* LessThanEqualsToken */, ">=": 31 /* GreaterThanEqualsToken */, "==": 32 /* EqualsEqualsToken */, "!=": 33 /* ExclamationEqualsToken */, "===": 34 /* EqualsEqualsEqualsToken */, "!==": 35 /* ExclamationEqualsEqualsToken */, "=>": 36 /* EqualsGreaterThanToken */, "+": 37 /* PlusToken */, "-": 38 /* MinusToken */, "**": 40 /* AsteriskAsteriskToken */, "*": 39 /* AsteriskToken */, "/": 41 /* SlashToken */, "%": 42 /* PercentToken */, "++": 43 /* PlusPlusToken */, "--": 44 /* MinusMinusToken */, "<<": 45 /* LessThanLessThanToken */, "</": 28 /* LessThanSlashToken */, ">>": 46 /* GreaterThanGreaterThanToken */, ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */, "&": 48 /* AmpersandToken */, "|": 49 /* BarToken */, "^": 50 /* CaretToken */, "!": 51 /* ExclamationToken */, "~": 52 /* TildeToken */, "&&": 53 /* AmpersandAmpersandToken */, "||": 54 /* BarBarToken */, "?": 55 /* QuestionToken */, ":": 56 /* ColonToken */, "=": 58 /* EqualsToken */, "+=": 59 /* PlusEqualsToken */, "-=": 60 /* MinusEqualsToken */, "*=": 61 /* AsteriskEqualsToken */, "**=": 62 /* AsteriskAsteriskEqualsToken */, "/=": 63 /* SlashEqualsToken */, "%=": 64 /* PercentEqualsToken */, "<<=": 65 /* LessThanLessThanEqualsToken */, ">>=": 66 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 68 /* AmpersandEqualsToken */, "|=": 69 /* BarEqualsToken */, "^=": 70 /* CaretEqualsToken */, "@": 57 /* AtToken */ }));
    /*
        As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
        IdentifierStart ::
@@ -7226,9 +7176,9 @@ var ts;
            if (len >= 2 && len <= 11) {
                var ch = tokenValue.charCodeAt(0);
                if (ch >= 97 /* a */ && ch <= 122 /* z */) {
-                    token = textToToken.get(tokenValue);
-                    if (token !== undefined) {
-                        return token;
+                    var keyword = textToKeyword.get(tokenValue);
+                    if (keyword !== undefined) {
+                        return token = keyword;
                    }
                }
            }
@@ -7908,7 +7858,7 @@ var ts;
                    pos++;
                }
                tokenValue = text.substring(tokenPos, pos);
-                return token = 71 /* Identifier */;
+                return token = getIdentifierToken();
            }
            else {
                return token = 0 /* Unknown */;
@@ -21422,7 +21372,7 @@ var ts;
            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
            // Parses out a JSDoc type expression.
            function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(281 /* JSDocTypeExpression */, scanner.getTokenPos());
+                var result = createNode(281 /* JSDocTypeExpression */);
                var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(17 /* OpenBraceToken */);
                result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                if (!mayOmitBraces || hasBrace) {
@@ -21617,7 +21567,7 @@ var ts;
                        nextJSDocToken();
                    }
                }
-                function skipWhitespaceOrAsterisk(next) {
+                function skipWhitespaceOrAsterisk() {
                    if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
@@ -21631,7 +21581,7 @@ var ts;
                        else if (token() === 39 /* AsteriskToken */) {
                            precedingLineBreak = false;
                        }
-                        next();
+                        nextJSDocToken();
                    }
                }
                function parseTag(indent) {
@@ -21639,9 +21589,8 @@ var ts;
                    var atToken = createNode(57 /* AtToken */, scanner.getTokenPos());
                    atToken.end = scanner.getTextPos();
                    nextJSDocToken();
-                    // Use 'nextToken' instead of 'nextJsDocToken' so we can parse a type like 'number' in `@enum number`
-                    var tagName = parseJSDocIdentifierName(/*message*/ undefined, nextToken);
-                    skipWhitespaceOrAsterisk(nextToken);
+                    var tagName = parseJSDocIdentifierName(/*message*/ undefined);
+                    skipWhitespaceOrAsterisk();
                    var tag;
                    switch (tagName.escapedText) {
                        case "augments":
@@ -21778,7 +21727,7 @@ var ts;
                    tagsEnd = tag.end;
                }
                function tryParseTypeExpression() {
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    return token() === 17 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                }
                function parseBracketNameInPropertyAndParamTag() {
@@ -21812,7 +21761,7 @@ var ts;
                function parseParameterOrPropertyTag(atToken, tagName, target, indent) {
                    var typeExpression = tryParseTypeExpression();
                    var isNameFirst = !typeExpression;
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
                    skipWhitespace();
                    if (isNameFirst) {
@@ -21931,7 +21880,7 @@ var ts;
                }
                function parseTypedefTag(atToken, tagName, indent) {
                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var typedefTag = createNode(302 /* JSDocTypedefTag */, atToken.pos);
                    typedefTag.atToken = atToken;
                    typedefTag.tagName = tagName;
@@ -22164,8 +22113,7 @@ var ts;
                    }
                    return entity;
                }
-                function parseJSDocIdentifierName(message, next) {
-                    if (next === void 0) { next = nextJSDocToken; }
+                function parseJSDocIdentifierName(message) {
                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
                        return createMissingNode(71 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                    }
@@ -22174,7 +22122,7 @@ var ts;
                    var result = createNode(71 /* Identifier */, pos);
                    result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                    finishNode(result, end);
-                    next();
+                    nextJSDocToken();
                    return result;
                }
            }
@@ -23851,7 +23799,7 @@ var ts;
                                    i++;
                                    break;
                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    var result = parseListTypeOption(opt, args[i], errors); // tslint:disable-line no-unnecessary-type-assertion
                                    options[opt.name] = result || [];
                                    if (result) {
                                        i++;
@@ -24385,7 +24333,7 @@ var ts;
                return undefined;
            }
            else if (optionDefinition.type === "list") {
-                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+                return getCustomTypeMapOfCommandLineOption(optionDefinition.element); // tslint:disable-line no-unnecessary-type-assertion
            }
            else {
                return optionDefinition.type;
@@ -24448,7 +24396,7 @@ var ts;
                case "object":
                    return {};
                default:
-                    return option.type.keys().next().value;
+                    return option.type.keys().next().value; // tslint:disable-line no-unnecessary-type-assertion
            }
        }
        function makePadding(paddingLength) {
@@ -24928,7 +24876,7 @@ var ts;
        if (isNullOrUndefined(value))
            return undefined;
        if (option.type === "list") {
-            var listOption_1 = option;
+            var listOption_1 = option; // tslint:disable-line no-unnecessary-type-assertion
            if (listOption_1.element.isFilePath || !ts.isString(listOption_1.element.type)) {
                return ts.filter(ts.map(value, function (v) { return normalizeOptionValue(listOption_1.element, basePath, v); }), function (v) { return !!v; });
            }
@@ -25272,7 +25220,7 @@ var ts;
            case "boolean":
                return typeof value === "boolean" ? value : "";
            case "list":
-                var elementType_1 = option.element;
+                var elementType_1 = option.element; // tslint:disable-line no-unnecessary-type-assertion
                return ts.isArray(value) ? value.map(function (v) { return getOptionValueWithEmptyStrings(v, elementType_1); }) : "";
            default:
                return ts.forEachEntry(option.type, function (optionEnumValue, optionStringValue) {
@@ -98459,7 +98407,7 @@ var ts;
                case "compilerOptions":
                    forEachProperty(property.initializer, function (property, propertyName) {
                        var option = ts.getOptionFromName(propertyName);
-                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) {
+                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) { // tslint:disable-line no-unnecessary-type-assertion
                            updatePaths(property);
                        }
                        else if (propertyName === "paths") {
@@ -69,7 +69,8 @@ declare namespace ts {
        pos: number;
        end: number;
    }
-    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown;
+    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
    type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
    enum SyntaxKind {
        Unknown = 0,
@@ -75,7 +75,7 @@ var ts;
    // If changing the text in this section, be sure to test `configureNightly` too.
    ts.versionMajorMinor = "3.1";
    /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".3";
+    ts.version = ts.versionMajorMinor + ".4";
 })(ts || (ts = {}));
 (function (ts) {
    /* @internal */
@@ -6081,6 +6081,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
    /* @internal */
    function tokenIsIdentifierOrKeyword(token) {
        return token >= 71 /* Identifier */;
@@ -6091,136 +6092,85 @@ var ts;
        return token === 29 /* GreaterThanToken */ || tokenIsIdentifierOrKeyword(token);
    }
    ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
-    var textToToken = ts.createMapFromTemplate({
-        "abstract": 117 /* AbstractKeyword */,
-        "any": 119 /* AnyKeyword */,
-        "as": 118 /* AsKeyword */,
-        "boolean": 122 /* BooleanKeyword */,
-        "break": 72 /* BreakKeyword */,
-        "case": 73 /* CaseKeyword */,
-        "catch": 74 /* CatchKeyword */,
-        "class": 75 /* ClassKeyword */,
-        "continue": 77 /* ContinueKeyword */,
-        "const": 76 /* ConstKeyword */,
-        "constructor": 123 /* ConstructorKeyword */,
-        "debugger": 78 /* DebuggerKeyword */,
-        "declare": 124 /* DeclareKeyword */,
-        "default": 79 /* DefaultKeyword */,
-        "delete": 80 /* DeleteKeyword */,
-        "do": 81 /* DoKeyword */,
-        "else": 82 /* ElseKeyword */,
-        "enum": 83 /* EnumKeyword */,
-        "export": 84 /* ExportKeyword */,
-        "extends": 85 /* ExtendsKeyword */,
-        "false": 86 /* FalseKeyword */,
-        "finally": 87 /* FinallyKeyword */,
-        "for": 88 /* ForKeyword */,
-        "from": 143 /* FromKeyword */,
-        "function": 89 /* FunctionKeyword */,
-        "get": 125 /* GetKeyword */,
-        "if": 90 /* IfKeyword */,
-        "implements": 108 /* ImplementsKeyword */,
-        "import": 91 /* ImportKeyword */,
-        "in": 92 /* InKeyword */,
-        "infer": 126 /* InferKeyword */,
-        "instanceof": 93 /* InstanceOfKeyword */,
-        "interface": 109 /* InterfaceKeyword */,
-        "is": 127 /* IsKeyword */,
-        "keyof": 128 /* KeyOfKeyword */,
-        "let": 110 /* LetKeyword */,
-        "module": 129 /* ModuleKeyword */,
-        "namespace": 130 /* NamespaceKeyword */,
-        "never": 131 /* NeverKeyword */,
-        "new": 94 /* NewKeyword */,
-        "null": 95 /* NullKeyword */,
-        "number": 134 /* NumberKeyword */,
-        "object": 135 /* ObjectKeyword */,
-        "package": 111 /* PackageKeyword */,
-        "private": 112 /* PrivateKeyword */,
-        "protected": 113 /* ProtectedKeyword */,
-        "public": 114 /* PublicKeyword */,
-        "readonly": 132 /* ReadonlyKeyword */,
-        "require": 133 /* RequireKeyword */,
-        "global": 144 /* GlobalKeyword */,
-        "return": 96 /* ReturnKeyword */,
-        "set": 136 /* SetKeyword */,
-        "static": 115 /* StaticKeyword */,
-        "string": 137 /* StringKeyword */,
-        "super": 97 /* SuperKeyword */,
-        "switch": 98 /* SwitchKeyword */,
-        "symbol": 138 /* SymbolKeyword */,
-        "this": 99 /* ThisKeyword */,
-        "throw": 100 /* ThrowKeyword */,
-        "true": 101 /* TrueKeyword */,
-        "try": 102 /* TryKeyword */,
-        "type": 139 /* TypeKeyword */,
-        "typeof": 103 /* TypeOfKeyword */,
-        "undefined": 140 /* UndefinedKeyword */,
-        "unique": 141 /* UniqueKeyword */,
-        "unknown": 142 /* UnknownKeyword */,
-        "var": 104 /* VarKeyword */,
-        "void": 105 /* VoidKeyword */,
-        "while": 106 /* WhileKeyword */,
-        "with": 107 /* WithKeyword */,
-        "yield": 116 /* YieldKeyword */,
-        "async": 120 /* AsyncKeyword */,
-        "await": 121 /* AwaitKeyword */,
-        "of": 145 /* OfKeyword */,
-        "{": 17 /* OpenBraceToken */,
-        "}": 18 /* CloseBraceToken */,
-        "(": 19 /* OpenParenToken */,
-        ")": 20 /* CloseParenToken */,
-        "[": 21 /* OpenBracketToken */,
-        "]": 22 /* CloseBracketToken */,
-        ".": 23 /* DotToken */,
-        "...": 24 /* DotDotDotToken */,
-        ";": 25 /* SemicolonToken */,
-        ",": 26 /* CommaToken */,
-        "<": 27 /* LessThanToken */,
-        ">": 29 /* GreaterThanToken */,
-        "<=": 30 /* LessThanEqualsToken */,
-        ">=": 31 /* GreaterThanEqualsToken */,
-        "==": 32 /* EqualsEqualsToken */,
-        "!=": 33 /* ExclamationEqualsToken */,
-        "===": 34 /* EqualsEqualsEqualsToken */,
-        "!==": 35 /* ExclamationEqualsEqualsToken */,
-        "=>": 36 /* EqualsGreaterThanToken */,
-        "+": 37 /* PlusToken */,
-        "-": 38 /* MinusToken */,
-        "**": 40 /* AsteriskAsteriskToken */,
-        "*": 39 /* AsteriskToken */,
-        "/": 41 /* SlashToken */,
-        "%": 42 /* PercentToken */,
-        "++": 43 /* PlusPlusToken */,
-        "--": 44 /* MinusMinusToken */,
-        "<<": 45 /* LessThanLessThanToken */,
-        "</": 28 /* LessThanSlashToken */,
-        ">>": 46 /* GreaterThanGreaterThanToken */,
-        ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */,
-        "&": 48 /* AmpersandToken */,
-        "|": 49 /* BarToken */,
-        "^": 50 /* CaretToken */,
-        "!": 51 /* ExclamationToken */,
-        "~": 52 /* TildeToken */,
-        "&&": 53 /* AmpersandAmpersandToken */,
-        "||": 54 /* BarBarToken */,
-        "?": 55 /* QuestionToken */,
-        ":": 56 /* ColonToken */,
-        "=": 58 /* EqualsToken */,
-        "+=": 59 /* PlusEqualsToken */,
-        "-=": 60 /* MinusEqualsToken */,
-        "*=": 61 /* AsteriskEqualsToken */,
-        "**=": 62 /* AsteriskAsteriskEqualsToken */,
-        "/=": 63 /* SlashEqualsToken */,
-        "%=": 64 /* PercentEqualsToken */,
-        "<<=": 65 /* LessThanLessThanEqualsToken */,
-        ">>=": 66 /* GreaterThanGreaterThanEqualsToken */,
-        ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */,
-        "&=": 68 /* AmpersandEqualsToken */,
-        "|=": 69 /* BarEqualsToken */,
-        "^=": 70 /* CaretEqualsToken */,
-        "@": 57 /* AtToken */,
-    });
+    var textToKeywordObj = (_a = {
+            abstract: 117 /* AbstractKeyword */,
+            any: 119 /* AnyKeyword */,
+            as: 118 /* AsKeyword */,
+            boolean: 122 /* BooleanKeyword */,
+            break: 72 /* BreakKeyword */,
+            case: 73 /* CaseKeyword */,
+            catch: 74 /* CatchKeyword */,
+            class: 75 /* ClassKeyword */,
+            continue: 77 /* ContinueKeyword */,
+            const: 76 /* ConstKeyword */
+        },
+        _a["" + "constructor"] = 123 /* ConstructorKeyword */,
+        _a.debugger = 78 /* DebuggerKeyword */,
+        _a.declare = 124 /* DeclareKeyword */,
+        _a.default = 79 /* DefaultKeyword */,
+        _a.delete = 80 /* DeleteKeyword */,
+        _a.do = 81 /* DoKeyword */,
+        _a.else = 82 /* ElseKeyword */,
+        _a.enum = 83 /* EnumKeyword */,
+        _a.export = 84 /* ExportKeyword */,
+        _a.extends = 85 /* ExtendsKeyword */,
+        _a.false = 86 /* FalseKeyword */,
+        _a.finally = 87 /* FinallyKeyword */,
+        _a.for = 88 /* ForKeyword */,
+        _a.from = 143 /* FromKeyword */,
+        _a.function = 89 /* FunctionKeyword */,
+        _a.get = 125 /* GetKeyword */,
+        _a.if = 90 /* IfKeyword */,
+        _a.implements = 108 /* ImplementsKeyword */,
+        _a.import = 91 /* ImportKeyword */,
+        _a.in = 92 /* InKeyword */,
+        _a.infer = 126 /* InferKeyword */,
+        _a.instanceof = 93 /* InstanceOfKeyword */,
+        _a.interface = 109 /* InterfaceKeyword */,
+        _a.is = 127 /* IsKeyword */,
+        _a.keyof = 128 /* KeyOfKeyword */,
+        _a.let = 110 /* LetKeyword */,
+        _a.module = 129 /* ModuleKeyword */,
+        _a.namespace = 130 /* NamespaceKeyword */,
+        _a.never = 131 /* NeverKeyword */,
+        _a.new = 94 /* NewKeyword */,
+        _a.null = 95 /* NullKeyword */,
+        _a.number = 134 /* NumberKeyword */,
+        _a.object = 135 /* ObjectKeyword */,
+        _a.package = 111 /* PackageKeyword */,
+        _a.private = 112 /* PrivateKeyword */,
+        _a.protected = 113 /* ProtectedKeyword */,
+        _a.public = 114 /* PublicKeyword */,
+        _a.readonly = 132 /* ReadonlyKeyword */,
+        _a.require = 133 /* RequireKeyword */,
+        _a.global = 144 /* GlobalKeyword */,
+        _a.return = 96 /* ReturnKeyword */,
+        _a.set = 136 /* SetKeyword */,
+        _a.static = 115 /* StaticKeyword */,
+        _a.string = 137 /* StringKeyword */,
+        _a.super = 97 /* SuperKeyword */,
+        _a.switch = 98 /* SwitchKeyword */,
+        _a.symbol = 138 /* SymbolKeyword */,
+        _a.this = 99 /* ThisKeyword */,
+        _a.throw = 100 /* ThrowKeyword */,
+        _a.true = 101 /* TrueKeyword */,
+        _a.try = 102 /* TryKeyword */,
+        _a.type = 139 /* TypeKeyword */,
+        _a.typeof = 103 /* TypeOfKeyword */,
+        _a.undefined = 140 /* UndefinedKeyword */,
+        _a.unique = 141 /* UniqueKeyword */,
+        _a.unknown = 142 /* UnknownKeyword */,
+        _a.var = 104 /* VarKeyword */,
+        _a.void = 105 /* VoidKeyword */,
+        _a.while = 106 /* WhileKeyword */,
+        _a.with = 107 /* WithKeyword */,
+        _a.yield = 116 /* YieldKeyword */,
+        _a.async = 120 /* AsyncKeyword */,
+        _a.await = 121 /* AwaitKeyword */,
+        _a.of = 145 /* OfKeyword */,
+        _a);
+    var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 17 /* OpenBraceToken */, "}": 18 /* CloseBraceToken */, "(": 19 /* OpenParenToken */, ")": 20 /* CloseParenToken */, "[": 21 /* OpenBracketToken */, "]": 22 /* CloseBracketToken */, ".": 23 /* DotToken */, "...": 24 /* DotDotDotToken */, ";": 25 /* SemicolonToken */, ",": 26 /* CommaToken */, "<": 27 /* LessThanToken */, ">": 29 /* GreaterThanToken */, "<=": 30 /* LessThanEqualsToken */, ">=": 31 /* GreaterThanEqualsToken */, "==": 32 /* EqualsEqualsToken */, "!=": 33 /* ExclamationEqualsToken */, "===": 34 /* EqualsEqualsEqualsToken */, "!==": 35 /* ExclamationEqualsEqualsToken */, "=>": 36 /* EqualsGreaterThanToken */, "+": 37 /* PlusToken */, "-": 38 /* MinusToken */, "**": 40 /* AsteriskAsteriskToken */, "*": 39 /* AsteriskToken */, "/": 41 /* SlashToken */, "%": 42 /* PercentToken */, "++": 43 /* PlusPlusToken */, "--": 44 /* MinusMinusToken */, "<<": 45 /* LessThanLessThanToken */, "</": 28 /* LessThanSlashToken */, ">>": 46 /* GreaterThanGreaterThanToken */, ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */, "&": 48 /* AmpersandToken */, "|": 49 /* BarToken */, "^": 50 /* CaretToken */, "!": 51 /* ExclamationToken */, "~": 52 /* TildeToken */, "&&": 53 /* AmpersandAmpersandToken */, "||": 54 /* BarBarToken */, "?": 55 /* QuestionToken */, ":": 56 /* ColonToken */, "=": 58 /* EqualsToken */, "+=": 59 /* PlusEqualsToken */, "-=": 60 /* MinusEqualsToken */, "*=": 61 /* AsteriskEqualsToken */, "**=": 62 /* AsteriskAsteriskEqualsToken */, "/=": 63 /* SlashEqualsToken */, "%=": 64 /* PercentEqualsToken */, "<<=": 65 /* LessThanLessThanEqualsToken */, ">>=": 66 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 68 /* AmpersandEqualsToken */, "|=": 69 /* BarEqualsToken */, "^=": 70 /* CaretEqualsToken */, "@": 57 /* AtToken */ }));
    /*
        As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
        IdentifierStart ::
@@ -7226,9 +7176,9 @@ var ts;
            if (len >= 2 && len <= 11) {
                var ch = tokenValue.charCodeAt(0);
                if (ch >= 97 /* a */ && ch <= 122 /* z */) {
-                    token = textToToken.get(tokenValue);
-                    if (token !== undefined) {
-                        return token;
+                    var keyword = textToKeyword.get(tokenValue);
+                    if (keyword !== undefined) {
+                        return token = keyword;
                    }
                }
            }
@@ -7908,7 +7858,7 @@ var ts;
                    pos++;
                }
                tokenValue = text.substring(tokenPos, pos);
-                return token = 71 /* Identifier */;
+                return token = getIdentifierToken();
            }
            else {
                return token = 0 /* Unknown */;
@@ -21422,7 +21372,7 @@ var ts;
            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
            // Parses out a JSDoc type expression.
            function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(281 /* JSDocTypeExpression */, scanner.getTokenPos());
+                var result = createNode(281 /* JSDocTypeExpression */);
                var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(17 /* OpenBraceToken */);
                result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                if (!mayOmitBraces || hasBrace) {
@@ -21617,7 +21567,7 @@ var ts;
                        nextJSDocToken();
                    }
                }
-                function skipWhitespaceOrAsterisk(next) {
+                function skipWhitespaceOrAsterisk() {
                    if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
@@ -21631,7 +21581,7 @@ var ts;
                        else if (token() === 39 /* AsteriskToken */) {
                            precedingLineBreak = false;
                        }
-                        next();
+                        nextJSDocToken();
                    }
                }
                function parseTag(indent) {
@@ -21639,9 +21589,8 @@ var ts;
                    var atToken = createNode(57 /* AtToken */, scanner.getTokenPos());
                    atToken.end = scanner.getTextPos();
                    nextJSDocToken();
-                    // Use 'nextToken' instead of 'nextJsDocToken' so we can parse a type like 'number' in `@enum number`
-                    var tagName = parseJSDocIdentifierName(/*message*/ undefined, nextToken);
-                    skipWhitespaceOrAsterisk(nextToken);
+                    var tagName = parseJSDocIdentifierName(/*message*/ undefined);
+                    skipWhitespaceOrAsterisk();
                    var tag;
                    switch (tagName.escapedText) {
                        case "augments":
@@ -21778,7 +21727,7 @@ var ts;
                    tagsEnd = tag.end;
                }
                function tryParseTypeExpression() {
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    return token() === 17 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                }
                function parseBracketNameInPropertyAndParamTag() {
@@ -21812,7 +21761,7 @@ var ts;
                function parseParameterOrPropertyTag(atToken, tagName, target, indent) {
                    var typeExpression = tryParseTypeExpression();
                    var isNameFirst = !typeExpression;
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
                    skipWhitespace();
                    if (isNameFirst) {
@@ -21931,7 +21880,7 @@ var ts;
                }
                function parseTypedefTag(atToken, tagName, indent) {
                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var typedefTag = createNode(302 /* JSDocTypedefTag */, atToken.pos);
                    typedefTag.atToken = atToken;
                    typedefTag.tagName = tagName;
@@ -22164,8 +22113,7 @@ var ts;
                    }
                    return entity;
                }
-                function parseJSDocIdentifierName(message, next) {
-                    if (next === void 0) { next = nextJSDocToken; }
+                function parseJSDocIdentifierName(message) {
                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
                        return createMissingNode(71 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                    }
@@ -22174,7 +22122,7 @@ var ts;
                    var result = createNode(71 /* Identifier */, pos);
                    result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                    finishNode(result, end);
-                    next();
+                    nextJSDocToken();
                    return result;
                }
            }
@@ -23851,7 +23799,7 @@ var ts;
                                    i++;
                                    break;
                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    var result = parseListTypeOption(opt, args[i], errors); // tslint:disable-line no-unnecessary-type-assertion
                                    options[opt.name] = result || [];
                                    if (result) {
                                        i++;
@@ -24385,7 +24333,7 @@ var ts;
                return undefined;
            }
            else if (optionDefinition.type === "list") {
-                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+                return getCustomTypeMapOfCommandLineOption(optionDefinition.element); // tslint:disable-line no-unnecessary-type-assertion
            }
            else {
                return optionDefinition.type;
@@ -24448,7 +24396,7 @@ var ts;
                case "object":
                    return {};
                default:
-                    return option.type.keys().next().value;
+                    return option.type.keys().next().value; // tslint:disable-line no-unnecessary-type-assertion
            }
        }
        function makePadding(paddingLength) {
@@ -24928,7 +24876,7 @@ var ts;
        if (isNullOrUndefined(value))
            return undefined;
        if (option.type === "list") {
-            var listOption_1 = option;
+            var listOption_1 = option; // tslint:disable-line no-unnecessary-type-assertion
            if (listOption_1.element.isFilePath || !ts.isString(listOption_1.element.type)) {
                return ts.filter(ts.map(value, function (v) { return normalizeOptionValue(listOption_1.element, basePath, v); }), function (v) { return !!v; });
            }
@@ -25272,7 +25220,7 @@ var ts;
            case "boolean":
                return typeof value === "boolean" ? value : "";
            case "list":
-                var elementType_1 = option.element;
+                var elementType_1 = option.element; // tslint:disable-line no-unnecessary-type-assertion
                return ts.isArray(value) ? value.map(function (v) { return getOptionValueWithEmptyStrings(v, elementType_1); }) : "";
            default:
                return ts.forEachEntry(option.type, function (optionEnumValue, optionStringValue) {
@@ -98459,7 +98407,7 @@ var ts;
                case "compilerOptions":
                    forEachProperty(property.initializer, function (property, propertyName) {
                        var option = ts.getOptionFromName(propertyName);
-                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) {
+                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) { // tslint:disable-line no-unnecessary-type-assertion
                            updatePaths(property);
                        }
                        else if (propertyName === "paths") {
@@ -88,7 +88,7 @@ var ts;
    // If changing the text in this section, be sure to test `configureNightly` too.
    ts.versionMajorMinor = "3.1";
    /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".3";
+    ts.version = ts.versionMajorMinor + ".4";
 })(ts || (ts = {}));
 (function (ts) {
    /* @internal */
@@ -6094,6 +6094,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
    /* @internal */
    function tokenIsIdentifierOrKeyword(token) {
        return token >= 71 /* Identifier */;
@@ -6104,136 +6105,85 @@ var ts;
        return token === 29 /* GreaterThanToken */ || tokenIsIdentifierOrKeyword(token);
    }
    ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
-    var textToToken = ts.createMapFromTemplate({
-        "abstract": 117 /* AbstractKeyword */,
-        "any": 119 /* AnyKeyword */,
-        "as": 118 /* AsKeyword */,
-        "boolean": 122 /* BooleanKeyword */,
-        "break": 72 /* BreakKeyword */,
-        "case": 73 /* CaseKeyword */,
-        "catch": 74 /* CatchKeyword */,
-        "class": 75 /* ClassKeyword */,
-        "continue": 77 /* ContinueKeyword */,
-        "const": 76 /* ConstKeyword */,
-        "constructor": 123 /* ConstructorKeyword */,
-        "debugger": 78 /* DebuggerKeyword */,
-        "declare": 124 /* DeclareKeyword */,
-        "default": 79 /* DefaultKeyword */,
-        "delete": 80 /* DeleteKeyword */,
-        "do": 81 /* DoKeyword */,
-        "else": 82 /* ElseKeyword */,
-        "enum": 83 /* EnumKeyword */,
-        "export": 84 /* ExportKeyword */,
-        "extends": 85 /* ExtendsKeyword */,
-        "false": 86 /* FalseKeyword */,
-        "finally": 87 /* FinallyKeyword */,
-        "for": 88 /* ForKeyword */,
-        "from": 143 /* FromKeyword */,
-        "function": 89 /* FunctionKeyword */,
-        "get": 125 /* GetKeyword */,
-        "if": 90 /* IfKeyword */,
-        "implements": 108 /* ImplementsKeyword */,
-        "import": 91 /* ImportKeyword */,
-        "in": 92 /* InKeyword */,
-        "infer": 126 /* InferKeyword */,
-        "instanceof": 93 /* InstanceOfKeyword */,
-        "interface": 109 /* InterfaceKeyword */,
-        "is": 127 /* IsKeyword */,
-        "keyof": 128 /* KeyOfKeyword */,
-        "let": 110 /* LetKeyword */,
-        "module": 129 /* ModuleKeyword */,
-        "namespace": 130 /* NamespaceKeyword */,
-        "never": 131 /* NeverKeyword */,
-        "new": 94 /* NewKeyword */,
-        "null": 95 /* NullKeyword */,
-        "number": 134 /* NumberKeyword */,
-        "object": 135 /* ObjectKeyword */,
-        "package": 111 /* PackageKeyword */,
-        "private": 112 /* PrivateKeyword */,
-        "protected": 113 /* ProtectedKeyword */,
-        "public": 114 /* PublicKeyword */,
-        "readonly": 132 /* ReadonlyKeyword */,
-        "require": 133 /* RequireKeyword */,
-        "global": 144 /* GlobalKeyword */,
-        "return": 96 /* ReturnKeyword */,
-        "set": 136 /* SetKeyword */,
-        "static": 115 /* StaticKeyword */,
-        "string": 137 /* StringKeyword */,
-        "super": 97 /* SuperKeyword */,
-        "switch": 98 /* SwitchKeyword */,
-        "symbol": 138 /* SymbolKeyword */,
-        "this": 99 /* ThisKeyword */,
-        "throw": 100 /* ThrowKeyword */,
-        "true": 101 /* TrueKeyword */,
-        "try": 102 /* TryKeyword */,
-        "type": 139 /* TypeKeyword */,
-        "typeof": 103 /* TypeOfKeyword */,
-        "undefined": 140 /* UndefinedKeyword */,
-        "unique": 141 /* UniqueKeyword */,
-        "unknown": 142 /* UnknownKeyword */,
-        "var": 104 /* VarKeyword */,
-        "void": 105 /* VoidKeyword */,
-        "while": 106 /* WhileKeyword */,
-        "with": 107 /* WithKeyword */,
-        "yield": 116 /* YieldKeyword */,
-        "async": 120 /* AsyncKeyword */,
-        "await": 121 /* AwaitKeyword */,
-        "of": 145 /* OfKeyword */,
-        "{": 17 /* OpenBraceToken */,
-        "}": 18 /* CloseBraceToken */,
-        "(": 19 /* OpenParenToken */,
-        ")": 20 /* CloseParenToken */,
-        "[": 21 /* OpenBracketToken */,
-        "]": 22 /* CloseBracketToken */,
-        ".": 23 /* DotToken */,
-        "...": 24 /* DotDotDotToken */,
-        ";": 25 /* SemicolonToken */,
-        ",": 26 /* CommaToken */,
-        "<": 27 /* LessThanToken */,
-        ">": 29 /* GreaterThanToken */,
-        "<=": 30 /* LessThanEqualsToken */,
-        ">=": 31 /* GreaterThanEqualsToken */,
-        "==": 32 /* EqualsEqualsToken */,
-        "!=": 33 /* ExclamationEqualsToken */,
-        "===": 34 /* EqualsEqualsEqualsToken */,
-        "!==": 35 /* ExclamationEqualsEqualsToken */,
-        "=>": 36 /* EqualsGreaterThanToken */,
-        "+": 37 /* PlusToken */,
-        "-": 38 /* MinusToken */,
-        "**": 40 /* AsteriskAsteriskToken */,
-        "*": 39 /* AsteriskToken */,
-        "/": 41 /* SlashToken */,
-        "%": 42 /* PercentToken */,
-        "++": 43 /* PlusPlusToken */,
-        "--": 44 /* MinusMinusToken */,
-        "<<": 45 /* LessThanLessThanToken */,
-        "</": 28 /* LessThanSlashToken */,
-        ">>": 46 /* GreaterThanGreaterThanToken */,
-        ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */,
-        "&": 48 /* AmpersandToken */,
-        "|": 49 /* BarToken */,
-        "^": 50 /* CaretToken */,
-        "!": 51 /* ExclamationToken */,
-        "~": 52 /* TildeToken */,
-        "&&": 53 /* AmpersandAmpersandToken */,
-        "||": 54 /* BarBarToken */,
-        "?": 55 /* QuestionToken */,
-        ":": 56 /* ColonToken */,
-        "=": 58 /* EqualsToken */,
-        "+=": 59 /* PlusEqualsToken */,
-        "-=": 60 /* MinusEqualsToken */,
-        "*=": 61 /* AsteriskEqualsToken */,
-        "**=": 62 /* AsteriskAsteriskEqualsToken */,
-        "/=": 63 /* SlashEqualsToken */,
-        "%=": 64 /* PercentEqualsToken */,
-        "<<=": 65 /* LessThanLessThanEqualsToken */,
-        ">>=": 66 /* GreaterThanGreaterThanEqualsToken */,
-        ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */,
-        "&=": 68 /* AmpersandEqualsToken */,
-        "|=": 69 /* BarEqualsToken */,
-        "^=": 70 /* CaretEqualsToken */,
-        "@": 57 /* AtToken */,
-    });
+    var textToKeywordObj = (_a = {
+            abstract: 117 /* AbstractKeyword */,
+            any: 119 /* AnyKeyword */,
+            as: 118 /* AsKeyword */,
+            boolean: 122 /* BooleanKeyword */,
+            break: 72 /* BreakKeyword */,
+            case: 73 /* CaseKeyword */,
+            catch: 74 /* CatchKeyword */,
+            class: 75 /* ClassKeyword */,
+            continue: 77 /* ContinueKeyword */,
+            const: 76 /* ConstKeyword */
+        },
+        _a["" + "constructor"] = 123 /* ConstructorKeyword */,
+        _a.debugger = 78 /* DebuggerKeyword */,
+        _a.declare = 124 /* DeclareKeyword */,
+        _a.default = 79 /* DefaultKeyword */,
+        _a.delete = 80 /* DeleteKeyword */,
+        _a.do = 81 /* DoKeyword */,
+        _a.else = 82 /* ElseKeyword */,
+        _a.enum = 83 /* EnumKeyword */,
+        _a.export = 84 /* ExportKeyword */,
+        _a.extends = 85 /* ExtendsKeyword */,
+        _a.false = 86 /* FalseKeyword */,
+        _a.finally = 87 /* FinallyKeyword */,
+        _a.for = 88 /* ForKeyword */,
+        _a.from = 143 /* FromKeyword */,
+        _a.function = 89 /* FunctionKeyword */,
+        _a.get = 125 /* GetKeyword */,
+        _a.if = 90 /* IfKeyword */,
+        _a.implements = 108 /* ImplementsKeyword */,
+        _a.import = 91 /* ImportKeyword */,
+        _a.in = 92 /* InKeyword */,
+        _a.infer = 126 /* InferKeyword */,
+        _a.instanceof = 93 /* InstanceOfKeyword */,
+        _a.interface = 109 /* InterfaceKeyword */,
+        _a.is = 127 /* IsKeyword */,
+        _a.keyof = 128 /* KeyOfKeyword */,
+        _a.let = 110 /* LetKeyword */,
+        _a.module = 129 /* ModuleKeyword */,
+        _a.namespace = 130 /* NamespaceKeyword */,
+        _a.never = 131 /* NeverKeyword */,
+        _a.new = 94 /* NewKeyword */,
+        _a.null = 95 /* NullKeyword */,
+        _a.number = 134 /* NumberKeyword */,
+        _a.object = 135 /* ObjectKeyword */,
+        _a.package = 111 /* PackageKeyword */,
+        _a.private = 112 /* PrivateKeyword */,
+        _a.protected = 113 /* ProtectedKeyword */,
+        _a.public = 114 /* PublicKeyword */,
+        _a.readonly = 132 /* ReadonlyKeyword */,
+        _a.require = 133 /* RequireKeyword */,
+        _a.global = 144 /* GlobalKeyword */,
+        _a.return = 96 /* ReturnKeyword */,
+        _a.set = 136 /* SetKeyword */,
+        _a.static = 115 /* StaticKeyword */,
+        _a.string = 137 /* StringKeyword */,
+        _a.super = 97 /* SuperKeyword */,
+        _a.switch = 98 /* SwitchKeyword */,
+        _a.symbol = 138 /* SymbolKeyword */,
+        _a.this = 99 /* ThisKeyword */,
+        _a.throw = 100 /* ThrowKeyword */,
+        _a.true = 101 /* TrueKeyword */,
+        _a.try = 102 /* TryKeyword */,
+        _a.type = 139 /* TypeKeyword */,
+        _a.typeof = 103 /* TypeOfKeyword */,
+        _a.undefined = 140 /* UndefinedKeyword */,
+        _a.unique = 141 /* UniqueKeyword */,
+        _a.unknown = 142 /* UnknownKeyword */,
+        _a.var = 104 /* VarKeyword */,
+        _a.void = 105 /* VoidKeyword */,
+        _a.while = 106 /* WhileKeyword */,
+        _a.with = 107 /* WithKeyword */,
+        _a.yield = 116 /* YieldKeyword */,
+        _a.async = 120 /* AsyncKeyword */,
+        _a.await = 121 /* AwaitKeyword */,
+        _a.of = 145 /* OfKeyword */,
+        _a);
+    var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 17 /* OpenBraceToken */, "}": 18 /* CloseBraceToken */, "(": 19 /* OpenParenToken */, ")": 20 /* CloseParenToken */, "[": 21 /* OpenBracketToken */, "]": 22 /* CloseBracketToken */, ".": 23 /* DotToken */, "...": 24 /* DotDotDotToken */, ";": 25 /* SemicolonToken */, ",": 26 /* CommaToken */, "<": 27 /* LessThanToken */, ">": 29 /* GreaterThanToken */, "<=": 30 /* LessThanEqualsToken */, ">=": 31 /* GreaterThanEqualsToken */, "==": 32 /* EqualsEqualsToken */, "!=": 33 /* ExclamationEqualsToken */, "===": 34 /* EqualsEqualsEqualsToken */, "!==": 35 /* ExclamationEqualsEqualsToken */, "=>": 36 /* EqualsGreaterThanToken */, "+": 37 /* PlusToken */, "-": 38 /* MinusToken */, "**": 40 /* AsteriskAsteriskToken */, "*": 39 /* AsteriskToken */, "/": 41 /* SlashToken */, "%": 42 /* PercentToken */, "++": 43 /* PlusPlusToken */, "--": 44 /* MinusMinusToken */, "<<": 45 /* LessThanLessThanToken */, "</": 28 /* LessThanSlashToken */, ">>": 46 /* GreaterThanGreaterThanToken */, ">>>": 47 /* GreaterThanGreaterThanGreaterThanToken */, "&": 48 /* AmpersandToken */, "|": 49 /* BarToken */, "^": 50 /* CaretToken */, "!": 51 /* ExclamationToken */, "~": 52 /* TildeToken */, "&&": 53 /* AmpersandAmpersandToken */, "||": 54 /* BarBarToken */, "?": 55 /* QuestionToken */, ":": 56 /* ColonToken */, "=": 58 /* EqualsToken */, "+=": 59 /* PlusEqualsToken */, "-=": 60 /* MinusEqualsToken */, "*=": 61 /* AsteriskEqualsToken */, "**=": 62 /* AsteriskAsteriskEqualsToken */, "/=": 63 /* SlashEqualsToken */, "%=": 64 /* PercentEqualsToken */, "<<=": 65 /* LessThanLessThanEqualsToken */, ">>=": 66 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 67 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 68 /* AmpersandEqualsToken */, "|=": 69 /* BarEqualsToken */, "^=": 70 /* CaretEqualsToken */, "@": 57 /* AtToken */ }));
    /*
        As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
        IdentifierStart ::
@@ -7239,9 +7189,9 @@ var ts;
            if (len >= 2 && len <= 11) {
                var ch = tokenValue.charCodeAt(0);
                if (ch >= 97 /* a */ && ch <= 122 /* z */) {
-                    token = textToToken.get(tokenValue);
-                    if (token !== undefined) {
-                        return token;
+                    var keyword = textToKeyword.get(tokenValue);
+                    if (keyword !== undefined) {
+                        return token = keyword;
                    }
                }
            }
@@ -7921,7 +7871,7 @@ var ts;
                    pos++;
                }
                tokenValue = text.substring(tokenPos, pos);
-                return token = 71 /* Identifier */;
+                return token = getIdentifierToken();
            }
            else {
                return token = 0 /* Unknown */;
@@ -21435,7 +21385,7 @@ var ts;
            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
            // Parses out a JSDoc type expression.
            function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(281 /* JSDocTypeExpression */, scanner.getTokenPos());
+                var result = createNode(281 /* JSDocTypeExpression */);
                var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(17 /* OpenBraceToken */);
                result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                if (!mayOmitBraces || hasBrace) {
@@ -21630,7 +21580,7 @@ var ts;
                        nextJSDocToken();
                    }
                }
-                function skipWhitespaceOrAsterisk(next) {
+                function skipWhitespaceOrAsterisk() {
                    if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
@@ -21644,7 +21594,7 @@ var ts;
                        else if (token() === 39 /* AsteriskToken */) {
                            precedingLineBreak = false;
                        }
-                        next();
+                        nextJSDocToken();
                    }
                }
                function parseTag(indent) {
@@ -21652,9 +21602,8 @@ var ts;
                    var atToken = createNode(57 /* AtToken */, scanner.getTokenPos());
                    atToken.end = scanner.getTextPos();
                    nextJSDocToken();
-                    // Use 'nextToken' instead of 'nextJsDocToken' so we can parse a type like 'number' in `@enum number`
-                    var tagName = parseJSDocIdentifierName(/*message*/ undefined, nextToken);
-                    skipWhitespaceOrAsterisk(nextToken);
+                    var tagName = parseJSDocIdentifierName(/*message*/ undefined);
+                    skipWhitespaceOrAsterisk();
                    var tag;
                    switch (tagName.escapedText) {
                        case "augments":
@@ -21791,7 +21740,7 @@ var ts;
                    tagsEnd = tag.end;
                }
                function tryParseTypeExpression() {
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    return token() === 17 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                }
                function parseBracketNameInPropertyAndParamTag() {
@@ -21825,7 +21774,7 @@ var ts;
                function parseParameterOrPropertyTag(atToken, tagName, target, indent) {
                    var typeExpression = tryParseTypeExpression();
                    var isNameFirst = !typeExpression;
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
                    skipWhitespace();
                    if (isNameFirst) {
@@ -21944,7 +21893,7 @@ var ts;
                }
                function parseTypedefTag(atToken, tagName, indent) {
                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespaceOrAsterisk(nextJSDocToken);
+                    skipWhitespaceOrAsterisk();
                    var typedefTag = createNode(302 /* JSDocTypedefTag */, atToken.pos);
                    typedefTag.atToken = atToken;
                    typedefTag.tagName = tagName;
@@ -22177,8 +22126,7 @@ var ts;
                    }
                    return entity;
                }
-                function parseJSDocIdentifierName(message, next) {
-                    if (next === void 0) { next = nextJSDocToken; }
+                function parseJSDocIdentifierName(message) {
                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
                        return createMissingNode(71 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                    }
@@ -22187,7 +22135,7 @@ var ts;
                    var result = createNode(71 /* Identifier */, pos);
                    result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                    finishNode(result, end);
-                    next();
+                    nextJSDocToken();
                    return result;
                }
            }
@@ -23864,7 +23812,7 @@ var ts;
                                    i++;
                                    break;
                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    var result = parseListTypeOption(opt, args[i], errors); // tslint:disable-line no-unnecessary-type-assertion
                                    options[opt.name] = result || [];
                                    if (result) {
                                        i++;
@@ -24398,7 +24346,7 @@ var ts;
                return undefined;
            }
            else if (optionDefinition.type === "list") {
-                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+                return getCustomTypeMapOfCommandLineOption(optionDefinition.element); // tslint:disable-line no-unnecessary-type-assertion
            }
            else {
                return optionDefinition.type;
@@ -24461,7 +24409,7 @@ var ts;
                case "object":
                    return {};
                default:
-                    return option.type.keys().next().value;
+                    return option.type.keys().next().value; // tslint:disable-line no-unnecessary-type-assertion
            }
        }
        function makePadding(paddingLength) {
@@ -24941,7 +24889,7 @@ var ts;
        if (isNullOrUndefined(value))
            return undefined;
        if (option.type === "list") {
-            var listOption_1 = option;
+            var listOption_1 = option; // tslint:disable-line no-unnecessary-type-assertion
            if (listOption_1.element.isFilePath || !ts.isString(listOption_1.element.type)) {
                return ts.filter(ts.map(value, function (v) { return normalizeOptionValue(listOption_1.element, basePath, v); }), function (v) { return !!v; });
            }
@@ -25285,7 +25233,7 @@ var ts;
            case "boolean":
                return typeof value === "boolean" ? value : "";
            case "list":
-                var elementType_1 = option.element;
+                var elementType_1 = option.element; // tslint:disable-line no-unnecessary-type-assertion
                return ts.isArray(value) ? value.map(function (v) { return getOptionValueWithEmptyStrings(v, elementType_1); }) : "";
            default:
                return ts.forEachEntry(option.type, function (optionEnumValue, optionStringValue) {