Merge branch 'master' into fix32434

src/compiler/checker.ts

@@ -9890,7 +9890,7 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function addTypeToIntersection(typeSet: Type[], includes: TypeFlags, type: Type) {
+        function addTypeToIntersection(typeSet: Map<Type>, includes: TypeFlags, type: Type) {
             const flags = type.flags;
             if (flags & TypeFlags.Intersection) {
                 return addTypesToIntersection(typeSet, includes, (<IntersectionType>type).types);
@@ -9898,20 +9898,20 @@ namespace ts {
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & TypeFlags.IncludesEmptyObject)) {
                     includes |= TypeFlags.IncludesEmptyObject;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
                 if (flags & TypeFlags.AnyOrUnknown) {
                     if (type === wildcardType) includes |= TypeFlags.IncludesWildcard;
                 }
-                else if ((strictNullChecks || !(flags & TypeFlags.Nullable)) && !contains(typeSet, type)) {
+                else if ((strictNullChecks || !(flags & TypeFlags.Nullable)) && !typeSet.has(type.id.toString())) {
                     if (type.flags & TypeFlags.Unit && includes & TypeFlags.Unit) {
                         // We have seen two distinct unit types which means we should reduce to an
                         // empty intersection. Adding TypeFlags.NonPrimitive causes that to happen.
                         includes |= TypeFlags.NonPrimitive;
                     }
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
                 includes |= flags & TypeFlags.IncludesMask;
             }
@@ -9920,7 +9920,7 @@ namespace ts {
 
         // Add the given types to the given type set. Order is preserved, freshness is removed from literal
         // types, duplicates are removed, and nested types of the given kind are flattened into the set.
-        function addTypesToIntersection(typeSet: Type[], includes: TypeFlags, types: ReadonlyArray<Type>) {
+        function addTypesToIntersection(typeSet: Map<Type>, includes: TypeFlags, types: ReadonlyArray<Type>) {
             for (const type of types) {
                 includes = addTypeToIntersection(typeSet, includes, getRegularTypeOfLiteralType(type));
             }
@@ -10027,8 +10027,9 @@ namespace ts {
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
         function getIntersectionType(types: ReadonlyArray<Type>, aliasSymbol?: Symbol, aliasTypeArguments?: ReadonlyArray<Type>): Type {
-            const typeSet: Type[] = [];
-            const includes = addTypesToIntersection(typeSet, 0, types);
+            const typeMembershipMap: Map<Type> = createMap();
+            const includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            const typeSet: Type[] = arrayFrom(typeMembershipMap.values());
             // An intersection type is considered empty if it contains
             // the type never, or
             // more than one unit type or,
@@ -24809,6 +24810,12 @@ namespace ts {
                     || anyType;
             }
 
+            const contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(IterationTypeKind.Next, contextualReturnType, isAsync)
+                    || anyType;
+            }
+
             return anyType;
         }
 

src/compiler/emitter.ts

@@ -411,7 +411,11 @@ namespace ts {
                     }
                 );
                 if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === SyntaxKind.SourceFile) {
-                    const sourceFile = declarationTransform.transformed[0] as SourceFile;
+                    // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
+                    // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // tslint directive can be all be removed.
+                    const sourceFile = declarationTransform.transformed[0] as SourceFile; // tslint:disable-line
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }

src/compiler/types.ts

@@ -4760,7 +4760,7 @@ namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
 
     export const enum JsxEmit {
@@ -4808,7 +4808,7 @@ namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 8,
+        ESNext = 99,
         JSON = 100,
         Latest = ESNext,
     }

src/compiler/utilities.ts

@@ -7485,7 +7485,7 @@ namespace ts {
     export function getDirectoryPath(path: Path): Path;
     /**
      * Returns the path except for its basename. Semantics align with NodeJS's `path.dirname`
-     * except that we support URLs as well.
+     * except that we support URL's as well.
      *
      * ```ts
      * getDirectoryPath("/path/to/file.ext") === "/path/to"

src/harness/fourslash.ts

@@ -797,8 +797,8 @@ namespace FourSlash {
                     for (const include of toArray(options.includes)) {
                         const name = typeof include === "string" ? include : include.name;
                         const found = nameToEntries.get(name);
-                        if (!found) throw this.raiseError(`No completion ${name} found`);
-                        assert(found.length === 1, `Must use 'exact' for multiple completions with same name: '${name}'`);
+                        if (!found) throw this.raiseError(`Includes: completion '${name}' not found.`);
+                        assert(found.length === 1); // Must use 'exact' for multiple completions with same name
                         this.verifyCompletionEntry(ts.first(found), include);
                     }
                 }
@@ -806,7 +806,7 @@ namespace FourSlash {
                     for (const exclude of toArray(options.excludes)) {
                         assert(typeof exclude === "string");
                         if (nameToEntries.has(exclude)) {
-                            this.raiseError(`Did not expect to get a completion named ${exclude}`);
+                            this.raiseError(`Excludes: unexpected completion '${exclude}' found.`);
                         }
                     }
                 }
@@ -4827,40 +4827,23 @@ namespace FourSlashInterface {
             "interface",
             "let",
             "package",
-            "private",
-            "protected",
-            "public",
-            "static",
             "yield",
-            "abstract",
-            "as",
             "any",
             "async",
             "await",
             "boolean",
-            "constructor",
             "declare",
-            "get",
-            "infer",
-            "is",
             "keyof",
             "module",
-            "namespace",
             "never",
             "readonly",
-            "require",
             "number",
             "object",
-            "set",
             "string",
             "symbol",
-            "type",
             "unique",
             "unknown",
-            "from",
-            "global",
             "bigint",
-            "of",
         ].map(keywordEntry);
 
         export const statementKeywords: ReadonlyArray<ExpectedCompletionEntryObject> = statementKeywordsWithTypes.filter(k => {
@@ -5041,40 +5024,23 @@ namespace FourSlashInterface {
             "interface",
             "let",
             "package",
-            "private",
-            "protected",
-            "public",
-            "static",
             "yield",
-            "abstract",
-            "as",
             "any",
             "async",
             "await",
             "boolean",
-            "constructor",
             "declare",
-            "get",
-            "infer",
-            "is",
             "keyof",
             "module",
-            "namespace",
             "never",
             "readonly",
-            "require",
             "number",
             "object",
-            "set",
             "string",
             "symbol",
-            "type",
             "unique",
             "unknown",
-            "from",
-            "global",
             "bigint",
-            "of",
         ].map(keywordEntry);
 
         export const globalInJsKeywords = getInJsKeywords(globalKeywords);
@@ -5127,11 +5093,6 @@ namespace FourSlashInterface {
 
         export const insideMethodInJsKeywords = getInJsKeywords(insideMethodKeywords);
 
-        export const globalKeywordsPlusUndefined: ReadonlyArray<ExpectedCompletionEntryObject> = (() => {
-            const i = ts.findIndex(globalKeywords, x => x.name === "unique");
-            return [...globalKeywords.slice(0, i), keywordEntry("undefined"), ...globalKeywords.slice(i)];
-        })();
-
         export const globals: ReadonlyArray<ExpectedCompletionEntryObject> = [
             globalThisEntry,
             ...globalsVars,

src/jsTyping/jsTyping.ts

@@ -289,9 +289,8 @@ namespace ts.JsTyping {
 
     }
 
-    export const enum PackageNameValidationResult {
+    export const enum NameValidationResult {
         Ok,
-        ScopedPackagesNotSupported,
         EmptyName,
         NameTooLong,
         NameStartsWithDot,
@@ -301,49 +300,77 @@ namespace ts.JsTyping {
 
     const maxPackageNameLength = 214;
 
+    export interface ScopedPackageNameValidationResult {
+        name: string;
+        isScopeName: boolean;
+        result: NameValidationResult;
+    }
+    export type PackageNameValidationResult = NameValidationResult | ScopedPackageNameValidationResult;
+
     /**
      * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
      */
     export function validatePackageName(packageName: string): PackageNameValidationResult {
+        return validatePackageNameWorker(packageName, /*supportScopedPackage*/ true);
+    }
+
+    function validatePackageNameWorker(packageName: string, supportScopedPackage: false): NameValidationResult;
+    function validatePackageNameWorker(packageName: string, supportScopedPackage: true): PackageNameValidationResult;
+    function validatePackageNameWorker(packageName: string, supportScopedPackage: boolean): PackageNameValidationResult {
         if (!packageName) {
-            return PackageNameValidationResult.EmptyName;
+            return NameValidationResult.EmptyName;
         }
         if (packageName.length > maxPackageNameLength) {
-            return PackageNameValidationResult.NameTooLong;
+            return NameValidationResult.NameTooLong;
         }
         if (packageName.charCodeAt(0) === CharacterCodes.dot) {
-            return PackageNameValidationResult.NameStartsWithDot;
+            return NameValidationResult.NameStartsWithDot;
         }
         if (packageName.charCodeAt(0) === CharacterCodes._) {
-            return PackageNameValidationResult.NameStartsWithUnderscore;
+            return NameValidationResult.NameStartsWithUnderscore;
         }
         // check if name is scope package like: starts with @ and has one '/' in the middle
         // scoped packages are not currently supported
-        // TODO: when support will be added we'll need to split and check both scope and package name
-        if (/^@[^/]+\/[^/]+$/.test(packageName)) {
-            return PackageNameValidationResult.ScopedPackagesNotSupported;
+        if (supportScopedPackage) {
+            const matches = /^@([^/]+)\/([^/]+)$/.exec(packageName);
+            if (matches) {
+                const scopeResult = validatePackageNameWorker(matches[1], /*supportScopedPackage*/ false);
+                if (scopeResult !== NameValidationResult.Ok) {
+                    return { name: matches[1], isScopeName: true, result: scopeResult };
+                }
+                const packageResult = validatePackageNameWorker(matches[2], /*supportScopedPackage*/ false);
+                if (packageResult !== NameValidationResult.Ok) {
+                    return { name: matches[2], isScopeName: false, result: packageResult };
+                }
+                return NameValidationResult.Ok;
+            }
         }
         if (encodeURIComponent(packageName) !== packageName) {
-            return PackageNameValidationResult.NameContainsNonURISafeCharacters;
+            return NameValidationResult.NameContainsNonURISafeCharacters;
         }
-        return PackageNameValidationResult.Ok;
+        return NameValidationResult.Ok;
     }
 
     export function renderPackageNameValidationFailure(result: PackageNameValidationResult, typing: string): string {
+        return typeof result === "object" ?
+            renderPackageNameValidationFailureWorker(typing, result.result, result.name, result.isScopeName) :
+            renderPackageNameValidationFailureWorker(typing, result, typing, /*isScopeName*/ false);
+    }
+
+    function renderPackageNameValidationFailureWorker(typing: string, result: NameValidationResult, name: string, isScopeName: boolean): string {
+        const kind = isScopeName ? "Scope" : "Package";
         switch (result) {
-            case PackageNameValidationResult.EmptyName:
-                return `Package name '${typing}' cannot be empty`;
-            case PackageNameValidationResult.NameTooLong:
-                return `Package name '${typing}' should be less than ${maxPackageNameLength} characters`;
-            case PackageNameValidationResult.NameStartsWithDot:
-                return `Package name '${typing}' cannot start with '.'`;
-            case PackageNameValidationResult.NameStartsWithUnderscore:
-                return `Package name '${typing}' cannot start with '_'`;
-            case PackageNameValidationResult.ScopedPackagesNotSupported:
-                return `Package '${typing}' is scoped and currently is not supported`;
-            case PackageNameValidationResult.NameContainsNonURISafeCharacters:
-                return `Package name '${typing}' contains non URI safe characters`;
-            case PackageNameValidationResult.Ok:
+            case NameValidationResult.EmptyName:
+                return `'${typing}':: ${kind} name '${name}' cannot be empty`;
+            case NameValidationResult.NameTooLong:
+                return `'${typing}':: ${kind} name '${name}' should be less than ${maxPackageNameLength} characters`;
+            case NameValidationResult.NameStartsWithDot:
+                return `'${typing}':: ${kind} name '${name}' cannot start with '.'`;
+            case NameValidationResult.NameStartsWithUnderscore:
+                return `'${typing}':: ${kind} name '${name}' cannot start with '_'`;
+            case NameValidationResult.NameContainsNonURISafeCharacters:
+                return `'${typing}':: ${kind} name '${name}' contains non URI safe characters`;
+            case NameValidationResult.Ok:
                 return Debug.fail(); // Shouldn't have called this.
             default:
                 throw Debug.assertNever(result);

src/lib/es5.d.ts

@@ -12,7 +12,7 @@ declare var Infinity: number;
 declare function eval(x: string): any;
 
 /**
-  * Converts A string to an integer.
+  * Converts a string to an integer.
   * @param s A string to convert into a number.
   * @param radix A value between 2 and 36 that specifies the base of the number in numString.
   * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LCX SchemaVersion="6.0" Name="f:\ddSetup\sources\typescript\localization\compiler2.resx" PsrId="306" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
   <Props>
     <Str Name="CustomName1" Val="Custom 1" />
@@ -3301,7 +3301,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Crea l'origine unitamente alle mappe di origine all'interno di un unico file. Richiede l'impostazione di '--inlineSourceMap' o '--sourceMap'.]]></Val>
+            <Val><![CDATA[Crea l'origine unitamente ai mapping di origine all'interno di un unico file. Richiede l'impostazione di '--inlineSourceMap' o '--sourceMap'.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -4123,7 +4123,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Genera un sourcemap per ogni file '.d.ts' corrispondente.]]></Val>
+            <Val><![CDATA[Genera un mapping di origine per ogni file '.d.ts' corrispondente.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LCX SchemaVersion="6.0" Name="f:\ddSetup\sources\typescript\localization\compiler2.resx" PsrId="306" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
   <Props>
     <Str Name="CustomName1" Val="Custom 1" />
@@ -3300,7 +3300,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Порождать источник вместе с sourcemap в одном файле (нужно задать параметр --inlineSourceMap или --sourceMap).]]></Val>
+            <Val><![CDATA[Порождать источник вместе с сопоставителями с исходным кодом в одном файле (нужно задать параметр --inlineSourceMap или --sourceMap).]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -4122,7 +4122,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Создает sourcemap для каждого соответствующего файла ".d.ts".]]></Val>
+            <Val><![CDATA[Создает сопоставитель с исходным кодом для каждого соответствующего файла ".d.ts".]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

src/server/editorServices.ts

@@ -1087,7 +1087,24 @@ namespace ts.server {
 
             project.close();
             if (Debug.shouldAssert(AssertionLevel.Normal)) {
-                this.filenameToScriptInfo.forEach(info => Debug.assert(!info.isAttached(project), "Found script Info still attached to project", () => `${project.projectName}: ScriptInfos still attached: ${JSON.stringify(mapDefined(arrayFrom(this.filenameToScriptInfo.values()), info => info.isAttached(project) ? info : undefined))}`));
+                this.filenameToScriptInfo.forEach(info => Debug.assert(
+                    !info.isAttached(project),
+                    "Found script Info still attached to project",
+                    () => `${project.projectName}: ScriptInfos still attached: ${JSON.stringify(
+                        arrayFrom(
+                            mapDefinedIterator(
+                                this.filenameToScriptInfo.values(),
+                                info => info.isAttached(project) ?
+                                    {
+                                        fileName: info.fileName,
+                                        projects: info.containingProjects.map(p => p.projectName),
+                                        hasMixedContent: info.hasMixedContent
+                                    } : undefined
+                            )
+                        ),
+                        /*replacer*/ undefined,
+                        " "
+                    )}`));
             }
             // Remove the project from pending project updates
             this.pendingProjectUpdates.delete(project.getProjectName());

src/services/codefixes/importFixes.ts

@@ -283,25 +283,13 @@ namespace ts.codefix {
         preferences: UserPreferences,
     ): ReadonlyArray<FixAddNewImport | FixUseImportType> {
         const isJs = isSourceFileJS(sourceFile);
-        const { allowsImporting } = createLazyPackageJsonDependencyReader(sourceFile, host);
         const choicesForEachExportingModule = flatMap(moduleSymbols, ({ moduleSymbol, importKind, exportedSymbolIsTypeOnly }) =>
             moduleSpecifiers.getModuleSpecifiers(moduleSymbol, program.getCompilerOptions(), sourceFile, host, program.getSourceFiles(), preferences, program.redirectTargetsMap)
             .map((moduleSpecifier): FixAddNewImport | FixUseImportType =>
                 // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
                 exportedSymbolIsTypeOnly && isJs ? { kind: ImportFixKind.ImportType, moduleSpecifier, position: Debug.assertDefined(position) } : { kind: ImportFixKind.AddNew, moduleSpecifier, importKind }));
-
-        // Sort by presence in package.json, then shortest paths first
-        return sort(choicesForEachExportingModule, (a, b) => {
-            const allowsImportingA = allowsImporting(a.moduleSpecifier);
-            const allowsImportingB = allowsImporting(b.moduleSpecifier);
-            if (allowsImportingA && !allowsImportingB) {
-                return -1;
-            }
-            if (allowsImportingB && !allowsImportingA) {
-                return 1;
-            }
-            return a.moduleSpecifier.length - b.moduleSpecifier.length;
-        });
+        // Sort to keep the shortest paths first
+        return sort(choicesForEachExportingModule, (a, b) => a.moduleSpecifier.length - b.moduleSpecifier.length);
     }
 
     function getFixesForAddImport(
@@ -392,8 +380,7 @@ namespace ts.codefix {
         // "default" is a keyword and not a legal identifier for the import, so we don't expect it here
         Debug.assert(symbolName !== InternalSymbolName.Default);
 
-        const exportInfos = getExportInfos(symbolName, getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program, preferences, host);
-        const fixes = arrayFrom(flatMapIterator(exportInfos.entries(), ([_, exportInfos]) =>
+        const fixes = arrayFrom(flatMapIterator(getExportInfos(symbolName, getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program).entries(), ([_, exportInfos]) =>
             getFixForImport(exportInfos, symbolName, symbolToken.getStart(sourceFile), program, sourceFile, host, preferences)));
         return { fixes, symbolName };
     }
@@ -406,8 +393,6 @@ namespace ts.codefix {
         sourceFile: SourceFile,
         checker: TypeChecker,
         program: Program,
-        preferences: UserPreferences,
-        host: LanguageServiceHost
     ): ReadonlyMap<ReadonlyArray<SymbolExportInfo>> {
         // For each original symbol, keep all re-exports of that symbol together so we can call `getCodeActionsForImport` on the whole group at once.
         // Maps symbol id to info for modules providing that symbol (original export + re-exports).
@@ -415,7 +400,7 @@ namespace ts.codefix {
         function addSymbol(moduleSymbol: Symbol, exportedSymbol: Symbol, importKind: ImportKind): void {
             originalSymbolToExportInfos.add(getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol, importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
         }
-        forEachExternalModuleToImportFrom(checker, host, preferences, program.redirectTargetsMap, sourceFile, program.getSourceFiles(), moduleSymbol => {
+        forEachExternalModuleToImportFrom(checker, sourceFile, program.getSourceFiles(), moduleSymbol => {
             cancellationToken.throwIfCancellationRequested();
 
             const defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, program.getCompilerOptions());
@@ -576,44 +561,12 @@ namespace ts.codefix {
         return some(declarations, decl => !!(getMeaningFromDeclaration(decl) & meaning));
     }
 
-    export function forEachExternalModuleToImportFrom(checker: TypeChecker, host: LanguageServiceHost, preferences: UserPreferences, redirectTargetsMap: RedirectTargetsMap, from: SourceFile, allSourceFiles: ReadonlyArray<SourceFile>, cb: (module: Symbol) => void) {
-        const { allowsImporting } = createLazyPackageJsonDependencyReader(from, host);
-        const compilerOptions = host.getCompilationSettings();
-        const getCanonicalFileName = hostGetCanonicalFileName(host);
+    export function forEachExternalModuleToImportFrom(checker: TypeChecker, from: SourceFile, allSourceFiles: ReadonlyArray<SourceFile>, cb: (module: Symbol) => void) {
         forEachExternalModule(checker, allSourceFiles, (module, sourceFile) => {
-            if (sourceFile === undefined && allowsImporting(stripQuotes(module.getName()))) {
+            if (sourceFile === undefined || sourceFile !== from && isImportablePath(from.fileName, sourceFile.fileName)) {
                 cb(module);
             }
-            else if (sourceFile && sourceFile !== from && isImportablePath(from.fileName, sourceFile.fileName)) {
-                const moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName);
-                if (!moduleSpecifier || allowsImporting(moduleSpecifier)) {
-                    cb(module);
-                }
-            }
         });
-
-        function getNodeModulesPackageNameFromFileName(importedFileName: string): string | undefined {
-            const specifier = moduleSpecifiers.getModuleSpecifier(
-                compilerOptions,
-                from,
-                toPath(from.fileName, /*basePath*/ undefined, getCanonicalFileName),
-                importedFileName,
-                host,
-                allSourceFiles,
-                preferences,
-                redirectTargetsMap);
-
-            // Paths here are not node_modules, so we don’t care about them;
-            // returning anything will trigger a lookup in package.json.
-            if (!pathIsRelative(specifier) && !isRootedDiskPath(specifier)) {
-                const components = getPathComponents(getPackageNameFromTypesPackageName(specifier)).slice(1);
-                // Scoped packages
-                if (startsWith(components[0], "@")) {
-                    return `${components[0]}/${components[1]}`;
-                }
-                return components[0];
-            }
-        }
     }
 
     function forEachExternalModule(checker: TypeChecker, allSourceFiles: ReadonlyArray<SourceFile>, cb: (module: Symbol, sourceFile: SourceFile | undefined) => void) {
@@ -667,69 +620,4 @@ namespace ts.codefix {
         // Need `|| "_"` to ensure result isn't empty.
         return !isStringANonContextualKeyword(res) ? res || "_" : `_${res}`;
     }
-
-    function createLazyPackageJsonDependencyReader(fromFile: SourceFile, host: LanguageServiceHost) {
-        const packageJsonPaths = findPackageJsons(getDirectoryPath(fromFile.fileName), host);
-        const dependencyIterator = readPackageJsonDependencies(host, packageJsonPaths);
-        let seenDeps: Map<true> | undefined;
-        let usesNodeCoreModules: boolean | undefined;
-        return { allowsImporting };
-
-        function containsDependency(dependency: string) {
-            if ((seenDeps || (seenDeps = createMap())).has(dependency)) {
-                return true;
-            }
-            let packageName: string | void;
-            while (packageName = dependencyIterator.next().value) {
-                seenDeps.set(packageName, true);
-                if (packageName === dependency) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        function allowsImporting(moduleSpecifier: string): boolean {
-            if (!packageJsonPaths.length) {
-                return true;
-            }
-
-            // If we’re in JavaScript, it can be difficult to tell whether the user wants to import
-            // from Node core modules or not. We can start by seeing if the user is actually using
-            // any node core modules, as opposed to simply having @types/node accidentally as a
-            // dependency of a dependency.
-            if (isSourceFileJS(fromFile) && JsTyping.nodeCoreModules.has(moduleSpecifier)) {
-                if (usesNodeCoreModules === undefined) {
-                    usesNodeCoreModules = consumesNodeCoreModules(fromFile);
-                }
-                if (usesNodeCoreModules) {
-                    return true;
-                }
-            }
-
-            return containsDependency(moduleSpecifier)
-                || containsDependency(getTypesPackageName(moduleSpecifier));
-        }
-    }
-
-    function *readPackageJsonDependencies(host: LanguageServiceHost, packageJsonPaths: string[]) {
-        type PackageJson = Record<typeof dependencyKeys[number], Record<string, string> | undefined>;
-        const dependencyKeys = ["dependencies", "devDependencies", "optionalDependencies"] as const;
-        for (const fileName of packageJsonPaths) {
-            const content = readJson(fileName, { readFile: host.readFile ? host.readFile.bind(host) : sys.readFile }) as PackageJson;
-            for (const key of dependencyKeys) {
-                const dependencies = content[key];
-                if (!dependencies) {
-                    continue;
-                }
-                for (const packageName in dependencies) {
-                    yield packageName;
-                }
-            }
-        }
-    }
-
-    function consumesNodeCoreModules(sourceFile: SourceFile): boolean {
-        return some(sourceFile.imports, ({ text }) => JsTyping.nodeCoreModules.has(text));
-    }
 }

src/services/completions.ts

@@ -64,7 +64,7 @@ namespace ts.Completions {
             return getLabelCompletionAtPosition(contextToken.parent);
         }
 
-        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined, host);
+        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
         if (!completionData) {
             return undefined;
         }
@@ -407,10 +407,10 @@ namespace ts.Completions {
         previousToken: Node | undefined;
         readonly isJsxInitializer: IsJsxInitializer;
     }
-    function getSymbolCompletionFromEntryId(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier, host: LanguageServiceHost
+    function getSymbolCompletionFromEntryId(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier,
     ): SymbolCompletion | { type: "request", request: Request } | { type: "literal", literal: string | number | PseudoBigInt } | { type: "none" } {
         const compilerOptions = program.getCompilerOptions();
-        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, entryId, host);
+        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, entryId);
         if (!completionData) {
             return { type: "none" };
         }
@@ -472,7 +472,7 @@ namespace ts.Completions {
         }
 
         // Compute all the completion symbols again.
-        const symbolCompletion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host);
+        const symbolCompletion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId);
         switch (symbolCompletion.type) {
             case "request": {
                 const { request } = symbolCompletion;
@@ -557,8 +557,8 @@ namespace ts.Completions {
         return { sourceDisplay: [textPart(moduleSpecifier)], codeActions: [codeAction] };
     }
 
-    export function getCompletionEntrySymbol(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier, host: LanguageServiceHost): Symbol | undefined {
-        const completion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host);
+    export function getCompletionEntrySymbol(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier): Symbol | undefined {
+        const completion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId);
         return completion.type === "symbol" ? completion.symbol : undefined;
     }
 
@@ -657,7 +657,6 @@ namespace ts.Completions {
         position: number,
         preferences: Pick<UserPreferences, "includeCompletionsForModuleExports" | "includeCompletionsWithInsertText">,
         detailsEntryId: CompletionEntryIdentifier | undefined,
-        host: LanguageServiceHost
     ): CompletionData | Request | undefined {
         const typeChecker = program.getTypeChecker();
 
@@ -948,11 +947,13 @@ namespace ts.Completions {
             // Right of dot member completion list
             completionKind = CompletionKind.PropertyAccess;
 
-            // Since this is qualified name check its a type node location
+            // Since this is qualified name check it's a type node location
             const isImportType = isLiteralImportTypeNode(node);
-            const isTypeLocation = insideJsDocTagTypeExpression || (isImportType && !(node as ImportTypeNode).isTypeOf) || isPartOfTypeNode(node.parent);
+            const isTypeLocation = insideJsDocTagTypeExpression
+                || (isImportType && !(node as ImportTypeNode).isTypeOf)
+                || isPartOfTypeNode(node.parent)
+                || isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
             const isRhsOfImportDeclaration = isInRightSideOfInternalImportEqualsDeclaration(node);
-            const allowTypeOrValue = isRhsOfImportDeclaration || (!isTypeLocation && isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker));
             if (isEntityName(node) || isImportType) {
                 const isNamespaceName = isModuleDeclaration(node.parent);
                 if (isNamespaceName) isNewIdentifierLocation = true;
@@ -969,7 +970,7 @@ namespace ts.Completions {
                             isNamespaceName
                                 // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
                                 ? symbol => !!(symbol.flags & SymbolFlags.Namespace) && !symbol.declarations.every(d => d.parent === node.parent)
-                                : allowTypeOrValue ?
+                                : isRhsOfImportDeclaration ?
                                     // Any kind is allowed when dotting off namespace in internal import equals declaration
                                     symbol => isValidTypeAccess(symbol) || isValidValueAccess(symbol) :
                                     isTypeLocation ? isValidTypeAccess : isValidValueAccess;
@@ -1150,7 +1151,7 @@ namespace ts.Completions {
             }
 
             if (shouldOfferImportCompletions()) {
-                getSymbolsFromOtherSourceFileExports(symbols, previousToken && isIdentifier(previousToken) ? previousToken.text : "", program.getCompilerOptions().target!, host);
+                getSymbolsFromOtherSourceFileExports(symbols, previousToken && isIdentifier(previousToken) ? previousToken.text : "", program.getCompilerOptions().target!);
             }
             filterGlobalCompletion(symbols);
         }
@@ -1182,7 +1183,6 @@ namespace ts.Completions {
 
         function filterGlobalCompletion(symbols: Symbol[]): void {
             const isTypeOnly = isTypeOnlyCompletion();
-            const allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
             if (isTypeOnly) {
                 keywordFilters = isTypeAssertion()
                     ? KeywordCompletionFilters.TypeAssertionKeywords
@@ -1203,12 +1203,9 @@ namespace ts.Completions {
                         return !!(symbol.flags & SymbolFlags.Namespace);
                     }
 
-                    if (allowTypes) {
-                        // Its a type, but you can reach it by namespace.type as well
-                        const symbolAllowedAsType = symbolCanBeReferencedAtTypeLocation(symbol);
-                        if (symbolAllowedAsType || isTypeOnly) {
-                            return symbolAllowedAsType;
-                        }
+                    if (isTypeOnly) {
+                        // It's a type, but you can reach it by namespace.type as well
+                        return symbolCanBeReferencedAtTypeLocation(symbol);
                     }
                 }
 
@@ -1222,7 +1219,11 @@ namespace ts.Completions {
         }
 
         function isTypeOnlyCompletion(): boolean {
-            return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
+            return insideJsDocTagTypeExpression
+                || !isContextTokenValueLocation(contextToken) &&
+                (isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)
+                 || isPartOfTypeNode(location)
+                 || isContextTokenTypeLocation(contextToken));
         }
 
         function isContextTokenValueLocation(contextToken: Node) {
@@ -1268,64 +1269,12 @@ namespace ts.Completions {
                 typeChecker.getExportsOfModule(sym).some(e => symbolCanBeReferencedAtTypeLocation(e, seenModules));
         }
 
-        /**
-         * Gathers symbols that can be imported from other files, deduplicating along the way. Symbols can be “duplicates”
-         * if re-exported from another module, e.g. `export { foo } from "./a"`. That syntax creates a fresh symbol, but
-         * it’s just an alias to the first, and both have the same name, so we generally want to filter those aliases out,
-         * if and only if the the first can be imported (it may be excluded due to package.json filtering in
-         * `codefix.forEachExternalModuleToImportFrom`).
-         *
-         * Example. Imagine a chain of node_modules re-exporting one original symbol:
-         *
-         * ```js
-         *  node_modules/x/index.js         node_modules/y/index.js           node_modules/z/index.js
-         * +-----------------------+      +--------------------------+      +--------------------------+
-         * |                       |      |                          |      |                          |
-         * | export const foo = 0; | <--- | export { foo } from 'x'; | <--- | export { foo } from 'y'; |
-         * |                       |      |                          |      |                          |
-         * +-----------------------+      +--------------------------+      +--------------------------+
-         * ```
-         *
-         * Also imagine three buckets, which we’ll reference soon:
-         *
-         * ```md
-         * |                  |      |                      |      |                   |
-         * |   **Bucket A**   |      |    **Bucket B**      |      |    **Bucket C**   |
-         * |    Symbols to    |      | Aliases to symbols   |      | Symbols to return |
-         * |    definitely    |      | in Buckets A or C    |      | if nothing better |
-         * |      return      |      | (don’t return these) |      |    comes along    |
-         * |__________________|      |______________________|      |___________________|
-         * ```
-         *
-         * We _probably_ want to show `foo` from 'x', but not from 'y' or 'z'. However, if 'x' is not in a package.json, it
-         * will not appear in a `forEachExternalModuleToImportFrom` iteration. Furthermore, the order of iterations is not
-         * guaranteed, as it is host-dependent. Therefore, when presented with the symbol `foo` from module 'y' alone, we
-         * may not be sure whether or not it should go in the list. So, we’ll take the following steps:
-         *
-         * 1. Resolve alias `foo` from 'y' to the export declaration in 'x', get the symbol there, and see if that symbol is
-         *    already in Bucket A (symbols we already know will be returned). If it is, put `foo` from 'y' in Bucket B
-         *    (symbols that are aliases to symbols in Bucket A). If it’s not, put it in Bucket C.
-         * 2. Next, imagine we see `foo` from module 'z'. Again, we resolve the alias to the nearest export, which is in 'y'.
-         *    At this point, if that nearest export from 'y' is in _any_ of the three buckets, we know the symbol in 'z'
-         *    should never be returned in the final list, so put it in Bucket B.
-         * 3. Next, imagine we see `foo` from module 'x', the original. Syntactically, it doesn’t look like a re-export, so
-         *    we can just check Bucket C to see if we put any aliases to the original in there. If they exist, throw them out.
-         *    Put this symbol in Bucket A.
-         * 4. After we’ve iterated through every symbol of every module, any symbol left in Bucket C means that step 3 didn’t
-         *    occur for that symbol---that is, the original symbol is not in Bucket A, so we should include the alias. Move
-         *    everything from Bucket C to Bucket A.
-         *
-         * Note: Bucket A is passed in as the parameter `symbols` and mutated.
-         */
-        function getSymbolsFromOtherSourceFileExports(/** Bucket A */ symbols: Symbol[], tokenText: string, target: ScriptTarget, host: LanguageServiceHost): void {
+        function getSymbolsFromOtherSourceFileExports(symbols: Symbol[], tokenText: string, target: ScriptTarget): void {
             const tokenTextLowerCase = tokenText.toLowerCase();
-            const seenResolvedModules = createMap<true>();
-            /** Bucket B */
-            const aliasesToAlreadyIncludedSymbols = createMap<true>();
-            /** Bucket C */
-            const aliasesToReturnIfOriginalsAreMissing = createMap<{ alias: Symbol, moduleSymbol: Symbol }>();
 
-            codefix.forEachExternalModuleToImportFrom(typeChecker, host, preferences, program.redirectTargetsMap, sourceFile, program.getSourceFiles(), moduleSymbol => {
+            const seenResolvedModules = createMap<true>();
+
+            codefix.forEachExternalModuleToImportFrom(typeChecker, sourceFile, program.getSourceFiles(), moduleSymbol => {
                 // Perf -- ignore other modules if this is a request for details
                 if (detailsEntryId && detailsEntryId.source && stripQuotes(moduleSymbol.name) !== detailsEntryId.source) {
                     return;
@@ -1346,59 +1295,33 @@ namespace ts.Completions {
                     symbolToOriginInfoMap[getSymbolId(resolvedModuleSymbol)] = { kind: SymbolOriginInfoKind.Export, moduleSymbol, isDefaultExport: false };
                 }
 
-                for (const symbol of typeChecker.getExportsOfModule(moduleSymbol)) {
-                    // If this is `export { _break as break };` (a keyword) -- skip this and prefer the keyword completion.
-                    if (some(symbol.declarations, d => isExportSpecifier(d) && !!d.propertyName && isIdentifierANonContextualKeyword(d.name))) {
+                for (let symbol of typeChecker.getExportsOfModule(moduleSymbol)) {
+                    // Don't add a completion for a re-export, only for the original.
+                    // The actual import fix might end up coming from a re-export -- we don't compute that until getting completion details.
+                    // This is just to avoid adding duplicate completion entries.
+                    //
+                    // If `symbol.parent !== ...`, this is an `export * from "foo"` re-export. Those don't create new symbols.
+                    if (typeChecker.getMergedSymbol(symbol.parent!) !== resolvedModuleSymbol
+                        || some(symbol.declarations, d =>
+                            // If `!!d.name.originalKeywordKind`, this is `export { _break as break };` -- skip this and prefer the keyword completion.
+                            // If `!!d.parent.parent.moduleSpecifier`, this is `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
+                            isExportSpecifier(d) && (d.propertyName ? isIdentifierANonContextualKeyword(d.name) : !!d.parent.parent.moduleSpecifier))) {
                         continue;
                     }
-                    // If `symbol.parent !== moduleSymbol`, this is an `export * from "foo"` re-export. Those don't create new symbols.
-                    const isExportStarFromReExport = typeChecker.getMergedSymbol(symbol.parent!) !== resolvedModuleSymbol;
-                    // If `!!d.parent.parent.moduleSpecifier`, this is `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
-                    if (isExportStarFromReExport || some(symbol.declarations, d => isExportSpecifier(d) && !d.propertyName && !!d.parent.parent.moduleSpecifier)) {
-                        // Walk the export chain back one module (step 1 or 2 in diagrammed example).
-                        // Or, in the case of `export * from "foo"`, `symbol` already points to the original export, so just use that.
-                        const nearestExportSymbolId = getSymbolId(isExportStarFromReExport ? symbol : Debug.assertDefined(getNearestExportSymbol(symbol)));
-                        const symbolHasBeenSeen = !!symbolToOriginInfoMap[nearestExportSymbolId] || aliasesToAlreadyIncludedSymbols.has(nearestExportSymbolId.toString());
-                        if (!symbolHasBeenSeen) {
-                            aliasesToReturnIfOriginalsAreMissing.set(nearestExportSymbolId.toString(), { alias: symbol, moduleSymbol });
-                            aliasesToAlreadyIncludedSymbols.set(getSymbolId(symbol).toString(), true);
-                        }
-                        else {
-                            // Perf - we know this symbol is an alias to one that’s already covered in `symbols`, so store it here
-                            // in case another symbol re-exports this one; that way we can short-circuit as soon as we see this symbol id.
-                            addToSeen(aliasesToAlreadyIncludedSymbols, getSymbolId(symbol));
-                        }
+
+                    const isDefaultExport = symbol.escapedName === InternalSymbolName.Default;
+                    if (isDefaultExport) {
+                        symbol = getLocalSymbolForExportDefault(symbol) || symbol;
                     }
-                    else {
-                        // This is not a re-export, so see if we have any aliases pending and remove them (step 3 in diagrammed example)
-                        aliasesToReturnIfOriginalsAreMissing.delete(getSymbolId(symbol).toString());
-                        pushSymbol(symbol, moduleSymbol);
+
+                    const origin: SymbolOriginInfoExport = { kind: SymbolOriginInfoKind.Export, moduleSymbol, isDefaultExport };
+                    if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
+                        symbols.push(symbol);
+                        symbolToSortTextMap[getSymbolId(symbol)] = SortText.AutoImportSuggestions;
+                        symbolToOriginInfoMap[getSymbolId(symbol)] = origin;
                     }
                 }
             });
-
-            // By this point, any potential duplicates that were actually duplicates have been
-            // removed, so the rest need to be added. (Step 4 in diagrammed example)
-            aliasesToReturnIfOriginalsAreMissing.forEach(({ alias, moduleSymbol }) => pushSymbol(alias, moduleSymbol));
-
-            function pushSymbol(symbol: Symbol, moduleSymbol: Symbol) {
-                const isDefaultExport = symbol.escapedName === InternalSymbolName.Default;
-                if (isDefaultExport) {
-                    symbol = getLocalSymbolForExportDefault(symbol) || symbol;
-                }
-                const origin: SymbolOriginInfoExport = { kind: SymbolOriginInfoKind.Export, moduleSymbol, isDefaultExport };
-                if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
-                    symbols.push(symbol);
-                    symbolToSortTextMap[getSymbolId(symbol)] = SortText.AutoImportSuggestions;
-                    symbolToOriginInfoMap[getSymbolId(symbol)] = origin;
-                }
-            }
-        }
-
-        function getNearestExportSymbol(fromSymbol: Symbol) {
-            return findAlias(typeChecker, fromSymbol, alias => {
-                return some(alias.declarations, d => isExportSpecifier(d) || !!d.localSymbol);
-            });
         }
 
         /**
@@ -2139,16 +2062,18 @@ namespace ts.Completions {
                 case KeywordCompletionFilters.None:
                     return false;
                 case KeywordCompletionFilters.All:
-                    return kind === SyntaxKind.AsyncKeyword || SyntaxKind.AwaitKeyword || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === SyntaxKind.DeclareKeyword || kind === SyntaxKind.ModuleKeyword
+                    return isFunctionLikeBodyKeyword(kind)
+                        || kind === SyntaxKind.DeclareKeyword
+                        || kind === SyntaxKind.ModuleKeyword
                         || isTypeKeyword(kind) && kind !== SyntaxKind.UndefinedKeyword;
+                case KeywordCompletionFilters.FunctionLikeBodyKeywords:
+                    return isFunctionLikeBodyKeyword(kind);
                 case KeywordCompletionFilters.ClassElementKeywords:
                     return isClassMemberCompletionKeyword(kind);
                 case KeywordCompletionFilters.InterfaceElementKeywords:
                     return isInterfaceOrTypeLiteralCompletionKeyword(kind);
                 case KeywordCompletionFilters.ConstructorParameterKeywords:
                     return isParameterPropertyModifier(kind);
-                case KeywordCompletionFilters.FunctionLikeBodyKeywords:
-                    return isFunctionLikeBodyKeyword(kind);
                 case KeywordCompletionFilters.TypeAssertionKeywords:
                     return isTypeKeyword(kind) || kind === SyntaxKind.ConstKeyword;
                 case KeywordCompletionFilters.TypeKeywords:
@@ -2211,7 +2136,9 @@ namespace ts.Completions {
     }
 
     function isFunctionLikeBodyKeyword(kind: SyntaxKind) {
-        return kind === SyntaxKind.AsyncKeyword || kind === SyntaxKind.AwaitKeyword || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+        return kind === SyntaxKind.AsyncKeyword
+            || kind === SyntaxKind.AwaitKeyword
+            || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
     }
 
     function keywordForNode(node: Node): SyntaxKind {
@@ -2322,13 +2249,4 @@ namespace ts.Completions {
     function binaryExpressionMayBeOpenTag({ left }: BinaryExpression): boolean {
         return nodeIsMissing(left);
     }
-
-    function findAlias(typeChecker: TypeChecker, symbol: Symbol, predicate: (symbol: Symbol) => boolean): Symbol | undefined {
-        let currentAlias: Symbol | undefined = symbol;
-        while (currentAlias.flags & SymbolFlags.Alias && (currentAlias = typeChecker.getImmediateAliasedSymbol(currentAlias))) {
-            if (predicate(currentAlias)) {
-                return currentAlias;
-            }
-        }
-    }
 }

src/services/services.ts

@@ -1453,7 +1453,7 @@ namespace ts {
 
         function getCompletionEntrySymbol(fileName: string, position: number, name: string, source?: string): Symbol | undefined {
             synchronizeHostData();
-            return Completions.getCompletionEntrySymbol(program, log, getValidSourceFile(fileName), position, { name, source }, host);
+            return Completions.getCompletionEntrySymbol(program, log, getValidSourceFile(fileName), position, { name, source });
         }
 
         function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined {

src/services/stringCompletions.ts

@@ -627,6 +627,30 @@ namespace ts.Completions.StringCompletions {
         }
     }
 
+    function findPackageJsons(directory: string, host: LanguageServiceHost): string[] {
+        const paths: string[] = [];
+        forEachAncestorDirectory(directory, ancestor => {
+            const currentConfigPath = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
+            if (!currentConfigPath) {
+                return true; // break out
+            }
+            paths.push(currentConfigPath);
+        });
+        return paths;
+    }
+
+    function findPackageJson(directory: string, host: LanguageServiceHost): string | undefined {
+        let packageJson: string | undefined;
+        forEachAncestorDirectory(directory, ancestor => {
+            if (ancestor === "node_modules") return true;
+            packageJson = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
+            if (packageJson) {
+                return true; // break out
+            }
+        });
+        return packageJson;
+    }
+
     function enumerateNodeModulesVisibleToScript(host: LanguageServiceHost, scriptPath: string): ReadonlyArray<string> {
         if (!host.readFile || !host.fileExists) return emptyArray;
 
@@ -682,6 +706,31 @@ namespace ts.Completions.StringCompletions {
 
     const nodeModulesDependencyKeys: ReadonlyArray<string> = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
 
+    function tryGetDirectories(host: LanguageServiceHost, directoryName: string): string[] {
+        return tryIOAndConsumeErrors(host, host.getDirectories, directoryName) || [];
+    }
+
+    function tryReadDirectory(host: LanguageServiceHost, path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>): ReadonlyArray<string> {
+        return tryIOAndConsumeErrors(host, host.readDirectory, path, extensions, exclude, include) || emptyArray;
+    }
+
+    function tryFileExists(host: LanguageServiceHost, path: string): boolean {
+        return tryIOAndConsumeErrors(host, host.fileExists, path);
+    }
+
+    function tryDirectoryExists(host: LanguageServiceHost, path: string): boolean {
+        return tryAndIgnoreErrors(() => directoryProbablyExists(path, host)) || false;
+    }
+
+    function tryIOAndConsumeErrors<T>(host: LanguageServiceHost, toApply: ((...a: any[]) => T) | undefined, ...args: any[]) {
+        return tryAndIgnoreErrors(() => toApply && toApply.apply(host, args));
+    }
+
+    function tryAndIgnoreErrors<T>(cb: () => T): T | undefined {
+        try { return cb(); }
+        catch { return undefined; }
+    }
+
     function containsSlash(fragment: string) {
         return stringContains(fragment, directorySeparator);
     }

src/services/utilities.ts

@@ -2022,53 +2022,4 @@ namespace ts {
         // If even 2/5 places have a semicolon, the user probably wants semicolons
         return withSemicolon / withoutSemicolon > 1 / nStatementsToObserve;
     }
-
-    export function tryGetDirectories(host: LanguageServiceHost, directoryName: string): string[] {
-        return tryIOAndConsumeErrors(host, host.getDirectories, directoryName) || [];
-    }
-
-    export function tryReadDirectory(host: LanguageServiceHost, path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>): ReadonlyArray<string> {
-        return tryIOAndConsumeErrors(host, host.readDirectory, path, extensions, exclude, include) || emptyArray;
-    }
-
-    export function tryFileExists(host: LanguageServiceHost, path: string): boolean {
-        return tryIOAndConsumeErrors(host, host.fileExists, path);
-    }
-
-    export function tryDirectoryExists(host: LanguageServiceHost, path: string): boolean {
-        return tryAndIgnoreErrors(() => directoryProbablyExists(path, host)) || false;
-    }
-
-    export function tryAndIgnoreErrors<T>(cb: () => T): T | undefined {
-        try { return cb(); }
-        catch { return undefined; }
-    }
-
-    export function tryIOAndConsumeErrors<T>(host: LanguageServiceHost, toApply: ((...a: any[]) => T) | undefined, ...args: any[]) {
-        return tryAndIgnoreErrors(() => toApply && toApply.apply(host, args));
-    }
-
-    export function findPackageJsons(directory: string, host: LanguageServiceHost): string[] {
-        const paths: string[] = [];
-        forEachAncestorDirectory(directory, ancestor => {
-            const currentConfigPath = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
-            if (!currentConfigPath) {
-                return true; // break out
-            }
-            paths.push(currentConfigPath);
-        });
-        return paths;
-    }
-
-    export function findPackageJson(directory: string, host: LanguageServiceHost): string | undefined {
-        let packageJson: string | undefined;
-        forEachAncestorDirectory(directory, ancestor => {
-            if (ancestor === "node_modules") return true;
-            packageJson = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
-            if (packageJson) {
-                return true; // break out
-            }
-        });
-        return packageJson;
-    }
 }

src/testRunner/unittests/tsserver/projects.ts

@@ -1467,5 +1467,22 @@ var x = 10;`
                 openFilesForSession([{ file, projectRootPath }], session);
             }
         });
+
+        it("assert when removing project", () => {
+            const host = createServerHost([commonFile1, commonFile2, libFile]);
+            const service = createProjectService(host);
+            service.openClientFile(commonFile1.path);
+            const project = service.inferredProjects[0];
+            checkProjectActualFiles(project, [commonFile1.path, libFile.path]);
+            // Intentionally create scriptinfo and attach it to project
+            const info = service.getOrCreateScriptInfoForNormalizedPath(commonFile2.path as server.NormalizedPath, /*openedByClient*/ false)!;
+            info.attachToProject(project);
+            try {
+                service.applyChangesInOpenFiles(/*openFiles*/ undefined, /*changedFiles*/ undefined, [commonFile1.path]);
+            }
+            catch (e) {
+                assert.isTrue(e.message.indexOf("Debug Failure. False expression: Found script Info still attached to project") === 0);
+            }
+        });
     });
 }

