Always cache union and intersection relations

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript",
-    "version": "4.6.0",
+    "version": "4.5.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -676,9 +676,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "16.11.10",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz",
-            "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==",
+            "version": "16.11.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz",
+            "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ==",
             "dev": true
         },
         "@types/node-fetch": {
@@ -1316,9 +1316,9 @@
             "dev": true
         },
         "async": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
-            "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
+            "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==",
             "dev": true
         },
         "async-done": {
@@ -6997,9 +6997,9 @@
             }
         },
         "source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "version": "0.5.20",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+            "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
             "dev": true,
             "requires": {
                 "buffer-from": "^1.0.0",
@@ -8423,9 +8423,9 @@
             },
             "dependencies": {
                 "camelcase": {
-                    "version": "6.2.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-                    "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+                    "version": "6.2.0",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+                    "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
                     "dev": true
                 },
                 "decamelize": {

package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.6.0",
+    "version": "4.5.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [

scripts/build/projects.js

@@ -39,7 +39,7 @@ const execTsc = (lkg, ...args) =>
     exec(process.execPath,
          [resolve(findUpRoot(), lkg ? "./lib/tsc" : "./built/local/tsc"),
           "-b", ...args],
-         { hidePrompt: true });
+         { hidePrompt: true })
 
 const projectBuilder = new ProjectQueue((projects, lkg, force) => execTsc(lkg, ...(force ? ["--force"] : []), ...projects));
 

scripts/open-cherry-pick-pr.ts

@@ -33,9 +33,9 @@ async function main() {
 
     const inputPR = (await gh.pulls.get({ pull_number: +process.env.SOURCE_ISSUE, owner: "microsoft", repo: "TypeScript" })).data;
     let remoteName = "origin";
-    if (inputPR.base.repo.git_url !== `git:github.com/microsoft/TypeScript` && inputPR.base.repo.git_url !== `git://github.com/microsoft/TypeScript`) {
+    if (inputPR.base.repo.git_url !== `git:github.com/microsoft/TypeScript`) {
         runSequence([
-            ["git", ["remote", "add", "nonlocal", inputPR.base.repo.git_url.replace(/^git:(?:\/\/)?/, "https://")]]
+            ["git", ["remote", "add", "nonlocal", inputPR.base.repo.git_url]]
         ]);
         remoteName = "nonlocal";
     }

src/compiler/commandLineParser.ts

@@ -29,7 +29,6 @@ namespace ts {
         ["es2019", "lib.es2019.d.ts"],
         ["es2020", "lib.es2020.d.ts"],
         ["es2021", "lib.es2021.d.ts"],
-        ["es2022", "lib.es2022.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -73,16 +72,12 @@ namespace ts {
         ["es2021.string", "lib.es2021.string.d.ts"],
         ["es2021.weakref", "lib.es2021.weakref.d.ts"],
         ["es2021.intl", "lib.es2021.intl.d.ts"],
-        ["es2022.array", "lib.es2022.array.d.ts"],
-        ["es2022.error", "lib.es2022.error.d.ts"],
-        ["es2022.object", "lib.es2022.object.d.ts"],
-        ["es2022.string", "lib.es2022.string.d.ts"],
-        ["esnext.array", "lib.es2022.array.d.ts"],
+        ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["esnext.intl", "lib.esnext.intl.d.ts"],
         ["esnext.bigint", "lib.es2020.bigint.d.ts"],
-        ["esnext.string", "lib.es2022.string.d.ts"],
+        ["esnext.string", "lib.es2021.string.d.ts"],
         ["esnext.promise", "lib.es2021.promise.d.ts"],
         ["esnext.weakref", "lib.es2021.weakref.d.ts"]
     ];
@@ -319,7 +314,6 @@ namespace ts {
             es2019: ScriptTarget.ES2019,
             es2020: ScriptTarget.ES2020,
             es2021: ScriptTarget.ES2021,
-            es2022: ScriptTarget.ES2022,
             esnext: ScriptTarget.ESNext,
         })),
         affectsSourceFile: true,

src/compiler/core.ts

@@ -23,6 +23,34 @@ namespace ts {
     export const emptyMap: ReadonlyESMap<never, never> = new Map<never, never>();
     export const emptySet: ReadonlySet<never> = new Set<never>();
 
+    /**
+     * Create a new map.
+     * @deprecated Use `new Map()` instead.
+     */
+    export function createMap<K, V>(): ESMap<K, V>;
+    export function createMap<T>(): ESMap<string, T>;
+    export function createMap<K, V>(): ESMap<K, V> {
+        return new Map<K, V>();
+    }
+
+    /**
+     * Create a new map from a template object is provided, the map will copy entries from it.
+     * @deprecated Use `new Map(getEntries(template))` instead.
+     */
+    export function createMapFromTemplate<T>(template: MapLike<T>): ESMap<string, T> {
+        const map: ESMap<string, T> = new Map<string, T>();
+
+        // Copies keys/values from template. Note that for..in will not throw if
+        // template is undefined, and instead will just exit the loop.
+        for (const key in template) {
+            if (hasOwnProperty.call(template, key)) {
+                map.set(key, template[key]);
+            }
+        }
+
+        return map;
+    }
+
     export function length(array: readonly any[] | undefined): number {
         return array ? array.length : 0;
     }

src/compiler/corePublic.ts

@@ -1,7 +1,7 @@
 namespace ts {
     // WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configurePrerelease` too.
-    export const versionMajorMinor = "4.6";
+    export const versionMajorMinor = "4.5";
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types

src/compiler/debug.ts

@@ -171,6 +171,12 @@ namespace ts {
             return value;
         }
 
+        /**
+         * @deprecated Use `checkDefined` to check whether a value is defined inline. Use `assertIsDefined` to check whether
+         * a value is defined at the statement level.
+         */
+        export const assertDefined = checkDefined;
+
         export function assertEachIsDefined<T extends Node>(value: NodeArray<T>, message?: string, stackCrawlMark?: AnyFunction): asserts value is NodeArray<T>;
         export function assertEachIsDefined<T>(value: readonly T[], message?: string, stackCrawlMark?: AnyFunction): asserts value is readonly NonNullable<T>[];
         export function assertEachIsDefined<T>(value: readonly T[], message?: string, stackCrawlMark?: AnyFunction) {
@@ -184,6 +190,12 @@ namespace ts {
             return value;
         }
 
+        /**
+         * @deprecated Use `checkEachDefined` to check whether the elements of an array are defined inline. Use `assertEachIsDefined` to check whether
+         * the elements of an array are defined at the statement level.
+         */
+        export const assertEachDefined = checkEachDefined;
+
         export function assertNever(member: never, message = "Illegal value:", stackCrawlMark?: AnyFunction): never {
             const detail = typeof member === "object" && hasProperty(member, "kind") && hasProperty(member, "pos") && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind((member as Node).kind) : JSON.stringify(member);
             return fail(`${message} ${detail}`, stackCrawlMark || assertNever);
@@ -339,10 +351,6 @@ namespace ts {
             return formatEnum(kind, (ts as any).SyntaxKind, /*isFlags*/ false);
         }
 
-        export function formatSnippetKind(kind: SnippetKind | undefined): string {
-            return formatEnum(kind, (ts as any).SnippetKind, /*isFlags*/ false);
-        }
-
         export function formatNodeFlags(flags: NodeFlags | undefined): string {
             return formatEnum(flags, (ts as any).NodeFlags, /*isFlags*/ true);
         }

src/compiler/diagnosticMessages.json

@@ -924,7 +924,7 @@
         "category": "Error",
         "code": 1323
     },
-    "Dynamic imports only support a second argument when the '--module' option is set to 'esnext' or 'nodenext'.": {
+    "Dynamic imports only support a second argument when the '--module' option is set to 'esnext'.": {
         "category": "Error",
         "code": 1324
     },
@@ -3333,7 +3333,7 @@
         "category": "Error",
         "code": 2820
     },
-    "Import assertions are only supported when the '--module' option is set to 'esnext' or 'nodenext'.": {
+    "Import assertions are only supported when the '--module' option is set to 'esnext'.": {
         "category": "Error",
         "code": 2821
     },
@@ -3345,18 +3345,6 @@
         "category": "Error",
         "code": 2833
     },
-    "Relative import paths need explicit file extensions in EcmaScript imports when '--moduleResolution' is 'node12' or 'nodenext'. Consider adding an extension to the import path.": {
-        "category": "Error",
-        "code": 2834
-    },
-    "Relative import paths need explicit file extensions in EcmaScript imports when '--moduleResolution' is 'node12' or 'nodenext'. Did you mean '{0}'?": {
-        "category": "Error",
-        "code": 2835
-    },
-    "Import assertions are not allowed on statements that transpile to commonjs 'require' calls.": {
-        "category": "Error",
-        "code": 2836
-    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
@@ -3782,11 +3770,6 @@
         "category": "Error",
         "code": 4123
     },
-    "Compiler option '{0}' of value '{1}' is unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
-        "category": "Error",
-        "code": 4124
-    },
-
     "The current host does not support the '{0}' option.": {
         "category": "Error",
         "code": 5001
@@ -6018,10 +6001,6 @@
         "category": "Error",
         "code": 7061
     },
-    "JSON imports are experimental in ES module mode imports.": {
-        "category": "Error",
-        "code": 7062
-    },
 
     "You cannot rename this element.": {
         "category": "Error",
@@ -6437,11 +6416,6 @@
         "category": "Message",
         "code": 90053
     },
-    "Includes imports of types referenced by '{0}'": {
-        "category": "Message",
-        "code": 90054
-    },
-
     "Convert function to an ES2015 class": {
         "category": "Message",
         "code": 95001

src/compiler/emitter.ts

@@ -1283,13 +1283,7 @@ namespace ts {
             currentParenthesizerRule = undefined;
         }
 
-        function pipelineEmitWithHintWorker(hint: EmitHint, node: Node, allowSnippets = true): void {
-            if (allowSnippets) {
-                const snippet = getSnippetElement(node);
-                if (snippet) {
-                    return emitSnippetNode(hint, node, snippet);
-                }
-            }
+        function pipelineEmitWithHintWorker(hint: EmitHint, node: Node): void {
             if (hint === EmitHint.SourceFile) return emitSourceFile(cast(node, isSourceFile));
             if (hint === EmitHint.IdentifierName) return emitIdentifier(cast(node, isIdentifier));
             if (hint === EmitHint.JsxAttributeValue) return emitLiteral(cast(node, isStringLiteral), /*jsxAttributeEscape*/ true);
@@ -1604,7 +1598,6 @@ namespace ts {
                         return emitJSDocSignature(node as JSDocSignature);
                     case SyntaxKind.JSDocTag:
                     case SyntaxKind.JSDocClassTag:
-                    case SyntaxKind.JSDocOverrideTag:
                         return emitJSDocSimpleTag(node as JSDocTag);
                     case SyntaxKind.JSDocAugmentsTag:
                     case SyntaxKind.JSDocImplementsTag:
@@ -1617,6 +1610,7 @@ namespace ts {
                     case SyntaxKind.JSDocPrivateTag:
                     case SyntaxKind.JSDocProtectedTag:
                     case SyntaxKind.JSDocReadonlyTag:
+                    case SyntaxKind.JSDocOverrideTag:
                         return;
                     case SyntaxKind.JSDocCallbackTag:
                         return emitJSDocCallbackTag(node as JSDocCallbackTag);
@@ -1930,32 +1924,6 @@ namespace ts {
             }
         }
 
-        //
-        // Snippet Elements
-        //
-
-        function emitSnippetNode(hint: EmitHint, node: Node, snippet: SnippetElement) {
-            switch (snippet.kind) {
-                case SnippetKind.Placeholder:
-                    emitPlaceholder(hint, node, snippet);
-                    break;
-                case SnippetKind.TabStop:
-                    emitTabStop(snippet);
-                    break;
-            }
-        }
-
-        function emitPlaceholder(hint: EmitHint, node: Node, snippet: Placeholder) {
-            nonEscapingWrite(`\$\{${snippet.order}:`); // `${2:`
-            pipelineEmitWithHintWorker(hint, node, /*allowSnippets*/ false); // `...`
-            nonEscapingWrite(`\}`); // `}`
-            // `${2:...}`
-        }
-
-        function emitTabStop(snippet: TabStop) {
-            nonEscapingWrite(`\$${snippet.order}`);
-        }
-
         //
         // Identifiers
         //
@@ -4489,16 +4457,6 @@ namespace ts {
             writer.writeProperty(s);
         }
 
-        function nonEscapingWrite(s: string) {
-            // This should be defined in a snippet-escaping text writer.
-            if (writer.nonEscapingWrite) {
-                writer.nonEscapingWrite(s);
-            }
-            else {
-                writer.write(s);
-            }
-        }
-
         function writeLine(count = 1) {
             for (let i = 0; i < count; i++) {
                 writer.writeLine(i > 0);

src/compiler/factory/emitNode.ts

@@ -256,24 +256,6 @@ namespace ts {
         }
     }
 
-    /**
-     * Gets the SnippetElement of a node.
-     */
-    /* @internal */
-    export function getSnippetElement(node: Node): SnippetElement | undefined {
-        return node.emitNode?.snippetElement;
-    }
-
-    /**
-     * Sets the SnippetElement of a node.
-     */
-    /* @internal */
-    export function setSnippetElement<T extends Node>(node: T, snippet: SnippetElement): T {
-        const emitNode = getOrCreateEmitNode(node);
-        emitNode.snippetElement = snippet;
-        return node;
-    }
-
     /* @internal */
     export function ignoreSourceNewlines<T extends Node>(node: T): T {
         getOrCreateEmitNode(node).flags |= EmitFlags.IgnoreSourceNewlines;

src/compiler/factory/nodeFactory.ts

@@ -6387,7 +6387,7 @@ namespace ts {
             sourceMapText = mapTextOrStripInternal as string;
         }
         const node = oldFileOfCurrentEmit ?
-            parseOldFileOfCurrentEmit(Debug.checkDefined(bundleFileInfo)) :
+            parseOldFileOfCurrentEmit(Debug.assertDefined(bundleFileInfo)) :
             parseUnparsedSourceFile(bundleFileInfo, stripInternal, length);
         node.fileName = fileName;
         node.sourceMapPath = sourceMapPath;
@@ -6587,13 +6587,13 @@ namespace ts {
             };
             node.javascriptPath = declarationTextOrJavascriptPath;
             node.javascriptMapPath = javascriptMapPath;
-            node.declarationPath = Debug.checkDefined(javascriptMapTextOrDeclarationPath);
+            node.declarationPath = Debug.assertDefined(javascriptMapTextOrDeclarationPath);
             node.declarationMapPath = declarationMapPath;
             node.buildInfoPath = declarationMapTextOrBuildInfoPath;
             Object.defineProperties(node, {
                 javascriptText: { get() { return definedTextGetter(declarationTextOrJavascriptPath); } },
                 javascriptMapText: { get() { return textGetter(javascriptMapPath); } }, // TODO:: if there is inline sourceMap in jsFile, use that
-                declarationText: { get() { return definedTextGetter(Debug.checkDefined(javascriptMapTextOrDeclarationPath)); } },
+                declarationText: { get() { return definedTextGetter(Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } },
                 declarationMapText: { get() { return textGetter(declarationMapPath); } }, // TODO:: if there is inline sourceMap in dtsFile, use that
                 buildInfo: { get() { return getAndCacheBuildInfo(() => textGetter(declarationMapTextOrBuildInfoPath)); } }
             });

src/compiler/moduleSpecifiers.ts

@@ -707,15 +707,13 @@ namespace ts.moduleSpecifiers {
             if (host.fileExists(packageJsonPath)) {
                 const packageJsonContent = JSON.parse(host.readFile!(packageJsonPath)!);
                 // TODO: Inject `require` or `import` condition based on the intended import mode
-                if (getEmitModuleResolutionKind(options) === ModuleResolutionKind.Node12 || getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeNext) {
-                    const fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string" ? tryGetModuleNameFromExports(options, path, packageRootPath, packageJsonContent.name, packageJsonContent.exports, ["node", "types"]) : undefined;
-                    if (fromExports) {
-                        const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
-                        return { ...withJsExtension, verbatimFromExports: true };
-                    }
-                    if (packageJsonContent.exports) {
-                        return { moduleFileToTry: path, blockedByExports: true };
-                    }
+                const fromExports = packageJsonContent.exports && typeof packageJsonContent.name === "string" ? tryGetModuleNameFromExports(options, path, packageRootPath, packageJsonContent.name, packageJsonContent.exports, ["node", "types"]) : undefined;
+                if (fromExports) {
+                    const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+                    return { ...withJsExtension, verbatimFromExports: true };
+                }
+                if (packageJsonContent.exports) {
+                    return { moduleFileToTry: path, blockedByExports: true };
                 }
                 const versionPaths = packageJsonContent.typesVersions
                     ? getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions)

src/compiler/program.ts

@@ -818,25 +818,6 @@ namespace ts {
         }
     }
 
-    /** @internal */
-    export const plainJSErrors: Set<number> = new Set([
-        Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
-        Diagnostics.A_module_cannot_have_multiple_default_exports.code,
-        Diagnostics.Another_export_default_is_here.code,
-        Diagnostics.The_first_export_default_is_here.code,
-        Diagnostics.Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module.code,
-        Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode.code,
-        Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here.code,
-        Diagnostics.constructor_is_a_reserved_word.code,
-        Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode.code,
-        Diagnostics.Code_contained_in_a_class_is_evaluated_in_JavaScript_s_strict_mode_which_does_not_allow_this_use_of_0_For_more_information_see_https_Colon_Slash_Slashdeveloper_mozilla_org_Slashen_US_Slashdocs_SlashWeb_SlashJavaScript_SlashReference_SlashStrict_mode.code,
-        Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode.code,
-        Diagnostics.Invalid_use_of_0_in_strict_mode.code,
-        Diagnostics.A_label_is_not_allowed_here.code,
-        Diagnostics.Octal_literals_are_not_allowed_in_strict_mode.code,
-        Diagnostics.with_statements_are_not_allowed_in_strict_mode.code,
-    ]);
-
     /**
      * Determine if source file needs to be re-created even if its text hasn't changed
      */
@@ -1596,7 +1577,6 @@ namespace ts {
                 newSourceFile.originalFileName = oldSourceFile.originalFileName;
                 newSourceFile.resolvedPath = oldSourceFile.resolvedPath;
                 newSourceFile.fileName = oldSourceFile.fileName;
-                newSourceFile.impliedNodeFormat = oldSourceFile.impliedNodeFormat;
 
                 const packageName = oldProgram.sourceFileToPackageName.get(oldSourceFile.path);
                 if (packageName !== undefined) {
@@ -1694,8 +1674,8 @@ namespace ts {
                 const typesReferenceDirectives = map(newSourceFile.typeReferenceDirectives, ref => toFileNameLowerCase(ref.fileName));
                 const typeReferenceResolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFile);
                 // ensure that types resolutions are still correct
-                const typeReferenceResolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, typeReferenceResolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, oldSourceFile, typeDirectiveIsEqualTo);
-                if (typeReferenceResolutionsChanged) {
+                const typeReferenceEesolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, typeReferenceResolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, oldSourceFile, typeDirectiveIsEqualTo);
+                if (typeReferenceEesolutionsChanged) {
                     structureIsReused = StructureIsReused.SafeModules;
                     newSourceFile.resolvedTypeReferenceDirectiveNames = zipToModeAwareCache(newSourceFile, typesReferenceDirectives, typeReferenceResolutions);
                 }
@@ -2024,24 +2004,15 @@ namespace ts {
 
                 Debug.assert(!!sourceFile.bindDiagnostics);
 
-                const isJs = sourceFile.scriptKind === ScriptKind.JS || sourceFile.scriptKind === ScriptKind.JSX;
-                const isCheckJs = isJs && isCheckJsEnabledForFile(sourceFile, options);
-                const isPlainJs = isJs && !sourceFile.checkJsDirective && options.checkJs === undefined;
+                const isCheckJs = isCheckJsEnabledForFile(sourceFile, options);
                 const isTsNoCheck = !!sourceFile.checkJsDirective && sourceFile.checkJsDirective.enabled === false;
-
-                // By default, only type-check .ts, .tsx, Deferred, plain JS, checked JS and External
-                // - plain JS: .js files with no // ts-check and checkJs: undefined
-                // - check JS: .js files with either // ts-check or checkJs: true
-                // - external: files that are added by plugins
+                // By default, only type-check .ts, .tsx, 'Deferred' and 'External' files (external files are added by plugins)
                 const includeBindAndCheckDiagnostics = !isTsNoCheck && (sourceFile.scriptKind === ScriptKind.TS || sourceFile.scriptKind === ScriptKind.TSX
-                        || sourceFile.scriptKind === ScriptKind.External || isPlainJs || isCheckJs || sourceFile.scriptKind === ScriptKind.Deferred);
-                let bindDiagnostics: readonly Diagnostic[] = includeBindAndCheckDiagnostics ? sourceFile.bindDiagnostics : emptyArray;
-                const checkDiagnostics = includeBindAndCheckDiagnostics && !isPlainJs ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : emptyArray;
-                if (isPlainJs) {
-                    bindDiagnostics = filter(bindDiagnostics, d => plainJSErrors.has(d.code));
-                }
-                // skip ts-expect-error errors in plain JS files, and skip JSDoc errors except in checked JS
-                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics && !isPlainJs, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
+                    || sourceFile.scriptKind === ScriptKind.External || isCheckJs || sourceFile.scriptKind === ScriptKind.Deferred);
+                const bindDiagnostics: readonly Diagnostic[] = includeBindAndCheckDiagnostics ? sourceFile.bindDiagnostics : emptyArray;
+                const checkDiagnostics = includeBindAndCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : emptyArray;
+
+                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
             });
         }
 
@@ -3189,21 +3160,6 @@ namespace ts {
         }
 
         function verifyCompilerOptions() {
-            const isNightly = stringContains(version, "-dev") || stringContains(version, "-insiders");
-            if (!isNightly) {
-                if (getEmitModuleKind(options) === ModuleKind.Node12) {
-                    createOptionValueDiagnostic("module", Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "module", "node12");
-                }
-                else if (getEmitModuleKind(options) === ModuleKind.NodeNext) {
-                    createOptionValueDiagnostic("module", Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "module", "nodenext");
-                }
-                else if (getEmitModuleResolutionKind(options) === ModuleResolutionKind.Node12) {
-                    createOptionValueDiagnostic("moduleResolution", Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "moduleResolution", "node12");
-                }
-                else if (getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeNext) {
-                    createOptionValueDiagnostic("moduleResolution", Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "moduleResolution", "nodenext");
-                }
-            }
             if (options.strictPropertyInitialization && !getStrictOptionValue(options, "strictNullChecks")) {
                 createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "strictPropertyInitialization", "strictNullChecks");
             }
@@ -3377,9 +3333,7 @@ namespace ts {
             }
 
             if (options.resolveJsonModule) {
-                if (getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeJs &&
-                    getEmitModuleResolutionKind(options) !== ModuleResolutionKind.Node12 &&
-                    getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeNext) {
+                if (getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeJs) {
                     createDiagnosticForOptionName(Diagnostics.Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy, "resolveJsonModule");
                 }
                 // Any emit other than common js, amd, es2015 or esnext is error
@@ -3740,8 +3694,8 @@ namespace ts {
             createDiagnosticForOption(/*onKey*/ true, option1, option2, message, option1, option2, option3);
         }
 
-        function createOptionValueDiagnostic(option1: string, message: DiagnosticMessage, arg0?: string, arg1?: string) {
-            createDiagnosticForOption(/*onKey*/ false, option1, /*option2*/ undefined, message, arg0, arg1);
+        function createOptionValueDiagnostic(option1: string, message: DiagnosticMessage, arg0?: string) {
+            createDiagnosticForOption(/*onKey*/ false, option1, /*option2*/ undefined, message, arg0);
         }
 
         function createDiagnosticForReference(sourceFile: JsonSourceFile | undefined, index: number, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number) {

src/compiler/resolutionCache.ts

@@ -66,7 +66,6 @@ namespace ts {
         getCurrentProgram(): Program | undefined;
         fileIsOpen(filePath: Path): boolean;
         getCompilerHost?(): CompilerHost | undefined;
-        onDiscoveredSymlink?(): void;
     }
 
     interface DirectoryWatchesOfFailedLookup {
@@ -432,9 +431,6 @@ namespace ts {
                     else {
                         resolution = loader(name, containingFile, compilerOptions, resolutionHost.getCompilerHost?.() || resolutionHost, redirectedReference, containingSourceFile);
                         perDirectoryResolution.set(name, mode, resolution);
-                        if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
-                            resolutionHost.onDiscoveredSymlink();
-                        }
                     }
                     resolutionsInFile.set(name, mode, resolution);
                     watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName);
@@ -619,7 +615,7 @@ namespace ts {
         ) {
             if (resolution.refCount) {
                 resolution.refCount++;
-                Debug.assertIsDefined(resolution.files);
+                Debug.assertDefined(resolution.files);
             }
             else {
                 resolution.refCount = 1;
@@ -696,7 +692,7 @@ namespace ts {
             filePath: Path,
             getResolutionWithResolvedFileName: GetResolutionWithResolvedFileName<T, R>,
         ) {
-            unorderedRemoveItem(Debug.checkDefined(resolution.files), filePath);
+            unorderedRemoveItem(Debug.assertDefined(resolution.files), filePath);
             resolution.refCount!--;
             if (resolution.refCount) {
                 return;
@@ -798,7 +794,7 @@ namespace ts {
             for (const resolution of resolutions) {
                 if (resolution.isInvalidated || !canInvalidate(resolution)) continue;
                 resolution.isInvalidated = invalidated = true;
-                for (const containingFilePath of Debug.checkDefined(resolution.files)) {
+                for (const containingFilePath of Debug.assertDefined(resolution.files)) {
                     (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = new Set())).add(containingFilePath);
                     // When its a file with inferred types resolution, invalidate type reference directive resolution
                     hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames || endsWith(containingFilePath, inferredTypesContainingFile);
@@ -969,11 +965,4 @@ namespace ts {
             return dirPath === rootPath || canWatchDirectory(dirPath);
         }
     }
-
-    function resolutionIsSymlink(resolution: ResolutionWithFailedLookupLocations) {
-        return !!(
-            (resolution as ResolvedModuleWithFailedLookupLocations).resolvedModule?.originalPath ||
-            (resolution as ResolvedTypeReferenceDirectiveWithFailedLookupLocations).resolvedTypeReferenceDirective?.originalPath
-        );
-    }
 }

src/compiler/scanner.ts

@@ -2374,7 +2374,6 @@ namespace ts {
                     tokenValue = tokenValue.slice(0, -1);
                     pos--;
                 }
-                return getIdentifierToken();
             }
             return token;
         }

src/compiler/sys.ts

@@ -1625,6 +1625,7 @@ namespace ts {
                         sysLog(`sysLog:: ${fileOrDirectory}:: Defaulting to fsWatchFile`);
                         return watchPresentFileSystemEntryWithFsWatchFile();
                     }
+
                     try {
                         const presentWatcher = _fs.watch(
                             fileOrDirectory,
@@ -1803,7 +1804,7 @@ namespace ts {
             }
 
             function readDirectory(path: string, extensions?: readonly string[], excludes?: readonly string[], includes?: readonly string[], depth?: number): string[] {
-                return matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
+                return matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
             }
 
             function fileSystemEntryExists(path: string, entryKind: FileSystemEntryKind): boolean {

src/compiler/transformers/es2018.ts

@@ -282,7 +282,7 @@ namespace ts {
         function visitYieldExpression(node: YieldExpression) {
             if (enclosingFunctionFlags & FunctionFlags.Async && enclosingFunctionFlags & FunctionFlags.Generator) {
                 if (node.asteriskToken) {
-                    const expression = visitNode(Debug.checkDefined(node.expression), visitor, isExpression);
+                    const expression = visitNode(Debug.assertDefined(node.expression), visitor, isExpression);
 
                     return setOriginalNode(
                         setTextRange(

src/compiler/transformers/jsx.ts

@@ -26,12 +26,12 @@ namespace ts {
             return currentFileState.filenameDeclaration.name;
         }
 
-        function getJsxFactoryCalleePrimitive(isStaticChildren: boolean): "jsx" | "jsxs" | "jsxDEV" {
-            return compilerOptions.jsx === JsxEmit.ReactJSXDev ? "jsxDEV" : isStaticChildren ? "jsxs" : "jsx";
+        function getJsxFactoryCalleePrimitive(childrenLength: number): "jsx" | "jsxs" | "jsxDEV" {
+            return compilerOptions.jsx === JsxEmit.ReactJSXDev ? "jsxDEV" : childrenLength > 1 ? "jsxs" : "jsx";
         }
 
-        function getJsxFactoryCallee(isStaticChildren: boolean) {
-            const type = getJsxFactoryCalleePrimitive(isStaticChildren);
+        function getJsxFactoryCallee(childrenLength: number) {
+            const type = getJsxFactoryCalleePrimitive(childrenLength);
             return getImplicitImportForName(type);
         }
 
@@ -48,11 +48,11 @@ namespace ts {
                 return existing.name;
             }
             if (!currentFileState.utilizedImplicitRuntimeImports) {
-                currentFileState.utilizedImplicitRuntimeImports = new Map();
+                currentFileState.utilizedImplicitRuntimeImports = createMap();
             }
             let specifierSourceImports = currentFileState.utilizedImplicitRuntimeImports.get(importSource);
             if (!specifierSourceImports) {
-                specifierSourceImports = new Map();
+                specifierSourceImports = createMap();
                 currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
             }
             const generatedName = factory.createUniqueName(`_${name}`, GeneratedIdentifierFlags.Optimistic | GeneratedIdentifierFlags.FileLevel | GeneratedIdentifierFlags.AllowNameSubstitution);
@@ -206,7 +206,7 @@ namespace ts {
 
         function convertJsxChildrenToChildrenPropAssignment(children: readonly JsxChild[]) {
             const nonWhitespaceChildren = getSemanticJsxChildren(children);
-            if (length(nonWhitespaceChildren) === 1 && !(nonWhitespaceChildren[0] as JsxExpression).dotDotDotToken) {
+            if (length(nonWhitespaceChildren) === 1) {
                 const result = transformJsxChildToExpression(nonWhitespaceChildren[0]);
                 return result && factory.createPropertyAssignment("children", result);
             }
@@ -221,33 +221,16 @@ namespace ts {
             const attrs = keyAttr ? filter(node.attributes.properties, p => p !== keyAttr) : node.attributes.properties;
             const objectProperties = length(attrs) ? transformJsxAttributesToObjectProps(attrs, childrenProp) :
                 factory.createObjectLiteralExpression(childrenProp ? [childrenProp] : emptyArray); // When there are no attributes, React wants {}
-            return visitJsxOpeningLikeElementOrFragmentJSX(
-                tagName,
-                objectProperties,
-                keyAttr,
-                children || emptyArray,
-                isChild,
-                location
-            );
+            return visitJsxOpeningLikeElementOrFragmentJSX(tagName, objectProperties, keyAttr, length(getSemanticJsxChildren(children || emptyArray)), isChild, location);
         }
 
-        function visitJsxOpeningLikeElementOrFragmentJSX(
-            tagName: Expression,
-            objectProperties: Expression,
-            keyAttr: JsxAttribute | undefined,
-            children: readonly JsxChild[],
-            isChild: boolean,
-            location: TextRange
-        ) {
-            const nonWhitespaceChildren = getSemanticJsxChildren(children);
-            const isStaticChildren =
-                length(nonWhitespaceChildren) > 1 || !!(nonWhitespaceChildren[0] as JsxExpression)?.dotDotDotToken;
+        function visitJsxOpeningLikeElementOrFragmentJSX(tagName: Expression, objectProperties: Expression, keyAttr: JsxAttribute | undefined, childrenLength: number, isChild: boolean, location: TextRange) {
             const args: Expression[] = [tagName, objectProperties, !keyAttr ? factory.createVoidZero() : transformJsxAttributeInitializer(keyAttr.initializer)];
             if (compilerOptions.jsx === JsxEmit.ReactJSXDev) {
                 const originalFile = getOriginalNode(currentSourceFile);
                 if (originalFile && isSourceFile(originalFile)) {
                     // isStaticChildren development flag
-                    args.push(isStaticChildren ? factory.createTrue() : factory.createFalse());
+                    args.push(childrenLength > 1 ? factory.createTrue() : factory.createFalse());
                     // __source development flag
                     const lineCol = getLineAndCharacterOfPosition(originalFile, location.pos);
                     args.push(factory.createObjectLiteralExpression([
@@ -259,10 +242,7 @@ namespace ts {
                     args.push(factory.createThis());
                 }
             }
-            const element = setTextRange(
-                factory.createCallExpression(getJsxFactoryCallee(isStaticChildren), /*typeArguments*/ undefined, args),
-                location
-            );
+            const element = setTextRange(factory.createCallExpression(getJsxFactoryCallee(childrenLength), /*typeArguments*/ undefined, args), location);
 
             if (isChild) {
                 startOnNewLine(element);
@@ -314,7 +294,7 @@ namespace ts {
                 getImplicitJsxFragmentReference(),
                 childrenProps || factory.createObjectLiteralExpression([]),
                 /*keyAttr*/ undefined,
-                children,
+                length(getSemanticJsxChildren(children)),
                 isChild,
                 location
             );

src/compiler/types.ts

@@ -1609,7 +1609,7 @@ namespace ts {
     export interface TypePredicateNode extends TypeNode {
         readonly kind: SyntaxKind.TypePredicate;
         readonly parent: SignatureDeclaration | JSDocTypeExpression;
-        readonly assertsModifier?: AssertsKeyword;
+        readonly assertsModifier?: AssertsToken;
         readonly parameterName: Identifier | ThisTypeNode;
         readonly type?: TypeNode;
     }
@@ -1702,7 +1702,7 @@ namespace ts {
 
     export interface MappedTypeNode extends TypeNode, Declaration {
         readonly kind: SyntaxKind.MappedType;
-        readonly readonlyToken?: ReadonlyKeyword | PlusToken | MinusToken;
+        readonly readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
         readonly typeParameter: TypeParameterDeclaration;
         readonly nameType?: TypeNode;
         readonly questionToken?: QuestionToken | PlusToken | MinusToken;
@@ -2756,7 +2756,7 @@ namespace ts {
 
     export interface ForOfStatement extends IterationStatement {
         readonly kind: SyntaxKind.ForOfStatement;
-        readonly awaitModifier?: AwaitKeyword;
+        readonly awaitModifier?: AwaitKeywordToken;
         readonly initializer: ForInitializer;
         readonly expression: Expression;
     }
@@ -4414,14 +4414,6 @@ namespace ts {
         /* @internal */ isDeclarationVisible(node: Declaration | AnyImportSyntax): boolean;
         /* @internal */ isPropertyAccessible(node: Node, isSuper: boolean, isWrite: boolean, containingType: Type, property: Symbol): boolean;
         /* @internal */ getTypeOnlyAliasDeclaration(symbol: Symbol): TypeOnlyAliasDeclaration | undefined;
-        /* @internal */ getMemberOverrideModifierStatus(node: ClassLikeDeclaration, member: ClassElement): MemberOverrideStatus;
-    }
-
-    /* @internal */
-    export const enum MemberOverrideStatus {
-        Ok,
-        NeedsOverride,
-        HasInvalidOverride
     }
 
     /* @internal */
@@ -5083,7 +5075,6 @@ namespace ts {
         ConstructorReferenceInClass              = 0x02000000,  // Binding to a class constructor inside of the class's body.
         ContainsClassWithPrivateIdentifiers      = 0x04000000,  // Marked on all block-scoped containers containing a class with private identifiers.
         ContainsSuperPropertyInStaticInitializer = 0x08000000,  // Marked on all block-scoped containers containing a static initializer with 'super.x' or 'super[x]'.
-        InCheckIdentifier                        = 0x10000000,
     }
 
     /* @internal */
@@ -5107,7 +5098,7 @@ namespace ts {
         jsxNamespace?: Symbol | false;      // Resolved jsx namespace symbol for this node
         jsxImplicitImportContainer?: Symbol | false; // Resolved module symbol the implicit jsx import of this file should refer to
         contextFreeType?: Type;             // Cached context-free type used by the first pass of inference; used when a function's return is partially contextually sensitive
-        deferredNodes?: Set<Node>;          // Set of nodes whose checking has been deferred
+        deferredNodes?: ESMap<NodeId, Node>; // Set of nodes whose checking has been deferred
         capturedBlockScopeBindings?: Symbol[]; // Block-scoped bindings captured beneath this part of an IterationStatement
         outerTypeParameters?: TypeParameter[]; // Outer type parameters of anonymous object type
         isExhaustive?: boolean;             // Is node an exhaustive switch statement
@@ -5188,6 +5179,8 @@ namespace ts {
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         Narrowable = Any | Unknown | StructuredOrInstantiable | StringLike | NumberLike | BigIntLike | BooleanLike | ESSymbol | UniqueESSymbol | NonPrimitive,
+        /* @internal */
+        NotPrimitiveUnion = Any | Unknown | Enum | Void | Never | Object | Intersection | Instantiable,
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
         IncludesMask = Any | Unknown | Primitive | Never | Object | Union | Intersection | NonPrimitive | TemplateLiteral,
@@ -5200,10 +5193,6 @@ namespace ts {
         IncludesWildcard = IndexedAccess,
         /* @internal */
         IncludesEmptyObject = Conditional,
-        /* @internal */
-        IncludesInstantiable = Substitution,
-        /* @internal */
-        NotPrimitiveUnion = Any | Unknown | Enum | Void | Never | Object | Intersection | IncludesInstantiable,
     }
 
     export type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
@@ -5590,7 +5579,6 @@ namespace ts {
     /* @internal */
     export interface SyntheticDefaultModuleType extends Type {
         syntheticType?: Type;
-        defaultOnlyType?: Type;
     }
 
     export interface InstantiableType extends Type {
@@ -5995,7 +5983,7 @@ namespace ts {
     export enum ModuleResolutionKind {
         Classic  = 1,
         NodeJs   = 2,
-        // Starting with node12, node's module resolver has significant departures from traditional cjs resolution
+        // Starting with node12, node's module resolver has significant departures from tranditional cjs resolution
         // to better support ecmascript modules and their use within node - more features are still being added, so
         // we can expect it to change over time, and as such, offer both a `NodeNext` moving resolution target, and a `Node12`
         // version-anchored resolution target
@@ -6268,7 +6256,6 @@ namespace ts {
         ES2019 = 6,
         ES2020 = 7,
         ES2021 = 8,
-        ES2022 = 9,
         ESNext = 99,
         JSON = 100,
         Latest = ESNext,
@@ -6726,16 +6713,15 @@ namespace ts {
         ContainsTypeScript = 1 << 0,
         ContainsJsx = 1 << 1,
         ContainsESNext = 1 << 2,
-        ContainsES2022 = 1 << 3,
-        ContainsES2021 = 1 << 4,
-        ContainsES2020 = 1 << 5,
-        ContainsES2019 = 1 << 6,
-        ContainsES2018 = 1 << 7,
-        ContainsES2017 = 1 << 8,
-        ContainsES2016 = 1 << 9,
-        ContainsES2015 = 1 << 10,
-        ContainsGenerator = 1 << 11,
-        ContainsDestructuringAssignment = 1 << 12,
+        ContainsES2021 = 1 << 3,
+        ContainsES2020 = 1 << 4,
+        ContainsES2019 = 1 << 5,
+        ContainsES2018 = 1 << 6,
+        ContainsES2017 = 1 << 7,
+        ContainsES2016 = 1 << 8,
+        ContainsES2015 = 1 << 9,
+        ContainsGenerator = 1 << 10,
+        ContainsDestructuringAssignment = 1 << 11,
 
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
@@ -6764,7 +6750,6 @@ namespace ts {
         AssertTypeScript = ContainsTypeScript,
         AssertJsx = ContainsJsx,
         AssertESNext = ContainsESNext,
-        AssertES2022 = ContainsES2022,
         AssertES2021 = ContainsES2021,
         AssertES2020 = ContainsES2020,
         AssertES2019 = ContainsES2019,
@@ -6830,31 +6815,6 @@ namespace ts {
         externalHelpers?: boolean;
         helpers?: EmitHelper[];                  // Emit helpers for the node
         startsOnNewLine?: boolean;               // If the node should begin on a new line
-        snippetElement?: SnippetElement;         // Snippet element of the node
-    }
-
-    /* @internal */
-    export type SnippetElement = TabStop | Placeholder;
-
-    /* @internal */
-    export interface TabStop {
-        kind: SnippetKind.TabStop;
-        order: number;
-    }
-
-    /* @internal */
-    export interface Placeholder {
-        kind: SnippetKind.Placeholder;
-        order: number;
-    }
-
-    // Reference: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax
-    /* @internal */
-    export const enum SnippetKind {
-        TabStop,                                // `$1`, `$2`
-        Placeholder,                            // `${1:foo}`
-        Choice,                                 // `${1|one,two,three|}`
-        Variable,                               // `$name`, `${name:default}`
     }
 
     export const enum EmitFlags {
@@ -8317,7 +8277,6 @@ namespace ts {
         hasTrailingComment(): boolean;
         hasTrailingWhitespace(): boolean;
         getTextPosWithWriteLine?(): number;
-        nonEscapingWrite?(text: string): void;
     }
 
     export interface GetEffectiveTypeRootsHost {
@@ -8663,7 +8622,6 @@ namespace ts {
         readonly includeCompletionsWithSnippetText?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
-        readonly includeCompletionsWithClassMemberSnippets?: boolean;
         readonly allowIncompleteCompletions?: boolean;
         readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */

src/compiler/utilities.ts

@@ -20,6 +20,21 @@ namespace ts {
         return undefined;
     }
 
+    /**
+     * Create a new escaped identifier map.
+     * @deprecated Use `new Map<__String, T>()` instead.
+     */
+    export function createUnderscoreEscapedMap<T>(): UnderscoreEscapedMap<T> {
+        return new Map<__String, T>();
+    }
+
+    /**
+     * @deprecated Use `!!map?.size` instead
+     */
+    export function hasEntries(map: ReadonlyCollection<any> | undefined): map is ReadonlyCollection<any> {
+        return !!map && !!map.size;
+    }
+
     export function createSymbolTable(symbols?: readonly Symbol[]): SymbolTable {
         const result = new Map<__String, Symbol>();
         if (symbols) {
@@ -591,7 +606,6 @@ namespace ts {
                 AsyncIterableIterator: emptyArray,
                 AsyncGenerator: emptyArray,
                 AsyncGeneratorFunction: emptyArray,
-                NumberFormat: ["formatToParts"]
             },
             es2019: {
                 Array: ["flat", "flatMap"],
@@ -613,21 +627,8 @@ namespace ts {
                 PromiseConstructor: ["any"],
                 String: ["replaceAll"]
             },
-            es2022: {
-                Array: ["at"],
-                String: ["at"],
-                Int8Array: ["at"],
-                Uint8Array: ["at"],
-                Uint8ClampedArray: ["at"],
-                Int16Array: ["at"],
-                Uint16Array: ["at"],
-                Int32Array: ["at"],
-                Uint32Array: ["at"],
-                Float32Array: ["at"],
-                Float64Array: ["at"],
-                BigInt64Array: ["at"],
-                BigUint64Array: ["at"],
-                ObjectConstructor: ["hasOwn"]
+            esnext: {
+                NumberFormat: ["formatToParts"]
             }
         };
     }
@@ -3160,7 +3161,7 @@ namespace ts {
         return undefined;
     }
 
-    export function isKeyword(token: SyntaxKind): token is KeywordSyntaxKind {
+    export function isKeyword(token: SyntaxKind): boolean {
         return SyntaxKind.FirstKeyword <= token && token <= SyntaxKind.LastKeyword;
     }
 
@@ -3345,7 +3346,7 @@ namespace ts {
         return node.escapedText === "push" || node.escapedText === "unshift";
     }
 
-    export function isParameterDeclaration(node: VariableLikeDeclaration): boolean {
+    export function isParameterDeclaration(node: VariableLikeDeclaration) {
         const root = getRootDeclaration(node);
         return root.kind === SyntaxKind.Parameter;
     }
@@ -6167,8 +6168,6 @@ namespace ts {
             case ModuleKind.ES2020:
             case ModuleKind.ES2022:
             case ModuleKind.ESNext:
-            case ModuleKind.Node12:
-            case ModuleKind.NodeNext:
                 return true;
             default:
                 return false;
@@ -6614,7 +6613,7 @@ namespace ts {
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
         };
     }
 
@@ -6623,7 +6622,7 @@ namespace ts {
     }
 
     /** @param path directory of the tsconfig.json */
-    export function matchFiles(path: string, extensions: readonly string[] | undefined, excludes: readonly string[] | undefined, includes: readonly string[] | undefined, useCaseSensitiveFileNames: boolean, currentDirectory: string, depth: number | undefined, getFileSystemEntries: (path: string) => FileSystemEntries, realpath: (path: string) => string): string[] {
+    export function matchFiles(path: string, extensions: readonly string[] | undefined, excludes: readonly string[] | undefined, includes: readonly string[] | undefined, useCaseSensitiveFileNames: boolean, currentDirectory: string, depth: number | undefined, getFileSystemEntries: (path: string) => FileSystemEntries, realpath: (path: string) => string, directoryExists: (path: string) => boolean): string[] {
         path = normalizePath(path);
         currentDirectory = normalizePath(currentDirectory);
 
@@ -6638,20 +6637,22 @@ namespace ts {
         const results: string[][] = includeFileRegexes ? includeFileRegexes.map(() => []) : [[]];
         const visited = new Map<string, true>();
         const toCanonical = createGetCanonicalFileName(useCaseSensitiveFileNames);
-        for (const basePath of patterns.basePaths) {
-            visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
+        for (const absoluteBasePath of patterns.basePaths) {
+            if (directoryExists(absoluteBasePath)) {
+                visitDirectory(absoluteBasePath, depth);
+            }
         }
 
         return flatten(results);
 
-        function visitDirectory(path: string, absolutePath: string, depth: number | undefined) {
+        function visitDirectory(absolutePath: string, depth: number | undefined) {
             const canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath)) return;
             visited.set(canonicalPath, true);
-            const { files, directories } = getFileSystemEntries(path);
+            const { files, directories } = getFileSystemEntries(absolutePath);
 
             for (const current of sort<string>(files, compareStringsCaseSensitive)) {
-                const name = combinePaths(path, current);
+                const name = combinePaths(absolutePath, current);
                 const absoluteName = combinePaths(absolutePath, current);
                 if (extensions && !fileExtensionIsOneOf(name, extensions)) continue;
                 if (excludeRegex && excludeRegex.test(absoluteName)) continue;
@@ -6674,11 +6675,10 @@ namespace ts {
             }
 
             for (const current of sort<string>(directories, compareStringsCaseSensitive)) {
-                const name = combinePaths(path, current);
                 const absoluteName = combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(name, absoluteName, depth);
+                    visitDirectory(absoluteName, depth);
                 }
             }
         }
@@ -6686,10 +6686,11 @@ namespace ts {
 
     /**
      * Computes the unique non-wildcard base paths amongst the provided include patterns.
+     * @returns Absolute directory paths
      */
-    function getBasePaths(path: string, includes: readonly string[] | undefined, useCaseSensitiveFileNames: boolean): string[] {
+    function getBasePaths(absoluteTsconfigPath: string, includes: readonly string[] | undefined, useCaseSensitiveFileNames: boolean): string[] {
         // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        const basePaths: string[] = [path];
+        const basePaths: string[] = [absoluteTsconfigPath];
 
         if (includes) {
             // Storage for literal base paths amongst the include patterns.
@@ -6697,9 +6698,9 @@ namespace ts {
             for (const include of includes) {
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
-                const absolute: string = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
+                const absoluteIncludePath: string = isRootedDiskPath(include) ? include : normalizePath(combinePaths(absoluteTsconfigPath, include));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(getIncludeBasePath(absolute));
+                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
             }
 
             // Sort the offsets array using either the literal or canonical path representations.
@@ -6708,7 +6709,7 @@ namespace ts {
             // Iterate over each include base path and include unique base paths that are not a
             // subpath of an existing base path
             for (const includeBasePath of includeBasePaths) {
-                if (every(basePaths, basePath => !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames))) {
+                if (every(basePaths, basePath => !containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames))) {
                     basePaths.push(includeBasePath);
                 }
             }
@@ -6979,6 +6980,18 @@ namespace ts {
         return { min, max };
     }
 
+    /** @deprecated Use `ReadonlySet<TNode>` instead. */
+    export type ReadonlyNodeSet<TNode extends Node> = ReadonlySet<TNode>;
+
+    /** @deprecated Use `Set<TNode>` instead. */
+    export type NodeSet<TNode extends Node> = Set<TNode>;
+
+    /** @deprecated Use `ReadonlyMap<TNode, TValue>` instead. */
+    export type ReadonlyNodeMap<TNode extends Node, TValue> = ReadonlyESMap<TNode, TValue>;
+
+    /** @deprecated Use `Map<TNode, TValue>` instead. */
+    export type NodeMap<TNode extends Node, TValue> = ESMap<TNode, TValue>;
+
     export function rangeOfNode(node: Node): TextRange {
         return { pos: getTokenPosOfNode(node), end: node.end };
     }
@@ -7410,8 +7423,4 @@ namespace ts {
     export function isFunctionExpressionOrArrowFunction(node: Node): node is FunctionExpression | ArrowFunction {
         return node.kind === SyntaxKind.FunctionExpression || node.kind === SyntaxKind.ArrowFunction;
     }
-
-    export function escapeSnippetText(text: string): string {
-        return text.replace(/\$/gm, "\\$");
-    }
 }

src/compiler/utilitiesPublic.ts

@@ -14,8 +14,6 @@ namespace ts {
         switch (getEmitScriptTarget(options)) {
             case ScriptTarget.ESNext:
                 return "lib.esnext.full.d.ts";
-            case ScriptTarget.ES2022:
-                return "lib.es2022.full.d.ts";
             case ScriptTarget.ES2021:
                 return "lib.es2021.full.d.ts";
             case ScriptTarget.ES2020:

src/compiler/watchUtilities.ts

@@ -184,7 +184,7 @@ namespace ts {
             const rootResult = tryReadDirectory(rootDir, rootDirPath);
             let rootSymLinkResult: FileSystemEntries | undefined;
             if (rootResult !== undefined) {
-                return matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
+                return matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
             }
             return host.readDirectory!(rootDir, extensions, excludes, includes, depth);
 

src/harness/fakesHosts.ts

@@ -95,7 +95,7 @@ namespace fakes {
         }
 
         public readDirectory(path: string, extensions?: readonly string[], exclude?: readonly string[], include?: readonly string[], depth?: number): string[] {
-            return ts.matchFiles(path, extensions, exclude, include, this.useCaseSensitiveFileNames, this.getCurrentDirectory(), depth, path => this.getAccessibleFileSystemEntries(path), path => this.realpath(path));
+            return ts.matchFiles(path, extensions, exclude, include, this.useCaseSensitiveFileNames, this.getCurrentDirectory(), depth, path => this.getAccessibleFileSystemEntries(path), path => this.realpath(path), path => this.directoryExists(path));
         }
 
         public getAccessibleFileSystemEntries(path: string): ts.FileSystemEntries {

src/harness/findUpDir.ts

@@ -1,11 +1,11 @@
-namespace Utils {
-    const { join, resolve, dirname } = require("path") as typeof import("path");
-    const { existsSync } = require("fs") as typeof import("fs");
+namespace findUpDir {
+    import { join, resolve, dirname } from "path";
+    import { existsSync } from "fs";
 
     // search directories upward to avoid hard-wired paths based on the
     // build tree (same as scripts/build/findUpDir.js)
 
-    export function findUpFile(name: string): string {
+    export function findUpFile(name: string) {
         let dir = __dirname;
         while (true) {
             const fullPath = join(dir, name);

src/harness/fourslashImpl.ts

@@ -637,8 +637,7 @@ namespace FourSlash {
             ts.forEachKey(this.inputFiles, fileName => {
                 if (!ts.isAnySupportedFileExtension(fileName)
                     || Harness.getConfigNameFromFileName(fileName)
-                    // Can't get a Program in Server tests
-                    || this.testType !== FourSlashTestType.Server && !ts.getAllowJSCompilerOption(this.getProgram().getCompilerOptions()) && !ts.resolutionExtensionIsTSOrJson(ts.extensionFromPath(fileName))
+                    || !ts.getAllowJSCompilerOption(this.getProgram().getCompilerOptions()) && !ts.resolutionExtensionIsTSOrJson(ts.extensionFromPath(fileName))
                     || ts.getBaseFileName(fileName) === "package.json") return;
                 const errors = this.getDiagnostics(fileName).filter(e => e.category !== ts.DiagnosticCategory.Suggestion);
                 if (errors.length) {
@@ -943,7 +942,7 @@ namespace FourSlash {
             expected = typeof expected === "string" ? { name: expected } : expected;
 
             if (actual.insertText !== expected.insertText) {
-                this.raiseError(`Completion insert text did not match: ${showTextDiff(expected.insertText || "", actual.insertText || "")}`);
+                this.raiseError(`Expected completion insert text to be ${expected.insertText}, got ${actual.insertText}`);
             }
             const convertedReplacementSpan = expected.replacementSpan && ts.createTextSpanFromRange(expected.replacementSpan);
             if (convertedReplacementSpan?.length) {

src/harness/harnessIO.ts

@@ -41,7 +41,6 @@ namespace Harness {
     export const virtualFileSystemRoot = "/";
 
     function createNodeIO(): IO {
-        const workspaceRoot = Utils.findUpRoot();
         let fs: any, pathModule: any;
         if (require) {
             fs = require("fs");
@@ -155,7 +154,7 @@ namespace Harness {
             log: s => console.log(s),
             args: () => ts.sys.args,
             getExecutingFilePath: () => ts.sys.getExecutingFilePath(),
-            getWorkspaceRoot: () => workspaceRoot,
+            getWorkspaceRoot: () => vpath.resolve(__dirname, "../.."),
             exit: exitCode => ts.sys.exit(exitCode),
             readDirectory: (path, extension, exclude, include, depth) => ts.sys.readDirectory(path, extension, exclude, include, depth),
             getAccessibleFileSystemEntries,

src/harness/tsconfig.json

@@ -28,7 +28,6 @@
         "evaluatorImpl.ts",
         "fakesHosts.ts",
         "client.ts",
-        "findUpDir.ts",
 
         "runnerbase.ts",
         "sourceMapRecorder.ts",

src/harness/virtualFileSystemWithWatch.ts

@@ -922,7 +922,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                     });
                 }
                 return { directories, files };
-            }, path => this.realpath(path));
+            }, path => this.realpath(path), path => this.directoryExists(path));
         }
 
         createHash(s: string): string {

src/lib/dom.generated.d.ts

@@ -53,8 +53,8 @@ interface AnimationEventInit extends EventInit {
 }
 
 interface AnimationPlaybackEventInit extends EventInit {
-    currentTime?: CSSNumberish | null;
-    timelineTime?: CSSNumberish | null;
+    currentTime?: number | null;
+    timelineTime?: number | null;
 }
 
 interface AssignedNodesOptions {
@@ -808,7 +808,6 @@ interface MediaTrackCapabilities {
 
 interface MediaTrackConstraintSet {
     aspectRatio?: ConstrainDouble;
-    autoGainControl?: ConstrainBoolean;
     channelCount?: ConstrainULong;
     deviceId?: ConstrainDOMString;
     echoCancellation?: ConstrainBoolean;
@@ -817,7 +816,6 @@ interface MediaTrackConstraintSet {
     groupId?: ConstrainDOMString;
     height?: ConstrainULong;
     latency?: ConstrainDouble;
-    noiseSuppression?: ConstrainBoolean;
     sampleRate?: ConstrainULong;
     sampleSize?: ConstrainULong;
     suppressLocalAudioPlayback?: ConstrainBoolean;
@@ -830,14 +828,12 @@ interface MediaTrackConstraints extends MediaTrackConstraintSet {
 
 interface MediaTrackSettings {
     aspectRatio?: number;
-    autoGainControl?: boolean;
     deviceId?: string;
     echoCancellation?: boolean;
     facingMode?: string;
     frameRate?: number;
     groupId?: string;
     height?: number;
-    noiseSuppression?: boolean;
     restrictOwnAudio?: boolean;
     sampleRate?: number;
     sampleSize?: number;
@@ -846,14 +842,12 @@ interface MediaTrackSettings {
 
 interface MediaTrackSupportedConstraints {
     aspectRatio?: boolean;
-    autoGainControl?: boolean;
     deviceId?: boolean;
     echoCancellation?: boolean;
     facingMode?: boolean;
     frameRate?: boolean;
     groupId?: boolean;
     height?: boolean;
-    noiseSuppression?: boolean;
     sampleRate?: boolean;
     sampleSize?: boolean;
     suppressLocalAudioPlayback?: boolean;
@@ -1469,7 +1463,7 @@ interface RequestInit {
     /** An AbortSignal to set request's signal. */
     signal?: AbortSignal | null;
     /** Can only be null. Used to disassociate request from any Window. */
-    window?: null;
+    window?: any;
 }
 
 interface ResizeObserverOptions {
@@ -1873,7 +1867,7 @@ interface AbortSignal extends EventTarget {
 declare var AbortSignal: {
     prototype: AbortSignal;
     new(): AbortSignal;
-    // abort(): AbortSignal; - To be re-added in the future
+    // abort(): AbortSignal;
 };
 
 interface AbstractRange {
@@ -1936,7 +1930,7 @@ interface AnimationEventMap {
 }
 
 interface Animation extends EventTarget {
-    currentTime: CSSNumberish | null;
+    currentTime: number | null;
     effect: AnimationEffect | null;
     readonly finished: Promise<Animation>;
     id: string;
@@ -1948,7 +1942,7 @@ interface Animation extends EventTarget {
     playbackRate: number;
     readonly ready: Promise<Animation>;
     readonly replaceState: AnimationReplaceState;
-    startTime: CSSNumberish | null;
+    startTime: number | null;
     timeline: AnimationTimeline | null;
     cancel(): void;
     commitStyles(): void;
@@ -1998,8 +1992,8 @@ interface AnimationFrameProvider {
 }
 
 interface AnimationPlaybackEvent extends Event {
-    readonly currentTime: CSSNumberish | null;
-    readonly timelineTime: CSSNumberish | null;
+    readonly currentTime: number | null;
+    readonly timelineTime: number | null;
 }
 
 declare var AnimationPlaybackEvent: {
@@ -2214,7 +2208,6 @@ declare var AudioScheduledSourceNode: {
     new(): AudioScheduledSourceNode;
 };
 
-/** Available only in secure contexts. */
 interface AudioWorklet extends Worklet {
 }
 
@@ -2227,7 +2220,6 @@ interface AudioWorkletNodeEventMap {
     "processorerror": Event;
 }
 
-/** Available only in secure contexts. */
 interface AudioWorkletNode extends AudioNode {
     onprocessorerror: ((this: AudioWorkletNode, ev: Event) => any) | null;
     readonly parameters: AudioParamMap;
@@ -2243,7 +2235,6 @@ declare var AudioWorkletNode: {
     new(context: BaseAudioContext, name: string, options?: AudioWorkletNodeOptions): AudioWorkletNode;
 };
 
-/** Available only in secure contexts. */
 interface AuthenticatorAssertionResponse extends AuthenticatorResponse {
     readonly authenticatorData: ArrayBuffer;
     readonly signature: ArrayBuffer;
@@ -2255,7 +2246,6 @@ declare var AuthenticatorAssertionResponse: {
     new(): AuthenticatorAssertionResponse;
 };
 
-/** Available only in secure contexts. */
 interface AuthenticatorAttestationResponse extends AuthenticatorResponse {
     readonly attestationObject: ArrayBuffer;
 }
@@ -2265,7 +2255,6 @@ declare var AuthenticatorAttestationResponse: {
     new(): AuthenticatorAttestationResponse;
 };
 
-/** Available only in secure contexts. */
 interface AuthenticatorResponse {
     readonly clientDataJSON: ArrayBuffer;
 }
@@ -2289,7 +2278,6 @@ interface BaseAudioContextEventMap {
 }
 
 interface BaseAudioContext extends EventTarget {
-    /** Available only in secure contexts. */
     readonly audioWorklet: AudioWorklet;
     readonly currentTime: number;
     readonly destination: AudioDestinationNode;
@@ -2612,7 +2600,6 @@ declare var CSSRuleList: {
 
 /** An object that is a CSS declaration block, and exposes style information and various style-related methods and properties. */
 interface CSSStyleDeclaration {
-    accentColor: string;
     alignContent: string;
     alignItems: string;
     alignSelf: string;
@@ -2786,14 +2773,11 @@ interface CSSStyleDeclaration {
     gridAutoRows: string;
     gridColumn: string;
     gridColumnEnd: string;
-    /** @deprecated This is a legacy alias of `columnGap`. */
     gridColumnGap: string;
     gridColumnStart: string;
-    /** @deprecated This is a legacy alias of `gap`. */
     gridGap: string;
     gridRow: string;
     gridRowEnd: string;
-    /** @deprecated This is a legacy alias of `rowGap`. */
     gridRowGap: string;
     gridRowStart: string;
     gridTemplate: string;
@@ -3032,15 +3016,15 @@ interface CSSStyleDeclaration {
     webkitBorderTopLeftRadius: string;
     /** @deprecated This is a legacy alias of `borderTopRightRadius`. */
     webkitBorderTopRightRadius: string;
-    /** @deprecated This is a legacy alias of `boxAlign`. */
+    /** @deprecated */
     webkitBoxAlign: string;
-    /** @deprecated This is a legacy alias of `boxFlex`. */
+    /** @deprecated */
     webkitBoxFlex: string;
-    /** @deprecated This is a legacy alias of `boxOrdinalGroup`. */
+    /** @deprecated */
     webkitBoxOrdinalGroup: string;
-    /** @deprecated This is a legacy alias of `boxOrient`. */
+    /** @deprecated */
     webkitBoxOrient: string;
-    /** @deprecated This is a legacy alias of `boxPack`. */
+    /** @deprecated */
     webkitBoxPack: string;
     /** @deprecated This is a legacy alias of `boxShadow`. */
     webkitBoxShadow: string;
@@ -3195,10 +3179,7 @@ declare var CSSTransition: {
     new(): CSSTransition;
 };
 
-/**
- * Provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec.
- * Available only in secure contexts.
- */
+/** Provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec. */
 interface Cache {
     add(request: RequestInfo): Promise<void>;
     addAll(requests: RequestInfo[]): Promise<void>;
@@ -3214,10 +3195,7 @@ declare var Cache: {
     new(): Cache;
 };
 
-/**
- * The storage for Cache objects.
- * Available only in secure contexts.
- */
+/** The storage for Cache objects. */
 interface CacheStorage {
     delete(cacheName: string): Promise<boolean>;
     has(cacheName: string): Promise<boolean>;
@@ -3449,7 +3427,6 @@ interface ChildNode extends Node {
 interface ClientRect extends DOMRect {
 }
 
-/** Available only in secure contexts. */
 interface Clipboard extends EventTarget {
     read(): Promise<ClipboardItems>;
     readText(): Promise<string>;
@@ -3553,7 +3530,6 @@ declare var CountQueuingStrategy: {
     new(init: QueuingStrategyInit): CountQueuingStrategy;
 };
 
-/** Available only in secure contexts. */
 interface Credential {
     readonly id: string;
     readonly type: string;
@@ -3564,7 +3540,6 @@ declare var Credential: {
     new(): Credential;
 };
 
-/** Available only in secure contexts. */
 interface CredentialsContainer {
     create(options?: CredentialCreationOptions): Promise<Credential | null>;
     get(options?: CredentialRequestOptions): Promise<Credential | null>;
@@ -3579,7 +3554,6 @@ declare var CredentialsContainer: {
 
 /** Basic cryptography features available in the current context. It allows access to a cryptographically strong random number generator and to cryptographic primitives. */
 interface Crypto {
-    /** Available only in secure contexts. */
     readonly subtle: SubtleCrypto;
     getRandomValues<T extends ArrayBufferView | null>(array: T): T;
 }
@@ -3589,10 +3563,7 @@ declare var Crypto: {
     new(): Crypto;
 };
 
-/**
- * The CryptoKey dictionary of the Web Crypto API represents a cryptographic key.
- * Available only in secure contexts.
- */
+/** The CryptoKey dictionary of the Web Crypto API represents a cryptographic key. */
 interface CryptoKey {
     readonly algorithm: KeyAlgorithm;
     readonly extractable: boolean;
@@ -4100,10 +4071,7 @@ declare var DelayNode: {
     new(context: BaseAudioContext, options?: DelayOptions): DelayNode;
 };
 
-/**
- * The DeviceMotionEvent provides web developers with information about the speed of changes for the device's position and orientation.
- * Available only in secure contexts.
- */
+/** The DeviceMotionEvent provides web developers with information about the speed of changes for the device's position and orientation. */
 interface DeviceMotionEvent extends Event {
     readonly acceleration: DeviceMotionEventAcceleration | null;
     readonly accelerationIncludingGravity: DeviceMotionEventAcceleration | null;
@@ -4116,24 +4084,19 @@ declare var DeviceMotionEvent: {
     new(type: string, eventInitDict?: DeviceMotionEventInit): DeviceMotionEvent;
 };
 
-/** Available only in secure contexts. */
 interface DeviceMotionEventAcceleration {
     readonly x: number | null;
     readonly y: number | null;
     readonly z: number | null;
 }
 
-/** Available only in secure contexts. */
 interface DeviceMotionEventRotationRate {
     readonly alpha: number | null;
     readonly beta: number | null;
     readonly gamma: number | null;
 }
 
-/**
- * The DeviceOrientationEvent provides web developers with information from the physical orientation of the device running the web page.
- * Available only in secure contexts.
- */
+/** The DeviceOrientationEvent provides web developers with information from the physical orientation of the device running the web page. */
 interface DeviceOrientationEvent extends Event {
     readonly absolute: boolean;
     readonly alpha: number | null;
@@ -4431,6 +4394,13 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
      * @param filter A custom NodeFilter function to use.
      */
     createTreeWalker(root: Node, whatToShow?: number, filter?: NodeFilter | null): TreeWalker;
+    /**
+     * Returns the element for the specified x coordinate and the specified y coordinate.
+     * @param x The x-offset
+     * @param y The y-offset
+     */
+    elementFromPoint(x: number, y: number): Element | null;
+    elementsFromPoint(x: number, y: number): Element[];
     /**
      * Executes a command on the current document, current selection, or the given range.
      * @param commandId String that specifies the command to execute. This command can be any of the command identifiers that can be executed in script.
@@ -4588,13 +4558,6 @@ interface DocumentOrShadowRoot {
     readonly pointerLockElement: Element | null;
     /** Retrieves a collection of styleSheet objects representing the style sheets that correspond to each instance of a link or style object in the document. */
     readonly styleSheets: StyleSheetList;
-    /**
-     * Returns the element for the specified x coordinate and the specified y coordinate.
-     * @param x The x-offset
-     * @param y The y-offset
-     */
-    elementFromPoint(x: number, y: number): Element | null;
-    elementsFromPoint(x: number, y: number): Element[];
     getAnimations(): Animation[];
 }
 
@@ -4822,16 +4785,6 @@ interface ElementContentEditable {
     readonly isContentEditable: boolean;
 }
 
-interface ElementInternals extends ARIAMixin {
-    /** Returns the ShadowRoot for internals's target element, if the target element is a shadow host, or null otherwise. */
-    readonly shadowRoot: ShadowRoot | null;
-}
-
-declare var ElementInternals: {
-    prototype: ElementInternals;
-    new(): ElementInternals;
-};
-
 /** Events providing information related to errors in scripts or in files. */
 interface ErrorEvent extends Event {
     readonly colno: number;
@@ -5071,10 +5024,13 @@ declare var FileSystemDirectoryEntry: {
     new(): FileSystemDirectoryEntry;
 };
 
+/** @deprecated */
 interface FileSystemDirectoryReader {
+    /** @deprecated */
     readEntries(successCallback: FileSystemEntriesCallback, errorCallback?: ErrorCallback): void;
 }
 
+/** @deprecated */
 declare var FileSystemDirectoryReader: {
     prototype: FileSystemDirectoryReader;
     new(): FileSystemDirectoryReader;
@@ -5211,10 +5167,7 @@ declare var GainNode: {
     new(context: BaseAudioContext, options?: GainOptions): GainNode;
 };
 
-/**
- * This Gamepad API interface defines an individual gamepad or other controller, allowing access to information such as button presses, axis positions, and id.
- * Available only in secure contexts.
- */
+/** This Gamepad API interface defines an individual gamepad or other controller, allowing access to information such as button presses, axis positions, and id. */
 interface Gamepad {
     readonly axes: ReadonlyArray<number>;
     readonly buttons: ReadonlyArray<GamepadButton>;
@@ -5231,10 +5184,7 @@ declare var Gamepad: {
     new(): Gamepad;
 };
 
-/**
- * An individual button of a gamepad or other controller, allowing access to the current state of different types of buttons available on the control device.
- * Available only in secure contexts.
- */
+/** An individual button of a gamepad or other controller, allowing access to the current state of different types of buttons available on the control device. */
 interface GamepadButton {
     readonly pressed: boolean;
     readonly touched: boolean;
@@ -5246,10 +5196,7 @@ declare var GamepadButton: {
     new(): GamepadButton;
 };
 
-/**
- * This Gamepad API interface contains references to gamepads connected to the system, which is what the gamepad events Window.gamepadconnected and Window.gamepaddisconnected are fired in response to.
- * Available only in secure contexts.
- */
+/** This Gamepad API interface contains references to gamepads connected to the system, which is what the gamepad events Window.gamepadconnected and Window.gamepaddisconnected are fired in response to. */
 interface GamepadEvent extends Event {
     readonly gamepad: Gamepad;
 }
@@ -5286,7 +5233,6 @@ declare var Geolocation: {
     new(): Geolocation;
 };
 
-/** Available only in secure contexts. */
 interface GeolocationCoordinates {
     readonly accuracy: number;
     readonly altitude: number | null;
@@ -5302,7 +5248,6 @@ declare var GeolocationCoordinates: {
     new(): GeolocationCoordinates;
 };
 
-/** Available only in secure contexts. */
 interface GeolocationPosition {
     readonly coords: GeolocationCoordinates;
     readonly timestamp: DOMTimeStamp;
@@ -6127,7 +6072,6 @@ interface HTMLElement extends Element, DocumentAndElementEventHandlers, ElementC
     spellcheck: boolean;
     title: string;
     translate: boolean;
-    attachInternals(): ElementInternals;
     click(): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -6989,7 +6933,6 @@ interface HTMLMediaElement extends HTMLElement {
     readonly error: MediaError | null;
     /** Gets or sets a flag to specify whether playback should restart after it completes. */
     loop: boolean;
-    /** Available only in secure contexts. */
     readonly mediaKeys: MediaKeys | null;
     /** Gets or sets a flag that indicates whether the audio (either audio or the audio track on video media) is muted. */
     muted: boolean;
@@ -7027,7 +6970,6 @@ interface HTMLMediaElement extends HTMLElement {
     pause(): void;
     /** Loads and starts playback of a media resource. */
     play(): Promise<void>;
-    /** Available only in secure contexts. */
     setMediaKeys(mediaKeys: MediaKeys | null): Promise<void>;
     readonly HAVE_CURRENT_DATA: number;
     readonly HAVE_ENOUGH_DATA: number;
@@ -7581,7 +7523,6 @@ declare var HTMLSelectElement: {
 
 interface HTMLSlotElement extends HTMLElement {
     name: string;
-    assign(...nodes: (Element | Text)[]): void;
     assignedElements(options?: AssignedNodesOptions): Element[];
     assignedNodes(options?: AssignedNodesOptions): Node[];
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSlotElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -8856,10 +8797,7 @@ declare var MediaCapabilities: {
     new(): MediaCapabilities;
 };
 
-/**
- * The MediaDevicesInfo interface contains information that describes a single media input or output device.
- * Available only in secure contexts.
- */
+/** The MediaDevicesInfo interface contains information that describes a single media input or output device. */
 interface MediaDeviceInfo {
     readonly deviceId: string;
     readonly groupId: string;
@@ -8877,10 +8815,7 @@ interface MediaDevicesEventMap {
     "devicechange": Event;
 }
 
-/**
- * Provides access to connected media input devices like cameras and microphones, as well as screen sharing. In essence, it lets you obtain access to any hardware source of media data.
- * Available only in secure contexts.
- */
+/** Provides access to connected media input devices like cameras and microphones, as well as screen sharing. In essence, it lets you obtain access to any hardware source of media data. */
 interface MediaDevices extends EventTarget {
     ondevicechange: ((this: MediaDevices, ev: Event) => any) | null;
     enumerateDevices(): Promise<MediaDeviceInfo[]>;
@@ -8937,10 +8872,7 @@ declare var MediaError: {
     readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
 };
 
-/**
- * This EncryptedMediaExtensions API interface contains the content and related data when the content decryption module generates a message for the session.
- * Available only in secure contexts.
- */
+/** This EncryptedMediaExtensions API interface contains the content and related data when the content decryption module generates a message for the session. */
 interface MediaKeyMessageEvent extends Event {
     readonly message: ArrayBuffer;
     readonly messageType: MediaKeyMessageType;
@@ -8956,10 +8888,7 @@ interface MediaKeySessionEventMap {
     "message": MediaKeyMessageEvent;
 }
 
-/**
- * This EncryptedMediaExtensions API interface represents a context for message exchange with a content decryption module (CDM).
- * Available only in secure contexts.
- */
+/** This EncryptedMediaExtensions API interface represents a context for message exchange with a content decryption module (CDM). */
 interface MediaKeySession extends EventTarget {
     readonly closed: Promise<MediaKeySessionClosedReason>;
     readonly expiration: number;
@@ -8983,10 +8912,7 @@ declare var MediaKeySession: {
     new(): MediaKeySession;
 };
 
-/**
- * This EncryptedMediaExtensions API interface is a read-only map of media key statuses by key IDs.
- * Available only in secure contexts.
- */
+/** This EncryptedMediaExtensions API interface is a read-only map of media key statuses by key IDs. */
 interface MediaKeyStatusMap {
     readonly size: number;
     get(keyId: BufferSource): MediaKeyStatus | undefined;
@@ -8999,10 +8925,7 @@ declare var MediaKeyStatusMap: {
     new(): MediaKeyStatusMap;
 };
 
-/**
- * This EncryptedMediaExtensions API interface provides access to a Key System for decryption and/or a content protection provider. You can request an instance of this object using the Navigator.requestMediaKeySystemAccess method.
- * Available only in secure contexts.
- */
+/** This EncryptedMediaExtensions API interface provides access to a Key System for decryption and/or a content protection provider. You can request an instance of this object using the Navigator.requestMediaKeySystemAccess method. */
 interface MediaKeySystemAccess {
     readonly keySystem: string;
     createMediaKeys(): Promise<MediaKeys>;
@@ -9014,10 +8937,7 @@ declare var MediaKeySystemAccess: {
     new(): MediaKeySystemAccess;
 };
 
-/**
- * This EncryptedMediaExtensions API interface the represents a set of keys that an associated HTMLMediaElement can use for decryption of media data during playback.
- * Available only in secure contexts.
- */
+/** This EncryptedMediaExtensions API interface the represents a set of keys that an associated HTMLMediaElement can use for decryption of media data during playback. */
 interface MediaKeys {
     createSession(sessionType?: MediaKeySessionType): MediaKeySession;
     setServerCertificate(serverCertificate: BufferSource): Promise<boolean>;
@@ -9091,7 +9011,7 @@ declare var MediaQueryListEvent: {
 
 interface MediaRecorderEventMap {
     "dataavailable": BlobEvent;
-    "error": MediaRecorderErrorEvent;
+    "error": Event;
     "pause": Event;
     "resume": Event;
     "start": Event;
@@ -9102,7 +9022,7 @@ interface MediaRecorder extends EventTarget {
     readonly audioBitsPerSecond: number;
     readonly mimeType: string;
     ondataavailable: ((this: MediaRecorder, ev: BlobEvent) => any) | null;
-    onerror: ((this: MediaRecorder, ev: MediaRecorderErrorEvent) => any) | null;
+    onerror: ((this: MediaRecorder, ev: Event) => any) | null;
     onpause: ((this: MediaRecorder, ev: Event) => any) | null;
     onresume: ((this: MediaRecorder, ev: Event) => any) | null;
     onstart: ((this: MediaRecorder, ev: Event) => any) | null;
@@ -9521,27 +9441,20 @@ declare var NamedNodeMap: {
 
 /** The state and the identity of the user agent. It allows scripts to query it and to register themselves to carry on some activities. */
 interface Navigator extends NavigatorAutomationInformation, NavigatorConcurrentHardware, NavigatorContentUtils, NavigatorCookies, NavigatorID, NavigatorLanguage, NavigatorNetworkInformation, NavigatorOnLine, NavigatorPlugins, NavigatorStorage {
-    /** Available only in secure contexts. */
     readonly clipboard: Clipboard;
-    /** Available only in secure contexts. */
     readonly credentials: CredentialsContainer;
     readonly doNotTrack: string | null;
     readonly geolocation: Geolocation;
     readonly maxTouchPoints: number;
     readonly mediaCapabilities: MediaCapabilities;
-    /** Available only in secure contexts. */
     readonly mediaDevices: MediaDevices;
     readonly mediaSession: MediaSession;
     readonly permissions: Permissions;
-    /** Available only in secure contexts. */
+    readonly pointerEnabled: boolean;
     readonly serviceWorker: ServiceWorkerContainer;
-    /** Available only in secure contexts. */
-    canShare(data?: ShareData): boolean;
     getGamepads(): (Gamepad | null)[];
-    /** Available only in secure contexts. */
     requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): Promise<MediaKeySystemAccess>;
     sendBeacon(url: string | URL, data?: BodyInit | null): boolean;
-    /** Available only in secure contexts. */
     share(data?: ShareData): Promise<void>;
     vibrate(pattern: VibratePattern): boolean;
 }
@@ -9560,7 +9473,6 @@ interface NavigatorConcurrentHardware {
 }
 
 interface NavigatorContentUtils {
-    /** Available only in secure contexts. */
     registerProtocolHandler(scheme: string, url: string | URL): void;
 }
 
@@ -9609,7 +9521,6 @@ interface NavigatorPlugins {
     javaEnabled(): boolean;
 }
 
-/** Available only in secure contexts. */
 interface NavigatorStorage {
     readonly storage: StorageManager;
 }
@@ -10037,7 +9948,41 @@ declare var Path2D: {
     new(path?: Path2D | string): Path2D;
 };
 
-/** Available only in secure contexts. */
+/**
+ * This Payment Request API interface is used to store shipping or payment address information.
+ * @deprecated
+ */
+interface PaymentAddress {
+    /** @deprecated */
+    readonly addressLine: ReadonlyArray<string>;
+    /** @deprecated */
+    readonly city: string;
+    /** @deprecated */
+    readonly country: string;
+    /** @deprecated */
+    readonly dependentLocality: string;
+    /** @deprecated */
+    readonly organization: string;
+    /** @deprecated */
+    readonly phone: string;
+    /** @deprecated */
+    readonly postalCode: string;
+    /** @deprecated */
+    readonly recipient: string;
+    /** @deprecated */
+    readonly region: string;
+    /** @deprecated */
+    readonly sortingCode: string;
+    /** @deprecated */
+    toJSON(): any;
+}
+
+/** @deprecated */
+declare var PaymentAddress: {
+    prototype: PaymentAddress;
+    new(): PaymentAddress;
+};
+
 interface PaymentMethodChangeEvent extends PaymentRequestUpdateEvent {
     readonly methodDetails: any;
     readonly methodName: string;
@@ -10052,10 +9997,7 @@ interface PaymentRequestEventMap {
     "paymentmethodchange": Event;
 }
 
-/**
- * This Payment Request API interface is the primary access point into the API, and lets web content and apps accept payments from the end user.
- * Available only in secure contexts.
- */
+/** This Payment Request API interface is the primary access point into the API, and lets web content and apps accept payments from the end user. */
 interface PaymentRequest extends EventTarget {
     readonly id: string;
     onpaymentmethodchange: ((this: PaymentRequest, ev: Event) => any) | null;
@@ -10073,10 +10015,7 @@ declare var PaymentRequest: {
     new(methodData: PaymentMethodData[], details: PaymentDetailsInit): PaymentRequest;
 };
 
-/**
- * This Payment Request API interface enables a web page to update the details of a PaymentRequest in response to a user action.
- * Available only in secure contexts.
- */
+/** This Payment Request API interface enables a web page to update the details of a PaymentRequest in response to a user action. */
 interface PaymentRequestUpdateEvent extends Event {
     updateWith(detailsPromise: PaymentDetailsUpdate | PromiseLike<PaymentDetailsUpdate>): void;
 }
@@ -10086,10 +10025,7 @@ declare var PaymentRequestUpdateEvent: {
     new(type: string, eventInitDict?: PaymentRequestUpdateEventInit): PaymentRequestUpdateEvent;
 };
 
-/**
- * This Payment Request API interface is returned after a user selects a payment method and approves a payment request.
- * Available only in secure contexts.
- */
+/** This Payment Request API interface is returned after a user selects a payment method and approves a payment request. */
 interface PaymentResponse extends EventTarget {
     readonly details: any;
     readonly methodName: string;
@@ -10489,7 +10425,6 @@ interface PointerEvent extends MouseEvent {
     readonly tiltY: number;
     readonly twist: number;
     readonly width: number;
-    /** Available only in secure contexts. */
     getCoalescedEvents(): PointerEvent[];
     getPredictedEvents(): PointerEvent[];
 }
@@ -10544,7 +10479,6 @@ declare var PromiseRejectionEvent: {
     new(type: string, eventInitDict: PromiseRejectionEventInit): PromiseRejectionEvent;
 };
 
-/** Available only in secure contexts. */
 interface PublicKeyCredential extends Credential {
     readonly rawId: ArrayBuffer;
     readonly response: AuthenticatorResponse;
@@ -10557,10 +10491,7 @@ declare var PublicKeyCredential: {
     isUserVerifyingPlatformAuthenticatorAvailable(): Promise<boolean>;
 };
 
-/**
- * This Push API interface provides a way to receive notifications from third-party servers as well as request URLs for push notifications.
- * Available only in secure contexts.
- */
+/** This Push API interface provides a way to receive notifications from third-party servers as well as request URLs for push notifications. */
 interface PushManager {
     getSubscription(): Promise<PushSubscription | null>;
     permissionState(options?: PushSubscriptionOptionsInit): Promise<PushPermissionState>;
@@ -10573,10 +10504,7 @@ declare var PushManager: {
     readonly supportedContentEncodings: ReadonlyArray<string>;
 };
 
-/**
- * This Push API interface provides a subcription's URL endpoint and allows unsubscription from a push service.
- * Available only in secure contexts.
- */
+/** This Push API interface provides a subcription's URL endpoint and allows unsubscription from a push service. */
 interface PushSubscription {
     readonly endpoint: string;
     readonly options: PushSubscriptionOptions;
@@ -10590,7 +10518,6 @@ declare var PushSubscription: {
     new(): PushSubscription;
 };
 
-/** Available only in secure contexts. */
 interface PushSubscriptionOptions {
     readonly applicationServerKey: ArrayBuffer | null;
 }
@@ -10983,6 +10910,7 @@ interface ReadableStream<R = any> {
     pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;
     pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
+    forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;
 }
 
 declare var ReadableStream: {
@@ -12970,10 +12898,7 @@ interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
     "statechange": Event;
 }
 
-/**
- * This ServiceWorker API interface provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object.
- * Available only in secure contexts.
- */
+/** This ServiceWorker API interface provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object. */
 interface ServiceWorker extends EventTarget, AbstractWorker {
     onstatechange: ((this: ServiceWorker, ev: Event) => any) | null;
     readonly scriptURL: string;
@@ -12997,10 +12922,7 @@ interface ServiceWorkerContainerEventMap {
     "messageerror": MessageEvent;
 }
 
-/**
- * The ServiceWorkerContainer interface of the ServiceWorker API provides an object representing the service worker as an overall unit in the network ecosystem, including facilities to register, unregister and update service workers, and access the state of service workers and their registrations.
- * Available only in secure contexts.
- */
+/** The ServiceWorkerContainer interface of the ServiceWorker API provides an object representing the service worker as an overall unit in the network ecosystem, including facilities to register, unregister and update service workers, and access the state of service workers and their registrations. */
 interface ServiceWorkerContainer extends EventTarget {
     readonly controller: ServiceWorker | null;
     oncontrollerchange: ((this: ServiceWorkerContainer, ev: Event) => any) | null;
@@ -13026,10 +12948,7 @@ interface ServiceWorkerRegistrationEventMap {
     "updatefound": Event;
 }
 
-/**
- * This ServiceWorker API interface represents the service worker registration. You register a service worker to control one or more pages that share the same origin.
- * Available only in secure contexts.
- */
+/** This ServiceWorker API interface represents the service worker registration. You register a service worker to control one or more pages that share the same origin. */
 interface ServiceWorkerRegistration extends EventTarget {
     readonly active: ServiceWorker | null;
     readonly installing: ServiceWorker | null;
@@ -13347,7 +13266,6 @@ declare var StorageEvent: {
     new(type: string, eventInitDict?: StorageEventInit): StorageEvent;
 };
 
-/** Available only in secure contexts. */
 interface StorageManager {
     estimate(): Promise<StorageEstimate>;
     persist(): Promise<boolean>;
@@ -13403,10 +13321,7 @@ declare var SubmitEvent: {
     new(type: string, eventInitDict?: SubmitEventInit): SubmitEvent;
 };
 
-/**
- * This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto).
- * Available only in secure contexts.
- */
+/** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */
 interface SubtleCrypto {
     decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesGcmParams, key: CryptoKey, data: BufferSource): Promise<any>;
     deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, length: number): Promise<ArrayBuffer>;
@@ -13433,6 +13348,7 @@ declare var SubtleCrypto: {
 
 /** The textual content of Element or Attr. If an element has no markup within its content, it has a single child implementing Text that contains the element's text. However, if the element contains markup, it is parsed into information items and Text nodes that form its children. */
 interface Text extends CharacterData, Slottable {
+    readonly assignedSlot: HTMLSlotElement | null;
     /** Returns the combined data of all direct Text node siblings. */
     readonly wholeText: string;
     /** Splits data at the given offset and returns the remainder as Text node. */
@@ -16116,9 +16032,7 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler
     readonly menubar: BarProp;
     name: string;
     readonly navigator: Navigator;
-    /** Available only in secure contexts. */
     ondevicemotion: ((this: Window, ev: DeviceMotionEvent) => any) | null;
-    /** Available only in secure contexts. */
     ondeviceorientation: ((this: Window, ev: DeviceOrientationEvent) => any) | null;
     /** @deprecated */
     onorientationchange: ((this: Window, ev: Event) => any) | null;
@@ -16266,7 +16180,6 @@ interface WindowLocalStorage {
 }
 
 interface WindowOrWorkerGlobalScope {
-    /** Available only in secure contexts. */
     readonly caches: CacheStorage;
     readonly crossOriginIsolated: boolean;
     readonly crypto: Crypto;
@@ -16315,7 +16228,6 @@ declare var Worker: {
     new(scriptURL: string | URL, options?: WorkerOptions): Worker;
 };
 
-/** Available only in secure contexts. */
 interface Worklet {
     /**
      * Loads and executes the module script given by moduleURL into all of worklet's global scopes. It can also create additional global scopes as part of this process, depending on the worklet type. The returned promise will fulfill once the script has been successfully loaded and run in all global scopes.
@@ -16661,8 +16573,7 @@ declare namespace WebAssembly {
 
     var CompileError: {
         prototype: CompileError;
-        new(message?: string): CompileError;
-        (message?: string): CompileError;
+        new(): CompileError;
     };
 
     interface Global {
@@ -16689,8 +16600,7 @@ declare namespace WebAssembly {
 
     var LinkError: {
         prototype: LinkError;
-        new(message?: string): LinkError;
-        (message?: string): LinkError;
+        new(): LinkError;
     };
 
     interface Memory {
@@ -16719,8 +16629,7 @@ declare namespace WebAssembly {
 
     var RuntimeError: {
         prototype: RuntimeError;
-        new(message?: string): RuntimeError;
-        (message?: string): RuntimeError;
+        new(): RuntimeError;
     };
 
     interface Table {
@@ -16865,7 +16774,7 @@ interface PositionErrorCallback {
 }
 
 interface QueuingStrategySize<T = any> {
-    (chunk: T): number;
+    (chunk?: T): number;
 }
 
 interface RTCPeerConnectionErrorCallback {
@@ -17157,9 +17066,7 @@ declare var menubar: BarProp;
 /** @deprecated */
 declare const name: void;
 declare var navigator: Navigator;
-/** Available only in secure contexts. */
 declare var ondevicemotion: ((this: Window, ev: DeviceMotionEvent) => any) | null;
-/** Available only in secure contexts. */
 declare var ondeviceorientation: ((this: Window, ev: DeviceOrientationEvent) => any) | null;
 /** @deprecated */
 declare var onorientationchange: ((this: Window, ev: Event) => any) | null;
@@ -17540,7 +17447,6 @@ declare var onstorage: ((this: Window, ev: StorageEvent) => any) | null;
 declare var onunhandledrejection: ((this: Window, ev: PromiseRejectionEvent) => any) | null;
 declare var onunload: ((this: Window, ev: Event) => any) | null;
 declare var localStorage: Storage;
-/** Available only in secure contexts. */
 declare var caches: CacheStorage;
 declare var crossOriginIsolated: boolean;
 declare var crypto: Crypto;
@@ -17703,7 +17609,7 @@ type OscillatorType = "custom" | "sawtooth" | "sine" | "square" | "triangle";
 type OverSampleType = "2x" | "4x" | "none";
 type PanningModelType = "HRTF" | "equalpower";
 type PaymentComplete = "fail" | "success" | "unknown";
-type PermissionName = "geolocation" | "notifications" | "persistent-storage" | "push" | "screen-wake-lock" | "xr-spatial-tracking";
+type PermissionName = "geolocation" | "notifications" | "persistent-storage" | "push" | "screen-wake-lock";
 type PermissionState = "denied" | "granted" | "prompt";
 type PlaybackDirection = "alternate" | "alternate-reverse" | "normal" | "reverse";
 type PositionAlignSetting = "auto" | "center" | "line-left" | "line-right";

src/lib/dom.iterable.generated.d.ts

@@ -135,7 +135,6 @@ interface NamedNodeMap {
 }
 
 interface Navigator {
-    /** Available only in secure contexts. */
     requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: Iterable<MediaKeySystemConfiguration>): Promise<MediaKeySystemAccess>;
     vibrate(pattern: Iterable<number>): boolean;
 }
@@ -171,6 +170,13 @@ interface PluginArray {
 interface RTCStatsReport extends ReadonlyMap<string, any> {
 }
 
+interface ReadableStream<R = any> {
+    [Symbol.iterator](): IterableIterator<any>;
+    entries(): IterableIterator<[number, any]>;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<any>;
+}
+
 interface SVGLengthList {
     [Symbol.iterator](): IterableIterator<SVGLength>;
 }

src/lib/es2020.intl.d.ts

@@ -200,7 +200,7 @@ declare namespace Intl {
     interface NumberFormatOptions {
         compactDisplay?: "short" | "long" | undefined;
         notation?: "standard" | "scientific" | "engineering" | "compact" | undefined;
-        signDisplay?: "auto" | "never" | "always" | "exceptZero" | undefined;
+        signDisplay?: "auto" | "never" | "always" | undefined;
         unit?: string | undefined;
         unitDisplay?: "short" | "long" | "narrow" | undefined;
     }
@@ -208,7 +208,7 @@ declare namespace Intl {
     interface ResolvedNumberFormatOptions {
         compactDisplay?: "short" | "long";
         notation?: "standard" | "scientific" | "engineering" | "compact";
-        signDisplay?: "auto" | "never" | "always" | "exceptZero";
+        signDisplay?: "auto" | "never" | "always";
         unit?: string;
         unitDisplay?: "short" | "long" | "narrow";
     }

src/lib/es2022.array.d.ts

@@ -1,103 +0,0 @@
-interface Array<T> {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): T | undefined;
-}
-
-interface ReadonlyArray<T> {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): T | undefined;
-}
-
-interface Int8Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Uint8Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Uint8ClampedArray {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Int16Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Uint16Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Int32Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Uint32Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Float32Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface Float64Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): number | undefined;
-}
-
-interface BigInt64Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): bigint | undefined;
-}
-
-interface BigUint64Array {
-    /**
-     * Returns the item located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): bigint | undefined;
-}

src/lib/es2022.d.ts

@@ -1,5 +0,0 @@
-/// <reference lib="es2021" />
-/// <reference lib="es2022.array" />
-/// <reference lib="es2022.error" />
-/// <reference lib="es2022.object" />
-/// <reference lib="es2022.string" />

src/lib/es2022.error.d.ts

@@ -1,8 +0,0 @@
-interface ErrorOptions {
-  cause?: Error;
-}
-
-interface ErrorConstructor {
-  new(message?: string, options?: ErrorOptions): Error;
-  (message?: string, options?: ErrorOptions): Error;
-}

src/lib/es2022.full.d.ts

@@ -1,5 +0,0 @@
-/// <reference lib="es2022" />
-/// <reference lib="dom" />
-/// <reference lib="webworker.importscripts" />
-/// <reference lib="scripthost" />
-/// <reference lib="dom.iterable" />

src/lib/es2022.object.d.ts

@@ -1,8 +0,0 @@
-interface Object {
-    /**
-     * Determines whether an object has a property with the specified name.
-     * @param o An object.
-     * @param v A property name.
-     */
-    hasOwn(o: object, v: PropertyKey): boolean;
-}

src/lib/es2022.string.d.ts

@@ -1,7 +0,0 @@
-interface String {
-    /**
-     * Returns a new String consisting of the single UTF-16 code unit located at the specified index.
-     * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
-     */
-    at(index: number): string | undefined;
-}

src/lib/es5.d.ts

@@ -96,7 +96,7 @@ interface PropertyDescriptor {
 }
 
 interface PropertyDescriptorMap {
-    [key: PropertyKey]: PropertyDescriptor;
+    [s: string]: PropertyDescriptor;
 }
 
 interface Object {

src/lib/esnext.d.ts

@@ -1,2 +1,2 @@
-/// <reference lib="es2022" />
+/// <reference lib="es2021" />
 /// <reference lib="esnext.intl" />

src/lib/libs.json

@@ -9,7 +9,6 @@
         "es2019",
         "es2020",
         "es2021",
-        "es2022",
         "esnext",
         // Host only
         "dom.generated",
@@ -53,10 +52,6 @@
         "es2021.promise",
         "es2021.weakref",
         "es2021.intl",
-        "es2022.array",
-        "es2022.error",
-        "es2022.object",
-        "es2022.string",
         "esnext.intl",
         // Default libraries
         "es5.full",
@@ -67,7 +62,6 @@
         "es2019.full",
         "es2020.full",
         "es2021.full",
-        "es2022.full",
         "esnext.full"
     ],
     "paths": {

src/lib/webworker.generated.d.ts

@@ -477,7 +477,7 @@ interface RequestInit {
     /** An AbortSignal to set request's signal. */
     signal?: AbortSignal | null;
     /** Can only be null. Used to disassociate request from any Window. */
-    window?: null;
+    window?: any;
 }
 
 interface ResponseInit {
@@ -671,7 +671,7 @@ interface AbortSignal extends EventTarget {
 declare var AbortSignal: {
     prototype: AbortSignal;
     new(): AbortSignal;
-    // abort(): AbortSignal; - To be re-added in the future
+    // abort(): AbortSignal;
 };
 
 interface AbstractWorkerEventMap {
@@ -752,10 +752,7 @@ declare var ByteLengthQueuingStrategy: {
     new(init: QueuingStrategyInit): ByteLengthQueuingStrategy;
 };
 
-/**
- * Provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec.
- * Available only in secure contexts.
- */
+/** Provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec. */
 interface Cache {
     add(request: RequestInfo): Promise<void>;
     addAll(requests: RequestInfo[]): Promise<void>;
@@ -771,10 +768,7 @@ declare var Cache: {
     new(): Cache;
 };
 
-/**
- * The storage for Cache objects.
- * Available only in secure contexts.
- */
+/** The storage for Cache objects. */
 interface CacheStorage {
     delete(cacheName: string): Promise<boolean>;
     has(cacheName: string): Promise<boolean>;
@@ -882,7 +876,6 @@ declare var CountQueuingStrategy: {
 
 /** Basic cryptography features available in the current context. It allows access to a cryptographically strong random number generator and to cryptographic primitives. */
 interface Crypto {
-    /** Available only in secure contexts. */
     readonly subtle: SubtleCrypto;
     getRandomValues<T extends ArrayBufferView | null>(array: T): T;
 }
@@ -892,10 +885,7 @@ declare var Crypto: {
     new(): Crypto;
 };
 
-/**
- * The CryptoKey dictionary of the Web Crypto API represents a cryptographic key.
- * Available only in secure contexts.
- */
+/** The CryptoKey dictionary of the Web Crypto API represents a cryptographic key. */
 interface CryptoKey {
     readonly algorithm: KeyAlgorithm;
     readonly extractable: boolean;
@@ -2147,7 +2137,6 @@ interface NavigatorOnLine {
     readonly onLine: boolean;
 }
 
-/** Available only in secure contexts. */
 interface NavigatorStorage {
     readonly storage: StorageManager;
 }
@@ -2442,10 +2431,7 @@ declare var PromiseRejectionEvent: {
     new(type: string, eventInitDict: PromiseRejectionEventInit): PromiseRejectionEvent;
 };
 
-/**
- * This Push API interface represents a push message that has been received. This event is sent to the global scope of a ServiceWorker. It contains the information sent from an application server to a PushSubscription.
- * Available only in secure contexts.
- */
+/** This Push API interface represents a push message that has been received. This event is sent to the global scope of a ServiceWorker. It contains the information sent from an application server to a PushSubscription. */
 interface PushEvent extends ExtendableEvent {
     readonly data: PushMessageData | null;
 }
@@ -2455,10 +2441,7 @@ declare var PushEvent: {
     new(type: string, eventInitDict?: PushEventInit): PushEvent;
 };
 
-/**
- * This Push API interface provides a way to receive notifications from third-party servers as well as request URLs for push notifications.
- * Available only in secure contexts.
- */
+/** This Push API interface provides a way to receive notifications from third-party servers as well as request URLs for push notifications. */
 interface PushManager {
     getSubscription(): Promise<PushSubscription | null>;
     permissionState(options?: PushSubscriptionOptionsInit): Promise<PushPermissionState>;
@@ -2471,10 +2454,7 @@ declare var PushManager: {
     readonly supportedContentEncodings: ReadonlyArray<string>;
 };
 
-/**
- * This Push API interface provides methods which let you retrieve the push data sent by a server in various formats.
- * Available only in secure contexts.
- */
+/** This Push API interface provides methods which let you retrieve the push data sent by a server in various formats. */
 interface PushMessageData {
     arrayBuffer(): ArrayBuffer;
     blob(): Blob;
@@ -2487,10 +2467,7 @@ declare var PushMessageData: {
     new(): PushMessageData;
 };
 
-/**
- * This Push API interface provides a subcription's URL endpoint and allows unsubscription from a push service.
- * Available only in secure contexts.
- */
+/** This Push API interface provides a subcription's URL endpoint and allows unsubscription from a push service. */
 interface PushSubscription {
     readonly endpoint: string;
     readonly options: PushSubscriptionOptions;
@@ -2504,7 +2481,6 @@ declare var PushSubscription: {
     new(): PushSubscription;
 };
 
-/** Available only in secure contexts. */
 interface PushSubscriptionOptions {
     readonly applicationServerKey: ArrayBuffer | null;
 }
@@ -2522,6 +2498,7 @@ interface ReadableStream<R = any> {
     pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;
     pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
+    forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;
 }
 
 declare var ReadableStream: {
@@ -2636,10 +2613,7 @@ interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
     "statechange": Event;
 }
 
-/**
- * This ServiceWorker API interface provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object.
- * Available only in secure contexts.
- */
+/** This ServiceWorker API interface provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object. */
 interface ServiceWorker extends EventTarget, AbstractWorker {
     onstatechange: ((this: ServiceWorker, ev: Event) => any) | null;
     readonly scriptURL: string;
@@ -2663,10 +2637,7 @@ interface ServiceWorkerContainerEventMap {
     "messageerror": MessageEvent;
 }
 
-/**
- * The ServiceWorkerContainer interface of the ServiceWorker API provides an object representing the service worker as an overall unit in the network ecosystem, including facilities to register, unregister and update service workers, and access the state of service workers and their registrations.
- * Available only in secure contexts.
- */
+/** The ServiceWorkerContainer interface of the ServiceWorker API provides an object representing the service worker as an overall unit in the network ecosystem, including facilities to register, unregister and update service workers, and access the state of service workers and their registrations. */
 interface ServiceWorkerContainer extends EventTarget {
     readonly controller: ServiceWorker | null;
     oncontrollerchange: ((this: ServiceWorkerContainer, ev: Event) => any) | null;
@@ -2727,10 +2698,7 @@ interface ServiceWorkerRegistrationEventMap {
     "updatefound": Event;
 }
 
-/**
- * This ServiceWorker API interface represents the service worker registration. You register a service worker to control one or more pages that share the same origin.
- * Available only in secure contexts.
- */
+/** This ServiceWorker API interface represents the service worker registration. You register a service worker to control one or more pages that share the same origin. */
 interface ServiceWorkerRegistration extends EventTarget {
     readonly active: ServiceWorker | null;
     readonly installing: ServiceWorker | null;
@@ -2775,7 +2743,6 @@ declare var SharedWorkerGlobalScope: {
     new(): SharedWorkerGlobalScope;
 };
 
-/** Available only in secure contexts. */
 interface StorageManager {
     estimate(): Promise<StorageEstimate>;
     persisted(): Promise<boolean>;
@@ -2786,10 +2753,7 @@ declare var StorageManager: {
     new(): StorageManager;
 };
 
-/**
- * This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto).
- * Available only in secure contexts.
- */
+/** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */
 interface SubtleCrypto {
     decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesGcmParams, key: CryptoKey, data: BufferSource): Promise<any>;
     deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, length: number): Promise<ArrayBuffer>;
@@ -5066,7 +5030,6 @@ declare var WindowClient: {
 };
 
 interface WindowOrWorkerGlobalScope {
-    /** Available only in secure contexts. */
     readonly caches: CacheStorage;
     readonly crossOriginIsolated: boolean;
     readonly crypto: Crypto;
@@ -5389,8 +5352,7 @@ declare namespace WebAssembly {
 
     var CompileError: {
         prototype: CompileError;
-        new(message?: string): CompileError;
-        (message?: string): CompileError;
+        new(): CompileError;
     };
 
     interface Global {
@@ -5417,8 +5379,7 @@ declare namespace WebAssembly {
 
     var LinkError: {
         prototype: LinkError;
-        new(message?: string): LinkError;
-        (message?: string): LinkError;
+        new(): LinkError;
     };
 
     interface Memory {
@@ -5447,8 +5408,7 @@ declare namespace WebAssembly {
 
     var RuntimeError: {
         prototype: RuntimeError;
-        new(message?: string): RuntimeError;
-        (message?: string): RuntimeError;
+        new(): RuntimeError;
     };
 
     interface Table {
@@ -5525,7 +5485,7 @@ interface PerformanceObserverCallback {
 }
 
 interface QueuingStrategySize<T = any> {
-    (chunk: T): number;
+    (chunk?: T): number;
 }
 
 interface TransformerFlushCallback<O> {
@@ -5600,7 +5560,6 @@ declare function importScripts(...urls: (string | URL)[]): void;
 /** Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise. */
 declare function dispatchEvent(event: Event): boolean;
 declare var fonts: FontFaceSet;
-/** Available only in secure contexts. */
 declare var caches: CacheStorage;
 declare var crossOriginIsolated: boolean;
 declare var crypto: Crypto;
@@ -5689,7 +5648,7 @@ type MediaDecodingType = "file" | "media-source" | "webrtc";
 type MediaEncodingType = "record" | "webrtc";
 type NotificationDirection = "auto" | "ltr" | "rtl";
 type NotificationPermission = "default" | "denied" | "granted";
-type PermissionName = "geolocation" | "notifications" | "persistent-storage" | "push" | "screen-wake-lock" | "xr-spatial-tracking";
+type PermissionName = "geolocation" | "notifications" | "persistent-storage" | "push" | "screen-wake-lock";
 type PermissionState = "denied" | "granted" | "prompt";
 type PredefinedColorSpace = "display-p3" | "srgb";
 type PremultiplyAlpha = "default" | "none" | "premultiply";

src/lib/webworker.iterable.generated.d.ts

@@ -56,6 +56,13 @@ interface MessageEvent<T = any> {
     initMessageEvent(type: string, bubbles?: boolean, cancelable?: boolean, data?: any, origin?: string, lastEventId?: string, source?: MessageEventSource | null, ports?: Iterable<MessagePort>): void;
 }
 
+interface ReadableStream<R = any> {
+    [Symbol.iterator](): IterableIterator<any>;
+    entries(): IterableIterator<[number, any]>;
+    keys(): IterableIterator<number>;
+    values(): IterableIterator<any>;
+}
+
 interface SubtleCrypto {
     deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: AlgorithmIdentifier | AesDerivedKeyParams | HmacImportParams | HkdfParams | Pbkdf2Params, extractable: boolean, keyUsages: Iterable<KeyUsage>): Promise<CryptoKey>;
     generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKeyPair>;

src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7764,15 +7764,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[JSON 导入在 ES 模块模式导入中是实验性的。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7764,15 +7764,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[JSON 匯入在 ES 模組模式匯入中為實驗性。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7773,15 +7773,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Importy JSON jsou v importech režimu modulu ES experimentální.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>
@@ -15285,15 +15276,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";_0_is_not_allowed_as_a_parameter_name_1390" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' is not allowed as a parameter name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} není povolen jako název parametru.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";_0_is_not_allowed_as_a_variable_declaration_name_1389" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{0}' is not allowed as a variable declaration name.]]></Val>

src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7761,15 +7761,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[JSON-Importe sind experimentell in Importen im ES-Modulmodus.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>
@@ -15270,15 +15261,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";_0_is_not_allowed_as_a_parameter_name_1390" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' is not allowed as a parameter name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA["{0}" ist als Parametername nicht zulässig.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";_0_is_not_allowed_as_a_variable_declaration_name_1389" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{0}' is not allowed as a variable declaration name.]]></Val>

src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7776,15 +7776,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Las importaciones de JSON son experimentales en las importaciones del modo de módulo ES.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7776,15 +7776,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Les importations JSON sont expérimentales dans les importations en mode module ES.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>
@@ -15288,15 +15279,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";_0_is_not_allowed_as_a_parameter_name_1390" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' is not allowed as a parameter name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}' n'est pas autorisé comme nom de paramètre.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";_0_is_not_allowed_as_a_variable_declaration_name_1389" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{0}' is not allowed as a variable declaration name.]]></Val>

src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7764,15 +7764,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Le importazioni JSON sono sperimentali nelle importazioni in modalità modulo ES.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7764,15 +7764,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[JSON インポートは、ES モジュール モードのインポートでは試験的な機能です。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7764,15 +7764,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[JSON 가져오기는 ES 모듈 모드 가져오기에서 실험적입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>
@@ -15276,15 +15267,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";_0_is_not_allowed_as_a_parameter_name_1390" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' is not allowed as a parameter name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['{0}'은(는) 매개 변수 이름으로 사용할 수 없습니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";_0_is_not_allowed_as_a_variable_declaration_name_1389" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{0}' is not allowed as a variable declaration name.]]></Val>

src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7754,15 +7754,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Importy JSON są eksperymentalne w importach w trybie modułu ES.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>
@@ -15263,15 +15254,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";_0_is_not_allowed_as_a_parameter_name_1390" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA['{0}' is not allowed as a parameter name.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[„{0}” jest niedozwolone jako nazwa parametru.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";_0_is_not_allowed_as_a_variable_declaration_name_1389" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{0}' is not allowed as a variable declaration name.]]></Val>

src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7757,15 +7757,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[As importações JSON são experimentais em importações de modo de módulo ES.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7763,15 +7763,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Импорт данных JSON — экспериментальная функция импорта в режиме модуля ES.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl

@@ -7757,15 +7757,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";JSON_imports_are_experimental_in_ES_module_mode_imports_7062" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[JSON imports are experimental in ES module mode imports.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[JSON içeri aktarmaları, ES modül modu içeri aktarmaları için deneyseldir.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>

src/server/editorServices.ts

@@ -49,23 +49,24 @@ namespace ts.server {
         readonly data: ProjectInfoTelemetryEventData;
     }
 
-    /* __GDPR__
-        "projectInfo" : {
-            "${include}": ["${TypeScriptCommonProperties}"],
-            "projectId": { "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight", "endpoint": "ProjectId" },
-            "fileStats": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "compilerOptions": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "extends": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "files": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "include": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "exclude": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "compileOnSave": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "typeAcquisition": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "configFileName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "projectType": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "languageServiceEnabled": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "version": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-        }
+    /*
+     * __GDPR__
+     * "projectInfo" : {
+     *      "${include}": ["${TypeScriptCommonProperties}"],
+     *      "projectId": { "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight", "endpoint": "ProjectId" },
+     *      "fileStats": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "compilerOptions": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "extends": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "files": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "include": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "exclude": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "compileOnSave": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "typeAcquisition": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "configFileName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "projectType": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "languageServiceEnabled": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *      "version": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+     * }
      */
     export interface ProjectInfoTelemetryEventData {
         /** Cryptographically secure hash of project file location. */

src/server/project.ts

@@ -1031,11 +1031,6 @@ namespace ts.server {
             }
         }
 
-        /* @internal */
-        onDiscoveredSymlink() {
-            this.hasAddedOrRemovedSymlinks = true;
-        }
-
         /**
          * Updates set of files that contribute to this project
          * @returns: true if set of files in the project stays the same and false - otherwise.
@@ -1944,15 +1939,15 @@ namespace ts.server {
                 for (const resolution of resolutions) {
                     if (!resolution.resolvedFileName) continue;
                     const { resolvedFileName, originalPath } = resolution;
-                    if (originalPath) {
-                        symlinkCache.setSymlinkedDirectoryFromSymlinkedFile(originalPath, resolvedFileName);
-                    }
                     if (!program.getSourceFile(resolvedFileName) && (!originalPath || !program.getSourceFile(originalPath))) {
                         rootNames = append(rootNames, resolvedFileName);
                         // Avoid creating a large project that would significantly slow down time to editor interactivity
                         if (dependencySelection === PackageJsonAutoImportPreference.Auto && rootNames.length > this.maxDependencies) {
                             return ts.emptyArray;
                         }
+                        if (originalPath) {
+                            symlinkCache.setSymlinkedDirectoryFromSymlinkedFile(originalPath, resolvedFileName);
+                        }
                     }
                 }
             }

src/server/protocol.ts

@@ -2289,7 +2289,7 @@ namespace ts.server.protocol {
         /**
          * Human-readable description of the `source`.
          */
-        sourceDisplay?: SymbolDisplayPart[];
+         sourceDisplay?: SymbolDisplayPart[];
         /**
          * If true, this completion should be highlighted as recommended. There will only be one of these.
          * This will be set when we know the user should write an expression with a certain type and that type is an enum or constructable class.
@@ -3199,32 +3199,14 @@ namespace ts.server.protocol {
         payload: TypingsInstalledTelemetryEventPayload;
     }
 
-    // A __GDPR__FRAGMENT__ has no meaning until it is ${include}d by a __GDPR__ comment, at which point
-    // the included properties are effectively inlined into the __GDPR__ declaration.  In this case, for
-    // example, any __GDPR__ comment including the TypeScriptCommonProperties will be updated with an
-    // additional version property with the classification below.  Obviously, the purpose of such a construct
-    // is to reduce duplication and keep multiple use sites consistent (e.g. by making sure that all reflect
-    // any newly added TypeScriptCommonProperties).  Unfortunately, the system has limits - in particular,
-    // these reusable __GDPR__FRAGMENT__s are not accessible across repo boundaries.  Therefore, even though
-    // the code for adding the common properties (i.e. version), along with the corresponding __GDPR__FRAGMENT__,
-    // lives in the VS Code repo (see https://github.com/microsoft/vscode/blob/main/extensions/typescript-language-features/src/utils/telemetry.ts)
-    // we have to duplicate it here.  It would be nice to keep them in sync, but the only likely failure mode
-    // is adding a property to the VS Code repro but not here and the only consequence would be having that
-    // property suppressed on the events (i.e. __GDPT__ comments) in this repo that reference the out-of-date
-    // local __GDPR__FRAGMENT__.
-    /* __GDPR__FRAGMENT__
-        "TypeScriptCommonProperties" : {
-            "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-        }
-    */
-
-    /* __GDPR__
-        "typingsinstalled" : {
-            "${include}": ["${TypeScriptCommonProperties}"],
-            "installedPackages": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-            "installSuccess": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-            "typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-        }
+    /*
+     * __GDPR__
+     * "typingsinstalled" : {
+     *     "${include}": ["${TypeScriptCommonProperties}"],
+     *     "installedPackages": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+     *     "installSuccess": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+     *     "typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+     * }
      */
     export interface TypingsInstalledTelemetryEventPayload {
         /**
@@ -3399,13 +3381,6 @@ namespace ts.server.protocol {
          * values, with insertion text to replace preceding `.` tokens with `?.`.
          */
         readonly includeAutomaticOptionalChainCompletions?: boolean;
-        /**
-         * If enabled, completions for class members (e.g. methods and properties) will include
-         * a whole declaration for the member.
-         * E.g., `class A { f| }` could be completed to `class A { foo(): number {} }`, instead of
-         * `class A { foo }`.
-         */
-        readonly includeCompletionsWithClassMemberSnippets?: boolean;
         readonly allowIncompleteCompletions?: boolean;
         readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
@@ -3534,7 +3509,6 @@ namespace ts.server.protocol {
         ES2019 = "ES2019",
         ES2020 = "ES2020",
         ES2021 = "ES2021",
-        ES2022 = "ES2022",
         ESNext = "ESNext"
     }
 

src/server/session.ts

@@ -2112,7 +2112,7 @@ namespace ts.server {
         private getFullNavigateToItems(args: protocol.NavtoRequestArgs): CombineOutputResult<NavigateToItem> {
             const { currentFileOnly, searchValue, maxResultCount, projectFileName } = args;
             if (currentFileOnly) {
-                Debug.assertIsDefined(args.file);
+                Debug.assertDefined(args.file);
                 const { file, project } = this.getFileAndProject(args as protocol.FileRequestArgs);
                 return [{ project, result: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
             }

src/services/codeFixProvider.ts

@@ -3,6 +3,13 @@ namespace ts.codefix {
     const errorCodeToFixes = createMultiMap<CodeFixRegistration>();
     const fixIdToRegistration = new Map<string, CodeFixRegistration>();
 
+    export type DiagnosticAndArguments = DiagnosticMessage | [DiagnosticMessage, string] | [DiagnosticMessage, string, string];
+    function diagnosticToString(diag: DiagnosticAndArguments): string {
+        return isArray(diag)
+            ? formatStringFromArgs(getLocaleSpecificMessage(diag[0]), diag.slice(1) as readonly string[])
+            : getLocaleSpecificMessage(diag);
+    }
+
     export function createCodeFixActionWithoutFixAll(fixName: string, changes: FileTextChanges[], description: DiagnosticAndArguments) {
         return createCodeFixActionWorker(fixName, diagnosticToString(description), changes, /*fixId*/ undefined, /*fixAllDescription*/ undefined);
     }

src/services/codefixes/addNameToNamelessParameter.ts

@@ -14,24 +14,24 @@ namespace ts.codefix {
 
     function makeChange(changeTracker: textChanges.ChangeTracker, sourceFile: SourceFile, pos: number) {
         const token = getTokenAtPosition(sourceFile, pos);
+        if (!isIdentifier(token)) {
+            return Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + Debug.formatSyntaxKind(token.kind));
+        }
         const param = token.parent;
         if (!isParameter(param)) {
             return Debug.fail("Tried to add a parameter name to a non-parameter: " + Debug.formatSyntaxKind(token.kind));
         }
-
         const i = param.parent.parameters.indexOf(param);
         Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
         Debug.assert(i > -1, "Parameter not found in parent parameter list.");
-
-        const typeNode = factory.createTypeReferenceNode(param.name as Identifier, /*typeArguments*/ undefined);
         const replacement = factory.createParameterDeclaration(
             /*decorators*/ undefined,
             param.modifiers,
             param.dotDotDotToken,
             "arg" + i,
             param.questionToken,
-            param.dotDotDotToken ? factory.createArrayTypeNode(typeNode) : typeNode,
+            factory.createTypeReferenceNode(token, /*typeArguments*/ undefined),
             param.initializer);
-        changeTracker.replaceNode(sourceFile, param, replacement);
+        changeTracker.replaceNode(sourceFile, token, replacement);
     }
 }

src/services/codefixes/convertToEsModule.ts

@@ -408,7 +408,9 @@ namespace ts.codefix {
                 const importSpecifiers = mapAllOrFail(name.elements, e =>
                     e.dotDotDotToken || e.initializer || e.propertyName && !isIdentifier(e.propertyName) || !isIdentifier(e.name)
                         ? undefined
-                        : makeImportSpecifier(e.propertyName && e.propertyName.text, e.name.text));
+                        // (TODO: GH#18217)
+                        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+                        : makeImportSpecifier(e.propertyName && (e.propertyName as Identifier).text, e.name.text));
                 if (importSpecifiers) {
                     return convertedImports([makeImport(/*name*/ undefined, importSpecifiers, moduleSpecifier, quotePreference)]);
                 }

src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts

@@ -42,7 +42,7 @@ namespace ts.codefix {
         const abstractAndNonPrivateExtendsSymbols = checker.getPropertiesOfType(instantiatedExtendsType).filter(symbolPointsToNonPrivateAndAbstractMember);
 
         const importAdder = createImportAdder(sourceFile, context.program, preferences, context.host);
-        createMissingMemberNodes(classDeclaration, abstractAndNonPrivateExtendsSymbols, sourceFile, context, preferences, importAdder, member => changeTracker.insertNodeAtClassStart(sourceFile, classDeclaration, member as ClassElement));
+        createMissingMemberNodes(classDeclaration, abstractAndNonPrivateExtendsSymbols, sourceFile, context, preferences, importAdder, member => changeTracker.insertNodeAtClassStart(sourceFile, classDeclaration, member));
         importAdder.writeFixes(changeTracker);
     }
 

src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts

@@ -64,7 +64,7 @@ namespace ts.codefix {
         }
 
         const importAdder = createImportAdder(sourceFile, context.program, preferences, context.host);
-        createMissingMemberNodes(classDeclaration, nonPrivateAndNotExistedInHeritageClauseMembers, sourceFile, context, preferences, importAdder, member => insertInterfaceMemberNode(sourceFile, classDeclaration, member as ClassElement));
+        createMissingMemberNodes(classDeclaration, nonPrivateAndNotExistedInHeritageClauseMembers, sourceFile, context, preferences, importAdder, member => insertInterfaceMemberNode(sourceFile, classDeclaration, member));
         importAdder.writeFixes(changeTracker);
 
         function createMissingIndexSignatureDeclaration(type: InterfaceType, kind: IndexKind): void {

src/services/codefixes/fixImplicitThis.ts

@@ -26,9 +26,9 @@ namespace ts.codefix {
         if (!isFunctionDeclaration(fn) && !isFunctionExpression(fn)) return undefined;
 
         if (!isSourceFile(getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function
-            const fnKeyword = Debug.checkDefined(findChildOfKind(fn, SyntaxKind.FunctionKeyword, sourceFile));
+            const fnKeyword = Debug.assertDefined(findChildOfKind(fn, SyntaxKind.FunctionKeyword, sourceFile));
             const { name } = fn;
-            const body = Debug.checkDefined(fn.body); // Should be defined because the function contained a 'this' expression
+            const body = Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression
             if (isFunctionExpression(fn)) {
                 if (name && FindAllReferences.Core.isSymbolReferencedInFile(name, checker, sourceFile, body)) {
                     // Function expression references itself. To fix we would have to extract it to a const.

src/services/codefixes/fixOverrideModifier.ts

@@ -17,81 +17,37 @@ namespace ts.codefix {
         Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code,
         Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code,
         Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code,
-        Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code,
-        Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code,
-        Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class.code,
-        Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code,
-        Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0.code,
+        Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code
     ];
 
-    interface ErrorCodeFixInfo {
-        descriptions: DiagnosticMessage;
-        fixId?: string | undefined;
-        fixAllDescriptions?: DiagnosticMessage | undefined;
-    }
-
-    const errorCodeFixIdMap: Record<number, ErrorCodeFixInfo> = {
-        // case #1:
-        [Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code]: {
-            descriptions: Diagnostics.Add_override_modifier,
-            fixId: fixAddOverrideId,
-            fixAllDescriptions: Diagnostics.Add_all_missing_override_modifiers,
-        },
-        [Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code]: {
-            descriptions: Diagnostics.Add_override_modifier,
-            fixId: fixAddOverrideId,
-            fixAllDescriptions: Diagnostics.Add_all_missing_override_modifiers
-        },
-        // case #2:
-        [Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code]: {
-            descriptions: Diagnostics.Remove_override_modifier,
-            fixId: fixRemoveOverrideId,
-            fixAllDescriptions: Diagnostics.Remove_all_unnecessary_override_modifiers,
-        },
-        [Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class.code]: {
-            descriptions: Diagnostics.Remove_override_modifier,
-            fixId: fixRemoveOverrideId,
-            fixAllDescriptions: Diagnostics.Remove_override_modifier
-        },
-        // case #3:
-        [Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code]: {
-            descriptions: Diagnostics.Add_override_modifier,
-            fixId: fixAddOverrideId,
-            fixAllDescriptions: Diagnostics.Add_all_missing_override_modifiers,
-        },
-        [Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code]: {
-            descriptions: Diagnostics.Add_override_modifier,
-            fixId: fixAddOverrideId,
-            fixAllDescriptions: Diagnostics.Add_all_missing_override_modifiers,
-        },
-        // case #4:
-        [Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code]: {
-            descriptions: Diagnostics.Add_override_modifier,
-            fixId: fixAddOverrideId,
-            fixAllDescriptions: Diagnostics.Remove_all_unnecessary_override_modifiers,
-        },
-        // case #5:
-        [Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code]: {
-            descriptions: Diagnostics.Remove_override_modifier,
-            fixId: fixRemoveOverrideId,
-            fixAllDescriptions: Diagnostics.Remove_all_unnecessary_override_modifiers,
-        },
-        [Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0.code]: {
-            descriptions: Diagnostics.Remove_override_modifier,
-            fixId: fixRemoveOverrideId,
-            fixAllDescriptions: Diagnostics.Remove_all_unnecessary_override_modifiers,
-        }
+    const errorCodeFixIdMap: Record<number, [DiagnosticMessage, string | undefined, DiagnosticMessage | undefined]> = {
+        [Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code]: [
+            Diagnostics.Add_override_modifier, fixAddOverrideId, Diagnostics.Add_all_missing_override_modifiers,
+        ],
+        [Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code]: [
+            Diagnostics.Remove_override_modifier, fixRemoveOverrideId, Diagnostics.Remove_all_unnecessary_override_modifiers
+        ],
+        [Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code]: [
+            Diagnostics.Add_override_modifier, fixAddOverrideId, Diagnostics.Add_all_missing_override_modifiers,
+        ],
+        [Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code]: [
+            Diagnostics.Add_override_modifier, fixAddOverrideId, Diagnostics.Remove_all_unnecessary_override_modifiers
+        ],
+        [Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code]: [
+            Diagnostics.Remove_override_modifier, fixRemoveOverrideId, Diagnostics.Remove_all_unnecessary_override_modifiers
+        ]
     };
 
     registerCodeFix({
         errorCodes,
         getCodeActions: context => {
-            const { errorCode, span } = context;
+            const { errorCode, span, sourceFile } = context;
 
             const info = errorCodeFixIdMap[errorCode];
             if (!info) return emptyArray;
 
-            const { descriptions, fixId, fixAllDescriptions } = info;
+            const [ descriptions, fixId, fixAllDescriptions ] = info;
+            if (isSourceFileJS(sourceFile)) return emptyArray;
             const changes = textChanges.ChangeTracker.with(context, changes => dispatchChanges(changes, context, errorCode, span.start));
 
             return [
@@ -101,9 +57,9 @@ namespace ts.codefix {
         fixIds: [fixName, fixAddOverrideId, fixRemoveOverrideId],
         getAllCodeActions: context =>
             codeFixAll(context, errorCodes, (changes, diag) => {
-                const { code, start } = diag;
+                const { code, start, file } = diag;
                 const info = errorCodeFixIdMap[code];
-                if (!info || info.fixId !== context.fixId) {
+                if (!info || info[1] !== context.fixId || isSourceFileJS(file)) {
                     return;
                 }
 
@@ -118,15 +74,11 @@ namespace ts.codefix {
         pos: number) {
         switch (errorCode) {
             case Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code:
-            case Diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code:
             case Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code:
             case Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code:
-            case Diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0.code:
                 return doAddOverrideModifierChange(changeTracker, context.sourceFile, pos);
             case Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code:
-            case Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0.code:
             case Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code:
-            case Diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class.code:
                 return doRemoveOverrideModifierChange(changeTracker, context.sourceFile, pos);
             default:
                 Debug.fail("Unexpected error code: " + errorCode);
@@ -135,10 +87,6 @@ namespace ts.codefix {
 
     function doAddOverrideModifierChange(changeTracker: textChanges.ChangeTracker, sourceFile: SourceFile, pos: number) {
         const classElement = findContainerClassElementLike(sourceFile, pos);
-        if (isSourceFileJS(sourceFile)) {
-            changeTracker.addJSDocTags(sourceFile, classElement, [factory.createJSDocOverrideTag(factory.createIdentifier("override"))]);
-            return;
-        }
         const modifiers = classElement.modifiers || emptyArray;
         const staticModifier = find(modifiers, isStaticModifier);
         const abstractModifier = find(modifiers, isAbstractModifier);
@@ -153,10 +101,6 @@ namespace ts.codefix {
 
     function doRemoveOverrideModifierChange(changeTracker: textChanges.ChangeTracker, sourceFile: SourceFile, pos: number) {
         const classElement = findContainerClassElementLike(sourceFile, pos);
-        if (isSourceFileJS(sourceFile)) {
-            changeTracker.filterJSDocTags(sourceFile, classElement, not(isJSDocOverrideTag));
-            return;
-        }
         const overrideModifier = classElement.modifiers && find(classElement.modifiers, modifier => modifier.kind === SyntaxKind.OverrideKeyword);
         Debug.assertIsDefined(overrideModifier);
 

src/services/codefixes/helpers.ts

@@ -7,18 +7,11 @@ namespace ts.codefix {
      * @param importAdder If provided, type annotations will use identifier type references instead of ImportTypeNodes, and the missing imports will be added to the importAdder.
      * @returns Empty string iff there are no member insertions.
      */
-    export function createMissingMemberNodes(
-        classDeclaration: ClassLikeDeclaration,
-        possiblyMissingSymbols: readonly Symbol[],
-        sourceFile: SourceFile,
-        context: TypeConstructionContext,
-        preferences: UserPreferences,
-        importAdder: ImportAdder | undefined,
-        addClassElement: (node: AddNode) => void): void {
+    export function createMissingMemberNodes(classDeclaration: ClassLikeDeclaration, possiblyMissingSymbols: readonly Symbol[], sourceFile: SourceFile, context: TypeConstructionContext, preferences: UserPreferences, importAdder: ImportAdder | undefined, addClassElement: (node: ClassElement) => void): void {
         const classMembers = classDeclaration.symbol.members!;
         for (const symbol of possiblyMissingSymbols) {
             if (!classMembers.has(symbol.escapedName)) {
-                addNewNodeForMemberSymbol(symbol, classDeclaration, sourceFile, context, preferences, importAdder, addClassElement, /* body */ undefined);
+                addNewNodeForMemberSymbol(symbol, classDeclaration, sourceFile, context, preferences, importAdder, addClassElement);
             }
         }
     }
@@ -35,30 +28,10 @@ namespace ts.codefix {
         host: LanguageServiceHost;
     }
 
-    type AddNode = PropertyDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | MethodDeclaration | FunctionExpression | ArrowFunction;
-
-    export const enum PreserveOptionalFlags {
-        Method  = 1 << 0,
-        Property = 1 << 1,
-        All     = Method | Property
-    }
-
     /**
-     * `addClassElement` will not be called if we can't figure out a representation for `symbol` in `enclosingDeclaration`.
-     * @param body If defined, this will be the body of the member node passed to `addClassElement`. Otherwise, the body will default to a stub.
+     * @returns Empty string iff there we can't figure out a representation for `symbol` in `enclosingDeclaration`.
      */
-    export function addNewNodeForMemberSymbol(
-        symbol: Symbol,
-        enclosingDeclaration: ClassLikeDeclaration,
-        sourceFile: SourceFile,
-        context: TypeConstructionContext,
-        preferences: UserPreferences,
-        importAdder: ImportAdder | undefined,
-        addClassElement: (node: AddNode) => void,
-        body: Block | undefined,
-        preserveOptional = PreserveOptionalFlags.All,
-        isAmbient = false,
-    ): void {
+    function addNewNodeForMemberSymbol(symbol: Symbol, enclosingDeclaration: ClassLikeDeclaration, sourceFile: SourceFile, context: TypeConstructionContext, preferences: UserPreferences, importAdder: ImportAdder | undefined, addClassElement: (node: Node) => void): void {
         const declarations = symbol.getDeclarations();
         if (!(declarations && declarations.length)) {
             return undefined;
@@ -71,7 +44,7 @@ namespace ts.codefix {
         const modifiers = visibilityModifier ? factory.createNodeArray([visibilityModifier]) : undefined;
         const type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
         const optional = !!(symbol.flags & SymbolFlags.Optional);
-        const ambient = !!(enclosingDeclaration.flags & NodeFlags.Ambient) || isAmbient;
+        const ambient = !!(enclosingDeclaration.flags & NodeFlags.Ambient);
         const quotePreference = getQuotePreference(sourceFile, preferences);
 
         switch (declaration.kind) {
@@ -90,7 +63,7 @@ namespace ts.codefix {
                     /*decorators*/ undefined,
                     modifiers,
                     name,
-                    optional && (preserveOptional & PreserveOptionalFlags.Property) ? factory.createToken(SyntaxKind.QuestionToken) : undefined,
+                    optional ? factory.createToken(SyntaxKind.QuestionToken) : undefined,
                     typeNode,
                     /*initializer*/ undefined));
                 break;
@@ -116,7 +89,7 @@ namespace ts.codefix {
                             name,
                             emptyArray,
                             typeNode,
-                            ambient ? undefined : body || createStubbedMethodBody(quotePreference)));
+                            ambient ? undefined : createStubbedMethodBody(quotePreference)));
                     }
                     else {
                         Debug.assertNode(accessor, isSetAccessorDeclaration, "The counterpart to a getter should be a setter");
@@ -127,7 +100,7 @@ namespace ts.codefix {
                             modifiers,
                             name,
                             createDummyParameters(1, [parameterName], [typeNode], 1, /*inJs*/ false),
-                            ambient ? undefined : body || createStubbedMethodBody(quotePreference)));
+                            ambient ? undefined : createStubbedMethodBody(quotePreference)));
                     }
                 }
                 break;
@@ -149,7 +122,7 @@ namespace ts.codefix {
                 if (declarations.length === 1) {
                     Debug.assert(signatures.length === 1, "One declaration implies one signature");
                     const signature = signatures[0];
-                    outputMethod(quotePreference, signature, modifiers, name, ambient ? undefined : body || createStubbedMethodBody(quotePreference));
+                    outputMethod(quotePreference, signature, modifiers, name, ambient ? undefined : createStubbedMethodBody(quotePreference));
                     break;
                 }
 
@@ -161,18 +134,18 @@ namespace ts.codefix {
                 if (!ambient) {
                     if (declarations.length > signatures.length) {
                         const signature = checker.getSignatureFromDeclaration(declarations[declarations.length - 1] as SignatureDeclaration)!;
-                        outputMethod(quotePreference, signature, modifiers, name, body || createStubbedMethodBody(quotePreference));
+                        outputMethod(quotePreference, signature, modifiers, name, createStubbedMethodBody(quotePreference));
                     }
                     else {
                         Debug.assert(declarations.length === signatures.length, "Declarations and signatures should match count");
-                        addClassElement(createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional && !!(preserveOptional & PreserveOptionalFlags.Method), modifiers, quotePreference, body));
+                        addClassElement(createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference));
                     }
                 }
                 break;
         }
 
         function outputMethod(quotePreference: QuotePreference, signature: Signature, modifiers: NodeArray<Modifier> | undefined, name: PropertyName, body?: Block): void {
-            const method = createSignatureDeclarationFromSignature(SyntaxKind.MethodDeclaration, context, quotePreference, signature, body, name, modifiers, optional && !!(preserveOptional & PreserveOptionalFlags.Method), enclosingDeclaration, importAdder);
+            const method = createSignatureDeclarationFromSignature(SyntaxKind.MethodDeclaration, context, quotePreference, signature, body, name, modifiers, optional, enclosingDeclaration, importAdder);
             if (method) addClassElement(method);
         }
     }
@@ -375,7 +348,6 @@ namespace ts.codefix {
         optional: boolean,
         modifiers: readonly Modifier[] | undefined,
         quotePreference: QuotePreference,
-        body: Block | undefined,
     ): MethodDeclaration {
         /** This is *a* signature with the maximal number of arguments,
          * such that if there is a "maximal" signature without rest arguments,
@@ -417,8 +389,7 @@ namespace ts.codefix {
             /*typeParameters*/ undefined,
             parameters,
             getReturnTypeFromSignatures(signatures, checker, context, enclosingDeclaration),
-            quotePreference,
-            body);
+            quotePreference);
     }
 
     function getReturnTypeFromSignatures(signatures: readonly Signature[], checker: TypeChecker, context: TypeConstructionContext, enclosingDeclaration: ClassLikeDeclaration): TypeNode | undefined {
@@ -435,8 +406,7 @@ namespace ts.codefix {
         typeParameters: readonly TypeParameterDeclaration[] | undefined,
         parameters: readonly ParameterDeclaration[],
         returnType: TypeNode | undefined,
-        quotePreference: QuotePreference,
-        body: Block | undefined
+        quotePreference: QuotePreference
     ): MethodDeclaration {
         return factory.createMethodDeclaration(
             /*decorators*/ undefined,
@@ -447,7 +417,7 @@ namespace ts.codefix {
             typeParameters,
             parameters,
             returnType,
-            body || createStubbedMethodBody(quotePreference));
+            createStubbedMethodBody(quotePreference));
     }
 
     function createStubbedMethodBody(quotePreference: QuotePreference) {

src/services/codefixes/importFixes.ts

@@ -33,7 +33,6 @@ namespace ts.codefix {
     });
 
     export interface ImportAdder {
-        hasFixes(): boolean;
         addImportFromDiagnostic: (diagnostic: DiagnosticWithLocation, context: CodeFixContextBase) => void;
         addImportFromExportedSymbol: (exportedSymbol: Symbol, isValidTypeOnlyUseSite?: boolean) => void;
         writeFixes: (changeTracker: textChanges.ChangeTracker) => void;
@@ -60,7 +59,7 @@ namespace ts.codefix {
         type NewImportsKey = `${0 | 1}|${string}`;
         /** Use `getNewImportEntry` for access */
         const newImports = new Map<NewImportsKey, Mutable<ImportsCollection & { useRequire: boolean }>>();
-        return { addImportFromDiagnostic, addImportFromExportedSymbol, writeFixes, hasFixes };
+        return { addImportFromDiagnostic, addImportFromExportedSymbol, writeFixes };
 
         function addImportFromDiagnostic(diagnostic: DiagnosticWithLocation, context: CodeFixContextBase) {
             const info = getFixesInfo(context, diagnostic.code, diagnostic.start, useAutoImportProvider);
@@ -218,10 +217,6 @@ namespace ts.codefix {
                 insertImports(changeTracker, sourceFile, newDeclarations, /*blankLineBetween*/ true);
             }
         }
-
-        function hasFixes() {
-            return addToNamespace.length > 0 || importType.length > 0 || addToExisting.size > 0 || newImports.size > 0;
-        }
     }
 
     // Sorted with the preferred fix coming first.

src/services/codefixes/inferFromUsage.ts

@@ -131,7 +131,7 @@ namespace ts.codefix {
                     if (typeNode) {
                         // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
                         const typeTag = factory.createJSDocTypeTag(/*tagName*/ undefined, factory.createJSDocTypeExpression(typeNode), /*comment*/ undefined);
-                        changes.addJSDocTags(sourceFile, cast(parent.parent.parent, isExpressionStatement), [typeTag]);
+                        addJSDocTags(changes, sourceFile, cast(parent.parent.parent, isExpressionStatement), [typeTag]);
                     }
                     importAdder.writeFixes(changes);
                     return parent;
@@ -271,7 +271,7 @@ namespace ts.codefix {
     }
 
     function annotateJSDocThis(changes: textChanges.ChangeTracker, sourceFile: SourceFile, containingFunction: SignatureDeclaration, typeNode: TypeNode) {
-        changes.addJSDocTags(sourceFile, containingFunction, [
+        addJSDocTags(changes, sourceFile, containingFunction, [
             factory.createJSDocThisTag(/*tagName*/ undefined, factory.createJSDocTypeExpression(typeNode)),
         ]);
     }
@@ -311,7 +311,7 @@ namespace ts.codefix {
                 }
                 const typeExpression = factory.createJSDocTypeExpression(typeNode);
                 const typeTag = isGetAccessorDeclaration(declaration) ? factory.createJSDocReturnTag(/*tagName*/ undefined, typeExpression, /*comment*/ undefined) : factory.createJSDocTypeTag(/*tagName*/ undefined, typeExpression, /*comment*/ undefined);
-                changes.addJSDocTags(sourceFile, parent, [typeTag]);
+                addJSDocTags(changes, sourceFile, parent, [typeTag]);
             }
             else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, sourceFile, changes, importAdder, getEmitScriptTarget(program.getCompilerOptions()))) {
                 changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
@@ -378,7 +378,46 @@ namespace ts.codefix {
         else {
             const paramTags = map(inferences, ({ name, typeNode, isOptional }) =>
                 factory.createJSDocParameterTag(/*tagName*/ undefined, name, /*isBracketed*/ !!isOptional, factory.createJSDocTypeExpression(typeNode), /* isNameFirst */ false, /*comment*/ undefined));
-            changes.addJSDocTags(sourceFile, signature, paramTags);
+            addJSDocTags(changes, sourceFile, signature, paramTags);
+        }
+    }
+
+    export function addJSDocTags(changes: textChanges.ChangeTracker, sourceFile: SourceFile, parent: HasJSDoc, newTags: readonly JSDocTag[]): void {
+        const comments = flatMap(parent.jsDoc, j => typeof j.comment === "string" ? factory.createJSDocText(j.comment) : j.comment) as JSDocComment[];
+        const oldTags = flatMapToMutable(parent.jsDoc, j => j.tags);
+        const unmergedNewTags = newTags.filter(newTag => !oldTags || !oldTags.some((tag, i) => {
+            const merged = tryMergeJsdocTags(tag, newTag);
+            if (merged) oldTags[i] = merged;
+            return !!merged;
+        }));
+        const tag = factory.createJSDocComment(factory.createNodeArray(intersperse(comments, factory.createJSDocText("\n"))), factory.createNodeArray([...(oldTags || emptyArray), ...unmergedNewTags]));
+        const jsDocNode = parent.kind === SyntaxKind.ArrowFunction ? getJsDocNodeForArrowFunction(parent) : parent;
+        jsDocNode.jsDoc = parent.jsDoc;
+        jsDocNode.jsDocCache = parent.jsDocCache;
+        changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
+    }
+
+    function getJsDocNodeForArrowFunction(signature: ArrowFunction): HasJSDoc {
+        if (signature.parent.kind === SyntaxKind.PropertyDeclaration) {
+            return signature.parent as HasJSDoc;
+        }
+        return signature.parent.parent as HasJSDoc;
+    }
+
+    function tryMergeJsdocTags(oldTag: JSDocTag, newTag: JSDocTag): JSDocTag | undefined {
+        if (oldTag.kind !== newTag.kind) {
+            return undefined;
+        }
+        switch (oldTag.kind) {
+            case SyntaxKind.JSDocParameterTag: {
+                const oldParam = oldTag as JSDocParameterTag;
+                const newParam = newTag as JSDocParameterTag;
+                return isIdentifier(oldParam.name) && isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
+                    ? factory.createJSDocParameterTag(/*tagName*/ undefined, newParam.name, /*isBracketed*/ false, newParam.typeExpression, newParam.isNameFirst, oldParam.comment)
+                    : undefined;
+            }
+            case SyntaxKind.JSDocReturnTag:
+                return factory.createJSDocReturnTag(/*tagName*/ undefined, (newTag as JSDocReturnTag).typeExpression, oldTag.comment);
         }
     }
 
@@ -961,25 +1000,13 @@ namespace ts.codefix {
             if (usage.numberIndex) {
                 types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
             }
-            if (usage.properties?.size || usage.constructs?.length || usage.stringIndex) {
+            if (usage.properties?.size || usage.calls?.length || usage.constructs?.length || usage.stringIndex) {
                 types.push(inferStructuralType(usage));
             }
 
-            const candidateTypes = (usage.candidateTypes || []).map(t => checker.getBaseTypeOfLiteralType(t));
-            const callsType = usage.calls?.length ? inferStructuralType(usage) : undefined;
-            if (callsType && candidateTypes) {
-                types.push(checker.getUnionType([callsType, ...candidateTypes], UnionReduction.Subtype));
-            }
-            else {
-                if (callsType) {
-                    types.push(callsType);
-                }
-                if (length(candidateTypes)) {
-                    types.push(...candidateTypes);
-                }
-            }
-
+            types.push(...(usage.candidateTypes || []).map(t => checker.getBaseTypeOfLiteralType(t)));
             types.push(...inferNamedTypesFromProperties(usage));
+
             return types;
         }
 

src/services/completions.ts

@@ -57,9 +57,7 @@ namespace ts.Completions {
      */
     export enum CompletionSource {
         /** Completions that require `this.` insertion text */
-        ThisProperty = "ThisProperty/",
-        /** Auto-import that comes attached to a class member snippet */
-        ClassMemberSnippet = "ClassMemberSnippet/",
+        ThisProperty = "ThisProperty/"
     }
 
     const enum SymbolOriginInfoKind {
@@ -246,6 +244,7 @@ namespace ts.Completions {
 
         // If the request is a continuation of an earlier `isIncomplete` response,
         // we can continue it from the cached previous response.
+        const typeChecker = program.getTypeChecker();
         const compilerOptions = program.getCompilerOptions();
         const incompleteCompletionsCache = preferences.allowIncompleteCompletions ? host.getIncompleteCompletionsCache?.() : undefined;
         if (incompleteCompletionsCache && completionKind === CompletionTriggerKind.TriggerForIncompleteCompletions && previousToken && isIdentifier(previousToken)) {
@@ -258,7 +257,7 @@ namespace ts.Completions {
             incompleteCompletionsCache?.clear();
         }
 
-        const stringCompletions = StringCompletions.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program, log, preferences);
+        const stringCompletions = StringCompletions.getStringLiteralCompletions(sourceFile, position, previousToken, typeChecker, compilerOptions, host, log, preferences);
         if (stringCompletions) {
             return stringCompletions;
         }
@@ -275,7 +274,7 @@ namespace ts.Completions {
 
         switch (completionData.kind) {
             case CompletionDataKind.Data:
-                const response = completionInfoFromData(sourceFile, host, program, compilerOptions, log, completionData, preferences);
+                const response = completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences);
                 if (response?.isIncomplete) {
                     incompleteCompletionsCache?.set(response);
                 }
@@ -404,15 +403,7 @@ namespace ts.Completions {
         return location?.kind === SyntaxKind.Identifier ? createTextSpanFromNode(location) : undefined;
     }
 
-    function completionInfoFromData(
-        sourceFile: SourceFile,
-        host: LanguageServiceHost,
-        program: Program,
-        compilerOptions: CompilerOptions,
-        log: Log,
-        completionData: CompletionData,
-        preferences: UserPreferences,
-    ): CompletionInfo | undefined {
+    function completionInfoFromData(sourceFile: SourceFile, typeChecker: TypeChecker, compilerOptions: CompilerOptions, log: Log, completionData: CompletionData, preferences: UserPreferences): CompletionInfo | undefined {
         const {
             symbols,
             contextToken,
@@ -452,8 +443,7 @@ namespace ts.Completions {
                 contextToken,
                 location,
                 sourceFile,
-                host,
-                program,
+                typeChecker,
                 getEmitScriptTarget(compilerOptions),
                 log,
                 completionKind,
@@ -482,8 +472,7 @@ namespace ts.Completions {
                 contextToken,
                 location,
                 sourceFile,
-                host,
-                program,
+                typeChecker,
                 getEmitScriptTarget(compilerOptions),
                 log,
                 completionKind,
@@ -625,8 +614,7 @@ namespace ts.Completions {
         contextToken: Node | undefined,
         location: Node,
         sourceFile: SourceFile,
-        host: LanguageServiceHost,
-        program: Program,
+        typeChecker: TypeChecker,
         name: string,
         needsConvertPropertyAccess: boolean,
         origin: SymbolOriginInfo | undefined,
@@ -637,17 +625,14 @@ namespace ts.Completions {
         useSemicolons: boolean,
         options: CompilerOptions,
         preferences: UserPreferences,
-        completionKind: CompletionKind,
     ): CompletionEntry | undefined {
         let insertText: string | undefined;
         let replacementSpan = getReplacementSpanForContextToken(replacementToken);
         let data: CompletionEntryData | undefined;
         let isSnippet: true | undefined;
-        let source = getSourceFromOrigin(origin);
         let sourceDisplay;
         let hasAction;
 
-        const typeChecker = program.getTypeChecker();
         const insertQuestionDot = origin && originIsNullableMember(origin);
         const useBraces = origin && originIsSymbolMember(origin) || needsConvertPropertyAccess;
         if (origin && originIsThisType(origin)) {
@@ -701,16 +686,13 @@ namespace ts.Completions {
             }
         }
 
-        if (preferences.includeCompletionsWithClassMemberSnippets &&
-            preferences.includeCompletionsWithInsertText &&
-            completionKind === CompletionKind.MemberLike &&
-            isClassLikeMemberCompletion(symbol, location)) {
-            let importAdder;
-            ({ insertText, isSnippet, importAdder } = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken));
-            if (importAdder?.hasFixes()) {
-                hasAction = true;
-                source = CompletionSource.ClassMemberSnippet;
-            }
+        if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
+            return undefined;
+        }
+
+        if (originIsExport(origin) || originIsResolvedExport(origin)) {
+            data = originToCompletionEntryData(origin);
+            hasAction = !importCompletionNode;
         }
 
         const kind = SymbolDisplay.getSymbolKind(typeChecker, symbol, location);
@@ -738,15 +720,10 @@ namespace ts.Completions {
                 insertText = `${escapeSnippetText(name)}={$1}`;
                 isSnippet = true;
             }
-        }
 
-        if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
-            return undefined;
-        }
-
-        if (originIsExport(origin) || originIsResolvedExport(origin)) {
-            data = originToCompletionEntryData(origin);
-            hasAction = !importCompletionNode;
+            if (isSnippet) {
+                replacementSpan = createTextSpanFromNode(location, sourceFile);
+            }
         }
 
         // TODO(drosen): Right now we just permit *all* semantic meanings when calling
@@ -762,7 +739,7 @@ namespace ts.Completions {
             kind,
             kindModifiers: SymbolDisplay.getSymbolModifiers(typeChecker, symbol),
             sortText,
-            source,
+            source: getSourceFromOrigin(origin),
             hasAction: hasAction ? true : undefined,
             isRecommended: isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker) || undefined,
             insertText,
@@ -775,232 +752,8 @@ namespace ts.Completions {
         };
     }
 
-    function isClassLikeMemberCompletion(symbol: Symbol, location: Node): boolean {
-        // TODO: support JS files.
-        if (isInJSFile(location)) {
-            return false;
-        }
-
-        // Completion symbol must be for a class member.
-        const memberFlags =
-            SymbolFlags.ClassMember
-            & SymbolFlags.EnumMemberExcludes;
-        /* In
-        `class C {
-            |
-        }`
-        `location` is a class-like declaration.
-        In
-        `class C {
-            m|
-        }`
-        `location` is an identifier,
-        `location.parent` is a class element declaration,
-        and `location.parent.parent` is a class-like declaration.
-        In
-        `abstract class C {
-            abstract
-            abstract m|
-        }`
-        `location` is a syntax list (with modifiers as children),
-        and `location.parent` is a class-like declaration.
-        */
-        return !!(symbol.flags & memberFlags) &&
-            (
-                isClassLike(location) ||
-                (
-                    location.parent &&
-                    location.parent.parent &&
-                    isClassElement(location.parent) &&
-                    location === location.parent.name &&
-                    isClassLike(location.parent.parent)
-                ) ||
-                (
-                    location.parent &&
-                    isSyntaxList(location) &&
-                    isClassLike(location.parent)
-                )
-            );
-    }
-
-    function getEntryForMemberCompletion(
-        host: LanguageServiceHost,
-        program: Program,
-        options: CompilerOptions,
-        preferences: UserPreferences,
-        name: string,
-        symbol: Symbol,
-        location: Node,
-        contextToken: Node | undefined,
-    ): { insertText: string, isSnippet?: true, importAdder?: codefix.ImportAdder } {
-        const classLikeDeclaration = findAncestor(location, isClassLike);
-        if (!classLikeDeclaration) {
-            return { insertText: name };
-        }
-
-        let isSnippet: true | undefined;
-        let insertText: string = name;
-
-        const checker = program.getTypeChecker();
-        const sourceFile = location.getSourceFile();
-        const printer = createSnippetPrinter({
-            removeComments: true,
-            module: options.module,
-            target: options.target,
-            omitTrailingSemicolon: false,
-            newLine: getNewLineKind(getNewLineCharacter(options, maybeBind(host, host.getNewLine))),
-        });
-        const importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
-
-        let body;
-        if (preferences.includeCompletionsWithSnippetText) {
-            isSnippet = true;
-            // We are adding a tabstop (i.e. `$0`) in the body of the suggested member,
-            // if it has one, so that the cursor ends up in the body once the completion is inserted.
-            // Note: this assumes we won't have more than one body in the completion nodes, which should be the case.
-            const emptyStatement = factory.createExpressionStatement(factory.createIdentifier(""));
-            setSnippetElement(emptyStatement, { kind: SnippetKind.TabStop, order: 0 });
-            body = factory.createBlock([emptyStatement], /* multiline */ true);
-        }
-        else {
-            body = factory.createBlock([], /* multiline */ true);
-        }
-
-        let modifiers = ModifierFlags.None;
-        // Whether the suggested member should be abstract.
-        // e.g. in `abstract class C { abstract | }`, we should offer abstract method signatures at position `|`.
-        // Note: We are relying on checking if the context token is `abstract`,
-        // since other visibility modifiers (e.g. `protected`) should come *before* `abstract`.
-        // However, that is not true for the e.g. `override` modifier, so this check has its limitations.
-        const isAbstract = contextToken && isModifierLike(contextToken) === SyntaxKind.AbstractKeyword;
-        const completionNodes: Node[] = [];
-        codefix.addNewNodeForMemberSymbol(
-            symbol,
-            classLikeDeclaration,
-            sourceFile,
-            { program, host },
-            preferences,
-            importAdder,
-            // `addNewNodeForMemberSymbol` calls this callback function for each new member node
-            // it adds for the given member symbol.
-            // We store these member nodes in the `completionNodes` array.
-            // Note: there might be:
-            //  - No nodes if `addNewNodeForMemberSymbol` cannot figure out a node for the member;
-            //  - One node;
-            //  - More than one node if the member is overloaded (e.g. a method with overload signatures).
-            node => {
-                let requiredModifiers = ModifierFlags.None;
-                if (isAbstract) {
-                    requiredModifiers |= ModifierFlags.Abstract;
-                }
-                if (isClassElement(node)
-                    && checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === MemberOverrideStatus.NeedsOverride) {
-                    requiredModifiers |= ModifierFlags.Override;
-                }
-
-                let presentModifiers = ModifierFlags.None;
-                if (!completionNodes.length) {
-                    // Omit already present modifiers from the first completion node/signature.
-                    if (contextToken) {
-                        presentModifiers = getPresentModifiers(contextToken);
-                    }
-                    // Keep track of added missing required modifiers and modifiers already present.
-                    // This is needed when we have overloaded signatures,
-                    // so this callback will be called for multiple nodes/signatures,
-                    // and we need to make sure the modifiers are uniform for all nodes/signatures.
-                    modifiers = node.modifierFlagsCache | requiredModifiers | presentModifiers;
-                }
-                node = factory.updateModifiers(node, modifiers & (~presentModifiers));
-
-                completionNodes.push(node);
-            },
-            body,
-            codefix.PreserveOptionalFlags.Property,
-            isAbstract);
-
-        if (completionNodes.length) {
-            insertText = printer.printSnippetList(
-                ListFormat.MultiLine | ListFormat.NoTrailingNewLine,
-                factory.createNodeArray(completionNodes),
-                sourceFile);
-        }
-
-        return { insertText, isSnippet, importAdder };
-    }
-
-    function getPresentModifiers(contextToken: Node): ModifierFlags {
-        let modifiers = ModifierFlags.None;
-        let contextMod;
-        /*
-        Cases supported:
-        In
-        `class C {
-            public abstract |
-        }`
-        `contextToken` is ``abstract`` (as an identifier),
-        `contextToken.parent` is property declaration,
-        `location` is class declaration ``class C { ... }``.
-        In
-        `class C {
-            protected override m|
-        }`
-            `contextToken` is ``override`` (as a keyword),
-        `contextToken.parent` is property declaration,
-        `location` is identifier ``m``,
-        `location.parent` is property declaration ``protected override m``,
-        `location.parent.parent` is class declaration ``class C { ... }``.
-        */
-        if (contextMod = isModifierLike(contextToken)) {
-            modifiers |= modifierToFlag(contextMod);
-        }
-        if (isPropertyDeclaration(contextToken.parent)) {
-            modifiers |= modifiersToFlags(contextToken.parent.modifiers);
-        }
-        return modifiers;
-    }
-
-    function isModifierLike(node: Node): ModifierSyntaxKind | undefined {
-        if (isModifier(node)) {
-            return node.kind;
-        }
-        if (isIdentifier(node) && node.originalKeywordKind && isModifierKind(node.originalKeywordKind)) {
-            return node.originalKeywordKind;
-        }
-        return undefined;
-    }
-
-    function createSnippetPrinter(
-        printerOptions: PrinterOptions,
-    ) {
-        const printer = createPrinter(printerOptions);
-        const baseWriter = createTextWriter(getNewLineCharacter(printerOptions));
-        const writer: EmitTextWriter = {
-            ...baseWriter,
-            write: s => baseWriter.write(escapeSnippetText(s)),
-            nonEscapingWrite: baseWriter.write,
-            writeLiteral: s => baseWriter.writeLiteral(escapeSnippetText(s)),
-            writeStringLiteral: s => baseWriter.writeStringLiteral(escapeSnippetText(s)),
-            writeSymbol: (s, symbol) => baseWriter.writeSymbol(escapeSnippetText(s), symbol),
-            writeParameter: s => baseWriter.writeParameter(escapeSnippetText(s)),
-            writeComment: s => baseWriter.writeComment(escapeSnippetText(s)),
-            writeProperty: s => baseWriter.writeProperty(escapeSnippetText(s)),
-        };
-
-        return {
-            printSnippetList,
-        };
-
-
-        /* Snippet-escaping version of `printer.printList`. */
-        function printSnippetList(
-            format: ListFormat,
-            list: NodeArray<Node>,
-            sourceFile: SourceFile | undefined,
-        ): string {
-            writer.clear();
-            printer.writeList(format, list, sourceFile, writer);
-            return writer.getText();
-        }
+    function escapeSnippetText(text: string): string {
+        return text.replace(/\$/gm, "\\$");
     }
 
     function originToCompletionEntryData(origin: SymbolOriginInfoExport | SymbolOriginInfoResolvedExport): CompletionEntryData | undefined {
@@ -1110,8 +863,7 @@ namespace ts.Completions {
         contextToken: Node | undefined,
         location: Node,
         sourceFile: SourceFile,
-        host: LanguageServiceHost,
-        program: Program,
+        typeChecker: TypeChecker,
         target: ScriptTarget,
         log: Log,
         kind: CompletionKind,
@@ -1129,7 +881,6 @@ namespace ts.Completions {
         const start = timestamp();
         const variableDeclaration = getVariableDeclaration(location);
         const useSemicolons = probablyUsesSemicolons(sourceFile);
-        const typeChecker = program.getTypeChecker();
         // Tracks unique names.
         // Value is set to false for global variables or completions from external module exports, because we can have multiple of those;
         // true otherwise. Based on the order we add things we will always see locals first, then globals, then module exports.
@@ -1153,8 +904,7 @@ namespace ts.Completions {
                 contextToken,
                 location,
                 sourceFile,
-                host,
-                program,
+                typeChecker,
                 name,
                 needsConvertPropertyAccess,
                 origin,
@@ -1164,8 +914,7 @@ namespace ts.Completions {
                 importCompletionNode,
                 useSemicolons,
                 compilerOptions,
-                preferences,
-                kind,
+                preferences
             );
             if (!entry) {
                 continue;
@@ -1272,7 +1021,6 @@ namespace ts.Completions {
         location: Node;
         origin: SymbolOriginInfo | SymbolOriginInfoExport | SymbolOriginInfoResolvedExport | undefined;
         previousToken: Node | undefined;
-        contextToken: Node | undefined;
         readonly isJsxInitializer: IsJsxInitializer;
         readonly isTypeOnlyLocation: boolean;
     }
@@ -1288,13 +1036,11 @@ namespace ts.Completions {
         if (entryId.data) {
             const autoImport = getAutoImportSymbolFromCompletionEntryData(entryId.name, entryId.data, program, host);
             if (autoImport) {
-                const { contextToken, previousToken } = getRelevantTokens(position, sourceFile);
                 return {
                     type: "symbol",
                     symbol: autoImport.symbol,
                     location: getTouchingPropertyName(sourceFile, position),
-                    previousToken,
-                    contextToken,
+                    previousToken: findPrecedingToken(position, sourceFile, /*startNode*/ undefined)!,
                     isJsxInitializer: false,
                     isTypeOnlyLocation: false,
                     origin: autoImport.origin,
@@ -1311,7 +1057,7 @@ namespace ts.Completions {
             return { type: "request", request: completionData };
         }
 
-        const { symbols, literals, location, completionKind, symbolToOriginInfoMap, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } = completionData;
+        const { symbols, literals, location, completionKind, symbolToOriginInfoMap, previousToken, isJsxInitializer, isTypeOnlyLocation } = completionData;
 
         const literal = find(literals, l => completionNameForLiteral(sourceFile, preferences, l) === entryId.name);
         if (literal !== undefined) return { type: "literal", literal };
@@ -1323,8 +1069,8 @@ namespace ts.Completions {
         return firstDefined(symbols, (symbol, index): SymbolCompletion | undefined => {
             const origin = symbolToOriginInfoMap[index];
             const info = getCompletionEntryDisplayNameForSymbol(symbol, getEmitScriptTarget(compilerOptions), origin, completionKind, completionData.isJsxIdentifierExpected);
-            return info && info.name === entryId.name && (entryId.source === CompletionSource.ClassMemberSnippet && symbol.flags & SymbolFlags.ClassMember || getSourceFromOrigin(origin) === entryId.source)
-                ? { type: "symbol" as const, symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation }
+            return info && info.name === entryId.name && getSourceFromOrigin(origin) === entryId.source
+                ? { type: "symbol" as const, symbol, location, origin, previousToken, isJsxInitializer, isTypeOnlyLocation }
                 : undefined;
         }) || { type: "none" };
     }
@@ -1348,7 +1094,7 @@ namespace ts.Completions {
     ): CompletionEntryDetails | undefined {
         const typeChecker = program.getTypeChecker();
         const compilerOptions = program.getCompilerOptions();
-        const { name, source, data } = entryId;
+        const { name } = entryId;
 
         const contextToken = findPrecedingToken(position, sourceFile);
         if (isInString(sourceFile, position, contextToken)) {
@@ -1374,8 +1120,8 @@ namespace ts.Completions {
                 }
             }
             case "symbol": {
-                const { symbol, location, contextToken, origin, previousToken } = symbolCompletion;
-                const { codeActions, sourceDisplay } = getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source);
+                const { symbol, location, origin, previousToken } = symbolCompletion;
+                const { codeActions, sourceDisplay } = getCompletionEntryCodeActionsAndSourceDisplay(origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, entryId.data);
                 return createCompletionDetailsForSymbol(symbol, typeChecker, sourceFile, location, cancellationToken, codeActions, sourceDisplay); // TODO: GH#18217
             }
             case "literal": {
@@ -1411,9 +1157,6 @@ namespace ts.Completions {
         readonly sourceDisplay: SymbolDisplayPart[] | undefined;
     }
     function getCompletionEntryCodeActionsAndSourceDisplay(
-        name: string,
-        location: Node,
-        contextToken: Node | undefined,
         origin: SymbolOriginInfo | SymbolOriginInfoExport | SymbolOriginInfoResolvedExport | undefined,
         symbol: Symbol,
         program: Program,
@@ -1425,7 +1168,6 @@ namespace ts.Completions {
         formatContext: formatting.FormatContext,
         preferences: UserPreferences,
         data: CompletionEntryData | undefined,
-        source: string | undefined,
     ): CodeActionsAndSourceDisplay {
         if (data?.moduleSpecifier) {
             const { contextToken, previousToken } = getRelevantTokens(position, sourceFile);
@@ -1435,30 +1177,6 @@ namespace ts.Completions {
             }
         }
 
-        if (source === CompletionSource.ClassMemberSnippet) {
-            const { importAdder } = getEntryForMemberCompletion(
-                host,
-                program,
-                compilerOptions,
-                preferences,
-                name,
-                symbol,
-                location,
-                contextToken);
-            if (importAdder) {
-                const changes = textChanges.ChangeTracker.with(
-                    { host, formatContext, preferences },
-                    importAdder.writeFixes);
-                return {
-                    sourceDisplay: undefined,
-                    codeActions: [{
-                        changes,
-                        description: diagnosticToString([Diagnostics.Includes_imports_of_types_referenced_by_0, name]),
-                    }],
-                };
-            }
-        }
-
         if (!origin || !(originIsExport(origin) || originIsResolvedExport(origin))) {
             return { codeActions: undefined, sourceDisplay: undefined };
         }
@@ -2540,9 +2258,6 @@ namespace ts.Completions {
                     case SyntaxKind.AsyncKeyword:
                         return containingNodeKind === SyntaxKind.MethodDeclaration            // const obj = { async c|()
                             || containingNodeKind === SyntaxKind.ShorthandPropertyAssignment; // const obj = { async c|
-
-                    case SyntaxKind.AsteriskToken:
-                        return containingNodeKind === SyntaxKind.MethodDeclaration;           // const obj = { * c|
                 }
 
                 if (isClassMemberCompletionKeyword(tokenKind)) {
@@ -3525,7 +3240,6 @@ namespace ts.Completions {
         // function f<T>(x: T) {}
         // f({ abc/**/: "" }) // `abc` is a member of `T` but only because it declares itself
         function hasDeclarationOtherThanSelf(member: Symbol) {
-            if (!length(member.declarations)) return true;
             return some(member.declarations, decl => decl.parent !== obj);
         }
     }
@@ -3889,6 +3603,5 @@ namespace ts.Completions {
         }
         return charCode;
     }
-
 }
 

src/services/findAllReferences.ts

@@ -1323,7 +1323,7 @@ namespace ts.FindAllReferences {
             if (!symbol) return undefined;
             for (const token of getPossibleSymbolReferenceNodes(sourceFile, symbol.name, searchContainer)) {
                 if (!isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText) continue;
-                const referenceSymbol = checker.getSymbolAtLocation(token)!;
+                const referenceSymbol: Symbol = checker.getSymbolAtLocation(token)!; // See GH#19955 for why the type annotation is necessary
                 if (referenceSymbol === symbol
                     || checker.getShorthandAssignmentValueSymbol(token.parent) === symbol
                     || isExportSpecifier(token.parent) && getLocalSymbolForExportSpecifier(token, referenceSymbol, token.parent, checker) === symbol) {
@@ -2021,8 +2021,7 @@ namespace ts.FindAllReferences {
                             }
                         }
                         else {
-                            return isNoSubstitutionTemplateLiteral(ref) && !rangeIsOnSingleLine(ref, sourceFile) ? undefined :
-                                nodeEntry(ref, EntryKind.StringLiteral);
+                            return nodeEntry(ref, EntryKind.StringLiteral);
                         }
                     }
                 });

src/services/goToDefinition.ts

@@ -198,17 +198,14 @@ namespace ts.GoToDefinition {
             return undefined;
         }
 
-        const symbol = getSymbol(node, typeChecker);
+        const symbol = typeChecker.getSymbolAtLocation(node);
         if (!symbol) return undefined;
 
         const typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
         const returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
         const fromReturnType = returnType && definitionFromType(returnType, typeChecker, node);
         // If a function returns 'void' or some other type with no definition, just return the function definition.
-        const typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
-        return typeDefinitions.length ? typeDefinitions
-            : !(symbol.flags & SymbolFlags.Value) && symbol.flags & SymbolFlags.Type ? getDefinitionFromSymbol(typeChecker, skipAlias(symbol, typeChecker), node)
-            : undefined;
+        return fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
     }
 
     function definitionFromType(type: Type, checker: TypeChecker, node: Node): readonly DefinitionInfo[] {

src/services/outliningElementsCollector.ts

@@ -34,7 +34,7 @@ namespace ts.OutliningElementsCollector {
             if (depthRemaining === 0) return;
             cancellationToken.throwIfCancellationRequested();
 
-            if (isDeclaration(n) || isVariableStatement(n) || isReturnStatement(n) || isCallOrNewExpression(n) || n.kind === SyntaxKind.EndOfFileToken) {
+            if (isDeclaration(n) || isVariableStatement(n) || isReturnStatement(n) || n.kind === SyntaxKind.EndOfFileToken) {
                 addOutliningForLeadingCommentsForNode(n, sourceFile, cancellationToken, out);
             }
 

src/services/refactors/extractSymbol.ts

@@ -314,7 +314,8 @@ namespace ts.refactor.extractSymbol {
                 return { errors: [createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
             }
             const statements: Statement[] = [];
-            for (const statement of start.parent.statements) {
+            const start2 = start; // TODO: GH#18217 Need to alias `start` to get this to compile. See https://github.com/Microsoft/TypeScript/issues/19955#issuecomment-344118248
+            for (const statement of (start2.parent as BlockLike).statements) {
                 if (statement === start || statements.length) {
                     const errors = checkNode(statement);
                     if (errors) {
@@ -363,11 +364,10 @@ namespace ts.refactor.extractSymbol {
                     return node.expression;
                 }
             }
-            else if (isVariableStatement(node) || isVariableDeclarationList(node)) {
-                const declarations = isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
+            else if (isVariableStatement(node)) {
                 let numInitializers = 0;
                 let lastInitializer: Expression | undefined;
-                for (const declaration of declarations) {
+                for (const declaration of node.declarationList.declarations) {
                     if (declaration.initializer) {
                         numInitializers++;
                         lastInitializer = declaration.initializer;
@@ -383,6 +383,7 @@ namespace ts.refactor.extractSymbol {
                     return node.initializer;
                 }
             }
+
             return node;
         }
 

src/services/services.ts

@@ -599,11 +599,10 @@ namespace ts {
     }
 
     function findBaseOfDeclaration<T>(checker: TypeChecker, declaration: Declaration, cb: (symbol: Symbol) => T[] | undefined): T[] | undefined {
-        if (hasStaticModifier(declaration)) return;
-
         const classOrInterfaceDeclaration = declaration.parent?.kind === SyntaxKind.Constructor ? declaration.parent.parent : declaration.parent;
-        if (!classOrInterfaceDeclaration) return;
-
+        if (!classOrInterfaceDeclaration) {
+            return;
+        }
         return firstDefined(getAllSuperTypeNodes(classOrInterfaceDeclaration), superTypeNode => {
             const symbol = checker.getPropertyOfType(checker.getTypeAtLocation(superTypeNode), declaration.symbol.name);
             return symbol ? cb(symbol) : undefined;

src/services/stringCompletions.ts

@@ -1,35 +1,18 @@
 /* @internal */
 namespace ts.Completions.StringCompletions {
-    export function getStringLiteralCompletions(
-        sourceFile: SourceFile,
-        position: number,
-        contextToken: Node | undefined,
-        options: CompilerOptions,
-        host: LanguageServiceHost,
-        program: Program,
-        log: Log,
-        preferences: UserPreferences): CompletionInfo | undefined {
+    export function getStringLiteralCompletions(sourceFile: SourceFile, position: number, contextToken: Node | undefined, checker: TypeChecker, options: CompilerOptions, host: LanguageServiceHost, log: Log, preferences: UserPreferences): CompletionInfo | undefined {
         if (isInReferenceComment(sourceFile, position)) {
             const entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
             return entries && convertPathCompletions(entries);
         }
         if (isInString(sourceFile, position, contextToken)) {
             if (!contextToken || !isStringLiteralLike(contextToken)) return undefined;
-            const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program.getTypeChecker(), options, host, preferences);
-            return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program, log, options, preferences);
+            const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host, preferences);
+            return convertStringLiteralCompletions(entries, contextToken, sourceFile, checker, log, options, preferences);
         }
     }
 
-    function convertStringLiteralCompletions(
-        completion: StringLiteralCompletion | undefined,
-        contextToken: StringLiteralLike,
-        sourceFile: SourceFile,
-        host: LanguageServiceHost,
-        program: Program,
-        log: Log,
-        options: CompilerOptions,
-        preferences: UserPreferences,
-    ): CompletionInfo | undefined {
+    function convertStringLiteralCompletions(completion: StringLiteralCompletion | undefined, contextToken: StringLiteralLike, sourceFile: SourceFile, checker: TypeChecker, log: Log, options: CompilerOptions, preferences: UserPreferences): CompletionInfo | undefined {
         if (completion === undefined) {
             return undefined;
         }
@@ -47,8 +30,7 @@ namespace ts.Completions.StringCompletions {
                     contextToken,
                     sourceFile,
                     sourceFile,
-                    host,
-                    program,
+                    checker,
                     ScriptTarget.ESNext,
                     log,
                     CompletionKind.String,

src/services/textChanges.ts

@@ -494,27 +494,6 @@ namespace ts.textChanges {
             this.insertNodeAt(sourceFile, fnStart, tag, { preserveLeadingWhitespace: false, suffix: this.newLineCharacter + indent });
         }
 
-        public addJSDocTags(sourceFile: SourceFile, parent: HasJSDoc, newTags: readonly JSDocTag[]): void {
-            const comments = flatMap(parent.jsDoc, j => typeof j.comment === "string" ? factory.createJSDocText(j.comment) : j.comment) as JSDocComment[];
-            const oldTags = flatMapToMutable(parent.jsDoc, j => j.tags);
-            const unmergedNewTags = newTags.filter(newTag => !oldTags.some((tag, i) => {
-                const merged = tryMergeJsdocTags(tag, newTag);
-                if (merged) oldTags[i] = merged;
-                return !!merged;
-            }));
-            const tag = factory.createJSDocComment(factory.createNodeArray(intersperse(comments, factory.createJSDocText("\n"))), factory.createNodeArray([...oldTags, ...unmergedNewTags]));
-            const host = updateJSDocHost(parent);
-            this.insertJsdocCommentBefore(sourceFile, host, tag);
-        }
-
-        public filterJSDocTags(sourceFile: SourceFile, parent: HasJSDoc, predicate: (tag: JSDocTag) => boolean): void {
-            const comments = flatMap(parent.jsDoc, j => typeof j.comment === "string" ? factory.createJSDocText(j.comment) : j.comment) as JSDocComment[];
-            const oldTags = flatMapToMutable(parent.jsDoc, j => j.tags);
-            const tag = factory.createJSDocComment(factory.createNodeArray(intersperse(comments, factory.createJSDocText("\n"))), factory.createNodeArray([...(filter(oldTags, predicate) || emptyArray)]));
-            const host = updateJSDocHost(parent);
-            this.insertJsdocCommentBefore(sourceFile, host, tag);
-        }
-
         public replaceRangeWithText(sourceFile: SourceFile, range: TextRange, text: string): void {
             this.changes.push({ kind: ChangeKind.Text, sourceFile, range, text });
         }
@@ -941,35 +920,6 @@ namespace ts.textChanges {
         }
     }
 
-    function updateJSDocHost(parent: HasJSDoc): HasJSDoc {
-        if (parent.kind !== SyntaxKind.ArrowFunction) {
-            return parent;
-        }
-        const jsDocNode = parent.parent.kind === SyntaxKind.PropertyDeclaration ?
-            parent.parent as HasJSDoc :
-            parent.parent.parent as HasJSDoc;
-        jsDocNode.jsDoc = parent.jsDoc;
-        jsDocNode.jsDocCache = parent.jsDocCache;
-        return jsDocNode;
-    }
-
-    function tryMergeJsdocTags(oldTag: JSDocTag, newTag: JSDocTag): JSDocTag | undefined {
-        if (oldTag.kind !== newTag.kind) {
-            return undefined;
-        }
-        switch (oldTag.kind) {
-            case SyntaxKind.JSDocParameterTag: {
-                const oldParam = oldTag as JSDocParameterTag;
-                const newParam = newTag as JSDocParameterTag;
-                return isIdentifier(oldParam.name) && isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
-                    ? factory.createJSDocParameterTag(/*tagName*/ undefined, newParam.name, /*isBracketed*/ false, newParam.typeExpression, newParam.isNameFirst, oldParam.comment)
-                    : undefined;
-            }
-            case SyntaxKind.JSDocReturnTag:
-                return factory.createJSDocReturnTag(/*tagName*/ undefined, (newTag as JSDocReturnTag).typeExpression, oldTag.comment);
-        }
-    }
-
     // find first non-whitespace position in the leading trivia of the node
     function startPositionToDeleteNodeInList(sourceFile: SourceFile, node: Node): number {
         return skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.IncludeAll }), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
@@ -1087,7 +1037,7 @@ namespace ts.textChanges {
         /** Note: output node may be mutated input node. */
         export function getNonformattedText(node: Node, sourceFile: SourceFile | undefined, newLineCharacter: string): { text: string, node: Node } {
             const writer = createWriter(newLineCharacter);
-            const newLine = getNewLineKind(newLineCharacter);
+            const newLine = newLineCharacter === "\n" ? NewLineKind.LineFeed : NewLineKind.CarriageReturnLineFeed;
             createPrinter({
                 newLine,
                 neverAsciiEscape: true,

src/services/utilities.ts

@@ -3279,16 +3279,5 @@ namespace ts {
         return decisionFromFile ?? program.usesUriStyleNodeCoreModules;
     }
 
-    export function getNewLineKind(newLineCharacter: string): NewLineKind {
-        return newLineCharacter === "\n" ? NewLineKind.LineFeed : NewLineKind.CarriageReturnLineFeed;
-    }
-
-    export type DiagnosticAndArguments = DiagnosticMessage | [DiagnosticMessage, string] | [DiagnosticMessage, string, string];
-    export function diagnosticToString(diag: DiagnosticAndArguments): string {
-        return isArray(diag)
-            ? formatStringFromArgs(getLocaleSpecificMessage(diag[0]), diag.slice(1) as readonly string[])
-            : getLocaleSpecificMessage(diag);
-    }
-
     // #endregion
 }

src/testRunner/parallel/host.ts

@@ -14,7 +14,7 @@ namespace Harness.Parallel.Host {
         const { statSync } = require("fs") as typeof import("fs");
 
         // NOTE: paths for module and types for FailedTestReporter _do not_ line up due to our use of --outFile for run.js
-        const FailedTestReporter = require(Utils.findUpFile("scripts/failed-tests.js")) as typeof import("../../../scripts/failed-tests");
+        const FailedTestReporter = require(path.resolve(__dirname, "../../scripts/failed-tests")) as typeof import("../../../scripts/failed-tests");
 
         const perfdataFileNameFragment = ".parallelperf";
         const perfData = readSavedPerfData(configOption);

src/testRunner/unittests/config/commandLineParsing.ts

@@ -211,7 +211,7 @@ namespace ts {
                         start: undefined,
                         length: undefined,
                     }, {
-                        messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'es2022', 'esnext'.",
+                        messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'es2021', 'esnext'.",
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
 

src/testRunner/unittests/publicApi.ts

@@ -182,3 +182,34 @@ describe("unittests:: Public APIs:: getChild* methods on EndOfFileToken with JSD
     assert.equal(endOfFileToken.getChildCount(), 1);
     assert.notEqual(endOfFileToken.getChildAt(0), /*expected*/ undefined);
 });
+
+describe("unittests:: Public APIs:: sys", () => {
+    it("readDirectory", () => {
+        // #45990, testing passing a non-absolute path
+        // `sys.readDirectory` is just `matchFiles` plugged into the real FS
+        const read = ts.matchFiles(
+            /*path*/ "",
+            /*extensions*/ [".ts", ".tsx"],
+            /*excludes*/ ["node_modules", "dist"],
+            /*includes*/ ["**/*"],
+            /*useCaseSensitiveFileNames*/ true,
+            /*currentDirectory*/ "/",
+            /*depth*/ undefined,
+            /*getFileSystemEntries*/ path => {
+                switch (path) {
+                    case "/": return { directories: [], files: ["file.ts"] };
+                    default: return { directories: [], files: [] };
+                }
+            },
+            /*realpath*/ ts.identity,
+            /*directoryExists*/ path => {
+                switch (path) {
+                    case "/": return true;
+                    default: return false;
+                }
+            }
+        );
+
+        assert.deepEqual(read, ["/file.ts"]);
+    });
+});

src/testRunner/unittests/services/extract/ranges.ts

@@ -191,7 +191,7 @@ namespace ts {
             testExtractRange("extractRange28", `[#|return [$|1|];|]`);
 
             // For statements
-            testExtractRange("extractRange29", `for ([#|var i = [$|1|]|]; i < 2; i++) {}`);
+            testExtractRange("extractRange29", `for ([#|var i = 1|]; i < 2; i++) {}`);
             testExtractRange("extractRange30", `for (var i = [#|[$|1|]|]; i < 2; i++) {}`);
         });
 

src/testRunner/unittests/tsserver/autoImportProvider.ts

@@ -326,7 +326,7 @@ namespace ts.projectSystem {
         };
 
         function updateFile(path: string, newText: string) {
-            Debug.assertIsDefined(files.find(f => f.path === path));
+            Debug.assertDefined(files.find(f => f.path === path));
             session.executeCommandSeq<protocol.ApplyChangedToOpenFilesRequest>({
                 command: protocol.CommandTypes.ApplyChangedToOpenFiles,
                 arguments: {
@@ -339,7 +339,7 @@ namespace ts.projectSystem {
         }
 
         function findAllReferences(file: string, line: number, offset: number) {
-            Debug.assertIsDefined(files.find(f => f.path === file));
+            Debug.assertDefined(files.find(f => f.path === file));
             session.executeCommandSeq<protocol.ReferencesRequest>({
                 command: protocol.CommandTypes.References,
                 arguments: {

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "4.6";
+    const versionMajorMinor = "4.5";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**
@@ -897,7 +897,7 @@ declare namespace ts {
     export interface TypePredicateNode extends TypeNode {
         readonly kind: SyntaxKind.TypePredicate;
         readonly parent: SignatureDeclaration | JSDocTypeExpression;
-        readonly assertsModifier?: AssertsKeyword;
+        readonly assertsModifier?: AssertsToken;
         readonly parameterName: Identifier | ThisTypeNode;
         readonly type?: TypeNode;
     }
@@ -968,7 +968,7 @@ declare namespace ts {
     }
     export interface MappedTypeNode extends TypeNode, Declaration {
         readonly kind: SyntaxKind.MappedType;
-        readonly readonlyToken?: ReadonlyKeyword | PlusToken | MinusToken;
+        readonly readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
         readonly typeParameter: TypeParameterDeclaration;
         readonly nameType?: TypeNode;
         readonly questionToken?: QuestionToken | PlusToken | MinusToken;
@@ -1465,7 +1465,7 @@ declare namespace ts {
     }
     export interface ForOfStatement extends IterationStatement {
         readonly kind: SyntaxKind.ForOfStatement;
-        readonly awaitModifier?: AwaitKeyword;
+        readonly awaitModifier?: AwaitKeywordToken;
         readonly initializer: ForInitializer;
         readonly expression: Expression;
     }
@@ -3078,7 +3078,6 @@ declare namespace ts {
         ES2019 = 6,
         ES2020 = 7,
         ES2021 = 8,
-        ES2022 = 9,
         ESNext = 99,
         JSON = 100,
         Latest = 99
@@ -4043,7 +4042,6 @@ declare namespace ts {
         readonly includeCompletionsWithSnippetText?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
-        readonly includeCompletionsWithClassMemberSnippets?: boolean;
         readonly allowIncompleteCompletions?: boolean;
         readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
@@ -9539,13 +9537,6 @@ declare namespace ts.server.protocol {
          * values, with insertion text to replace preceding `.` tokens with `?.`.
          */
         readonly includeAutomaticOptionalChainCompletions?: boolean;
-        /**
-         * If enabled, completions for class members (e.g. methods and properties) will include
-         * a whole declaration for the member.
-         * E.g., `class A { f| }` could be completed to `class A { foo(): number {} }`, instead of
-         * `class A { foo }`.
-         */
-        readonly includeCompletionsWithClassMemberSnippets?: boolean;
         readonly allowIncompleteCompletions?: boolean;
         readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
@@ -9667,7 +9658,6 @@ declare namespace ts.server.protocol {
         ES2019 = "ES2019",
         ES2020 = "ES2020",
         ES2021 = "ES2021",
-        ES2022 = "ES2022",
         ESNext = "ESNext"
     }
     enum ClassificationType {

tests/baselines/reference/api/typescript.d.ts

@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "4.6";
+    const versionMajorMinor = "4.5";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**
@@ -897,7 +897,7 @@ declare namespace ts {
     export interface TypePredicateNode extends TypeNode {
         readonly kind: SyntaxKind.TypePredicate;
         readonly parent: SignatureDeclaration | JSDocTypeExpression;
-        readonly assertsModifier?: AssertsKeyword;
+        readonly assertsModifier?: AssertsToken;
         readonly parameterName: Identifier | ThisTypeNode;
         readonly type?: TypeNode;
     }
@@ -968,7 +968,7 @@ declare namespace ts {
     }
     export interface MappedTypeNode extends TypeNode, Declaration {
         readonly kind: SyntaxKind.MappedType;
-        readonly readonlyToken?: ReadonlyKeyword | PlusToken | MinusToken;
+        readonly readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
         readonly typeParameter: TypeParameterDeclaration;
         readonly nameType?: TypeNode;
         readonly questionToken?: QuestionToken | PlusToken | MinusToken;
@@ -1465,7 +1465,7 @@ declare namespace ts {
     }
     export interface ForOfStatement extends IterationStatement {
         readonly kind: SyntaxKind.ForOfStatement;
-        readonly awaitModifier?: AwaitKeyword;
+        readonly awaitModifier?: AwaitKeywordToken;
         readonly initializer: ForInitializer;
         readonly expression: Expression;
     }
@@ -3078,7 +3078,6 @@ declare namespace ts {
         ES2019 = 6,
         ES2020 = 7,
         ES2021 = 8,
-        ES2022 = 9,
         ESNext = 99,
         JSON = 100,
         Latest = 99
@@ -4043,7 +4042,6 @@ declare namespace ts {
         readonly includeCompletionsWithSnippetText?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
-        readonly includeCompletionsWithClassMemberSnippets?: boolean;
         readonly allowIncompleteCompletions?: boolean;
         readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
         /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */

tests/baselines/reference/argumentsReferenceInConstructor4_Js.errors.txt

@@ -1,46 +0,0 @@
-/a.js(18,9): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-
-
-==== /a.js (1 errors) ====
-    class A {
-    	/**
-    	 * Constructor
-    	 *
-    	 * @param {object} [foo={}]
-    	 */
-    	constructor(foo = {}) {
-    		const key = "bar";
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.foo = foo;
-    
-    		/**
-    		 * @type object
-    		 */
-    		const arguments = this.arguments;
-    		      ~~~~~~~~~
-!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.bar = arguments.bar;
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.baz = arguments[key];
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.options = arguments;
-    	}
-    
-    	get arguments() {
-    		return { bar: {} };
-    	}
-    }
-    

tests/baselines/reference/argumentsReferenceInMethod4_Js.errors.txt

@@ -1,44 +0,0 @@
-/a.js(16,9): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-
-
-==== /a.js (1 errors) ====
-    class A {
-    	/**
-    	 * @param {object} [foo={}]
-    	 */
-    	m(foo = {}) {
-    		const key = "bar";
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.foo = foo;
-    
-    		/**
-    		 * @type object
-    		 */
-    		const arguments = this.arguments;
-    		      ~~~~~~~~~
-!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.bar = arguments.bar;
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.baz = arguments[key];
-    
-    		/**
-    		 * @type object
-    		 */
-    		this.options = arguments;
-    	}
-    
-    	get arguments() {
-    		return { bar: {} };
-    	}
-    }
-    

tests/baselines/reference/callChainWithSuper(target=es2022).js

@@ -1,18 +0,0 @@
-//// [callChainWithSuper.ts]
-// GH#34952
-class Base { method?() {} }
-class Derived extends Base {
-    method1() { return super.method?.(); }
-    method2() { return super["method"]?.(); }
-}
-
-//// [callChainWithSuper.js]
-"use strict";
-// GH#34952
-class Base {
-    method() { }
-}
-class Derived extends Base {
-    method1() { return super.method?.(); }
-    method2() { return super["method"]?.(); }
-}

tests/baselines/reference/callWithSpread4.symbols

@@ -30,7 +30,7 @@ declare const pli: {
 
     (streams: ReadonlyArray<R | W | RW>): Promise<void>;
 >streams : Symbol(streams, Decl(callWithSpread4.ts, 5, 5))
->ReadonlyArray : Symbol(ReadonlyArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2016.array.include.d.ts, --, --), Decl(lib.es2019.array.d.ts, --, --) ... and 1 more)
+>ReadonlyArray : Symbol(ReadonlyArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2016.array.include.d.ts, --, --), Decl(lib.es2019.array.d.ts, --, --))
 >R : Symbol(R, Decl(callWithSpread4.ts, 0, 0))
 >W : Symbol(W, Decl(callWithSpread4.ts, 0, 22))
 >RW : Symbol(RW, Decl(callWithSpread4.ts, 1, 22))
@@ -43,7 +43,7 @@ declare const pli: {
 >RW : Symbol(RW, Decl(callWithSpread4.ts, 1, 22))
 >W : Symbol(W, Decl(callWithSpread4.ts, 0, 22))
 >streams : Symbol(streams, Decl(callWithSpread4.ts, 6, 23))
->Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --) ... and 3 more)
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --) ... and 2 more)
 >RW : Symbol(RW, Decl(callWithSpread4.ts, 1, 22))
 >W : Symbol(W, Decl(callWithSpread4.ts, 0, 22))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))

tests/baselines/reference/contextuallyTypedSymbolNamedProperties.js

@@ -1,53 +0,0 @@
-//// [contextuallyTypedSymbolNamedProperties.ts]
-// Repros from #43628
-
-const A = Symbol("A");
-const B = Symbol("B");
-
-type Action =
-    | {type: typeof A, data: string}
-    | {type: typeof B, data: number}
-
-declare const ab: Action;
-
-declare function f<T extends { type: string | symbol }>(action: T, blah: { [K in T['type']]: (p: K) => void }): any;
-
-f(ab, {
-    [A]: ap => { ap.description },
-    [B]: bp => { bp.description },
-})
-
-const x: { [sym: symbol]: (p: string) => void } = { [A]: s => s.length };
-
-
-//// [contextuallyTypedSymbolNamedProperties.js]
-"use strict";
-// Repros from #43628
-const A = Symbol("A");
-const B = Symbol("B");
-f(ab, {
-    [A]: ap => { ap.description; },
-    [B]: bp => { bp.description; },
-});
-const x = { [A]: s => s.length };
-
-
-//// [contextuallyTypedSymbolNamedProperties.d.ts]
-declare const A: unique symbol;
-declare const B: unique symbol;
-declare type Action = {
-    type: typeof A;
-    data: string;
-} | {
-    type: typeof B;
-    data: number;
-};
-declare const ab: Action;
-declare function f<T extends {
-    type: string | symbol;
-}>(action: T, blah: {
-    [K in T['type']]: (p: K) => void;
-}): any;
-declare const x: {
-    [sym: symbol]: (p: string) => void;
-};

tests/baselines/reference/contextuallyTypedSymbolNamedProperties.symbols

@@ -1,73 +0,0 @@
-=== tests/cases/compiler/contextuallyTypedSymbolNamedProperties.ts ===
-// Repros from #43628
-
-const A = Symbol("A");
->A : Symbol(A, Decl(contextuallyTypedSymbolNamedProperties.ts, 2, 5))
->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --))
-
-const B = Symbol("B");
->B : Symbol(B, Decl(contextuallyTypedSymbolNamedProperties.ts, 3, 5))
->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --))
-
-type Action =
->Action : Symbol(Action, Decl(contextuallyTypedSymbolNamedProperties.ts, 3, 22))
-
-    | {type: typeof A, data: string}
->type : Symbol(type, Decl(contextuallyTypedSymbolNamedProperties.ts, 6, 7))
->A : Symbol(A, Decl(contextuallyTypedSymbolNamedProperties.ts, 2, 5))
->data : Symbol(data, Decl(contextuallyTypedSymbolNamedProperties.ts, 6, 22))
-
-    | {type: typeof B, data: number}
->type : Symbol(type, Decl(contextuallyTypedSymbolNamedProperties.ts, 7, 7))
->B : Symbol(B, Decl(contextuallyTypedSymbolNamedProperties.ts, 3, 5))
->data : Symbol(data, Decl(contextuallyTypedSymbolNamedProperties.ts, 7, 22))
-
-declare const ab: Action;
->ab : Symbol(ab, Decl(contextuallyTypedSymbolNamedProperties.ts, 9, 13))
->Action : Symbol(Action, Decl(contextuallyTypedSymbolNamedProperties.ts, 3, 22))
-
-declare function f<T extends { type: string | symbol }>(action: T, blah: { [K in T['type']]: (p: K) => void }): any;
->f : Symbol(f, Decl(contextuallyTypedSymbolNamedProperties.ts, 9, 25))
->T : Symbol(T, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 19))
->type : Symbol(type, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 30))
->action : Symbol(action, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 56))
->T : Symbol(T, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 19))
->blah : Symbol(blah, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 66))
->K : Symbol(K, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 76))
->T : Symbol(T, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 19))
->p : Symbol(p, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 94))
->K : Symbol(K, Decl(contextuallyTypedSymbolNamedProperties.ts, 11, 76))
-
-f(ab, {
->f : Symbol(f, Decl(contextuallyTypedSymbolNamedProperties.ts, 9, 25))
->ab : Symbol(ab, Decl(contextuallyTypedSymbolNamedProperties.ts, 9, 13))
-
-    [A]: ap => { ap.description },
->[A] : Symbol([A], Decl(contextuallyTypedSymbolNamedProperties.ts, 13, 7))
->A : Symbol(A, Decl(contextuallyTypedSymbolNamedProperties.ts, 2, 5))
->ap : Symbol(ap, Decl(contextuallyTypedSymbolNamedProperties.ts, 14, 8))
->ap.description : Symbol(Symbol.description, Decl(lib.es2019.symbol.d.ts, --, --))
->ap : Symbol(ap, Decl(contextuallyTypedSymbolNamedProperties.ts, 14, 8))
->description : Symbol(Symbol.description, Decl(lib.es2019.symbol.d.ts, --, --))
-
-    [B]: bp => { bp.description },
->[B] : Symbol([B], Decl(contextuallyTypedSymbolNamedProperties.ts, 14, 34))
->B : Symbol(B, Decl(contextuallyTypedSymbolNamedProperties.ts, 3, 5))
->bp : Symbol(bp, Decl(contextuallyTypedSymbolNamedProperties.ts, 15, 8))
->bp.description : Symbol(Symbol.description, Decl(lib.es2019.symbol.d.ts, --, --))
->bp : Symbol(bp, Decl(contextuallyTypedSymbolNamedProperties.ts, 15, 8))
->description : Symbol(Symbol.description, Decl(lib.es2019.symbol.d.ts, --, --))
-
-})
-
-const x: { [sym: symbol]: (p: string) => void } = { [A]: s => s.length };
->x : Symbol(x, Decl(contextuallyTypedSymbolNamedProperties.ts, 18, 5))
->sym : Symbol(sym, Decl(contextuallyTypedSymbolNamedProperties.ts, 18, 12))
->p : Symbol(p, Decl(contextuallyTypedSymbolNamedProperties.ts, 18, 27))
->[A] : Symbol([A], Decl(contextuallyTypedSymbolNamedProperties.ts, 18, 51))
->A : Symbol(A, Decl(contextuallyTypedSymbolNamedProperties.ts, 2, 5))
->s : Symbol(s, Decl(contextuallyTypedSymbolNamedProperties.ts, 18, 56))
->s.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->s : Symbol(s, Decl(contextuallyTypedSymbolNamedProperties.ts, 18, 56))
->length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
-

tests/baselines/reference/contextuallyTypedSymbolNamedProperties.types

@@ -1,77 +0,0 @@
-=== tests/cases/compiler/contextuallyTypedSymbolNamedProperties.ts ===
-// Repros from #43628
-
-const A = Symbol("A");
->A : unique symbol
->Symbol("A") : unique symbol
->Symbol : SymbolConstructor
->"A" : "A"
-
-const B = Symbol("B");
->B : unique symbol
->Symbol("B") : unique symbol
->Symbol : SymbolConstructor
->"B" : "B"
-
-type Action =
->Action : Action
-
-    | {type: typeof A, data: string}
->type : unique symbol
->A : unique symbol
->data : string
-
-    | {type: typeof B, data: number}
->type : unique symbol
->B : unique symbol
->data : number
-
-declare const ab: Action;
->ab : Action
-
-declare function f<T extends { type: string | symbol }>(action: T, blah: { [K in T['type']]: (p: K) => void }): any;
->f : <T extends { type: string | symbol; }>(action: T, blah: { [K in T["type"]]: (p: K) => void; }) => any
->type : string | symbol
->action : T
->blah : { [K in T["type"]]: (p: K) => void; }
->p : K
-
-f(ab, {
->f(ab, {    [A]: ap => { ap.description },    [B]: bp => { bp.description },}) : any
->f : <T extends { type: string | symbol; }>(action: T, blah: { [K in T["type"]]: (p: K) => void; }) => any
->ab : Action
->{    [A]: ap => { ap.description },    [B]: bp => { bp.description },} : { [A]: (ap: unique symbol) => void; [B]: (bp: unique symbol) => void; }
-
-    [A]: ap => { ap.description },
->[A] : (ap: unique symbol) => void
->A : unique symbol
->ap => { ap.description } : (ap: unique symbol) => void
->ap : unique symbol
->ap.description : string | undefined
->ap : unique symbol
->description : string | undefined
-
-    [B]: bp => { bp.description },
->[B] : (bp: unique symbol) => void
->B : unique symbol
->bp => { bp.description } : (bp: unique symbol) => void
->bp : unique symbol
->bp.description : string | undefined
->bp : unique symbol
->description : string | undefined
-
-})
-
-const x: { [sym: symbol]: (p: string) => void } = { [A]: s => s.length };
->x : { [sym: symbol]: (p: string) => void; }
->sym : symbol
->p : string
->{ [A]: s => s.length } : { [A]: (s: string) => number; }
->[A] : (s: string) => number
->A : unique symbol
->s => s.length : (s: string) => number
->s : string
->s.length : number
->s : string
->length : number
-

tests/baselines/reference/controlFlowAliasing.errors.txt

@@ -28,11 +28,15 @@ tests/cases/conformance/controlFlow/controlFlowAliasing.ts(232,13): error TS2322
   Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/controlFlow/controlFlowAliasing.ts(233,13): error TS2322: Type 'string | number' is not assignable to type 'string'.
   Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/controlFlow/controlFlowAliasing.ts(267,13): error TS2322: Type 'string | number' is not assignable to type 'string'.
+  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/controlFlow/controlFlowAliasing.ts(270,13): error TS2322: Type 'string | number' is not assignable to type 'number'.
+  Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/controlFlow/controlFlowAliasing.ts(280,5): error TS2448: Block-scoped variable 'a' used before its declaration.
 tests/cases/conformance/controlFlow/controlFlowAliasing.ts(280,5): error TS2454: Variable 'a' is used before being assigned.
 
 
-==== tests/cases/conformance/controlFlow/controlFlowAliasing.ts (17 errors) ====
+==== tests/cases/conformance/controlFlow/controlFlowAliasing.ts (19 errors) ====
     // Narrowing by aliased conditional expressions
     
     function f10(x: string | number) {
@@ -345,9 +349,15 @@ tests/cases/conformance/controlFlow/controlFlowAliasing.ts(280,5): error TS2454:
     function foo({ kind, payload }: Data) {
         if (kind === 'str') {
             let t: string = payload;
+                ~
+!!! error TS2322: Type 'string | number' is not assignable to type 'string'.
+!!! error TS2322:   Type 'number' is not assignable to type 'string'.
         }
         else {
             let t: number = payload;
+                ~
+!!! error TS2322: Type 'string | number' is not assignable to type 'number'.
+!!! error TS2322:   Type 'string' is not assignable to type 'number'.
         }
     }
     

tests/baselines/reference/controlFlowAliasing.types

@@ -888,12 +888,12 @@ function foo({ kind, payload }: Data) {
 
         let t: string = payload;
 >t : string
->payload : string
+>payload : string | number
     }
     else {
         let t: number = payload;
 >t : number
->payload : number
+>payload : string | number
     }
 }
 

tests/baselines/reference/controlFlowGenericTypes.errors.txt

@@ -220,24 +220,4 @@ tests/cases/conformance/controlFlow/controlFlowGenericTypes.ts(168,9): error TS2
             this.validateRow(row);
         }
     }
-    
-    // Repro from #46495
-    
-    interface Button {
-        type: "button";
-        text: string;
-    }
-    
-    interface Checkbox {
-        type: "checkbox";
-        isChecked: boolean;
-    }
-    
-    type Control = Button | Checkbox;
-    
-    function update<T extends Control, K extends keyof T>(control : T | undefined, key: K, value: T[K]): void {
-        if (control !== undefined) {
-            control[key] = value;
-        }
-    }
     

tests/baselines/reference/controlFlowGenericTypes.js

@@ -190,26 +190,6 @@ class SqlTable<T> {
         this.validateRow(row);
     }
 }
-
-// Repro from #46495
-
-interface Button {
-    type: "button";
-    text: string;
-}
-
-interface Checkbox {
-    type: "checkbox";
-    isChecked: boolean;
-}
-
-type Control = Button | Checkbox;
-
-function update<T extends Control, K extends keyof T>(control : T | undefined, key: K, value: T[K]): void {
-    if (control !== undefined) {
-        control[key] = value;
-    }
-}
 
 
 //// [controlFlowGenericTypes.js]
@@ -363,8 +343,3 @@ var SqlTable = /** @class */ (function () {
     };
     return SqlTable;
 }());
-function update(control, key, value) {
-    if (control !== undefined) {
-        control[key] = value;
-    }
-}

tests/baselines/reference/controlFlowGenericTypes.symbols

@@ -574,55 +574,3 @@ class SqlTable<T> {
     }
 }
 
-// Repro from #46495
-
-interface Button {
->Button : Symbol(Button, Decl(controlFlowGenericTypes.ts, 190, 1))
-
-    type: "button";
->type : Symbol(Button.type, Decl(controlFlowGenericTypes.ts, 194, 18))
-
-    text: string;
->text : Symbol(Button.text, Decl(controlFlowGenericTypes.ts, 195, 19))
-}
-
-interface Checkbox {
->Checkbox : Symbol(Checkbox, Decl(controlFlowGenericTypes.ts, 197, 1))
-
-    type: "checkbox";
->type : Symbol(Checkbox.type, Decl(controlFlowGenericTypes.ts, 199, 20))
-
-    isChecked: boolean;
->isChecked : Symbol(Checkbox.isChecked, Decl(controlFlowGenericTypes.ts, 200, 21))
-}
-
-type Control = Button | Checkbox;
->Control : Symbol(Control, Decl(controlFlowGenericTypes.ts, 202, 1))
->Button : Symbol(Button, Decl(controlFlowGenericTypes.ts, 190, 1))
->Checkbox : Symbol(Checkbox, Decl(controlFlowGenericTypes.ts, 197, 1))
-
-function update<T extends Control, K extends keyof T>(control : T | undefined, key: K, value: T[K]): void {
->update : Symbol(update, Decl(controlFlowGenericTypes.ts, 204, 33))
->T : Symbol(T, Decl(controlFlowGenericTypes.ts, 206, 16))
->Control : Symbol(Control, Decl(controlFlowGenericTypes.ts, 202, 1))
->K : Symbol(K, Decl(controlFlowGenericTypes.ts, 206, 34))
->T : Symbol(T, Decl(controlFlowGenericTypes.ts, 206, 16))
->control : Symbol(control, Decl(controlFlowGenericTypes.ts, 206, 54))
->T : Symbol(T, Decl(controlFlowGenericTypes.ts, 206, 16))
->key : Symbol(key, Decl(controlFlowGenericTypes.ts, 206, 78))
->K : Symbol(K, Decl(controlFlowGenericTypes.ts, 206, 34))
->value : Symbol(value, Decl(controlFlowGenericTypes.ts, 206, 86))
->T : Symbol(T, Decl(controlFlowGenericTypes.ts, 206, 16))
->K : Symbol(K, Decl(controlFlowGenericTypes.ts, 206, 34))
-
-    if (control !== undefined) {
->control : Symbol(control, Decl(controlFlowGenericTypes.ts, 206, 54))
->undefined : Symbol(undefined)
-
-        control[key] = value;
->control : Symbol(control, Decl(controlFlowGenericTypes.ts, 206, 54))
->key : Symbol(key, Decl(controlFlowGenericTypes.ts, 206, 78))
->value : Symbol(value, Decl(controlFlowGenericTypes.ts, 206, 86))
-    }
-}
-

tests/baselines/reference/controlFlowGenericTypes.types

@@ -542,44 +542,3 @@ class SqlTable<T> {
     }
 }
 
-// Repro from #46495
-
-interface Button {
-    type: "button";
->type : "button"
-
-    text: string;
->text : string
-}
-
-interface Checkbox {
-    type: "checkbox";
->type : "checkbox"
-
-    isChecked: boolean;
->isChecked : boolean
-}
-
-type Control = Button | Checkbox;
->Control : Control
-
-function update<T extends Control, K extends keyof T>(control : T | undefined, key: K, value: T[K]): void {
->update : <T extends Control, K extends keyof T>(control: T | undefined, key: K, value: T[K]) => void
->control : T | undefined
->key : K
->value : T[K]
-
-    if (control !== undefined) {
->control !== undefined : boolean
->control : T | undefined
->undefined : undefined
-
-        control[key] = value;
->control[key] = value : T[K]
->control[key] : T[K]
->control : T
->key : K
->value : T[K]
-    }
-}
-