src/testRunner/unittests/tsserver/typingsInstaller.ts

@@ -1,6 +1,6 @@
 namespace ts.projectSystem {
     import validatePackageName = JsTyping.validatePackageName;
-    import PackageNameValidationResult = JsTyping.PackageNameValidationResult;
+    import NameValidationResult = JsTyping.NameValidationResult;
 
     interface InstallerParams {
         globalTypingsCacheLocation?: string;
@@ -948,7 +948,8 @@ namespace ts.projectSystem {
                 path: "/a/b/app.js",
                 content: `
                 import * as fs from "fs";
-                import * as commander from "commander";`
+                import * as commander from "commander";
+                import * as component from "@ember/component";`
             };
             const cachePath = "/a/cache";
             const node = {
@@ -959,14 +960,19 @@ namespace ts.projectSystem {
                 path: cachePath + "/node_modules/@types/commander/index.d.ts",
                 content: "export let y: string"
             };
+            const emberComponentDirectory = "ember__component";
+            const emberComponent = {
+                path: `${cachePath}/node_modules/@types/${emberComponentDirectory}/index.d.ts`,
+                content: "export let x: number"
+            };
             const host = createServerHost([file]);
             const installer = new (class extends Installer {
                 constructor() {
                     super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("node", "commander") });
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction) {
-                    const installedTypings = ["@types/node", "@types/commander"];
-                    const typingFiles = [node, commander];
+                    const installedTypings = ["@types/node", "@types/commander", `@types/${emberComponentDirectory}`];
+                    const typingFiles = [node, commander, emberComponent];
                     executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
@@ -980,9 +986,10 @@ namespace ts.projectSystem {
 
             assert.isTrue(host.fileExists(node.path), "typings for 'node' should be created");
             assert.isTrue(host.fileExists(commander.path), "typings for 'commander' should be created");
+            assert.isTrue(host.fileExists(emberComponent.path), "typings for 'commander' should be created");
 
             host.checkTimeoutQueueLengthAndRun(2);
-            checkProjectActualFiles(service.inferredProjects[0], [file.path, node.path, commander.path]);
+            checkProjectActualFiles(service.inferredProjects[0], [file.path, node.path, commander.path, emberComponent.path]);
         });
 
         it("should redo resolution that resolved to '.js' file after typings are installed", () => {
@@ -1263,21 +1270,44 @@ namespace ts.projectSystem {
             for (let i = 0; i < 8; i++) {
                 packageName += packageName;
             }
-            assert.equal(validatePackageName(packageName), PackageNameValidationResult.NameTooLong);
+            assert.equal(validatePackageName(packageName), NameValidationResult.NameTooLong);
         });
-        it("name cannot start with dot", () => {
-            assert.equal(validatePackageName(".foo"), PackageNameValidationResult.NameStartsWithDot);
+        it("package name cannot start with dot", () => {
+            assert.equal(validatePackageName(".foo"), NameValidationResult.NameStartsWithDot);
         });
-        it("name cannot start with underscore", () => {
-            assert.equal(validatePackageName("_foo"), PackageNameValidationResult.NameStartsWithUnderscore);
+        it("package name cannot start with underscore", () => {
+            assert.equal(validatePackageName("_foo"), NameValidationResult.NameStartsWithUnderscore);
         });
-        it("scoped packages not supported", () => {
-            assert.equal(validatePackageName("@scope/bar"), PackageNameValidationResult.ScopedPackagesNotSupported);
+        it("package non URI safe characters are not supported", () => {
+            assert.equal(validatePackageName("  scope  "), NameValidationResult.NameContainsNonURISafeCharacters);
+            assert.equal(validatePackageName("; say ‘Hello from TypeScript!’ #"), NameValidationResult.NameContainsNonURISafeCharacters);
+            assert.equal(validatePackageName("a/b/c"), NameValidationResult.NameContainsNonURISafeCharacters);
         });
-        it("non URI safe characters are not supported", () => {
-            assert.equal(validatePackageName("  scope  "), PackageNameValidationResult.NameContainsNonURISafeCharacters);
-            assert.equal(validatePackageName("; say ‘Hello from TypeScript!’ #"), PackageNameValidationResult.NameContainsNonURISafeCharacters);
-            assert.equal(validatePackageName("a/b/c"), PackageNameValidationResult.NameContainsNonURISafeCharacters);
+        it("scoped package name is supported", () => {
+            assert.equal(validatePackageName("@scope/bar"), NameValidationResult.Ok);
+        });
+        it("scoped name in scoped package name cannot start with dot", () => {
+            assert.deepEqual(validatePackageName("@.scope/bar"), { name: ".scope", isScopeName: true, result: NameValidationResult.NameStartsWithDot });
+            assert.deepEqual(validatePackageName("@.scope/.bar"), { name: ".scope", isScopeName: true, result: NameValidationResult.NameStartsWithDot });
+        });
+        it("scope name in scoped package name cannot start with underscore", () => {
+            assert.deepEqual(validatePackageName("@_scope/bar"), { name: "_scope", isScopeName: true, result: NameValidationResult.NameStartsWithUnderscore });
+            assert.deepEqual(validatePackageName("@_scope/_bar"), { name: "_scope", isScopeName: true, result: NameValidationResult.NameStartsWithUnderscore });
+        });
+        it("scope name in scoped package name with non URI safe characters are not supported", () => {
+            assert.deepEqual(validatePackageName("@  scope  /bar"), { name: "  scope  ", isScopeName: true, result: NameValidationResult.NameContainsNonURISafeCharacters });
+            assert.deepEqual(validatePackageName("@; say ‘Hello from TypeScript!’ #/bar"), { name: "; say ‘Hello from TypeScript!’ #", isScopeName: true, result: NameValidationResult.NameContainsNonURISafeCharacters });
+            assert.deepEqual(validatePackageName("@  scope  /  bar  "), { name: "  scope  ", isScopeName: true, result: NameValidationResult.NameContainsNonURISafeCharacters });
+        });
+        it("package name in scoped package name cannot start with dot", () => {
+            assert.deepEqual(validatePackageName("@scope/.bar"), { name: ".bar", isScopeName: false, result: NameValidationResult.NameStartsWithDot });
+        });
+        it("package name in scoped package name cannot start with underscore", () => {
+            assert.deepEqual(validatePackageName("@scope/_bar"), { name: "_bar", isScopeName: false, result: NameValidationResult.NameStartsWithUnderscore });
+        });
+        it("package name in scoped package name with non URI safe characters are not supported", () => {
+            assert.deepEqual(validatePackageName("@scope/  bar  "), { name: "  bar  ", isScopeName: false, result: NameValidationResult.NameContainsNonURISafeCharacters });
+            assert.deepEqual(validatePackageName("@scope/; say ‘Hello from TypeScript!’ #"), { name: "; say ‘Hello from TypeScript!’ #", isScopeName: false, result: NameValidationResult.NameContainsNonURISafeCharacters });
         });
     });
 
@@ -1309,7 +1339,7 @@ namespace ts.projectSystem {
             projectService.openClientFile(f1.path);
 
             installer.checkPendingCommands(/*expectedCount*/ 0);
-            assert.isTrue(messages.indexOf("Package name '; say ‘Hello from TypeScript!’ #' contains non URI safe characters") > 0, "should find package with invalid name");
+            assert.isTrue(messages.indexOf("'; say ‘Hello from TypeScript!’ #':: Package name '; say ‘Hello from TypeScript!’ #' contains non URI safe characters") > 0, "should find package with invalid name");
         });
     });
 

src/tsserver/server.ts

@@ -248,7 +248,7 @@ namespace ts.server {
         isKnownTypesPackageName(name: string): boolean {
             // We want to avoid looking this up in the registry as that is expensive. So first check that it's actually an NPM package.
             const validationResult = JsTyping.validatePackageName(name);
-            if (validationResult !== JsTyping.PackageNameValidationResult.Ok) {
+            if (validationResult !== JsTyping.NameValidationResult.Ok) {
                 return false;
             }
 

src/typingsInstallerCore/typingsInstaller.ts

@@ -268,27 +268,28 @@ namespace ts.server.typingsInstaller {
         }
 
         private filterTypings(typingsToInstall: ReadonlyArray<string>): ReadonlyArray<string> {
-            return typingsToInstall.filter(typing => {
-                if (this.missingTypingsSet.get(typing)) {
-                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}' is in missingTypingsSet - skipping...`);
-                    return false;
+            return mapDefined(typingsToInstall, typing => {
+                const typingKey = mangleScopedPackageName(typing);
+                if (this.missingTypingsSet.get(typingKey)) {
+                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}':: '${typingKey}' is in missingTypingsSet - skipping...`);
+                    return undefined;
                 }
                 const validationResult = JsTyping.validatePackageName(typing);
-                if (validationResult !== JsTyping.PackageNameValidationResult.Ok) {
+                if (validationResult !== JsTyping.NameValidationResult.Ok) {
                     // add typing name to missing set so we won't process it again
-                    this.missingTypingsSet.set(typing, true);
+                    this.missingTypingsSet.set(typingKey, true);
                     if (this.log.isEnabled()) this.log.writeLine(JsTyping.renderPackageNameValidationFailure(validationResult, typing));
-                    return false;
+                    return undefined;
                 }
-                if (!this.typesRegistry.has(typing)) {
-                    if (this.log.isEnabled()) this.log.writeLine(`Entry for package '${typing}' does not exist in local types registry - skipping...`);
-                    return false;
+                if (!this.typesRegistry.has(typingKey)) {
+                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}':: Entry for package '${typingKey}' does not exist in local types registry - skipping...`);
+                    return undefined;
                 }
-                if (this.packageNameToTypingLocation.get(typing) && JsTyping.isTypingUpToDate(this.packageNameToTypingLocation.get(typing)!, this.typesRegistry.get(typing)!)) {
-                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}' already has an up-to-date typing - skipping...`);
-                    return false;
+                if (this.packageNameToTypingLocation.get(typingKey) && JsTyping.isTypingUpToDate(this.packageNameToTypingLocation.get(typingKey)!, this.typesRegistry.get(typingKey)!)) {
+                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}':: '${typingKey}' already has an up-to-date typing - skipping...`);
+                    return undefined;
                 }
-                return true;
+                return typingKey;
             });
         }
 

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

@@ -2600,7 +2600,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
     enum JsxEmit {
         None = 0,
@@ -2640,9 +2640,9 @@ declare namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 8,
+        ESNext = 99,
         JSON = 100,
-        Latest = 8
+        Latest = 99
     }
     enum LanguageVariant {
         Standard = 0,

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

@@ -2600,7 +2600,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
     enum JsxEmit {
         None = 0,
@@ -2640,9 +2640,9 @@ declare namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 8,
+        ESNext = 99,
         JSON = 100,
-        Latest = 8
+        Latest = 99
     }
     enum LanguageVariant {
         Standard = 0,

tests/baselines/reference/docker/azure-sdk.log

@@ -5,16 +5,11 @@ Rush Multi-Project Build Tool 5.10.1 - https://rushjs.io
 Starting "rush rebuild"
 Executing a maximum of 1 simultaneous processes...
 [@azure/cosmos] started
-npm ERR! code ELIFECYCLE
-npm ERR! errno 2
-npm ERR! @azure/cosmos@X.X.X compile: `echo Using TypeScript && tsc --version && tsc -p tsconfig.prod.json --pretty`
-npm ERR! Exit status 2
-npm ERR! 
-npm ERR! Failed at the @azure/cosmos@X.X.X compile script.
-npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
-npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_35_10_789Z-debug.log
+XX of XX: [@azure/cosmos] completed successfully in ? seconds
+[@azure/event-processor-host] started
+XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
 [@azure/service-bus] started
+Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
 [@azure/storage-blob] started
 XX of XX: [@azure/storage-blob] completed successfully in ? seconds
 [@azure/storage-file] started
@@ -23,6 +18,8 @@ XX of XX: [@azure/storage-file] completed successfully in ? seconds
 XX of XX: [@azure/storage-queue] completed successfully in ? seconds
 [@azure/template] started
 XX of XX: [@azure/template] completed successfully in ? seconds
+[testhub] started
+XX of XX: [testhub] completed successfully in ? seconds
 [@azure/abort-controller] started
 XX of XX: [@azure/abort-controller] completed successfully in ? seconds
 [@azure/core-asynciterator-polyfill] started
@@ -38,7 +35,7 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_862Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
 ERROR: "build:tsc" exited with 2.
 npm ERR! code ELIFECYCLE
 npm ERR! errno 1
@@ -48,20 +45,17 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_938Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
 ERROR: "build:lib" exited with 1.
 [@azure/core-paging] started
 XX of XX: [@azure/core-paging] completed successfully in ? seconds
-[@azure/event-processor-host] started
-XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
-[testhub] started
-XX of XX: [testhub] completed successfully in ? seconds
-SUCCESS (10)
+SUCCESS (11)
 ================================
 @azure/abort-controller (? seconds)
 @azure/core-asynciterator-polyfill (? seconds)
 @azure/core-auth (? seconds)
 @azure/core-paging (? seconds)
+@azure/cosmos (? seconds)
 @azure/event-processor-host (? seconds)
 @azure/storage-blob (? seconds)
 @azure/storage-file (? seconds)
@@ -69,6 +63,11 @@ SUCCESS (10)
 @azure/template (? seconds)
 testhub (? seconds)
 ================================
+SUCCESS WITH WARNINGS (1)
+================================
+@azure/service-bus (? seconds)
+Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
+================================
 BLOCKED (7)
 ================================
 @azure/core-amqp
@@ -79,7 +78,7 @@ BLOCKED (7)
 @azure/keyvault-keys
 @azure/keyvault-secrets
 ================================
-FAILURE (3)
+FAILURE (1)
 ================================
 @azure/core-http (? seconds)
 npm ERR! code ELIFECYCLE
@@ -90,7 +89,7 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_862Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
 ERROR: "build:tsc" exited with 2.
 npm ERR! code ELIFECYCLE
 npm ERR! errno 1
@@ -100,24 +99,8 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_938Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
 ERROR: "build:lib" exited with 1.
-@azure/cosmos ( ? seconds)
-npm ERR! code ELIFECYCLE
-npm ERR! errno 2
-npm ERR! @azure/cosmos@X.X.X compile: `echo Using TypeScript && tsc --version && tsc -p tsconfig.prod.json --pretty`
-npm ERR! Exit status 2
-npm ERR!
-npm ERR! Failed at the @azure/cosmos@X.X.X compile script.
-npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
-npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_35_10_789Z-debug.log
-@azure/service-bus ( ? seconds)
->>> @azure/service-bus
-tsc -p . && rollup -c 2>&1 && npm run extract-api
-error TS2318: Cannot find global type 'AsyncGenerator'.
-src/receiver.ts(193,32): error TS2739: Type '{}' is missing the following properties from type 'AsyncIterableIterator<ServiceBusMessage>': [Symbol.asyncIterator], next
-src/receiver.ts(742,32): error TS2322: Type '{}' is not assignable to type 'AsyncIterableIterator<ServiceBusMessage>'.
 ================================
 Error: Project(s) failed to build
 rush rebuild - Errors! ( ? seconds)
@@ -126,8 +109,7 @@ rush rebuild - Errors! ( ? seconds)
 
 Standard error:
 Your version of Node.js (X.X.X) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js.
-XX of XX: [@azure/cosmos] failed to build!
-XX of XX: [@azure/service-bus] failed to build!
+XX of XX: [@azure/service-bus] completed with warnings in ? seconds
 XX of XX: [@azure/core-http] failed to build!
 XX of XX: [@azure/core-arm] blocked by [@azure/core-http]!
 XX of XX: [@azure/identity] blocked by [@azure/core-http]!
@@ -137,5 +119,3 @@ XX of XX: [@azure/keyvault-certificates] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-keys] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-secrets] blocked by [@azure/core-http]!
 [@azure/core-http] Returned error code: 1
-[@azure/cosmos] Returned error code: 2
-[@azure/service-bus] Returned error code: 2

tests/baselines/reference/docker/office-ui-fabric.log

@@ -12,11 +12,11 @@ XX of XX: [@uifabric/tslint-rules] completed successfully in ? seconds
 ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
  PASS  src/__tests__/codepenTransform.test.ts
   codepen transform
-    ✓ handles examples with function components (225ms)
+    ✓ handles examples with function components (256ms)
     ✓ handles examples with class components (38ms)
-    ✓ handles examples importing exampleData (115ms)
-    ✓ handles examples importing TestImages (45ms)
-    ✓ handles examples importing PeopleExampleData (288ms)
+    ✓ handles examples importing exampleData (125ms)
+    ✓ handles examples importing TestImages (33ms)
+    ✓ handles examples importing PeopleExampleData (270ms)
 Test Suites: 1 passed, 1 total
 Tests:       5 passed, 5 total
 Snapshots:   4 passed, 4 total
@@ -246,11 +246,11 @@ SUCCESS WITH WARNINGS (5)
 ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
  PASS  src/__tests__/codepenTransform.test.ts
   codepen transform
-    ✓ handles examples with function components (225ms)
+    ✓ handles examples with function components (256ms)
     ✓ handles examples with class components (38ms)
-    ✓ handles examples importing exampleData (115ms)
-    ✓ handles examples importing TestImages (45ms)
-    ✓ handles examples importing PeopleExampleData (288ms)
+    ✓ handles examples importing exampleData (125ms)
+    ✓ handles examples importing TestImages (33ms)
+    ✓ handles examples importing PeopleExampleData (270ms)
 Test Suites: 1 passed, 1 total
 Tests:       5 passed, 5 total
 Snapshots:   4 passed, 4 total

tests/baselines/reference/generatorTypeCheck25.types

@@ -17,15 +17,15 @@ var g3: () => Iterable<Foo> = function* () {
 >function* () {    yield;    yield new Bar;    yield new Baz;    yield *[new Bar];    yield *[new Baz];} : () => Generator<Bar | Baz, void, undefined>
 
     yield;
->yield : any
+>yield : undefined
 
     yield new Bar;
->yield new Bar : any
+>yield new Bar : undefined
 >new Bar : Bar
 >Bar : typeof Bar
 
     yield new Baz;
->yield new Baz : any
+>yield new Baz : undefined
 >new Baz : Baz
 >Baz : typeof Baz
 

tests/baselines/reference/generatorTypeCheck28.types

@@ -14,7 +14,7 @@ function* g(): IterableIterator<(x: string) => number> {
 >iterator : symbol
 
             yield x => x.length;
->yield x => x.length : any
+>yield x => x.length : undefined
 >x => x.length : (x: string) => number
 >x : string
 >x.length : number

tests/baselines/reference/generatorTypeCheck45.types

@@ -12,7 +12,7 @@ foo("", function* () { yield x => x.length }, p => undefined); // T is fixed, sh
 >foo : <T, U>(x: T, fun: () => Iterator<(x: T) => U, any, undefined>, fun2: (y: U) => T) => T
 >"" : ""
 >function* () { yield x => x.length } : () => Generator<(x: string) => number, void, unknown>
->yield x => x.length : any
+>yield x => x.length : undefined
 >x => x.length : (x: string) => number
 >x : string
 >x.length : number

tests/baselines/reference/generatorTypeCheck46.types

@@ -24,7 +24,7 @@ foo("", function* () {
 >iterator : symbol
 
             yield x => x.length
->yield x => x.length : any
+>yield x => x.length : undefined
 >x => x.length : (x: string) => number
 >x : string
 >x.length : number

tests/baselines/reference/generatorTypeCheck62.types

@@ -32,7 +32,7 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 >stratName : string
             }
             yield next;
->yield next : any
+>yield next : undefined
 >next : T
         }
     }
@@ -70,7 +70,7 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: St
 >state : State
 
     yield state;
->yield state : any
+>yield state : undefined
 >state : State
 
 });
@@ -84,7 +84,7 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >state : State
 
     yield ;
->yield : any
+>yield : undefined
 
     return state;
 >state : State

tests/baselines/reference/generatorTypeCheck63.types

@@ -32,7 +32,7 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 >stratName : string
             }
             yield next;
->yield next : any
+>yield next : undefined
 >next : T
         }
     }
@@ -97,7 +97,7 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >state : State
 
     yield state;
->yield state : any
+>yield state : undefined
 >state : State
 
     return 1;

tests/baselines/reference/generatorYieldContextualType.symbols

@@ -0,0 +1,44 @@
+=== tests/cases/conformance/generators/generatorYieldContextualType.ts ===
+declare function f1<T, R, S>(gen: () => Generator<R, T, S>): void;
+>f1 : Symbol(f1, Decl(generatorYieldContextualType.ts, 0, 0))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 0, 20))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 0, 22))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 0, 25))
+>gen : Symbol(gen, Decl(generatorYieldContextualType.ts, 0, 29))
+>Generator : Symbol(Generator, Decl(lib.es2015.generator.d.ts, --, --))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 0, 22))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 0, 20))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 0, 25))
+
+f1<0, 0, 1>(function* () {
+>f1 : Symbol(f1, Decl(generatorYieldContextualType.ts, 0, 0))
+
+	const a = yield 0;
+>a : Symbol(a, Decl(generatorYieldContextualType.ts, 2, 6))
+
+	return 0;
+});
+
+declare function f2<T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>): void;
+>f2 : Symbol(f2, Decl(generatorYieldContextualType.ts, 4, 3))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 6, 20))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 6, 22))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 6, 25))
+>gen : Symbol(gen, Decl(generatorYieldContextualType.ts, 6, 29))
+>Generator : Symbol(Generator, Decl(lib.es2015.generator.d.ts, --, --))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 6, 22))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 6, 20))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 6, 25))
+>AsyncGenerator : Symbol(AsyncGenerator, Decl(lib.es2018.asyncgenerator.d.ts, --, --))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 6, 22))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 6, 20))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 6, 25))
+
+f2<0, 0, 1>(async function* () {
+>f2 : Symbol(f2, Decl(generatorYieldContextualType.ts, 4, 3))
+
+	const a = yield 0;
+>a : Symbol(a, Decl(generatorYieldContextualType.ts, 8, 6))
+
+	return 0;
+});

tests/baselines/reference/generatorYieldContextualType.types

@@ -0,0 +1,38 @@
+=== tests/cases/conformance/generators/generatorYieldContextualType.ts ===
+declare function f1<T, R, S>(gen: () => Generator<R, T, S>): void;
+>f1 : <T, R, S>(gen: () => Generator<R, T, S>) => void
+>gen : () => Generator<R, T, S>
+
+f1<0, 0, 1>(function* () {
+>f1<0, 0, 1>(function* () {	const a = yield 0;	return 0;}) : void
+>f1 : <T, R, S>(gen: () => Generator<R, T, S>) => void
+>function* () {	const a = yield 0;	return 0;} : () => Generator<0, 0, unknown>
+
+	const a = yield 0;
+>a : 1
+>yield 0 : 1
+>0 : 0
+
+	return 0;
+>0 : 0
+
+});
+
+declare function f2<T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>): void;
+>f2 : <T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>) => void
+>gen : () => Generator<R, T, S> | AsyncGenerator<R, T, S>
+
+f2<0, 0, 1>(async function* () {
+>f2<0, 0, 1>(async function* () {	const a = yield 0;	return 0;}) : void
+>f2 : <T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>) => void
+>async function* () {	const a = yield 0;	return 0;} : () => AsyncGenerator<0, 0, unknown>
+
+	const a = yield 0;
+>a : 1
+>yield 0 : 1
+>0 : 0
+
+	return 0;
+>0 : 0
+
+});

tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js

@@ -70,7 +70,7 @@ export function multiply(a, b) { return a * b; }
       "incremental": true,
       "listFiles": true,
       "listEmittedFiles": true,
-      "target": 8,
+      "target": 99,
       "configFilePath": "./tsconfig.json"
     },
     "referencedMap": {},

tests/baselines/reference/types.asyncGenerators.es2018.1.types

@@ -78,7 +78,7 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
 >async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
 
     yield 1;
->yield 1 : any
+>yield 1 : undefined
 >1 : 1
 
 };
@@ -87,7 +87,7 @@ const assignability2: () => AsyncIterableIterator<number> = async function * ()
 >async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
 
     yield Promise.resolve(1);
->yield Promise.resolve(1) : any
+>yield Promise.resolve(1) : undefined
 >Promise.resolve(1) : Promise<number>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
@@ -138,7 +138,7 @@ const assignability6: () => AsyncIterable<number> = async function * () {
 >async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
 
     yield 1;
->yield 1 : any
+>yield 1 : undefined
 >1 : 1
 
 };
@@ -147,7 +147,7 @@ const assignability7: () => AsyncIterable<number> = async function * () {
 >async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
 
     yield Promise.resolve(1);
->yield Promise.resolve(1) : any
+>yield Promise.resolve(1) : undefined
 >Promise.resolve(1) : Promise<number>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
@@ -198,7 +198,7 @@ const assignability11: () => AsyncIterator<number> = async function * () {
 >async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
 
     yield 1;
->yield 1 : any
+>yield 1 : undefined
 >1 : 1
 
 };
@@ -207,7 +207,7 @@ const assignability12: () => AsyncIterator<number> = async function * () {
 >async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
 
     yield Promise.resolve(1);
->yield Promise.resolve(1) : any
+>yield Promise.resolve(1) : undefined
 >Promise.resolve(1) : Promise<number>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor

tests/baselines/reference/types.asyncGenerators.es2018.2.types

@@ -32,7 +32,7 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
 >async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
 
     yield "a";
->yield "a" : any
+>yield "a" : undefined
 >"a" : "a"
 
 };
@@ -65,7 +65,7 @@ const assignability4: () => AsyncIterable<number> = async function * () {
 >async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
 
     yield "a";
->yield "a" : any
+>yield "a" : undefined
 >"a" : "a"
 
 };
@@ -98,7 +98,7 @@ const assignability7: () => AsyncIterator<number> = async function * () {
 >async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
 
     yield "a";
->yield "a" : any
+>yield "a" : undefined
 >"a" : "a"
 
 };

tests/baselines/reference/uniqueSymbols.types

@@ -839,7 +839,7 @@ const o3: Context = {
 >method3 : () => AsyncGenerator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },
@@ -847,7 +847,7 @@ const o3: Context = {
 >method4 : () => Generator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },

tests/baselines/reference/uniqueSymbolsDeclarations.types

@@ -832,7 +832,7 @@ const o4: Context = {
 >method3 : () => AsyncGenerator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },
@@ -840,7 +840,7 @@ const o4: Context = {
 >method4 : () => Generator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },

tests/baselines/reference/user/adonis-framework.log

@@ -30,7 +30,7 @@ node_modules/adonis-framework/src/Encryption/index.js(87,15): error TS2304: Cann
 node_modules/adonis-framework/src/Encryption/index.js(101,21): error TS2769: No overload matches this call.
   Overload 1 of 4, '(data: Binary, input_encoding: undefined, output_encoding: Utf8AsciiBinaryEncoding): string', gave the following error.
     Argument of type '"base64"' is not assignable to parameter of type 'undefined'.
-  Overload 2 of 4, '(data: string, input_encoding: "binary" | "base64" | "hex" | undefined, output_encoding: Utf8AsciiBinaryEncoding): string', gave the following error.
+  Overload 2 of 4, '(data: string, input_encoding: "base64" | "binary" | "hex" | undefined, output_encoding: Utf8AsciiBinaryEncoding): string', gave the following error.
     Argument of type 'string' is not assignable to parameter of type 'Utf8AsciiBinaryEncoding'.
 node_modules/adonis-framework/src/Encryption/index.js(114,15): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Encryption/index.js(119,23): error TS2554: Expected 2 arguments, but got 1.

tests/baselines/reference/user/chrome-devtools-frontend.log

@@ -6501,7 +6501,8 @@ node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loo
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loose.js(258,55): error TS2339: Property 'end' does not exist on type 'true'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loose.js(1365,5): error TS2339: Property 'next' does not exist on type 'LooseParser'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loose.js(1366,12): error TS2339: Property 'parseTopLevel' does not exist on type 'LooseParser'.
-node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(26,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'page' must be of type 'any', but here has type 'HARPage'.
+node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(16,32): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(16,52): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(46,5): error TS2322: Type 'Date' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/heap_profiler_test_runner/HeapProfilerTestRunner.js(320,70): error TS2339: Property 'heap_profiler' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/heap_profiler_test_runner/HeapProfilerTestRunner.js(321,35): error TS2339: Property 'heap_profiler' does not exist on type 'any[]'.

tests/baselines/reference/user/lodash.log

@@ -382,8 +382,6 @@ node_modules/lodash/nthArg.js(28,26): error TS2345: Argument of type 'number | u
 node_modules/lodash/omit.js(48,32): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
 node_modules/lodash/orderBy.js(18,10): error TS1003: Identifier expected.
 node_modules/lodash/orderBy.js(18,10): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/org.js(8,22): error TS2307: Cannot find module 'moment'.
-node_modules/lodash/org.js(9,19): error TS2307: Cannot find module 'ncp'.
 node_modules/lodash/parseInt.js(24,10): error TS1003: Identifier expected.
 node_modules/lodash/parseInt.js(24,10): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
 node_modules/lodash/partial.js(48,9): error TS2339: Property 'placeholder' does not exist on type 'Function'.

tests/baselines/reference/user/npmlog.log

@@ -8,9 +8,9 @@ node_modules/npmlog/log.js(194,37): error TS2345: Argument of type 'any[]' is no
   Property '0' is missing in type 'any[]' but required in type '[any, ...any[]]'.
 node_modules/npmlog/log.js(218,12): error TS2551: Property '_paused' does not exist on type 'typeof EventEmitter'. Did you mean 'pause'?
 node_modules/npmlog/log.js(271,16): error TS2769: No overload matches this call.
-  Overload 1 of 2, '(buffer: string | Uint8Array | Buffer, cb?: ((err?: Error | null | undefined) => void) | undefined): boolean', gave the following error.
-    Argument of type 'string | undefined' is not assignable to parameter of type 'string | Uint8Array | Buffer'.
-      Type 'undefined' is not assignable to type 'string | Uint8Array | Buffer'.
+  Overload 1 of 2, '(buffer: string | Uint8Array, cb?: ((err?: Error | null | undefined) => void) | undefined): boolean', gave the following error.
+    Argument of type 'string | undefined' is not assignable to parameter of type 'string | Uint8Array'.
+      Type 'undefined' is not assignable to type 'string | Uint8Array'.
   Overload 2 of 2, '(str: string, encoding?: string | undefined, cb?: ((err?: Error | null | undefined) => void) | undefined): boolean', gave the following error.
     Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
       Type 'undefined' is not assignable to type 'string'.

tests/cases/conformance/generators/generatorYieldContextualType.ts

@@ -0,0 +1,14 @@
+// @target: esnext
+// @strict: true
+// @noEmit: true
+declare function f1<T, R, S>(gen: () => Generator<R, T, S>): void;
+f1<0, 0, 1>(function* () {
+	const a = yield 0;
+	return 0;
+});
+
+declare function f2<T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>): void;
+f2<0, 0, 1>(async function* () {
+	const a = yield 0;
+	return 0;
+});

tests/cases/fourslash/completionInFunctionLikeBody_includesPrimitiveTypes.ts

@@ -0,0 +1,27 @@
+/// <reference path='fourslash.ts'/>
+
+//// class Foo<T> { }
+//// class Bar { }
+//// function includesTypes() {
+////     new Foo</*1*/
+//// }
+//// function excludesTypes1() {
+////     new Bar</*2*/
+//// }
+//// function excludesTypes2() {
+////     1</*3*/
+//// }
+
+verify.completions(
+    {
+        marker: ["1"],
+        includes: [
+            { name: "string", sortText: completion.SortText.GlobalsOrKeywords },
+            { name: "String", sortText: completion.SortText.GlobalsOrKeywords },
+        ],
+    },
+    {
+        marker: ["2", "3"],
+        excludes: ["string"]
+    }
+);

tests/cases/fourslash/completionListInUnclosedTypeArguments.ts

@@ -8,14 +8,14 @@
 ////f</*1b*/T/*2b*/y/*3b*/;
 ////f</*1c*/T/*2c*/y/*3c*/>
 ////f</*1d*/T/*2d*/y/*3d*/>
-////f</*1eTypeOnly*/T/*2eTypeOnly*/y/*3eTypeOnly*/>();
+////f</*1e*/T/*2e*/y/*3e*/>();
 ////
 ////f2</*1k*/T/*2k*/y/*3k*/,
 ////f2</*1l*/T/*2l*/y/*3l*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |}
 ////f2</*1m*/T/*2m*/y/*3m*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |};
 ////f2</*1n*/T/*2n*/y/*3n*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |}>
 ////f2</*1o*/T/*2o*/y/*3o*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |}>
-////f2</*1pTypeOnly*/T/*2pTypeOnly*/y/*3pTypeOnly*/,{| "newId": true, "typeOnly": true |}T{| "newId": true, "typeOnly": true |}y{| "newId": true, "typeOnly": true |}>();
+////f2</*1p*/T/*2p*/y/*3p*/,{| "newId": true, "typeOnly": true |}T{| "newId": true, "typeOnly": true |}y{| "newId": true, "typeOnly": true |}>();
 ////
 ////f2<typeof /*1uValueOnly*/x, {| "newId": true |}T{| "newId": true |}y{| "newId": true |}
 ////
@@ -25,12 +25,11 @@
 
 goTo.eachMarker(marker => {
     const markerName = test.markerName(marker) || "";
-    const typeOnly = markerName.endsWith("TypeOnly") || marker.data && marker.data.typeOnly;
     const valueOnly = markerName.endsWith("ValueOnly");
     verify.completions({
         marker,
-        includes: typeOnly ? "Type" : valueOnly ? "x" : ["Type", "x"],
-        excludes: typeOnly ? "x" : valueOnly ? "Type" : [],
+        includes: valueOnly ? "x" : "Type",
+        excludes: valueOnly ? "Type" : "x",
         isNewIdentifierLocation: marker.data && marker.data.newId || false,
     });
 });

tests/cases/fourslash/completionListIsGlobalCompletion.ts

@@ -48,5 +48,5 @@ verify.completions(
     { marker: "13", exact: globals, isGlobalCompletion: false },
     { marker: "15", exact: globals, isGlobalCompletion: true, isNewIdentifierLocation: true },
     { marker: "16", exact: [...x, completion.globalThisEntry, ...completion.globalsVars, completion.undefinedVarEntry], isGlobalCompletion: false },
-    { marker: "17", exact: completion.globalKeywordsPlusUndefined, isGlobalCompletion: false },
+    { marker: "17", exact: completion.globalKeywords, isGlobalCompletion: false },
 );

tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesImplicit.ts

@@ -1,44 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/@types/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/@types/react/package.json
-////{
-////  "name": "@types/react"
-////}
-
-//@Filename: /node_modules/@types/fake-react/index.d.ts
-////export declare var ReactFake: any;
-
-//@Filename: /node_modules/@types/fake-react/package.json
-////{
-////  "name": "@types/fake-react"
-////}
-
-//@Filename: /src/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/@types/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  excludes: "ReactFake",
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesOnly.ts

@@ -1,44 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "devDependencies": {
-////    "@types/react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/@types/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/@types/react/package.json
-////{
-////  "name": "@types/react"
-////}
-
-//@Filename: /node_modules/@types/fake-react/index.d.ts
-////export declare var ReactFake: any;
-
-//@Filename: /node_modules/@types/fake-react/package.json
-////{
-////  "name": "@types/fake-react"
-////}
-
-//@Filename: /src/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/@types/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  excludes: "ReactFake",
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts

@@ -1,30 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////  }
-////}
-
-//@Filename: /node_modules/@types/node/timers.d.ts
-////declare module "timers" {
-////  function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-////}
-
-//@Filename: /node_modules/@types/node/package.json
-////{
-////  "name": "@types/node",
-////}
-
-//@Filename: /src/index.ts
-////setTimeo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  exact: completion.globals,
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_direct.ts

@@ -1,46 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/react/package.json
-////{
-////  "name": "react",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/fake-react/index.d.ts
-////export declare var ReactFake: any;
-
-//@Filename: /node_modules/fake-react/package.json
-////{
-////  "name": "fake-react",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  excludes: "ReactFake",
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_nested.ts

@@ -1,66 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/react/package.json
-////{
-////  "name": "react",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /dir/package.json
-////{
-////  "dependencies": {
-////    "redux": "*"
-////  }
-////}
-
-//@Filename: /dir/node_modules/redux/package.json
-////{
-////  "name": "redux",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /dir/node_modules/redux/index.d.ts
-////export declare var Redux: any;
-
-//@Filename: /dir/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "Redux",
-    hasAction: true,
-    source: "/dir/node_modules/redux/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport.ts

@@ -1,58 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "@emotion/core": "*"
-////  }
-////}
-
-//@Filename: /node_modules/@emotion/css/index.d.ts
-////export declare const css: any;
-////const css2: any;
-////export { css2 };
-
-//@Filename: /node_modules/@emotion/css/package.json
-////{
-////  "name": "@emotion/css",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/@emotion/core/index.d.ts
-////import { css2 } from "@emotion/css";
-////export { css } from "@emotion/css";
-////export { css2 };
-
-//@Filename: /node_modules/@emotion/core/package.json
-////{
-////  "name": "@emotion/core",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////cs/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "css",
-      source: "/node_modules/@emotion/core/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    {
-      name: "css2",
-      source: "/node_modules/@emotion/core/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport2.ts

@@ -1,58 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "b_": "*",
-////    "_c": "*"
-////  }
-////}
-
-//@Filename: /node_modules/a/index.d.ts
-////export const foo = 0;
-
-//@Filename: /node_modules/a/package.json
-////{
-////  "name": "a",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/b_/index.d.ts
-////export { foo } from "a";
-
-//@Filename: /node_modules/b_/package.json
-////{
-////  "name": "b_",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/_c/index.d.ts
-////export { foo } from "b_";
-
-//@Filename: /node_modules/_c/package.json
-////{
-////  "name": "_c",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////fo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "foo",
-      source: "/node_modules/b_/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport3.ts

@@ -1,48 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "b": "*",
-////  }
-////}
-
-//@Filename: /node_modules/a/index.d.ts
-////export const foo = 0;
-
-//@Filename: /node_modules/a/package.json
-////{
-////  "name": "a",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/b/index.d.ts
-////export * from "a";
-
-//@Filename: /node_modules/b/package.json
-////{
-////  "name": "b",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////fo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "foo",
-      source: "/node_modules/b/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport4.ts

@@ -1,57 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "c": "*",
-////  }
-////}
-
-//@Filename: /node_modules/a/index.d.ts
-////export const foo = 0;
-
-//@Filename: /node_modules/a/package.json
-////{
-////  "name": "a",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/b/index.d.ts
-////export * from "a";
-
-//@Filename: /node_modules/b/package.json
-////{
-////  "name": "b",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/c/index.d.ts
-////export * from "a";
-
-//@Filename: /node_modules/c/package.json
-////{
-////  "name": "c",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////fo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "foo",
-      source: "/node_modules/c/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});

tests/cases/fourslash/completionsImport_ofAlias.ts

@@ -16,9 +16,6 @@
 // @Filename: /a_reexport_2.ts
 ////export * from "./a";
 
-// @Filename: /a_reexport_3.ts
-////export { foo } from "./a_reexport";
-
 // @Filename: /b.ts
 ////fo/**/
 
@@ -27,13 +24,13 @@ verify.completions({
     includes: [
         completion.undefinedVarEntry,
         {
-            name: "foo",
-            source: "/a",
-            sourceDisplay: "./a",
-            text: "(alias) const foo: 0\nexport foo",
-            kind: "alias",
-            hasAction: true,
-            sortText: completion.SortText.AutoImportSuggestions
+            name: "foo",
+            source: "/a",
+            sourceDisplay: "./a",
+            text: "(alias) const foo: 0\nexport foo",
+            kind: "alias",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         ...completion.statementKeywordsWithTypes,
     ],

tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts

@@ -9,25 +9,22 @@
 ////x + {| "valueOnly": true |}
 ////x < {| "valueOnly": true |}
 ////f < {| "valueOnly": true |}
-////g < {| "valueOnly": false |}
-////const something: C<{| "typeOnly": true |};
-////const something2: C<C<{| "typeOnly": true |};
-////new C<{| "valueOnly": false |};
-////new C<C<{| "valueOnly": false |};
+////g < /*g*/
+////const something: C</*something*/;
+////const something2: C<C</*something2*/;
+////new C</*C*/;
+////new C<C</*CC*/;
 ////
 ////declare const callAndConstruct: { new<T>(): callAndConstruct<T>; <T>(): string; };
 ////interface callAndConstruct<T> {}
 ////new callAndConstruct<callAndConstruct</*callAndConstruct*/
 
 for (const marker of test.markers()) {
-    if (marker.data && marker.data.typeOnly) {
-        verify.completions({ marker, includes: "T", excludes: "x" });
-    }
-    else if (marker.data && marker.data.valueOnly) {
+    if (marker.data && marker.data.valueOnly) {
         verify.completions({ marker, includes: "x", excludes: "T" });
     }
     else {
-        verify.completions({ marker, includes: ["x", "T"] });
+        verify.completions({ marker, includes: "T", excludes: "x" });
     }
 }
 

tests/cases/fourslash/fourslash.ts

@@ -685,7 +685,6 @@ declare namespace completion {
     export const globalInJsKeywords: ReadonlyArray<Entry>;
     export const insideMethodKeywords: ReadonlyArray<Entry>;
     export const insideMethodInJsKeywords: ReadonlyArray<Entry>;
-    export const globalKeywordsPlusUndefined: ReadonlyArray<Entry>;
     export const globalsVars: ReadonlyArray<Entry>;
     export function globalsInsideFunction(plus: ReadonlyArray<Entry>): ReadonlyArray<Entry>;
     export function globalsInJsInsideFunction(plus: ReadonlyArray<Entry>): ReadonlyArray<Entry>;

tests/cases/fourslash/importNameCodeFixNewImportNodeModules8.ts

@@ -3,7 +3,7 @@
 //// [|f1/*0*/('');|]
 
 // @Filename: package.json
-//// { "dependencies": { "@scope/package-name": "latest" } }
+//// { "dependencies": { "package-name": "latest" } }
 
 // @Filename: node_modules/@scope/package-name/bin/lib/index.d.ts
 //// export function f1(text: string): string;