diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 5e3aa294038..bd6c5d02cbe 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -242,17 +242,7 @@ namespace ts { const parsed = getParseTreeNode(node, isFunctionLike); return parsed ? isImplementationOfOverload(parsed) : undefined; }, - getImmediateAliasedSymbol: symbol => { - Debug.assert((symbol.flags & SymbolFlags.Alias) !== 0, "Should only get Alias here."); - const links = getSymbolLinks(symbol); - if (!links.immediateTarget) { - const node = getDeclarationOfAliasSymbol(symbol); - if (!node) return Debug.fail(); - links.immediateTarget = getTargetOfAliasDeclaration(node, /*dontRecursivelyResolve*/ true); - } - - return links.immediateTarget; - }, + getImmediateAliasedSymbol, getAliasedSymbol: resolveAlias, getEmitResolver, getExportsOfModule: getExportsOfModuleAsArray, @@ -17828,6 +17818,18 @@ namespace ts { return createIndexInfo(unionType, /*isReadonly*/ false); } + function getImmediateAliasedSymbol(symbol: Symbol): Symbol | undefined { + Debug.assert((symbol.flags & SymbolFlags.Alias) !== 0, "Should only get Alias here."); + const links = getSymbolLinks(symbol); + if (!links.immediateTarget) { + const node = getDeclarationOfAliasSymbol(symbol); + if (!node) return Debug.fail(); + links.immediateTarget = getTargetOfAliasDeclaration(node, /*dontRecursivelyResolve*/ true); + } + + return links.immediateTarget; + } + function checkObjectLiteral(node: ObjectLiteralExpression, checkMode?: CheckMode): Type { const inDestructuringPattern = isAssignmentTarget(node); // Grammar checking @@ -28218,7 +28220,10 @@ namespace ts { if (isDeclarationNameOrImportPropertyName(node)) { // This is a declaration, call getSymbolOfNode - return getSymbolOfNode(parent); + const parentSymbol = getSymbolOfNode(parent)!; + return isImportOrExportSpecifier(node.parent) && node.parent.propertyName === node + ? getImmediateAliasedSymbol(parentSymbol) + : parentSymbol; } else if (isLiteralComputedPropertyDeclarationName(node)) { return getSymbolOfNode(parent.parent); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 29212e6fa63..790145dc48b 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -6111,6 +6111,10 @@ namespace ts { || kind === SyntaxKind.TemplateTail; } + export function isImportOrExportSpecifier(node: Node): node is ImportSpecifier | ExportSpecifier { + return isImportSpecifier(node) || isExportSpecifier(node); + } + export function isStringTextContainingNode(node: Node): node is StringLiteral | TemplateLiteralToken { return node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind); } diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index 16e34565b7e..0ed29a73bb5 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -89,10 +89,10 @@ namespace ts.FindAllReferences { program: Program, cancellationToken: CancellationToken, sourceFiles: ReadonlyArray, node: Node, position: number, options: Options | undefined, convertEntry: ToReferenceOrRenameEntry, ): T[] | undefined { - return map(flattenEntries(Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options)), entry => convertEntry(entry, node)); + return map(flattenEntries(Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options)), entry => convertEntry(entry, node, program.getTypeChecker())); } - export type ToReferenceOrRenameEntry = (entry: Entry, originalNode: Node) => T; + export type ToReferenceOrRenameEntry = (entry: Entry, originalNode: Node, checker: TypeChecker) => T; export function getReferenceEntriesForNode( position: number, @@ -157,8 +157,8 @@ namespace ts.FindAllReferences { return { displayParts, kind: symbolKind }; } - export function toRenameLocation(entry: Entry, originalNode: Node): RenameLocation { - return { ...entryToDocumentSpan(entry), ...getPrefixAndSuffixText(entry, originalNode) }; + export function toRenameLocation(entry: Entry, originalNode: Node, checker: TypeChecker): RenameLocation { + return { ...entryToDocumentSpan(entry), ...getPrefixAndSuffixText(entry, originalNode, checker) }; } export function toReferenceEntry(entry: Entry): ReferenceEntry { @@ -188,25 +188,28 @@ namespace ts.FindAllReferences { } } - function getPrefixAndSuffixText(entry: Entry, originalNode: Node): { readonly prefixText?: string, readonly suffixText?: string } { + interface PrefixAndSuffix { readonly prefixText?: string; readonly suffixText?: string; } + function getPrefixAndSuffixText(entry: Entry, originalNode: Node, checker: TypeChecker): PrefixAndSuffix { if (entry.kind !== EntryKind.Span && isIdentifier(originalNode)) { const { node, kind } = entry; const name = originalNode.text; const isShorthandAssignment = isShorthandPropertyAssignment(node.parent); if (isShorthandAssignment || isObjectBindingElementWithoutPropertyName(node.parent)) { - if (kind === EntryKind.SearchedLocalFoundProperty) { - return { prefixText: name + ": " }; - } - else if (kind === EntryKind.SearchedPropertyFoundLocal) { - return { suffixText: ": " + name }; - } - else { - return isShorthandAssignment - // In `const o = { x }; o.x`, symbolAtLocation at `x` in `{ x }` is the property symbol. - ? { suffixText: ": " + name } - // For a binding element `const { x } = o;`, symbolAtLocation at `x` is the property symbol. - : { prefixText: name + ": " }; - } + const prefixColon: PrefixAndSuffix = { prefixText: name + ": " }; + const suffixColon: PrefixAndSuffix = { suffixText: ": " + name }; + return kind === EntryKind.SearchedLocalFoundProperty ? prefixColon + : kind === EntryKind.SearchedPropertyFoundLocal ? suffixColon + // In `const o = { x }; o.x`, symbolAtLocation at `x` in `{ x }` is the property symbol. + // For a binding element `const { x } = o;`, symbolAtLocation at `x` is the property symbol. + : isShorthandAssignment ? suffixColon : prefixColon; + } + else if (isImportSpecifier(entry.node.parent) && !entry.node.parent.propertyName) { + // If the original symbol was using this alias, just rename the alias. + const originalSymbol = isExportSpecifier(originalNode.parent) ? checker.getExportSpecifierLocalTargetSymbol(originalNode.parent) : checker.getSymbolAtLocation(originalNode); + return contains(originalSymbol!.declarations, entry.node.parent) ? { prefixText: name + " as " } : emptyOptions; + } + else if (isExportSpecifier(entry.node.parent) && !entry.node.parent.propertyName) { + return originalNode === entry.node ? { prefixText: name + " as " } : { suffixText: " as " + name }; } } @@ -480,8 +483,8 @@ namespace ts.FindAllReferences.Core { } /** Core find-all-references algorithm for a normal symbol. */ - function getReferencedSymbolsForSymbol(symbol: Symbol, node: Node | undefined, sourceFiles: ReadonlyArray, sourceFilesSet: ReadonlyMap, checker: TypeChecker, cancellationToken: CancellationToken, options: Options): SymbolAndEntries[] { - symbol = node && skipPastExportOrImportSpecifierOrUnion(symbol, node, checker) || symbol; + function getReferencedSymbolsForSymbol(originalSymbol: Symbol, node: Node | undefined, sourceFiles: ReadonlyArray, sourceFilesSet: ReadonlyMap, checker: TypeChecker, cancellationToken: CancellationToken, options: Options): SymbolAndEntries[] { + const symbol = node && skipPastExportOrImportSpecifierOrUnion(originalSymbol, node, checker, !!options.isForRename) || originalSymbol; // Compute the meaning from the location and the symbol it references const searchMeaning = node ? getIntersectingMeaningFromDeclarations(node, symbol) : SemanticMeaning.All; @@ -489,7 +492,12 @@ namespace ts.FindAllReferences.Core { const result: SymbolAndEntries[] = []; const state = new State(sourceFiles, sourceFilesSet, node ? getSpecialSearchKind(node) : SpecialSearchKind.None, checker, cancellationToken, searchMeaning, options, result); - if (node && node.kind === SyntaxKind.DefaultKeyword) { + const exportSpecifier = !options.isForRename ? undefined : find(symbol.declarations, isExportSpecifier); + if (exportSpecifier) { + // When renaming at an export specifier, rename the export and not the thing being exported. + getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true); + } + else if (node && node.kind === SyntaxKind.DefaultKeyword) { addReference(node, symbol, state); searchForImportsOfExport(node, symbol, { exportingModuleSymbol: Debug.assertDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: ExportKind.Default }, state); } @@ -530,16 +538,11 @@ namespace ts.FindAllReferences.Core { } /** Handle a few special cases relating to export/import specifiers. */ - function skipPastExportOrImportSpecifierOrUnion(symbol: Symbol, node: Node, checker: TypeChecker): Symbol | undefined { + function skipPastExportOrImportSpecifierOrUnion(symbol: Symbol, node: Node, checker: TypeChecker, isForRename: boolean): Symbol | undefined { const { parent } = node; - if (isExportSpecifier(parent)) { + if (isExportSpecifier(parent) && !isForRename) { return getLocalSymbolForExportSpecifier(node as Identifier, symbol, parent, checker); } - if (isImportSpecifier(parent) && parent.propertyName === node) { - // We're at `foo` in `import { foo as bar }`. Probably intended to find all refs on the original, not just on the import. - return checker.getImmediateAliasedSymbol(symbol)!; - } - // If the symbol is declared as part of a declaration like `{ type: "a" } | { type: "b" }`, use the property on the union type to get more references. return firstDefined(symbol.declarations, decl => { if (!decl.parent) { @@ -741,7 +744,8 @@ namespace ts.FindAllReferences.Core { } for (const indirectUser of indirectUsers) { for (const node of getPossibleSymbolReferenceNodes(indirectUser, isDefaultExport ? "default" : exportName)) { - if (isIdentifier(node) && checker.getSymbolAtLocation(node) === exportSymbol) { + // Import specifiers should be handled by importSearches + if (isIdentifier(node) && !isImportOrExportSpecifier(node.parent) && checker.getSymbolAtLocation(node) === exportSymbol) { cb(node); } } @@ -754,7 +758,7 @@ namespace ts.FindAllReferences.Core { // Don't rename an import type `import("./module-name")` when renaming `name` in `export = name;` if (!isIdentifier(singleRef)) return false; // At `default` in `import { default as x }` or `export { default as x }`, do add a reference, but do not rename. - return !((isExportSpecifier(singleRef.parent) || isImportSpecifier(singleRef.parent)) && singleRef.escapedText === InternalSymbolName.Default); + return !(isImportOrExportSpecifier(singleRef.parent) && singleRef.escapedText === InternalSymbolName.Default); } // Go to the symbol we imported from and find references for it. @@ -1058,17 +1062,25 @@ namespace ts.FindAllReferences.Core { getImportOrExportReferences(referenceLocation, referenceSymbol, search, state); } - function getReferencesAtExportSpecifier(referenceLocation: Identifier, referenceSymbol: Symbol, exportSpecifier: ExportSpecifier, search: Search, state: State, addReferencesHere: boolean): void { + function getReferencesAtExportSpecifier( + referenceLocation: Identifier, + referenceSymbol: Symbol, + exportSpecifier: ExportSpecifier, + search: Search, + state: State, + addReferencesHere: boolean, + alwaysGetReferences?: boolean, + ): void { const { parent, propertyName, name } = exportSpecifier; const exportDeclaration = parent.parent; const localSymbol = getLocalSymbolForExportSpecifier(referenceLocation, referenceSymbol, exportSpecifier, state.checker); - if (!search.includes(localSymbol)) { + if (!alwaysGetReferences && !search.includes(localSymbol)) { return; } if (!propertyName) { // Don't rename at `export { default } from "m";`. (but do continue to search for imports of the re-export) - if (!(state.options.isForRename && name.escapedText === InternalSymbolName.Default)) { + if (!(state.options.isForRename && (name.escapedText === InternalSymbolName.Default))) { addRef(); } } @@ -1080,7 +1092,7 @@ namespace ts.FindAllReferences.Core { } if (addReferencesHere && !state.options.isForRename && state.markSeenReExportRHS(name)) { - addReference(name, referenceSymbol, state); + addReference(name, Debug.assertDefined(exportSpecifier.symbol), state); } } else { @@ -1090,15 +1102,15 @@ namespace ts.FindAllReferences.Core { } // For `export { foo as bar }`, rename `foo`, but not `bar`. - if (!(referenceLocation === propertyName && state.options.isForRename)) { + if (!state.options.isForRename || alwaysGetReferences) { const exportKind = referenceLocation.originalKeywordKind === SyntaxKind.DefaultKeyword ? ExportKind.Default : ExportKind.Named; - const exportInfo = getExportInfo(referenceSymbol, exportKind, state.checker); - if (!exportInfo) return Debug.fail(); - searchForImportsOfExport(referenceLocation, referenceSymbol, exportInfo, state); + const exportSymbol = Debug.assertDefined(exportSpecifier.symbol); + const exportInfo = Debug.assertDefined(getExportInfo(exportSymbol, exportKind, state.checker)); + searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state); } // At `export { x } from "foo"`, also search for the imported symbol `"foo".x`. - if (search.comingFrom !== ImportExport.Export && exportDeclaration.moduleSpecifier && !propertyName) { + if (search.comingFrom !== ImportExport.Export && exportDeclaration.moduleSpecifier && !propertyName && !state.options.isForRename) { const imported = state.checker.getExportSpecifierLocalTargetSymbol(exportSpecifier); if (imported) searchForImportedSymbol(imported, state); } @@ -1133,12 +1145,11 @@ namespace ts.FindAllReferences.Core { const { symbol } = importOrExport; if (importOrExport.kind === ImportExport.Import) { - if (!state.options.isForRename || importOrExport.isNamedImport) { + if (!state.options.isForRename) { searchForImportedSymbol(symbol, state); } } else { - // We don't check for `state.isForRename`, even for default exports, because importers that previously matched the export name should be updated to continue matching. searchForImportsOfExport(referenceLocation, symbol, importOrExport.exportInfo, state); } } diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts index 9872b378403..6b50d62d9b4 100644 --- a/src/services/importTracker.ts +++ b/src/services/importTracker.ts @@ -424,7 +424,6 @@ namespace ts.FindAllReferences { export interface ImportedSymbol { kind: ImportExport.Import; symbol: Symbol; - isNamedImport: boolean; } export interface ExportedSymbol { kind: ImportExport.Export; @@ -467,7 +466,7 @@ namespace ts.FindAllReferences { } const lhsSymbol = checker.getSymbolAtLocation(exportNode.name)!; - return { kind: ImportExport.Import, symbol: lhsSymbol, isNamedImport: false }; + return { kind: ImportExport.Import, symbol: lhsSymbol }; } else { return exportInfo(symbol, getExportKindForDeclaration(exportNode)); @@ -542,7 +541,7 @@ namespace ts.FindAllReferences { // (All imports returned from this function will be ignored anyway if we are in rename and this is a not a named export.) const importedName = symbolEscapedNameNoDefault(importedSymbol); if (importedName === undefined || importedName === InternalSymbolName.Default || importedName === symbol.escapedName) { - return { kind: ImportExport.Import, symbol: importedSymbol, ...isImport }; + return { kind: ImportExport.Import, symbol: importedSymbol }; } } @@ -588,22 +587,20 @@ namespace ts.FindAllReferences { } } - function isNodeImport(node: Node): { isNamedImport: boolean } | undefined { + function isNodeImport(node: Node): boolean { const { parent } = node; switch (parent.kind) { case SyntaxKind.ImportEqualsDeclaration: - return (parent as ImportEqualsDeclaration).name === node && isExternalModuleImportEquals(parent as ImportEqualsDeclaration) - ? { isNamedImport: false } - : undefined; + return (parent as ImportEqualsDeclaration).name === node && isExternalModuleImportEquals(parent as ImportEqualsDeclaration); case SyntaxKind.ImportSpecifier: // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`. - return (parent as ImportSpecifier).propertyName ? undefined : { isNamedImport: true }; + return !(parent as ImportSpecifier).propertyName; case SyntaxKind.ImportClause: case SyntaxKind.NamespaceImport: Debug.assert((parent as ImportClause | NamespaceImport).name === node); - return { isNamedImport: false }; + return true; default: - return undefined; + return false; } } diff --git a/src/services/utilities.ts b/src/services/utilities.ts index e95e144d41a..3db985fd375 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -1628,9 +1628,7 @@ namespace ts { } export function isImportOrExportSpecifierName(location: Node): location is Identifier { - return !!location.parent && - (location.parent.kind === SyntaxKind.ImportSpecifier || location.parent.kind === SyntaxKind.ExportSpecifier) && - (location.parent).propertyName === location; + return !!location.parent && isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location; } /** diff --git a/src/testRunner/unittests/tsserverProjectSystem.ts b/src/testRunner/unittests/tsserverProjectSystem.ts index 085b5cf18af..b292ec5486c 100644 --- a/src/testRunner/unittests/tsserverProjectSystem.ts +++ b/src/testRunner/unittests/tsserverProjectSystem.ts @@ -10107,12 +10107,12 @@ declare class TestLib { const userTs: File = { path: "/user/user.ts", - content: 'import { fnA, instanceA } from "../a/bin/a";\nimport { fnB } from "../b/bin/b";\nexport function fnUser() { fnA(); fnB(); instanceA; }', + content: 'import * as a from "../a/bin/a";\nimport * as b from "../b/bin/b";\nexport function fnUser() { a.fnA(); b.fnB(); a.instanceA; }', }; const userTsForConfigProject: File = { path: "/user/user.ts", - content: 'import { fnA, instanceA } from "../a/a";\nimport { fnB } from "../b/b";\nexport function fnUser() { fnA(); fnB(); instanceA; }', + content: 'import * as a from "../a/a";\nimport * as b from "../b/b";\nexport function fnUser() { a.fnA(); b.fnB(); a.instanceA; }', }; const userTsconfig: File = { @@ -10202,7 +10202,7 @@ declare class TestLib { const session = makeSampleProjects(); const response = executeSessionRequest(session, protocol.CommandTypes.DefinitionAndBoundSpan, protocolFileLocationFromSubstring(userTs, "fnA()")); assert.deepEqual(response, { - textSpan: protocolTextSpanFromSubstring(userTs.content, "fnA", { index: 1 }), + textSpan: protocolTextSpanFromSubstring(userTs.content, "fnA"), definitions: [protocolFileSpanFromSubstring(aTs, "fnA")], }); verifySingleInferredProject(session); @@ -10212,7 +10212,7 @@ declare class TestLib { const session = makeSampleProjects(/*addUserTsConfig*/ true); const response = executeSessionRequest(session, protocol.CommandTypes.DefinitionAndBoundSpan, protocolFileLocationFromSubstring(userTs, "fnA()")); assert.deepEqual(response, { - textSpan: protocolTextSpanFromSubstring(userTs.content, "fnA", { index: 1 }), + textSpan: protocolTextSpanFromSubstring(userTs.content, "fnA"), definitions: [protocolFileSpanFromSubstring(aTs, "fnA")], }); checkNumberOfProjects(session.getProjectService(), { configuredProjects: 1 }); @@ -10266,7 +10266,7 @@ declare class TestLib { kindModifiers: "export,declare", }, { - ...protocolFileSpanFromSubstring(userTs, "export function fnUser() { fnA(); fnB(); instanceA; }"), + ...protocolFileSpanFromSubstring(userTs, "export function fnUser() { a.fnA(); b.fnB(); a.instanceA; }"), name: "fnUser", matchKind: "prefix", isCaseSensitive: true, @@ -10288,8 +10288,7 @@ declare class TestLib { const referenceATs = (aTs: File): protocol.ReferencesResponseItem => makeReferenceItem(aTs, /*isDefinition*/ true, "fnA", "export function fnA() {}"); const referencesUserTs = (userTs: File): ReadonlyArray => [ - makeReferenceItem(userTs, /*isDefinition*/ true, "fnA", "import { fnA, instanceA } from \"../a/bin/a\";"), - makeReferenceItem(userTs, /*isDefinition*/ false, "fnA", "export function fnUser() { fnA(); fnB(); instanceA; }", { index: 1 }), + makeReferenceItem(userTs, /*isDefinition*/ false, "fnA", "export function fnUser() { a.fnA(); b.fnB(); a.instanceA; }"), ]; it("findAllReferences", () => { @@ -10300,7 +10299,7 @@ declare class TestLib { refs: [...referencesUserTs(userTs), referenceATs(aTs)], symbolName: "fnA", symbolStartOffset: protocolLocationFromSubstring(userTs.content, "fnA()").offset, - symbolDisplayString: "(alias) fnA(): void\nimport fnA", + symbolDisplayString: "function fnA(): void", }); verifyATsConfigOriginalProject(session); @@ -10327,43 +10326,7 @@ declare class TestLib { const responseFull = executeSessionRequest(session, protocol.CommandTypes.ReferencesFull, protocolFileLocationFromSubstring(userTs, "fnA()")); - function fnAVoid(kind: SymbolDisplayPartKind): SymbolDisplayPart[] { - return [ - keywordPart(SyntaxKind.FunctionKeyword), - spacePart(), - displayPart("fnA", kind), - punctuationPart(SyntaxKind.OpenParenToken), - punctuationPart(SyntaxKind.CloseParenToken), - punctuationPart(SyntaxKind.ColonToken), - spacePart(), - keywordPart(SyntaxKind.VoidKeyword), - ]; - } assert.deepEqual>(responseFull, [ - { - definition: { - ...documentSpanFromSubstring(userTs, "fnA"), - kind: ScriptElementKind.alias, - name: "(alias) function fnA(): void\nimport fnA", - containerKind: ScriptElementKind.unknown, - containerName: "", - displayParts: [ - punctuationPart(SyntaxKind.OpenParenToken), - textPart("alias"), - punctuationPart(SyntaxKind.CloseParenToken), - spacePart(), - ...fnAVoid(SymbolDisplayPartKind.aliasName), - lineBreakPart(), - keywordPart(SyntaxKind.ImportKeyword), - spacePart(), - displayPart("fnA", SymbolDisplayPartKind.aliasName), - ], - }, - references: [ - makeReferenceEntry(userTs, /*isDefinition*/ true, "fnA"), - makeReferenceEntry(userTs, /*isDefinition*/ false, "fnA", { index: 1 }), - ], - }, { definition: { ...documentSpanFromSubstring(aTs, "fnA"), @@ -10371,12 +10334,22 @@ declare class TestLib { name: "function fnA(): void", containerKind: ScriptElementKind.unknown, containerName: "", - displayParts: fnAVoid(SymbolDisplayPartKind.functionName), + displayParts: [ + keywordPart(SyntaxKind.FunctionKeyword), + spacePart(), + displayPart("fnA", SymbolDisplayPartKind.functionName), + punctuationPart(SyntaxKind.OpenParenToken), + punctuationPart(SyntaxKind.CloseParenToken), + punctuationPart(SyntaxKind.ColonToken), + spacePart(), + keywordPart(SyntaxKind.VoidKeyword), + ], }, references: [ + makeReferenceEntry(userTs, /*isDefinition*/ false, "fnA"), makeReferenceEntry(aTs, /*isDefinition*/ true, "fnA"), ], - } + }, ]); verifyATsConfigOriginalProject(session); }); @@ -10448,13 +10421,12 @@ declare class TestLib { const response = executeSessionRequest(session, protocol.CommandTypes.References, protocolFileLocationFromSubstring(userTs, "fnB()")); assert.deepEqual(response, { refs: [ - makeReferenceItem(userTs, /*isDefinition*/ true, "fnB", "import { fnB } from \"../b/bin/b\";"), - makeReferenceItem(userTs, /*isDefinition*/ false, "fnB", "export function fnUser() { fnA(); fnB(); instanceA; }", { index: 1 }), makeReferenceItem(bDts, /*isDefinition*/ true, "fnB", "export declare function fnB(): void;"), + makeReferenceItem(userTs, /*isDefinition*/ false, "fnB", "export function fnUser() { a.fnA(); b.fnB(); a.instanceA; }"), ], symbolName: "fnB", symbolStartOffset: protocolLocationFromSubstring(userTs.content, "fnB()").offset, - symbolDisplayString: "(alias) fnB(): void\nimport fnB", + symbolDisplayString: "function fnB(): void", }); verifySingleInferredProject(session); }); @@ -10465,10 +10437,7 @@ declare class TestLib { }); const renameUserTs = (userTs: File): protocol.SpanGroup => ({ file: userTs.path, - locs: [ - protocolRenameSpanFromSubstring(userTs.content, "fnA"), - protocolRenameSpanFromSubstring(userTs.content, "fnA", { index: 1 }), - ], + locs: [protocolRenameSpanFromSubstring(userTs.content, "fnA")], }); it("renameLocations", () => { @@ -10479,10 +10448,10 @@ declare class TestLib { canRename: true, displayName: "fnA", fileToRename: undefined, - fullDisplayName: "fnA", - kind: ScriptElementKind.alias, - kindModifiers: ScriptElementKindModifier.none, - triggerSpan: protocolTextSpanFromSubstring(userTs.content, "fnA", { index: 1 }), + fullDisplayName: '"/a/bin/a".fnA', // Ideally this would use the original source's path instead of the declaration file's path. + kind: ScriptElementKind.functionElement, + kindModifiers: [ScriptElementKindModifier.exportedModifier, ScriptElementKindModifier.ambientModifier].join(","), + triggerSpan: protocolTextSpanFromSubstring(userTs.content, "fnA"), }, locs: [renameUserTs(userTs), renameATs(aTs)], }); @@ -10513,7 +10482,6 @@ declare class TestLib { const response = executeSessionRequest(session, protocol.CommandTypes.RenameLocationsFull, protocolFileLocationFromSubstring(userTs, "fnA()")); assert.deepEqual>(response, [ renameLocation(userTs, "fnA"), - renameLocation(userTs, "fnA", { index: 1 }), renameLocation(aTs, "fnA"), ]); verifyATsConfigOriginalProject(session); @@ -10527,23 +10495,20 @@ declare class TestLib { canRename: true, displayName: "fnB", fileToRename: undefined, - fullDisplayName: "fnB", - kind: ScriptElementKind.alias, - kindModifiers: ScriptElementKindModifier.none, - triggerSpan: protocolTextSpanFromSubstring(userTs.content, "fnB", { index: 1 }), + fullDisplayName: '"/b/bin/b".fnB', + kind: ScriptElementKind.functionElement, + kindModifiers: [ScriptElementKindModifier.exportedModifier, ScriptElementKindModifier.ambientModifier].join(","), + triggerSpan: protocolTextSpanFromSubstring(userTs.content, "fnB"), }, locs: [ - { - file: userTs.path, - locs: [ - protocolRenameSpanFromSubstring(userTs.content, "fnB"), - protocolRenameSpanFromSubstring(userTs.content, "fnB", { index: 1 }), - ], - }, { file: bDts.path, locs: [protocolRenameSpanFromSubstring(bDts.content, "fnB")], - } + }, + { + file: userTs.path, + locs: [protocolRenameSpanFromSubstring(userTs.content, "fnB")], + }, ], }); verifySingleInferredProject(session); diff --git a/tests/baselines/reference/allowImportClausesToMergeWithTypes.symbols b/tests/baselines/reference/allowImportClausesToMergeWithTypes.symbols index 2195912a395..a87db081e1d 100644 --- a/tests/baselines/reference/allowImportClausesToMergeWithTypes.symbols +++ b/tests/baselines/reference/allowImportClausesToMergeWithTypes.symbols @@ -25,7 +25,7 @@ zzz; >zzz : Symbol(zzz, Decl(a.ts, 0, 0), Decl(a.ts, 4, 6)) export { zzz as default }; ->zzz : Symbol(zzz, Decl(a.ts, 0, 0), Decl(a.ts, 9, 8)) +>zzz : Symbol(zzz, Decl(a.ts, 0, 0), Decl(a.ts, 4, 6)) >default : Symbol(zzz, Decl(a.ts, 0, 0), Decl(a.ts, 9, 8)) === tests/cases/compiler/index.ts === diff --git a/tests/baselines/reference/allowSyntheticDefaultImports7.symbols b/tests/baselines/reference/allowSyntheticDefaultImports7.symbols index 51155dd69df..f8930425112 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports7.symbols +++ b/tests/baselines/reference/allowSyntheticDefaultImports7.symbols @@ -7,7 +7,7 @@ export function bar(); === tests/cases/compiler/a.ts === import { default as Foo } from "./b"; ->default : Symbol(Foo, Decl(a.ts, 0, 8)) +>default : Symbol(Foo, Decl(b.d.ts, 0, 0)) >Foo : Symbol(Foo, Decl(a.ts, 0, 8)) Foo.bar(); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports8.symbols b/tests/baselines/reference/allowSyntheticDefaultImports8.symbols index cf5eece0999..bd55792c1ec 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports8.symbols +++ b/tests/baselines/reference/allowSyntheticDefaultImports8.symbols @@ -7,7 +7,6 @@ export function bar(); === tests/cases/compiler/a.ts === import { default as Foo } from "./b"; ->default : Symbol(Foo, Decl(a.ts, 0, 8)) >Foo : Symbol(Foo, Decl(a.ts, 0, 8)) Foo.bar(); diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.symbols b/tests/baselines/reference/allowSyntheticDefaultImports9.symbols index 51155dd69df..f8930425112 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports9.symbols +++ b/tests/baselines/reference/allowSyntheticDefaultImports9.symbols @@ -7,7 +7,7 @@ export function bar(); === tests/cases/compiler/a.ts === import { default as Foo } from "./b"; ->default : Symbol(Foo, Decl(a.ts, 0, 8)) +>default : Symbol(Foo, Decl(b.d.ts, 0, 0)) >Foo : Symbol(Foo, Decl(a.ts, 0, 8)) Foo.bar(); diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 132d523abc8..120f3bcb5a1 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -3479,6 +3479,7 @@ declare namespace ts { type TemplateLiteralToken = NoSubstitutionTemplateLiteral | TemplateHead | TemplateMiddle | TemplateTail; function isTemplateLiteralToken(node: Node): node is TemplateLiteralToken; function isTemplateMiddleOrTemplateTail(node: Node): node is TemplateMiddle | TemplateTail; + function isImportOrExportSpecifier(node: Node): node is ImportSpecifier | ExportSpecifier; function isStringTextContainingNode(node: Node): node is StringLiteral | TemplateLiteralToken; function isModifier(node: Node): node is Modifier; function isEntityName(node: Node): node is EntityName; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index ebfb65b7aba..f4cebf2da7f 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -3479,6 +3479,7 @@ declare namespace ts { type TemplateLiteralToken = NoSubstitutionTemplateLiteral | TemplateHead | TemplateMiddle | TemplateTail; function isTemplateLiteralToken(node: Node): node is TemplateLiteralToken; function isTemplateMiddleOrTemplateTail(node: Node): node is TemplateMiddle | TemplateTail; + function isImportOrExportSpecifier(node: Node): node is ImportSpecifier | ExportSpecifier; function isStringTextContainingNode(node: Node): node is StringLiteral | TemplateLiteralToken; function isModifier(node: Node): node is Modifier; function isEntityName(node: Node): node is EntityName; diff --git a/tests/baselines/reference/declarationEmitAliasFromIndirectFile.symbols b/tests/baselines/reference/declarationEmitAliasFromIndirectFile.symbols index a6f76121e15..4475277094a 100644 --- a/tests/baselines/reference/declarationEmitAliasFromIndirectFile.symbols +++ b/tests/baselines/reference/declarationEmitAliasFromIndirectFile.symbols @@ -34,7 +34,7 @@ export type key = "ar" | "bg"; import { Locale, CustomLocale, key as LocaleKey } from "./locale"; >Locale : Symbol(Locale, Decl(instance.d.ts, 0, 8)) >CustomLocale : Symbol(CustomLocale, Decl(instance.d.ts, 0, 16)) ->key : Symbol(LocaleKey, Decl(instance.d.ts, 0, 30)) +>key : Symbol(LocaleKey, Decl(locale.d.ts, 11, 2)) >LocaleKey : Symbol(LocaleKey, Decl(instance.d.ts, 0, 30)) export interface FlatpickrFn { diff --git a/tests/baselines/reference/declarationEmitDefaultExport8.symbols b/tests/baselines/reference/declarationEmitDefaultExport8.symbols index b5bf1beaa9e..7bfc976b957 100644 --- a/tests/baselines/reference/declarationEmitDefaultExport8.symbols +++ b/tests/baselines/reference/declarationEmitDefaultExport8.symbols @@ -3,7 +3,7 @@ var _default = 1; >_default : Symbol(_default, Decl(declarationEmitDefaultExport8.ts, 0, 3)) export {_default as d} ->_default : Symbol(d, Decl(declarationEmitDefaultExport8.ts, 1, 8)) +>_default : Symbol(_default, Decl(declarationEmitDefaultExport8.ts, 0, 3)) >d : Symbol(d, Decl(declarationEmitDefaultExport8.ts, 1, 8)) export default 1 + 2; diff --git a/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.symbols b/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.symbols index d13d242105b..2f8947c1088 100644 --- a/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.symbols +++ b/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.symbols @@ -3,7 +3,7 @@ class C {} >C : Symbol(C, Decl(a.ts, 0, 0)) export { C as D } ->C : Symbol(D, Decl(a.ts, 1, 8)) +>C : Symbol(C, Decl(a.ts, 0, 0)) >D : Symbol(D, Decl(a.ts, 1, 8)) === /b.ts === diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols index b25eaf73fbd..02df6e5312c 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols @@ -9,7 +9,7 @@ export class db { === tests/cases/compiler/service.ts === import {db as Database} from './db'; ->db : Symbol(Database, Decl(service.ts, 0, 8)) +>db : Symbol(Database, Decl(db.ts, 0, 0)) >Database : Symbol(Database, Decl(service.ts, 0, 8)) function someDecorator(target) { diff --git a/tests/baselines/reference/destructuringAssignmentWithExportedName.symbols b/tests/baselines/reference/destructuringAssignmentWithExportedName.symbols index 28b2392c533..b2f4e54df31 100644 --- a/tests/baselines/reference/destructuringAssignmentWithExportedName.symbols +++ b/tests/baselines/reference/destructuringAssignmentWithExportedName.symbols @@ -47,8 +47,8 @@ export { nonexportedFoo }; >nonexportedFoo : Symbol(nonexportedFoo, Decl(destructuringAssignmentWithExportedName.ts, 23, 8)) export { exportedFoo as foo, nonexportedFoo as nfoo }; ->exportedFoo : Symbol(foo, Decl(destructuringAssignmentWithExportedName.ts, 24, 8)) +>exportedFoo : Symbol(exportedFoo, Decl(destructuringAssignmentWithExportedName.ts, 0, 10)) >foo : Symbol(foo, Decl(destructuringAssignmentWithExportedName.ts, 24, 8)) ->nonexportedFoo : Symbol(nfoo, Decl(destructuringAssignmentWithExportedName.ts, 24, 28)) +>nonexportedFoo : Symbol(nonexportedFoo, Decl(destructuringAssignmentWithExportedName.ts, 1, 3)) >nfoo : Symbol(nfoo, Decl(destructuringAssignmentWithExportedName.ts, 24, 28)) diff --git a/tests/baselines/reference/duplicatePackage_withErrors.symbols b/tests/baselines/reference/duplicatePackage_withErrors.symbols index da86f440d6d..918842e75a9 100644 --- a/tests/baselines/reference/duplicatePackage_withErrors.symbols +++ b/tests/baselines/reference/duplicatePackage_withErrors.symbols @@ -1,10 +1,10 @@ === /src/a.ts === import { x as xa } from "a"; ->x : Symbol(xa, Decl(a.ts, 0, 8)) +>x : Symbol(x, Decl(index.d.ts, 0, 8)) >xa : Symbol(xa, Decl(a.ts, 0, 8)) import { x as xb } from "b"; ->x : Symbol(xb, Decl(a.ts, 1, 8)) +>x : Symbol(x, Decl(index.d.ts, 0, 8)) >xb : Symbol(xb, Decl(a.ts, 1, 8)) === /node_modules/a/index.d.ts === diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.symbols b/tests/baselines/reference/es3defaultAliasIsQuoted.symbols index 0e1eeade6b9..2965780c9a8 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.symbols +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.symbols @@ -18,7 +18,7 @@ export default function assert(value: boolean) { === tests/cases/compiler/es3defaultAliasQuoted_file1.ts === import {Foo, default as assert} from "./es3defaultAliasQuoted_file0"; >Foo : Symbol(Foo, Decl(es3defaultAliasQuoted_file1.ts, 0, 8)) ->default : Symbol(assert, Decl(es3defaultAliasQuoted_file1.ts, 0, 12)) +>default : Symbol(assert, Decl(es3defaultAliasQuoted_file0.ts, 2, 1)) >assert : Symbol(assert, Decl(es3defaultAliasQuoted_file1.ts, 0, 12)) assert(Foo.CONSTANT === "Foo"); diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.symbols b/tests/baselines/reference/es5ModuleInternalNamedImports.symbols index f6f474d3eab..f82a357dbe2 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.symbols +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.symbols @@ -42,35 +42,35 @@ export module M { // Reexports export {M_V as v}; ->M_V : Symbol(v, Decl(es5ModuleInternalNamedImports.ts, 21, 12)) +>M_V : Symbol(M_V, Decl(es5ModuleInternalNamedImports.ts, 2, 14)) >v : Symbol(v, Decl(es5ModuleInternalNamedImports.ts, 21, 12)) export {M_I as i}; ->M_I : Symbol(i, Decl(es5ModuleInternalNamedImports.ts, 22, 12)) +>M_I : Symbol(M_I, Decl(es5ModuleInternalNamedImports.ts, 2, 23)) >i : Symbol(i, Decl(es5ModuleInternalNamedImports.ts, 22, 12)) export {M_C as c}; ->M_C : Symbol(c, Decl(es5ModuleInternalNamedImports.ts, 23, 12)) +>M_C : Symbol(M_C, Decl(es5ModuleInternalNamedImports.ts, 4, 28)) >c : Symbol(c, Decl(es5ModuleInternalNamedImports.ts, 23, 12)) export {M_M as m}; ->M_M : Symbol(m, Decl(es5ModuleInternalNamedImports.ts, 24, 12)) +>M_M : Symbol(M_M, Decl(es5ModuleInternalNamedImports.ts, 6, 24)) >m : Symbol(m, Decl(es5ModuleInternalNamedImports.ts, 24, 12)) export {M_MU as mu}; ->M_MU : Symbol(mu, Decl(es5ModuleInternalNamedImports.ts, 25, 12)) +>M_MU : Symbol(M_MU, Decl(es5ModuleInternalNamedImports.ts, 8, 32)) >mu : Symbol(mu, Decl(es5ModuleInternalNamedImports.ts, 25, 12)) export {M_F as f}; ->M_F : Symbol(f, Decl(es5ModuleInternalNamedImports.ts, 26, 12)) +>M_F : Symbol(M_F, Decl(es5ModuleInternalNamedImports.ts, 10, 26)) >f : Symbol(f, Decl(es5ModuleInternalNamedImports.ts, 26, 12)) export {M_E as e}; ->M_E : Symbol(e, Decl(es5ModuleInternalNamedImports.ts, 27, 12)) +>M_E : Symbol(M_E, Decl(es5ModuleInternalNamedImports.ts, 12, 29)) >e : Symbol(e, Decl(es5ModuleInternalNamedImports.ts, 27, 12)) export {M_A as a}; ->M_A : Symbol(a, Decl(es5ModuleInternalNamedImports.ts, 28, 12)) +>M_A : Symbol(M_A, Decl(es5ModuleInternalNamedImports.ts, 16, 29)) >a : Symbol(a, Decl(es5ModuleInternalNamedImports.ts, 28, 12)) import * as M2 from "M2"; diff --git a/tests/baselines/reference/es6ExportClause.symbols b/tests/baselines/reference/es6ExportClause.symbols index 428b0b4448b..5191d08ad92 100644 --- a/tests/baselines/reference/es6ExportClause.symbols +++ b/tests/baselines/reference/es6ExportClause.symbols @@ -21,12 +21,12 @@ export { c }; >c : Symbol(c, Decl(server.ts, 10, 8)) export { c as c2 }; ->c : Symbol(c2, Decl(server.ts, 11, 8)) +>c : Symbol(c, Decl(server.ts, 0, 0)) >c2 : Symbol(c2, Decl(server.ts, 11, 8)) export { i, m as instantiatedModule }; >i : Symbol(i, Decl(server.ts, 12, 8)) ->m : Symbol(instantiatedModule, Decl(server.ts, 12, 11)) +>m : Symbol(m, Decl(server.ts, 3, 1)) >instantiatedModule : Symbol(instantiatedModule, Decl(server.ts, 12, 11)) export { uninstantiated }; diff --git a/tests/baselines/reference/es6ExportClauseInEs5.symbols b/tests/baselines/reference/es6ExportClauseInEs5.symbols index 428b0b4448b..5191d08ad92 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.symbols +++ b/tests/baselines/reference/es6ExportClauseInEs5.symbols @@ -21,12 +21,12 @@ export { c }; >c : Symbol(c, Decl(server.ts, 10, 8)) export { c as c2 }; ->c : Symbol(c2, Decl(server.ts, 11, 8)) +>c : Symbol(c, Decl(server.ts, 0, 0)) >c2 : Symbol(c2, Decl(server.ts, 11, 8)) export { i, m as instantiatedModule }; >i : Symbol(i, Decl(server.ts, 12, 8)) ->m : Symbol(instantiatedModule, Decl(server.ts, 12, 11)) +>m : Symbol(m, Decl(server.ts, 3, 1)) >instantiatedModule : Symbol(instantiatedModule, Decl(server.ts, 12, 11)) export { uninstantiated }; diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.symbols b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.symbols index 27c40ea5bbe..f6991e8d095 100644 --- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.symbols +++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.symbols @@ -32,7 +32,7 @@ bizz--; // similarly export { foo, baz, baz as quux, buzz, bizz }; >foo : Symbol(foo, Decl(server.ts, 14, 8)) >baz : Symbol(baz, Decl(server.ts, 14, 13)) ->baz : Symbol(quux, Decl(server.ts, 14, 18)) +>baz : Symbol(baz, Decl(server.ts, 3, 3)) >quux : Symbol(quux, Decl(server.ts, 14, 18)) >buzz : Symbol(buzz, Decl(server.ts, 14, 31)) >bizz : Symbol(bizz, Decl(server.ts, 14, 37)) diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols index 5103e803104..a291c1d501f 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols @@ -23,12 +23,12 @@ export { c } from "server"; >c : Symbol(c, Decl(client.ts, 0, 8)) export { c as c2 } from "server"; ->c : Symbol(c2, Decl(client.ts, 1, 8)) +>c : Symbol(c, Decl(server.ts, 0, 0)) >c2 : Symbol(c2, Decl(client.ts, 1, 8)) export { i, m as instantiatedModule } from "server"; >i : Symbol(i, Decl(client.ts, 2, 8)) ->m : Symbol(instantiatedModule, Decl(client.ts, 2, 11)) +>m : Symbol(m, Decl(server.ts, 3, 1)) >instantiatedModule : Symbol(instantiatedModule, Decl(client.ts, 2, 11)) export { uninstantiated } from "server"; diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols index a69f038d077..b4d2fb48a5b 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols @@ -23,12 +23,12 @@ export { c } from "./server"; >c : Symbol(c, Decl(client.ts, 0, 8)) export { c as c2 } from "./server"; ->c : Symbol(c2, Decl(client.ts, 1, 8)) +>c : Symbol(c, Decl(server.ts, 0, 0)) >c2 : Symbol(c2, Decl(client.ts, 1, 8)) export { i, m as instantiatedModule } from "./server"; >i : Symbol(i, Decl(client.ts, 2, 8)) ->m : Symbol(instantiatedModule, Decl(client.ts, 2, 11)) +>m : Symbol(m, Decl(server.ts, 3, 1)) >instantiatedModule : Symbol(instantiatedModule, Decl(client.ts, 2, 11)) export { uninstantiated } from "./server"; diff --git a/tests/baselines/reference/es6ExportEqualsInterop.symbols b/tests/baselines/reference/es6ExportEqualsInterop.symbols index 0687da5ec39..b2ae91ee602 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.symbols +++ b/tests/baselines/reference/es6ExportEqualsInterop.symbols @@ -180,43 +180,40 @@ y0.a; // named import import { a as a1 } from "interface"; ->a : Symbol(a1, Decl(main.ts, 61, 8)) >a1 : Symbol(a1, Decl(main.ts, 61, 8)) import { a as a2 } from "variable"; ->a : Symbol(a2, Decl(main.ts, 62, 8)) +>a : Symbol(a2, Decl(modules.d.ts, 9, 14)) >a2 : Symbol(a2, Decl(main.ts, 62, 8)) import { a as a3 } from "interface-variable"; ->a : Symbol(a3, Decl(main.ts, 63, 8)) +>a : Symbol(a3, Decl(modules.d.ts, 21, 14)) >a3 : Symbol(a3, Decl(main.ts, 63, 8)) import { a as a4 } from "module"; ->a : Symbol(a4, Decl(main.ts, 64, 8)) +>a : Symbol(z4.a, Decl(modules.d.ts, 30, 18)) >a4 : Symbol(a4, Decl(main.ts, 64, 8)) import { a as a5 } from "interface-module"; ->a : Symbol(a5, Decl(main.ts, 65, 8)) +>a : Symbol(z5.a, Decl(modules.d.ts, 42, 18)) >a5 : Symbol(a5, Decl(main.ts, 65, 8)) import { a as a6 } from "variable-module"; ->a : Symbol(a6, Decl(main.ts, 66, 8)) +>a : Symbol(a6, Decl(modules.d.ts, 55, 14)) >a6 : Symbol(a6, Decl(main.ts, 66, 8)) import { a as a7 } from "function"; ->a : Symbol(a7, Decl(main.ts, 67, 8)) >a7 : Symbol(a7, Decl(main.ts, 67, 8)) import { a as a8 } from "function-module"; ->a : Symbol(a8, Decl(main.ts, 68, 8)) +>a : Symbol(z8.a, Decl(modules.d.ts, 70, 18)) >a8 : Symbol(a8, Decl(main.ts, 68, 8)) import { a as a9 } from "class"; ->a : Symbol(a9, Decl(main.ts, 69, 8)) >a9 : Symbol(a9, Decl(main.ts, 69, 8)) import { a as a0 } from "class-module"; ->a : Symbol(a0, Decl(main.ts, 70, 8)) +>a : Symbol(z0.a, Decl(modules.d.ts, 90, 18)) >a0 : Symbol(a0, Decl(main.ts, 70, 8)) a1; @@ -251,43 +248,40 @@ a0; // named export export { a as a1 } from "interface"; ->a : Symbol(a1, Decl(main.ts, 84, 8)) >a1 : Symbol(a1, Decl(main.ts, 84, 8)) export { a as a2 } from "variable"; ->a : Symbol(a2, Decl(main.ts, 85, 8)) +>a : Symbol(a2, Decl(modules.d.ts, 9, 14)) >a2 : Symbol(a2, Decl(main.ts, 85, 8)) export { a as a3 } from "interface-variable"; ->a : Symbol(a3, Decl(main.ts, 86, 8)) +>a : Symbol(a3, Decl(modules.d.ts, 21, 14)) >a3 : Symbol(a3, Decl(main.ts, 86, 8)) export { a as a4 } from "module"; ->a : Symbol(a4, Decl(main.ts, 87, 8)) +>a : Symbol(z4.a, Decl(modules.d.ts, 30, 18)) >a4 : Symbol(a4, Decl(main.ts, 87, 8)) export { a as a5 } from "interface-module"; ->a : Symbol(a5, Decl(main.ts, 88, 8)) +>a : Symbol(z5.a, Decl(modules.d.ts, 42, 18)) >a5 : Symbol(a5, Decl(main.ts, 88, 8)) export { a as a6 } from "variable-module"; ->a : Symbol(a6, Decl(main.ts, 89, 8)) +>a : Symbol(a6, Decl(modules.d.ts, 55, 14)) >a6 : Symbol(a6, Decl(main.ts, 89, 8)) export { a as a7 } from "function"; ->a : Symbol(a7, Decl(main.ts, 90, 8)) >a7 : Symbol(a7, Decl(main.ts, 90, 8)) export { a as a8 } from "function-module"; ->a : Symbol(a8, Decl(main.ts, 91, 8)) +>a : Symbol(z8.a, Decl(modules.d.ts, 70, 18)) >a8 : Symbol(a8, Decl(main.ts, 91, 8)) export { a as a9 } from "class"; ->a : Symbol(a9, Decl(main.ts, 92, 8)) >a9 : Symbol(a9, Decl(main.ts, 92, 8)) export { a as a0 } from "class-module"; ->a : Symbol(a0, Decl(main.ts, 93, 8)) +>a : Symbol(z0.a, Decl(modules.d.ts, 90, 18)) >a0 : Symbol(a0, Decl(main.ts, 93, 8)) // export-star diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.symbols index ecaa4ae6214..926dfd05912 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.symbols @@ -26,7 +26,7 @@ var x1: number = a; import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport_0"; >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 3, 6)) ->a : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 3, 25)) +>a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImport_0.ts, 0, 10)) >b : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 3, 25)) var x1: number = b; @@ -36,7 +36,7 @@ var x1: number = b; import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport_0"; >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 5, 6)) >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 5, 25)) ->a : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 5, 28)) +>a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImport_0.ts, 0, 10)) >y : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 5, 28)) var x1: number = x; @@ -49,7 +49,7 @@ var x1: number = y; import defaultBinding5, { x as z, } from "./es6ImportDefaultBindingFollowedWithNamedImport_0"; >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 8, 6)) ->x : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 8, 25)) +>x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImport_0.ts, 1, 10)) >z : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport_1.ts, 8, 25)) var x1: number = z; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols index 614d800da79..f5ac084f194 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.symbols @@ -23,7 +23,6 @@ var x1: number = defaultBinding2; import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 6)) ->a : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 25)) >b : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 25)) var x1: number = defaultBinding3; @@ -33,7 +32,6 @@ var x1: number = defaultBinding3; import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 6)) >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 25)) ->a : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 28)) >y : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 28)) var x1: number = defaultBinding4; @@ -42,7 +40,6 @@ var x1: number = defaultBinding4; import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 6)) ->x : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 25)) >z : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 25)) var x1: number = defaultBinding5; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.symbols index 325a6305e36..d0630db4f6f 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.symbols @@ -23,7 +23,6 @@ var x: number = defaultBinding2; import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"; >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 4, 6)) ->a : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 4, 25)) >b : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 4, 25)) var x: number = defaultBinding3; @@ -33,7 +32,6 @@ var x: number = defaultBinding3; import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"; >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 6, 6)) >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 6, 25), Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 7, 3) ... and 2 more) ->a : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 6, 28)) >y : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 6, 28)) var x: number = defaultBinding4; @@ -42,7 +40,6 @@ var x: number = defaultBinding4; import defaultBinding5, { x as z, } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"; >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 8, 6)) ->x : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 8, 25)) >z : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts, 8, 25)) var x: number = defaultBinding5; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.symbols index 5537210ef2e..5d8bcd95189 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.symbols @@ -23,7 +23,6 @@ export var x1: number = defaultBinding2; export import defaultBinding3, { a as b } from "./server"; >defaultBinding3 : Symbol(defaultBinding3, Decl(client.ts, 4, 13)) ->a : Symbol(b, Decl(client.ts, 4, 32)) >b : Symbol(b, Decl(client.ts, 4, 32)) export var x1: number = defaultBinding3; @@ -33,7 +32,6 @@ export var x1: number = defaultBinding3; export import defaultBinding4, { x, a as y } from "./server"; >defaultBinding4 : Symbol(defaultBinding4, Decl(client.ts, 6, 13)) >x : Symbol(x, Decl(client.ts, 6, 32)) ->a : Symbol(y, Decl(client.ts, 6, 35)) >y : Symbol(y, Decl(client.ts, 6, 35)) export var x1: number = defaultBinding4; @@ -42,7 +40,6 @@ export var x1: number = defaultBinding4; export import defaultBinding5, { x as z, } from "./server"; >defaultBinding5 : Symbol(defaultBinding5, Decl(client.ts, 8, 13)) ->x : Symbol(z, Decl(client.ts, 8, 32)) >z : Symbol(z, Decl(client.ts, 8, 32)) export var x1: number = defaultBinding5; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.symbols index d63927ee2b9..b08ba5fbac2 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.symbols @@ -31,7 +31,7 @@ export var x1 = new a(); import defaultBinding3, { a11 as b } from "./server"; >defaultBinding3 : Symbol(defaultBinding3, Decl(client.ts, 3, 6)) ->a11 : Symbol(b, Decl(client.ts, 3, 25)) +>a11 : Symbol(b, Decl(server.ts, 2, 18)) >b : Symbol(b, Decl(client.ts, 3, 25)) export var x2 = new b(); @@ -41,7 +41,7 @@ export var x2 = new b(); import defaultBinding4, { x, a12 as y } from "./server"; >defaultBinding4 : Symbol(defaultBinding4, Decl(client.ts, 5, 6)) >x : Symbol(x, Decl(client.ts, 5, 25)) ->a12 : Symbol(y, Decl(client.ts, 5, 28)) +>a12 : Symbol(y, Decl(server.ts, 3, 20)) >y : Symbol(y, Decl(client.ts, 5, 28)) export var x4 = new x(); @@ -54,7 +54,7 @@ export var x5 = new y(); import defaultBinding5, { x11 as z, } from "./server"; >defaultBinding5 : Symbol(defaultBinding5, Decl(client.ts, 8, 6)) ->x11 : Symbol(z, Decl(client.ts, 8, 25)) +>x11 : Symbol(z, Decl(server.ts, 4, 20)) >z : Symbol(z, Decl(client.ts, 8, 25)) export var x3 = new z(); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.symbols index 3e93fbf8c65..a2826693792 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.symbols @@ -23,7 +23,6 @@ export var x2 = new defaultBinding2(); import defaultBinding3, { a as b } from "./server"; >defaultBinding3 : Symbol(defaultBinding3, Decl(client.ts, 4, 6)) ->a : Symbol(b, Decl(client.ts, 4, 25)) >b : Symbol(b, Decl(client.ts, 4, 25)) export var x3 = new defaultBinding3(); @@ -33,7 +32,6 @@ export var x3 = new defaultBinding3(); import defaultBinding4, { x, a as y } from "./server"; >defaultBinding4 : Symbol(defaultBinding4, Decl(client.ts, 6, 6)) >x : Symbol(x, Decl(client.ts, 6, 25)) ->a : Symbol(y, Decl(client.ts, 6, 28)) >y : Symbol(y, Decl(client.ts, 6, 28)) export var x4 = new defaultBinding4(); @@ -42,7 +40,6 @@ export var x4 = new defaultBinding4(); import defaultBinding5, { x as z, } from "./server"; >defaultBinding5 : Symbol(defaultBinding5, Decl(client.ts, 8, 6)) ->x : Symbol(z, Decl(client.ts, 8, 25)) >z : Symbol(z, Decl(client.ts, 8, 25)) export var x5 = new defaultBinding5(); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.symbols index 3c9eedaa041..22dfbf75684 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.symbols @@ -24,7 +24,7 @@ var x1: number = a; import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"; >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 3, 6)) ->a : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 3, 25)) +>a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.ts, 0, 10)) >b : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 3, 25)) var x1: number = b; @@ -34,7 +34,7 @@ var x1: number = b; import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"; >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 5, 6)) >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 5, 25)) ->a : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 5, 28)) +>a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.ts, 0, 10)) >y : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 5, 28)) var x1: number = x; @@ -47,7 +47,7 @@ var x1: number = y; import defaultBinding5, { x as z, } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"; >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 8, 6)) ->x : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 8, 25)) +>x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.ts, 1, 10)) >z : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts, 8, 25)) var x1: number = z; diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols index dcede3be8cf..de6ea4647d5 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols @@ -26,7 +26,7 @@ export var x1: number = a; export import defaultBinding3, { a as b } from "server"; >defaultBinding3 : Symbol(defaultBinding3, Decl(client.ts, 3, 13)) ->a : Symbol(b, Decl(client.ts, 3, 32)) +>a : Symbol(a, Decl(server.ts, 0, 10)) >b : Symbol(b, Decl(client.ts, 3, 32)) export var x1: number = b; @@ -36,7 +36,7 @@ export var x1: number = b; export import defaultBinding4, { x, a as y } from "server"; >defaultBinding4 : Symbol(defaultBinding4, Decl(client.ts, 5, 13)) >x : Symbol(x, Decl(client.ts, 5, 32)) ->a : Symbol(y, Decl(client.ts, 5, 35)) +>a : Symbol(a, Decl(server.ts, 0, 10)) >y : Symbol(y, Decl(client.ts, 5, 35)) export var x1: number = x; @@ -49,7 +49,7 @@ export var x1: number = y; export import defaultBinding5, { x as z, } from "server"; >defaultBinding5 : Symbol(defaultBinding5, Decl(client.ts, 8, 13)) ->x : Symbol(z, Decl(client.ts, 8, 32)) +>x : Symbol(x, Decl(server.ts, 1, 10)) >z : Symbol(z, Decl(client.ts, 8, 32)) export var x1: number = z; diff --git a/tests/baselines/reference/es6ImportNamedImport.symbols b/tests/baselines/reference/es6ImportNamedImport.symbols index ebfb5d256fa..4937b3c2f25 100644 --- a/tests/baselines/reference/es6ImportNamedImport.symbols +++ b/tests/baselines/reference/es6ImportNamedImport.symbols @@ -35,7 +35,7 @@ var xxxx = a; >a : Symbol(a, Decl(es6ImportNamedImport_1.ts, 1, 8)) import { a as b } from "./es6ImportNamedImport_0"; ->a : Symbol(b, Decl(es6ImportNamedImport_1.ts, 3, 8)) +>a : Symbol(a, Decl(es6ImportNamedImport_0.ts, 0, 10)) >b : Symbol(b, Decl(es6ImportNamedImport_1.ts, 3, 8)) var xxxx = b; @@ -44,7 +44,7 @@ var xxxx = b; import { x, a as y } from "./es6ImportNamedImport_0"; >x : Symbol(x, Decl(es6ImportNamedImport_1.ts, 5, 8)) ->a : Symbol(y, Decl(es6ImportNamedImport_1.ts, 5, 11)) +>a : Symbol(a, Decl(es6ImportNamedImport_0.ts, 0, 10)) >y : Symbol(y, Decl(es6ImportNamedImport_1.ts, 5, 11)) var xxxx = x; @@ -56,7 +56,7 @@ var xxxx = y; >y : Symbol(y, Decl(es6ImportNamedImport_1.ts, 5, 11)) import { x as z, } from "./es6ImportNamedImport_0"; ->x : Symbol(z, Decl(es6ImportNamedImport_1.ts, 8, 8)) +>x : Symbol(x, Decl(es6ImportNamedImport_0.ts, 1, 10)) >z : Symbol(z, Decl(es6ImportNamedImport_1.ts, 8, 8)) var xxxx = z; @@ -83,9 +83,9 @@ var xxxx = x1; >x1 : Symbol(x1, Decl(es6ImportNamedImport_1.ts, 12, 12)) import { a1 as a11, x1 as x11 } from "./es6ImportNamedImport_0"; ->a1 : Symbol(a11, Decl(es6ImportNamedImport_1.ts, 15, 8)) +>a1 : Symbol(a1, Decl(es6ImportNamedImport_0.ts, 3, 10)) >a11 : Symbol(a11, Decl(es6ImportNamedImport_1.ts, 15, 8)) ->x1 : Symbol(x11, Decl(es6ImportNamedImport_1.ts, 15, 19)) +>x1 : Symbol(x1, Decl(es6ImportNamedImport_0.ts, 4, 10)) >x11 : Symbol(x11, Decl(es6ImportNamedImport_1.ts, 15, 19)) var xxxx = a11; @@ -104,7 +104,7 @@ var z111 = z1; >z1 : Symbol(z1, Decl(es6ImportNamedImport_1.ts, 18, 8)) import { z2 as z3 } from "./es6ImportNamedImport_0"; ->z2 : Symbol(z3, Decl(es6ImportNamedImport_1.ts, 20, 8)) +>z2 : Symbol(z3, Decl(es6ImportNamedImport_0.ts, 6, 10)) >z3 : Symbol(z3, Decl(es6ImportNamedImport_1.ts, 20, 8)) var z2 = z3; // z2 shouldn't give redeclare error @@ -117,6 +117,6 @@ import { aaaa } from "./es6ImportNamedImport_0"; // These are elided import { aaaa as bbbb } from "./es6ImportNamedImport_0"; ->aaaa : Symbol(bbbb, Decl(es6ImportNamedImport_1.ts, 26, 8)) +>aaaa : Symbol(aaaa, Decl(es6ImportNamedImport_0.ts, 7, 10)) >bbbb : Symbol(bbbb, Decl(es6ImportNamedImport_1.ts, 26, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.symbols b/tests/baselines/reference/es6ImportNamedImportAmd.symbols index c7154a40292..457975df777 100644 --- a/tests/baselines/reference/es6ImportNamedImportAmd.symbols +++ b/tests/baselines/reference/es6ImportNamedImportAmd.symbols @@ -35,7 +35,7 @@ var xxxx = a; >a : Symbol(a, Decl(es6ImportNamedImportAmd_1.ts, 1, 8)) import { a as b } from "es6ImportNamedImportAmd_0"; ->a : Symbol(b, Decl(es6ImportNamedImportAmd_1.ts, 3, 8)) +>a : Symbol(a, Decl(es6ImportNamedImportAmd_0.ts, 0, 10)) >b : Symbol(b, Decl(es6ImportNamedImportAmd_1.ts, 3, 8)) var xxxx = b; @@ -44,7 +44,7 @@ var xxxx = b; import { x, a as y } from "es6ImportNamedImportAmd_0"; >x : Symbol(x, Decl(es6ImportNamedImportAmd_1.ts, 5, 8)) ->a : Symbol(y, Decl(es6ImportNamedImportAmd_1.ts, 5, 11)) +>a : Symbol(a, Decl(es6ImportNamedImportAmd_0.ts, 0, 10)) >y : Symbol(y, Decl(es6ImportNamedImportAmd_1.ts, 5, 11)) var xxxx = x; @@ -56,7 +56,7 @@ var xxxx = y; >y : Symbol(y, Decl(es6ImportNamedImportAmd_1.ts, 5, 11)) import { x as z, } from "es6ImportNamedImportAmd_0"; ->x : Symbol(z, Decl(es6ImportNamedImportAmd_1.ts, 8, 8)) +>x : Symbol(x, Decl(es6ImportNamedImportAmd_0.ts, 1, 10)) >z : Symbol(z, Decl(es6ImportNamedImportAmd_1.ts, 8, 8)) var xxxx = z; @@ -83,9 +83,9 @@ var xxxx = x1; >x1 : Symbol(x1, Decl(es6ImportNamedImportAmd_1.ts, 12, 12)) import { a1 as a11, x1 as x11 } from "es6ImportNamedImportAmd_0"; ->a1 : Symbol(a11, Decl(es6ImportNamedImportAmd_1.ts, 15, 8)) +>a1 : Symbol(a1, Decl(es6ImportNamedImportAmd_0.ts, 3, 10)) >a11 : Symbol(a11, Decl(es6ImportNamedImportAmd_1.ts, 15, 8)) ->x1 : Symbol(x11, Decl(es6ImportNamedImportAmd_1.ts, 15, 19)) +>x1 : Symbol(x1, Decl(es6ImportNamedImportAmd_0.ts, 4, 10)) >x11 : Symbol(x11, Decl(es6ImportNamedImportAmd_1.ts, 15, 19)) var xxxx = a11; @@ -104,7 +104,7 @@ var z111 = z1; >z1 : Symbol(z1, Decl(es6ImportNamedImportAmd_1.ts, 18, 8)) import { z2 as z3 } from "es6ImportNamedImportAmd_0"; ->z2 : Symbol(z3, Decl(es6ImportNamedImportAmd_1.ts, 20, 8)) +>z2 : Symbol(z3, Decl(es6ImportNamedImportAmd_0.ts, 6, 10)) >z3 : Symbol(z3, Decl(es6ImportNamedImportAmd_1.ts, 20, 8)) var z2 = z3; // z2 shouldn't give redeclare error @@ -117,6 +117,6 @@ import { aaaa } from "es6ImportNamedImportAmd_0"; // These are elided import { aaaa as bbbb } from "es6ImportNamedImportAmd_0"; ->aaaa : Symbol(bbbb, Decl(es6ImportNamedImportAmd_1.ts, 26, 8)) +>aaaa : Symbol(aaaa, Decl(es6ImportNamedImportAmd_0.ts, 7, 10)) >bbbb : Symbol(bbbb, Decl(es6ImportNamedImportAmd_1.ts, 26, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportDts.symbols b/tests/baselines/reference/es6ImportNamedImportDts.symbols index 88e22bec1b5..75a1ad7e8d6 100644 --- a/tests/baselines/reference/es6ImportNamedImportDts.symbols +++ b/tests/baselines/reference/es6ImportNamedImportDts.symbols @@ -51,7 +51,7 @@ export var xxxx = new a(); >a : Symbol(a, Decl(client.ts, 1, 8)) import { a11 as b } from "./server"; ->a11 : Symbol(b, Decl(client.ts, 3, 8)) +>a11 : Symbol(b, Decl(server.ts, 0, 18)) >b : Symbol(b, Decl(client.ts, 3, 8)) export var xxxx1 = new b(); @@ -60,7 +60,7 @@ export var xxxx1 = new b(); import { x, a12 as y } from "./server"; >x : Symbol(x, Decl(client.ts, 5, 8)) ->a12 : Symbol(y, Decl(client.ts, 5, 11)) +>a12 : Symbol(y, Decl(server.ts, 1, 20)) >y : Symbol(y, Decl(client.ts, 5, 11)) export var xxxx2 = new x(); @@ -72,7 +72,7 @@ export var xxxx3 = new y(); >y : Symbol(y, Decl(client.ts, 5, 11)) import { x11 as z, } from "./server"; ->x11 : Symbol(z, Decl(client.ts, 8, 8)) +>x11 : Symbol(z, Decl(server.ts, 3, 18)) >z : Symbol(z, Decl(client.ts, 8, 8)) export var xxxx4 = new z(); @@ -99,9 +99,9 @@ export var xxxx7 = new x1(); >x1 : Symbol(x1, Decl(client.ts, 12, 12)) import { a111 as a11, x111 as x11 } from "./server"; ->a111 : Symbol(a11, Decl(client.ts, 15, 8)) +>a111 : Symbol(a11, Decl(server.ts, 7, 19)) >a11 : Symbol(a11, Decl(client.ts, 15, 8)) ->x111 : Symbol(x11, Decl(client.ts, 15, 21)) +>x111 : Symbol(x11, Decl(server.ts, 8, 21)) >x11 : Symbol(x11, Decl(client.ts, 15, 21)) export var xxxx8 = new a11(); @@ -120,7 +120,7 @@ export var z111 = new z1(); >z1 : Symbol(z1, Decl(client.ts, 18, 8)) import { z2 as z3 } from "./server"; ->z2 : Symbol(z3, Decl(client.ts, 20, 8)) +>z2 : Symbol(z3, Decl(server.ts, 10, 19)) >z3 : Symbol(z3, Decl(client.ts, 20, 8)) export var z2 = new z3(); // z2 shouldn't give redeclare error @@ -132,6 +132,6 @@ import { aaaa } from "./server"; >aaaa : Symbol(aaaa, Decl(client.ts, 24, 8)) import { aaaa1 as bbbb } from "./server"; ->aaaa1 : Symbol(bbbb, Decl(client.ts, 25, 8)) +>aaaa1 : Symbol(bbbb, Decl(server.ts, 12, 21)) >bbbb : Symbol(bbbb, Decl(client.ts, 25, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.symbols b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.symbols index 80be53d469d..0040b123439 100644 --- a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.symbols +++ b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.symbols @@ -6,14 +6,11 @@ import { default } from "somemodule"; // Error - as this is keyword that is not >default : Symbol(default, Decl(es6ImportNamedImportIdentifiersParsing.ts, 1, 8)) import { yield as default } from "somemodule"; // error to use default as binding name ->yield : Symbol(default, Decl(es6ImportNamedImportIdentifiersParsing.ts, 2, 8)) >default : Symbol(default, Decl(es6ImportNamedImportIdentifiersParsing.ts, 2, 8)) import { default as yield } from "somemodule"; // no error ->default : Symbol(yield, Decl(es6ImportNamedImportIdentifiersParsing.ts, 3, 8)) >yield : Symbol(yield, Decl(es6ImportNamedImportIdentifiersParsing.ts, 3, 8)) import { default as default } from "somemodule"; // default as is ok, error of default binding name >default : Symbol(default, Decl(es6ImportNamedImportIdentifiersParsing.ts, 4, 8)) ->default : Symbol(default, Decl(es6ImportNamedImportIdentifiersParsing.ts, 4, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.symbols b/tests/baselines/reference/es6ImportNamedImportInEs5.symbols index 87768f5ccb7..b19714e96f6 100644 --- a/tests/baselines/reference/es6ImportNamedImportInEs5.symbols +++ b/tests/baselines/reference/es6ImportNamedImportInEs5.symbols @@ -35,7 +35,7 @@ var xxxx = a; >a : Symbol(a, Decl(es6ImportNamedImportInEs5_1.ts, 1, 8)) import { a as b } from "./es6ImportNamedImportInEs5_0"; ->a : Symbol(b, Decl(es6ImportNamedImportInEs5_1.ts, 3, 8)) +>a : Symbol(a, Decl(es6ImportNamedImportInEs5_0.ts, 0, 10)) >b : Symbol(b, Decl(es6ImportNamedImportInEs5_1.ts, 3, 8)) var xxxx = b; @@ -44,7 +44,7 @@ var xxxx = b; import { x, a as y } from "./es6ImportNamedImportInEs5_0"; >x : Symbol(x, Decl(es6ImportNamedImportInEs5_1.ts, 5, 8)) ->a : Symbol(y, Decl(es6ImportNamedImportInEs5_1.ts, 5, 11)) +>a : Symbol(a, Decl(es6ImportNamedImportInEs5_0.ts, 0, 10)) >y : Symbol(y, Decl(es6ImportNamedImportInEs5_1.ts, 5, 11)) var xxxx = x; @@ -56,7 +56,7 @@ var xxxx = y; >y : Symbol(y, Decl(es6ImportNamedImportInEs5_1.ts, 5, 11)) import { x as z, } from "./es6ImportNamedImportInEs5_0"; ->x : Symbol(z, Decl(es6ImportNamedImportInEs5_1.ts, 8, 8)) +>x : Symbol(x, Decl(es6ImportNamedImportInEs5_0.ts, 1, 10)) >z : Symbol(z, Decl(es6ImportNamedImportInEs5_1.ts, 8, 8)) var xxxx = z; @@ -83,9 +83,9 @@ var xxxx = x1; >x1 : Symbol(x1, Decl(es6ImportNamedImportInEs5_1.ts, 12, 12)) import { a1 as a11, x1 as x11 } from "./es6ImportNamedImportInEs5_0"; ->a1 : Symbol(a11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 8)) +>a1 : Symbol(a1, Decl(es6ImportNamedImportInEs5_0.ts, 3, 10)) >a11 : Symbol(a11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 8)) ->x1 : Symbol(x11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 19)) +>x1 : Symbol(x1, Decl(es6ImportNamedImportInEs5_0.ts, 4, 10)) >x11 : Symbol(x11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 19)) var xxxx = a11; @@ -104,7 +104,7 @@ var z111 = z1; >z1 : Symbol(z1, Decl(es6ImportNamedImportInEs5_1.ts, 18, 8)) import { z2 as z3 } from "./es6ImportNamedImportInEs5_0"; ->z2 : Symbol(z3, Decl(es6ImportNamedImportInEs5_1.ts, 20, 8)) +>z2 : Symbol(z3, Decl(es6ImportNamedImportInEs5_0.ts, 6, 10)) >z3 : Symbol(z3, Decl(es6ImportNamedImportInEs5_1.ts, 20, 8)) var z2 = z3; // z2 shouldn't give redeclare error @@ -117,6 +117,6 @@ import { aaaa } from "./es6ImportNamedImportInEs5_0"; // These are elided import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0"; ->aaaa : Symbol(bbbb, Decl(es6ImportNamedImportInEs5_1.ts, 26, 8)) +>aaaa : Symbol(aaaa, Decl(es6ImportNamedImportInEs5_0.ts, 7, 10)) >bbbb : Symbol(bbbb, Decl(es6ImportNamedImportInEs5_1.ts, 26, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols b/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols index 74c723fb0e4..94844f18f9f 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.symbols @@ -22,7 +22,7 @@ interface a { } // shouldnt be error >a : Symbol(a, Decl(es6ImportNamedImportMergeErrors_1.ts, 0, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 0, 56)) import { x as x1 } from "./es6ImportNamedImportMergeErrors_0"; ->x : Symbol(x1, Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 62)) +>x : Symbol(x1, Decl(es6ImportNamedImportMergeErrors_0.ts, 1, 10)) >x1 : Symbol(x1, Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 2, 62)) interface x1 { } // shouldnt be error @@ -35,7 +35,7 @@ var x = 10; >x : Symbol(x, Decl(es6ImportNamedImportMergeErrors_1.ts, 4, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 5, 3)) import { x as x44 } from "./es6ImportNamedImportMergeErrors_0"; // should be error ->x : Symbol(x44, Decl(es6ImportNamedImportMergeErrors_1.ts, 6, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 7, 3)) +>x : Symbol(x1, Decl(es6ImportNamedImportMergeErrors_0.ts, 1, 10)) >x44 : Symbol(x44, Decl(es6ImportNamedImportMergeErrors_1.ts, 6, 8), Decl(es6ImportNamedImportMergeErrors_1.ts, 7, 3)) var x44 = 10; @@ -45,6 +45,6 @@ import { z } from "./es6ImportNamedImportMergeErrors_0"; // should be error >z : Symbol(z, Decl(es6ImportNamedImportMergeErrors_1.ts, 8, 8)) import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be error ->z1 : Symbol(z, Decl(es6ImportNamedImportMergeErrors_1.ts, 9, 8)) +>z1 : Symbol(z1, Decl(es6ImportNamedImportMergeErrors_0.ts, 3, 10)) >z : Symbol(z, Decl(es6ImportNamedImportMergeErrors_1.ts, 9, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.symbols b/tests/baselines/reference/es6ImportNamedImportNoExportMember.symbols index b1970427f34..8a14dec0af4 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.symbols +++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.symbols @@ -11,6 +11,5 @@ import { a1 } from "./es6ImportNamedImportNoExportMember_0"; >a1 : Symbol(a1, Decl(es6ImportNamedImport_1.ts, 0, 8)) import { x1 as x } from "./es6ImportNamedImportNoExportMember_0"; ->x1 : Symbol(x, Decl(es6ImportNamedImport_1.ts, 1, 8)) >x : Symbol(x, Decl(es6ImportNamedImport_1.ts, 1, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.symbols b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.symbols index 947272d225c..3d8e423c3f5 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.symbols +++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.symbols @@ -10,6 +10,5 @@ import { a } from "./es6ImportNamedImportNoNamedExports_0"; >a : Symbol(a, Decl(es6ImportNamedImportNoNamedExports_1.ts, 0, 8)) import { a as x } from "./es6ImportNamedImportNoNamedExports_0"; ->a : Symbol(x, Decl(es6ImportNamedImportNoNamedExports_1.ts, 1, 8)) >x : Symbol(x, Decl(es6ImportNamedImportNoNamedExports_1.ts, 1, 8)) diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.symbols b/tests/baselines/reference/es6ImportNamedImportWithExport.symbols index d07406cf9cc..1384499fea2 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.symbols +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.symbols @@ -35,7 +35,7 @@ export var xxxx = a; >a : Symbol(a, Decl(client.ts, 1, 15)) export import { a as b } from "./server"; ->a : Symbol(b, Decl(client.ts, 3, 15)) +>a : Symbol(a, Decl(server.ts, 0, 10)) >b : Symbol(b, Decl(client.ts, 3, 15)) export var xxxx = b; @@ -44,7 +44,7 @@ export var xxxx = b; export import { x, a as y } from "./server"; >x : Symbol(x, Decl(client.ts, 5, 15)) ->a : Symbol(y, Decl(client.ts, 5, 18)) +>a : Symbol(a, Decl(server.ts, 0, 10)) >y : Symbol(y, Decl(client.ts, 5, 18)) export var xxxx = x; @@ -56,7 +56,7 @@ export var xxxx = y; >y : Symbol(y, Decl(client.ts, 5, 18)) export import { x as z, } from "./server"; ->x : Symbol(z, Decl(client.ts, 8, 15)) +>x : Symbol(x, Decl(server.ts, 1, 10)) >z : Symbol(z, Decl(client.ts, 8, 15)) export var xxxx = z; @@ -83,9 +83,9 @@ export var xxxx = x1; >x1 : Symbol(x1, Decl(client.ts, 12, 19)) export import { a1 as a11, x1 as x11 } from "./server"; ->a1 : Symbol(a11, Decl(client.ts, 15, 15)) +>a1 : Symbol(a1, Decl(server.ts, 3, 10)) >a11 : Symbol(a11, Decl(client.ts, 15, 15)) ->x1 : Symbol(x11, Decl(client.ts, 15, 26)) +>x1 : Symbol(x1, Decl(server.ts, 4, 10)) >x11 : Symbol(x11, Decl(client.ts, 15, 26)) export var xxxx = a11; @@ -104,7 +104,7 @@ export var z111 = z1; >z1 : Symbol(z1, Decl(client.ts, 18, 15)) export import { z2 as z3 } from "./server"; ->z2 : Symbol(z3, Decl(client.ts, 20, 15)) +>z2 : Symbol(z3, Decl(server.ts, 6, 10)) >z3 : Symbol(z3, Decl(client.ts, 20, 15)) export var z2 = z3; // z2 shouldn't give redeclare error @@ -116,6 +116,6 @@ export import { aaaa } from "./server"; >aaaa : Symbol(aaaa, Decl(client.ts, 24, 15)) export import { aaaa as bbbb } from "./server"; ->aaaa : Symbol(bbbb, Decl(client.ts, 25, 15)) +>aaaa : Symbol(aaaa, Decl(server.ts, 7, 10)) >bbbb : Symbol(bbbb, Decl(client.ts, 25, 15)) diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.symbols b/tests/baselines/reference/es6ModuleInternalNamedImports.symbols index fd7a2424835..21caef2d8dc 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports.symbols +++ b/tests/baselines/reference/es6ModuleInternalNamedImports.symbols @@ -42,35 +42,35 @@ export module M { // Reexports export {M_V as v}; ->M_V : Symbol(v, Decl(es6ModuleInternalNamedImports.ts, 21, 12)) +>M_V : Symbol(M_V, Decl(es6ModuleInternalNamedImports.ts, 2, 14)) >v : Symbol(v, Decl(es6ModuleInternalNamedImports.ts, 21, 12)) export {M_I as i}; ->M_I : Symbol(i, Decl(es6ModuleInternalNamedImports.ts, 22, 12)) +>M_I : Symbol(M_I, Decl(es6ModuleInternalNamedImports.ts, 2, 23)) >i : Symbol(i, Decl(es6ModuleInternalNamedImports.ts, 22, 12)) export {M_C as c}; ->M_C : Symbol(c, Decl(es6ModuleInternalNamedImports.ts, 23, 12)) +>M_C : Symbol(M_C, Decl(es6ModuleInternalNamedImports.ts, 4, 28)) >c : Symbol(c, Decl(es6ModuleInternalNamedImports.ts, 23, 12)) export {M_M as m}; ->M_M : Symbol(m, Decl(es6ModuleInternalNamedImports.ts, 24, 12)) +>M_M : Symbol(M_M, Decl(es6ModuleInternalNamedImports.ts, 6, 24)) >m : Symbol(m, Decl(es6ModuleInternalNamedImports.ts, 24, 12)) export {M_MU as mu}; ->M_MU : Symbol(mu, Decl(es6ModuleInternalNamedImports.ts, 25, 12)) +>M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports.ts, 8, 32)) >mu : Symbol(mu, Decl(es6ModuleInternalNamedImports.ts, 25, 12)) export {M_F as f}; ->M_F : Symbol(f, Decl(es6ModuleInternalNamedImports.ts, 26, 12)) +>M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports.ts, 10, 26)) >f : Symbol(f, Decl(es6ModuleInternalNamedImports.ts, 26, 12)) export {M_E as e}; ->M_E : Symbol(e, Decl(es6ModuleInternalNamedImports.ts, 27, 12)) +>M_E : Symbol(M_E, Decl(es6ModuleInternalNamedImports.ts, 12, 29)) >e : Symbol(e, Decl(es6ModuleInternalNamedImports.ts, 27, 12)) export {M_A as a}; ->M_A : Symbol(a, Decl(es6ModuleInternalNamedImports.ts, 28, 12)) +>M_A : Symbol(M_A, Decl(es6ModuleInternalNamedImports.ts, 16, 29)) >a : Symbol(a, Decl(es6ModuleInternalNamedImports.ts, 28, 12)) } diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols b/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols index cdb7d5d3114..b5e81fc0785 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols +++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.symbols @@ -46,35 +46,35 @@ export module M { // Reexports export {M_V as v}; ->M_V : Symbol(v, Decl(es6ModuleInternalNamedImports2.ts, 23, 12)) +>M_V : Symbol(M_V, Decl(es6ModuleInternalNamedImports2.ts, 2, 14)) >v : Symbol(v, Decl(es6ModuleInternalNamedImports2.ts, 23, 12)) export {M_I as i}; ->M_I : Symbol(i, Decl(es6ModuleInternalNamedImports2.ts, 24, 12)) +>M_I : Symbol(M_I, Decl(es6ModuleInternalNamedImports2.ts, 2, 23)) >i : Symbol(i, Decl(es6ModuleInternalNamedImports2.ts, 24, 12)) export {M_C as c}; ->M_C : Symbol(c, Decl(es6ModuleInternalNamedImports2.ts, 25, 12)) +>M_C : Symbol(M_C, Decl(es6ModuleInternalNamedImports2.ts, 4, 28)) >c : Symbol(c, Decl(es6ModuleInternalNamedImports2.ts, 25, 12)) export {M_M as m}; ->M_M : Symbol(m, Decl(es6ModuleInternalNamedImports2.ts, 26, 12)) +>M_M : Symbol(M_M, Decl(es6ModuleInternalNamedImports2.ts, 6, 24)) >m : Symbol(m, Decl(es6ModuleInternalNamedImports2.ts, 26, 12)) export {M_MU as mu}; ->M_MU : Symbol(mu, Decl(es6ModuleInternalNamedImports2.ts, 27, 12)) +>M_MU : Symbol(M_MU, Decl(es6ModuleInternalNamedImports2.ts, 8, 32)) >mu : Symbol(mu, Decl(es6ModuleInternalNamedImports2.ts, 27, 12)) export {M_F as f}; ->M_F : Symbol(f, Decl(es6ModuleInternalNamedImports2.ts, 28, 12)) +>M_F : Symbol(M_F, Decl(es6ModuleInternalNamedImports2.ts, 10, 26)) >f : Symbol(f, Decl(es6ModuleInternalNamedImports2.ts, 28, 12)) export {M_E as e}; ->M_E : Symbol(e, Decl(es6ModuleInternalNamedImports2.ts, 29, 12)) +>M_E : Symbol(M_E, Decl(es6ModuleInternalNamedImports2.ts, 12, 29)) >e : Symbol(e, Decl(es6ModuleInternalNamedImports2.ts, 29, 12)) export {M_A as a}; ->M_A : Symbol(a, Decl(es6ModuleInternalNamedImports2.ts, 30, 12)) +>M_A : Symbol(M_A, Decl(es6ModuleInternalNamedImports2.ts, 16, 29)) >a : Symbol(a, Decl(es6ModuleInternalNamedImports2.ts, 30, 12)) } diff --git a/tests/baselines/reference/es6modulekindWithES5Target.symbols b/tests/baselines/reference/es6modulekindWithES5Target.symbols index 2b91794b97e..38d212438cb 100644 --- a/tests/baselines/reference/es6modulekindWithES5Target.symbols +++ b/tests/baselines/reference/es6modulekindWithES5Target.symbols @@ -12,7 +12,7 @@ export class C { >method : Symbol(C.method, Decl(es6modulekindWithES5Target.ts, 2, 10)) } export { C as C2 }; ->C : Symbol(C2, Decl(es6modulekindWithES5Target.ts, 5, 8)) +>C : Symbol(C, Decl(es6modulekindWithES5Target.ts, 0, 0)) >C2 : Symbol(C2, Decl(es6modulekindWithES5Target.ts, 5, 8)) declare function foo(...args: any[]): any; @@ -35,7 +35,7 @@ export class D { >method : Symbol(D.method, Decl(es6modulekindWithES5Target.ts, 11, 10)) } export { D as D2 }; ->D : Symbol(D2, Decl(es6modulekindWithES5Target.ts, 14, 8)) +>D : Symbol(D, Decl(es6modulekindWithES5Target.ts, 7, 42)) >D2 : Symbol(D2, Decl(es6modulekindWithES5Target.ts, 14, 8)) class E { } diff --git a/tests/baselines/reference/esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.symbols b/tests/baselines/reference/esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.symbols index 3b8c7f5c405..764c60d2aea 100644 --- a/tests/baselines/reference/esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.symbols +++ b/tests/baselines/reference/esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.symbols @@ -1,8 +1,6 @@ === tests/cases/compiler/esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.ts === import {default as a, default as b} from "m"; ->default : Symbol(a, Decl(esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.ts, 0, 8)) >a : Symbol(a, Decl(esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.ts, 0, 8)) ->default : Symbol(b, Decl(esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.ts, 0, 21)) >b : Symbol(b, Decl(esModuleInteropImportDefaultWhenAllNamedAreDefaultAlias.ts, 0, 21)) void a; diff --git a/tests/baselines/reference/esModuleInteropNamedDefaultImports.symbols b/tests/baselines/reference/esModuleInteropNamedDefaultImports.symbols index 5b84c591fea..19236653bdf 100644 --- a/tests/baselines/reference/esModuleInteropNamedDefaultImports.symbols +++ b/tests/baselines/reference/esModuleInteropNamedDefaultImports.symbols @@ -10,12 +10,12 @@ import Foo from "./mod"; >Foo : Symbol(Foo, Decl(idx.ts, 0, 6)) import { default as Foo2 } from "./mod"; ->default : Symbol(Foo2, Decl(idx.ts, 1, 8)) +>default : Symbol(Foo, Decl(mod.ts, 0, 0)) >Foo2 : Symbol(Foo2, Decl(idx.ts, 1, 8)) import { Bar, default as Foo3 } from "./mod"; >Bar : Symbol(Bar, Decl(idx.ts, 2, 8)) ->default : Symbol(Foo3, Decl(idx.ts, 2, 13)) +>default : Symbol(Foo, Decl(mod.ts, 0, 0)) >Foo3 : Symbol(Foo3, Decl(idx.ts, 2, 13)) new Foo(); diff --git a/tests/baselines/reference/esModuleInteropTslibHelpers.symbols b/tests/baselines/reference/esModuleInteropTslibHelpers.symbols index 45f97ec8812..2c41b775eb6 100644 --- a/tests/baselines/reference/esModuleInteropTslibHelpers.symbols +++ b/tests/baselines/reference/esModuleInteropTslibHelpers.symbols @@ -24,7 +24,7 @@ export class Foo2 { } === tests/cases/compiler/file3.ts === import {default as resolve} from "path"; ->default : Symbol(resolve, Decl(file3.ts, 0, 8)) +>default : Symbol(resolve, Decl(refs.d.ts, 0, 0)) >resolve : Symbol(resolve, Decl(file3.ts, 0, 8)) resolve("", "../"); @@ -36,7 +36,7 @@ export class Foo3 { } === tests/cases/compiler/file4.ts === import {Bar, default as resolve} from "path"; >Bar : Symbol(Bar, Decl(file4.ts, 0, 8)) ->default : Symbol(resolve, Decl(file4.ts, 0, 12)) +>default : Symbol(Bar, Decl(refs.d.ts, 0, 0)) >resolve : Symbol(resolve, Decl(file4.ts, 0, 12)) resolve("", "../"); diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target.symbols b/tests/baselines/reference/esnextmodulekindWithES5Target.symbols index ae548754ae2..d7fabf6029e 100644 --- a/tests/baselines/reference/esnextmodulekindWithES5Target.symbols +++ b/tests/baselines/reference/esnextmodulekindWithES5Target.symbols @@ -12,7 +12,7 @@ export class C { >method : Symbol(C.method, Decl(esnextmodulekindWithES5Target.ts, 2, 10)) } export { C as C2 }; ->C : Symbol(C2, Decl(esnextmodulekindWithES5Target.ts, 5, 8)) +>C : Symbol(C, Decl(esnextmodulekindWithES5Target.ts, 0, 0)) >C2 : Symbol(C2, Decl(esnextmodulekindWithES5Target.ts, 5, 8)) declare function foo(...args: any[]): any; @@ -35,7 +35,7 @@ export class D { >method : Symbol(D.method, Decl(esnextmodulekindWithES5Target.ts, 11, 10)) } export { D as D2 }; ->D : Symbol(D2, Decl(esnextmodulekindWithES5Target.ts, 14, 8)) +>D : Symbol(D, Decl(esnextmodulekindWithES5Target.ts, 7, 42)) >D2 : Symbol(D2, Decl(esnextmodulekindWithES5Target.ts, 14, 8)) class E { } diff --git a/tests/baselines/reference/exportBinding.symbols b/tests/baselines/reference/exportBinding.symbols index 2f8ae2564ac..da9562c63f6 100644 --- a/tests/baselines/reference/exportBinding.symbols +++ b/tests/baselines/reference/exportBinding.symbols @@ -3,7 +3,7 @@ export { x } >x : Symbol(x, Decl(exportConsts.ts, 0, 8)) export { x as xx } ->x : Symbol(xx, Decl(exportConsts.ts, 1, 8)) +>x : Symbol(x, Decl(exportConsts.ts, 4, 5)) >xx : Symbol(xx, Decl(exportConsts.ts, 1, 8)) export default x; @@ -13,7 +13,7 @@ const x = 'x' >x : Symbol(x, Decl(exportConsts.ts, 4, 5)) export { Y as Z } ->Y : Symbol(Z, Decl(exportConsts.ts, 6, 8)) +>Y : Symbol(Y, Decl(exportConsts.ts, 6, 17)) >Z : Symbol(Z, Decl(exportConsts.ts, 6, 8)) class Y {} @@ -24,7 +24,7 @@ export { y } >y : Symbol(y, Decl(exportVars.ts, 0, 8)) export { y as yy } ->y : Symbol(yy, Decl(exportVars.ts, 1, 8)) +>y : Symbol(y, Decl(exportVars.ts, 3, 3)) >yy : Symbol(yy, Decl(exportVars.ts, 1, 8)) export default y; diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.symbols b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.symbols index 10644407572..e3796ccf685 100644 --- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.symbols +++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.symbols @@ -14,14 +14,14 @@ No type information for this code. "./t1"; No type information for this code. No type information for this code.=== tests/cases/compiler/t4.ts === export { x as a } from ->x : Symbol(a, Decl(t4.ts, 0, 8)) +>x : Symbol(x, Decl(t1.ts, 0, 10)) >a : Symbol(a, Decl(t4.ts, 0, 8)) "./t1"; === tests/cases/compiler/t5.ts === export { x as a, } from ->x : Symbol(a, Decl(t5.ts, 0, 8)) +>x : Symbol(x, Decl(t1.ts, 0, 10)) >a : Symbol(a, Decl(t5.ts, 0, 8)) "./t1"; diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols index dbf7f7e5e3b..28e94aca733 100644 --- a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols +++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols @@ -9,7 +9,7 @@ declare namespace Q { >args : Symbol(args, Decl(exportDeclarationsInAmbientNamespaces.ts, 1, 35)) export { _try as try }; ->_try : Symbol(try, Decl(exportDeclarationsInAmbientNamespaces.ts, 2, 12)) +>_try : Symbol(_try, Decl(exportDeclarationsInAmbientNamespaces.ts, 0, 21)) >try : Symbol(try, Decl(exportDeclarationsInAmbientNamespaces.ts, 2, 12)) } diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols index 0afd5fe3046..14f6578dd46 100644 --- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols +++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols @@ -12,7 +12,7 @@ declare module "m2" { >Y : Symbol(Y, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 3, 5)) export { Y as X }; ->Y : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12)) +>Y : Symbol(Y, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 3, 5)) >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12)) function Z(): X.I; diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols index 828abbb3b3b..e4ae6ce0c76 100644 --- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols +++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.symbols @@ -12,7 +12,7 @@ declare module "m2" { >Y : Symbol(Y, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 3, 5)) export { Y as X }; ->Y : Symbol(X, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 5, 12)) +>Y : Symbol(Y, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 3, 5)) >X : Symbol(X, Decl(exportSpecifierAndLocalMemberDeclaration.ts, 5, 12)) function Z(): X.I; diff --git a/tests/baselines/reference/exportsAndImports2-amd.symbols b/tests/baselines/reference/exportsAndImports2-amd.symbols index 293755a8005..3cea7d17e30 100644 --- a/tests/baselines/reference/exportsAndImports2-amd.symbols +++ b/tests/baselines/reference/exportsAndImports2-amd.symbols @@ -7,9 +7,9 @@ export var y = "y"; === tests/cases/conformance/es6/modules/t2.ts === export { x as y, y as x } from "./t1"; ->x : Symbol(y, Decl(t2.ts, 0, 8)) +>x : Symbol(x, Decl(t1.ts, 0, 10)) >y : Symbol(y, Decl(t2.ts, 0, 8)) ->y : Symbol(x, Decl(t2.ts, 0, 16)) +>y : Symbol(y, Decl(t1.ts, 1, 10)) >x : Symbol(x, Decl(t2.ts, 0, 16)) === tests/cases/conformance/es6/modules/t3.ts === @@ -18,8 +18,8 @@ import { x, y } from "./t1"; >y : Symbol(y, Decl(t3.ts, 0, 11)) export { x as y, y as x }; ->x : Symbol(y, Decl(t3.ts, 1, 8)) +>x : Symbol(x, Decl(t3.ts, 0, 8)) >y : Symbol(y, Decl(t3.ts, 1, 8)) ->y : Symbol(x, Decl(t3.ts, 1, 16)) +>y : Symbol(y, Decl(t3.ts, 0, 11)) >x : Symbol(x, Decl(t3.ts, 1, 16)) diff --git a/tests/baselines/reference/exportsAndImports2-es6.symbols b/tests/baselines/reference/exportsAndImports2-es6.symbols index 293755a8005..3cea7d17e30 100644 --- a/tests/baselines/reference/exportsAndImports2-es6.symbols +++ b/tests/baselines/reference/exportsAndImports2-es6.symbols @@ -7,9 +7,9 @@ export var y = "y"; === tests/cases/conformance/es6/modules/t2.ts === export { x as y, y as x } from "./t1"; ->x : Symbol(y, Decl(t2.ts, 0, 8)) +>x : Symbol(x, Decl(t1.ts, 0, 10)) >y : Symbol(y, Decl(t2.ts, 0, 8)) ->y : Symbol(x, Decl(t2.ts, 0, 16)) +>y : Symbol(y, Decl(t1.ts, 1, 10)) >x : Symbol(x, Decl(t2.ts, 0, 16)) === tests/cases/conformance/es6/modules/t3.ts === @@ -18,8 +18,8 @@ import { x, y } from "./t1"; >y : Symbol(y, Decl(t3.ts, 0, 11)) export { x as y, y as x }; ->x : Symbol(y, Decl(t3.ts, 1, 8)) +>x : Symbol(x, Decl(t3.ts, 0, 8)) >y : Symbol(y, Decl(t3.ts, 1, 8)) ->y : Symbol(x, Decl(t3.ts, 1, 16)) +>y : Symbol(y, Decl(t3.ts, 0, 11)) >x : Symbol(x, Decl(t3.ts, 1, 16)) diff --git a/tests/baselines/reference/exportsAndImports2.symbols b/tests/baselines/reference/exportsAndImports2.symbols index 293755a8005..3cea7d17e30 100644 --- a/tests/baselines/reference/exportsAndImports2.symbols +++ b/tests/baselines/reference/exportsAndImports2.symbols @@ -7,9 +7,9 @@ export var y = "y"; === tests/cases/conformance/es6/modules/t2.ts === export { x as y, y as x } from "./t1"; ->x : Symbol(y, Decl(t2.ts, 0, 8)) +>x : Symbol(x, Decl(t1.ts, 0, 10)) >y : Symbol(y, Decl(t2.ts, 0, 8)) ->y : Symbol(x, Decl(t2.ts, 0, 16)) +>y : Symbol(y, Decl(t1.ts, 1, 10)) >x : Symbol(x, Decl(t2.ts, 0, 16)) === tests/cases/conformance/es6/modules/t3.ts === @@ -18,8 +18,8 @@ import { x, y } from "./t1"; >y : Symbol(y, Decl(t3.ts, 0, 11)) export { x as y, y as x }; ->x : Symbol(y, Decl(t3.ts, 1, 8)) +>x : Symbol(x, Decl(t3.ts, 0, 8)) >y : Symbol(y, Decl(t3.ts, 1, 8)) ->y : Symbol(x, Decl(t3.ts, 1, 16)) +>y : Symbol(y, Decl(t3.ts, 0, 11)) >x : Symbol(x, Decl(t3.ts, 1, 16)) diff --git a/tests/baselines/reference/exportsAndImports3-amd.symbols b/tests/baselines/reference/exportsAndImports3-amd.symbols index f71014281c2..3f386f55c5f 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.symbols +++ b/tests/baselines/reference/exportsAndImports3-amd.symbols @@ -49,71 +49,71 @@ export import a = M.x; >x : Symbol(a, Decl(t1.ts, 13, 14)) export { v as v1, f as f1, C as C1, I as I1, E as E1, D as D1, M as M1, N as N1, T as T1, a as a1 }; ->v : Symbol(v1, Decl(t1.ts, 22, 8)) +>v : Symbol(v, Decl(t1.ts, 0, 10)) >v1 : Symbol(v1, Decl(t1.ts, 22, 8)) ->f : Symbol(f1, Decl(t1.ts, 22, 17)) +>f : Symbol(f, Decl(t1.ts, 0, 17)) >f1 : Symbol(f1, Decl(t1.ts, 22, 17)) ->C : Symbol(C1, Decl(t1.ts, 22, 26)) +>C : Symbol(C, Decl(t1.ts, 1, 23)) >C1 : Symbol(C1, Decl(t1.ts, 22, 26)) ->I : Symbol(I1, Decl(t1.ts, 22, 35)) +>I : Symbol(I, Decl(t1.ts, 3, 1)) >I1 : Symbol(I1, Decl(t1.ts, 22, 35)) ->E : Symbol(E1, Decl(t1.ts, 22, 44)) +>E : Symbol(E, Decl(t1.ts, 5, 1)) >E1 : Symbol(E1, Decl(t1.ts, 22, 44)) ->D : Symbol(D1, Decl(t1.ts, 22, 53)) +>D : Symbol(D, Decl(t1.ts, 8, 1)) >D1 : Symbol(D1, Decl(t1.ts, 22, 53)) ->M : Symbol(M1, Decl(t1.ts, 22, 62)) +>M : Symbol(M, Decl(t1.ts, 11, 1)) >M1 : Symbol(M1, Decl(t1.ts, 22, 62)) ->N : Symbol(N1, Decl(t1.ts, 22, 71)) +>N : Symbol(N, Decl(t1.ts, 14, 1)) >N1 : Symbol(N1, Decl(t1.ts, 22, 71)) ->T : Symbol(T1, Decl(t1.ts, 22, 80)) +>T : Symbol(T, Decl(t1.ts, 18, 1)) >T1 : Symbol(T1, Decl(t1.ts, 22, 80)) ->a : Symbol(a1, Decl(t1.ts, 22, 89)) +>a : Symbol(a, Decl(t1.ts, 19, 23)) >a1 : Symbol(a1, Decl(t1.ts, 22, 89)) === tests/cases/conformance/es6/modules/t2.ts === export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1"; ->v1 : Symbol(v, Decl(t2.ts, 0, 8)) +>v1 : Symbol(v1, Decl(t1.ts, 22, 8)) >v : Symbol(v, Decl(t2.ts, 0, 8)) ->f1 : Symbol(f, Decl(t2.ts, 0, 17)) +>f1 : Symbol(f1, Decl(t1.ts, 22, 17)) >f : Symbol(f, Decl(t2.ts, 0, 17)) ->C1 : Symbol(C, Decl(t2.ts, 0, 26)) +>C1 : Symbol(C1, Decl(t1.ts, 22, 26)) >C : Symbol(C, Decl(t2.ts, 0, 26)) ->I1 : Symbol(I, Decl(t2.ts, 0, 35)) +>I1 : Symbol(I1, Decl(t1.ts, 22, 35)) >I : Symbol(I, Decl(t2.ts, 0, 35)) ->E1 : Symbol(E, Decl(t2.ts, 0, 44)) +>E1 : Symbol(E1, Decl(t1.ts, 22, 44)) >E : Symbol(E, Decl(t2.ts, 0, 44)) ->D1 : Symbol(D, Decl(t2.ts, 0, 53)) +>D1 : Symbol(D1, Decl(t1.ts, 22, 53)) >D : Symbol(D, Decl(t2.ts, 0, 53)) ->M1 : Symbol(M, Decl(t2.ts, 0, 62)) +>M1 : Symbol(M1, Decl(t1.ts, 22, 62)) >M : Symbol(M, Decl(t2.ts, 0, 62)) ->N1 : Symbol(N, Decl(t2.ts, 0, 71)) +>N1 : Symbol(N1, Decl(t1.ts, 22, 71)) >N : Symbol(N, Decl(t2.ts, 0, 71)) ->T1 : Symbol(T, Decl(t2.ts, 0, 80)) +>T1 : Symbol(T1, Decl(t1.ts, 22, 80)) >T : Symbol(T, Decl(t2.ts, 0, 80)) ->a1 : Symbol(a, Decl(t2.ts, 0, 89)) +>a1 : Symbol(a1, Decl(t1.ts, 22, 89)) >a : Symbol(a, Decl(t2.ts, 0, 89)) === tests/cases/conformance/es6/modules/t3.ts === import { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1"; ->v1 : Symbol(v, Decl(t3.ts, 0, 8)) +>v1 : Symbol(v1, Decl(t1.ts, 22, 8)) >v : Symbol(v, Decl(t3.ts, 0, 8)) ->f1 : Symbol(f, Decl(t3.ts, 0, 17)) +>f1 : Symbol(f1, Decl(t1.ts, 22, 17)) >f : Symbol(f, Decl(t3.ts, 0, 17)) ->C1 : Symbol(C, Decl(t3.ts, 0, 26)) +>C1 : Symbol(C1, Decl(t1.ts, 22, 26)) >C : Symbol(C, Decl(t3.ts, 0, 26)) ->I1 : Symbol(I, Decl(t3.ts, 0, 35)) +>I1 : Symbol(I1, Decl(t1.ts, 22, 35)) >I : Symbol(I, Decl(t3.ts, 0, 35)) ->E1 : Symbol(E, Decl(t3.ts, 0, 44)) +>E1 : Symbol(E1, Decl(t1.ts, 22, 44)) >E : Symbol(E, Decl(t3.ts, 0, 44)) ->D1 : Symbol(D, Decl(t3.ts, 0, 53)) +>D1 : Symbol(D1, Decl(t1.ts, 22, 53)) >D : Symbol(D, Decl(t3.ts, 0, 53)) ->M1 : Symbol(M, Decl(t3.ts, 0, 62)) +>M1 : Symbol(M1, Decl(t1.ts, 22, 62)) >M : Symbol(M, Decl(t3.ts, 0, 62)) ->N1 : Symbol(N, Decl(t3.ts, 0, 71)) +>N1 : Symbol(N1, Decl(t1.ts, 22, 71)) >N : Symbol(N, Decl(t3.ts, 0, 71)) ->T1 : Symbol(T, Decl(t3.ts, 0, 80)) +>T1 : Symbol(T1, Decl(t1.ts, 22, 80)) >T : Symbol(T, Decl(t3.ts, 0, 80)) ->a1 : Symbol(a, Decl(t3.ts, 0, 89)) +>a1 : Symbol(a1, Decl(t1.ts, 22, 89)) >a : Symbol(a, Decl(t3.ts, 0, 89)) export { v, f, C, I, E, D, M, N, T, a }; diff --git a/tests/baselines/reference/exportsAndImports3-es6.symbols b/tests/baselines/reference/exportsAndImports3-es6.symbols index f71014281c2..3f386f55c5f 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.symbols +++ b/tests/baselines/reference/exportsAndImports3-es6.symbols @@ -49,71 +49,71 @@ export import a = M.x; >x : Symbol(a, Decl(t1.ts, 13, 14)) export { v as v1, f as f1, C as C1, I as I1, E as E1, D as D1, M as M1, N as N1, T as T1, a as a1 }; ->v : Symbol(v1, Decl(t1.ts, 22, 8)) +>v : Symbol(v, Decl(t1.ts, 0, 10)) >v1 : Symbol(v1, Decl(t1.ts, 22, 8)) ->f : Symbol(f1, Decl(t1.ts, 22, 17)) +>f : Symbol(f, Decl(t1.ts, 0, 17)) >f1 : Symbol(f1, Decl(t1.ts, 22, 17)) ->C : Symbol(C1, Decl(t1.ts, 22, 26)) +>C : Symbol(C, Decl(t1.ts, 1, 23)) >C1 : Symbol(C1, Decl(t1.ts, 22, 26)) ->I : Symbol(I1, Decl(t1.ts, 22, 35)) +>I : Symbol(I, Decl(t1.ts, 3, 1)) >I1 : Symbol(I1, Decl(t1.ts, 22, 35)) ->E : Symbol(E1, Decl(t1.ts, 22, 44)) +>E : Symbol(E, Decl(t1.ts, 5, 1)) >E1 : Symbol(E1, Decl(t1.ts, 22, 44)) ->D : Symbol(D1, Decl(t1.ts, 22, 53)) +>D : Symbol(D, Decl(t1.ts, 8, 1)) >D1 : Symbol(D1, Decl(t1.ts, 22, 53)) ->M : Symbol(M1, Decl(t1.ts, 22, 62)) +>M : Symbol(M, Decl(t1.ts, 11, 1)) >M1 : Symbol(M1, Decl(t1.ts, 22, 62)) ->N : Symbol(N1, Decl(t1.ts, 22, 71)) +>N : Symbol(N, Decl(t1.ts, 14, 1)) >N1 : Symbol(N1, Decl(t1.ts, 22, 71)) ->T : Symbol(T1, Decl(t1.ts, 22, 80)) +>T : Symbol(T, Decl(t1.ts, 18, 1)) >T1 : Symbol(T1, Decl(t1.ts, 22, 80)) ->a : Symbol(a1, Decl(t1.ts, 22, 89)) +>a : Symbol(a, Decl(t1.ts, 19, 23)) >a1 : Symbol(a1, Decl(t1.ts, 22, 89)) === tests/cases/conformance/es6/modules/t2.ts === export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1"; ->v1 : Symbol(v, Decl(t2.ts, 0, 8)) +>v1 : Symbol(v1, Decl(t1.ts, 22, 8)) >v : Symbol(v, Decl(t2.ts, 0, 8)) ->f1 : Symbol(f, Decl(t2.ts, 0, 17)) +>f1 : Symbol(f1, Decl(t1.ts, 22, 17)) >f : Symbol(f, Decl(t2.ts, 0, 17)) ->C1 : Symbol(C, Decl(t2.ts, 0, 26)) +>C1 : Symbol(C1, Decl(t1.ts, 22, 26)) >C : Symbol(C, Decl(t2.ts, 0, 26)) ->I1 : Symbol(I, Decl(t2.ts, 0, 35)) +>I1 : Symbol(I1, Decl(t1.ts, 22, 35)) >I : Symbol(I, Decl(t2.ts, 0, 35)) ->E1 : Symbol(E, Decl(t2.ts, 0, 44)) +>E1 : Symbol(E1, Decl(t1.ts, 22, 44)) >E : Symbol(E, Decl(t2.ts, 0, 44)) ->D1 : Symbol(D, Decl(t2.ts, 0, 53)) +>D1 : Symbol(D1, Decl(t1.ts, 22, 53)) >D : Symbol(D, Decl(t2.ts, 0, 53)) ->M1 : Symbol(M, Decl(t2.ts, 0, 62)) +>M1 : Symbol(M1, Decl(t1.ts, 22, 62)) >M : Symbol(M, Decl(t2.ts, 0, 62)) ->N1 : Symbol(N, Decl(t2.ts, 0, 71)) +>N1 : Symbol(N1, Decl(t1.ts, 22, 71)) >N : Symbol(N, Decl(t2.ts, 0, 71)) ->T1 : Symbol(T, Decl(t2.ts, 0, 80)) +>T1 : Symbol(T1, Decl(t1.ts, 22, 80)) >T : Symbol(T, Decl(t2.ts, 0, 80)) ->a1 : Symbol(a, Decl(t2.ts, 0, 89)) +>a1 : Symbol(a1, Decl(t1.ts, 22, 89)) >a : Symbol(a, Decl(t2.ts, 0, 89)) === tests/cases/conformance/es6/modules/t3.ts === import { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1"; ->v1 : Symbol(v, Decl(t3.ts, 0, 8)) +>v1 : Symbol(v1, Decl(t1.ts, 22, 8)) >v : Symbol(v, Decl(t3.ts, 0, 8)) ->f1 : Symbol(f, Decl(t3.ts, 0, 17)) +>f1 : Symbol(f1, Decl(t1.ts, 22, 17)) >f : Symbol(f, Decl(t3.ts, 0, 17)) ->C1 : Symbol(C, Decl(t3.ts, 0, 26)) +>C1 : Symbol(C1, Decl(t1.ts, 22, 26)) >C : Symbol(C, Decl(t3.ts, 0, 26)) ->I1 : Symbol(I, Decl(t3.ts, 0, 35)) +>I1 : Symbol(I1, Decl(t1.ts, 22, 35)) >I : Symbol(I, Decl(t3.ts, 0, 35)) ->E1 : Symbol(E, Decl(t3.ts, 0, 44)) +>E1 : Symbol(E1, Decl(t1.ts, 22, 44)) >E : Symbol(E, Decl(t3.ts, 0, 44)) ->D1 : Symbol(D, Decl(t3.ts, 0, 53)) +>D1 : Symbol(D1, Decl(t1.ts, 22, 53)) >D : Symbol(D, Decl(t3.ts, 0, 53)) ->M1 : Symbol(M, Decl(t3.ts, 0, 62)) +>M1 : Symbol(M1, Decl(t1.ts, 22, 62)) >M : Symbol(M, Decl(t3.ts, 0, 62)) ->N1 : Symbol(N, Decl(t3.ts, 0, 71)) +>N1 : Symbol(N1, Decl(t1.ts, 22, 71)) >N : Symbol(N, Decl(t3.ts, 0, 71)) ->T1 : Symbol(T, Decl(t3.ts, 0, 80)) +>T1 : Symbol(T1, Decl(t1.ts, 22, 80)) >T : Symbol(T, Decl(t3.ts, 0, 80)) ->a1 : Symbol(a, Decl(t3.ts, 0, 89)) +>a1 : Symbol(a1, Decl(t1.ts, 22, 89)) >a : Symbol(a, Decl(t3.ts, 0, 89)) export { v, f, C, I, E, D, M, N, T, a }; diff --git a/tests/baselines/reference/exportsAndImports3.symbols b/tests/baselines/reference/exportsAndImports3.symbols index f71014281c2..3f386f55c5f 100644 --- a/tests/baselines/reference/exportsAndImports3.symbols +++ b/tests/baselines/reference/exportsAndImports3.symbols @@ -49,71 +49,71 @@ export import a = M.x; >x : Symbol(a, Decl(t1.ts, 13, 14)) export { v as v1, f as f1, C as C1, I as I1, E as E1, D as D1, M as M1, N as N1, T as T1, a as a1 }; ->v : Symbol(v1, Decl(t1.ts, 22, 8)) +>v : Symbol(v, Decl(t1.ts, 0, 10)) >v1 : Symbol(v1, Decl(t1.ts, 22, 8)) ->f : Symbol(f1, Decl(t1.ts, 22, 17)) +>f : Symbol(f, Decl(t1.ts, 0, 17)) >f1 : Symbol(f1, Decl(t1.ts, 22, 17)) ->C : Symbol(C1, Decl(t1.ts, 22, 26)) +>C : Symbol(C, Decl(t1.ts, 1, 23)) >C1 : Symbol(C1, Decl(t1.ts, 22, 26)) ->I : Symbol(I1, Decl(t1.ts, 22, 35)) +>I : Symbol(I, Decl(t1.ts, 3, 1)) >I1 : Symbol(I1, Decl(t1.ts, 22, 35)) ->E : Symbol(E1, Decl(t1.ts, 22, 44)) +>E : Symbol(E, Decl(t1.ts, 5, 1)) >E1 : Symbol(E1, Decl(t1.ts, 22, 44)) ->D : Symbol(D1, Decl(t1.ts, 22, 53)) +>D : Symbol(D, Decl(t1.ts, 8, 1)) >D1 : Symbol(D1, Decl(t1.ts, 22, 53)) ->M : Symbol(M1, Decl(t1.ts, 22, 62)) +>M : Symbol(M, Decl(t1.ts, 11, 1)) >M1 : Symbol(M1, Decl(t1.ts, 22, 62)) ->N : Symbol(N1, Decl(t1.ts, 22, 71)) +>N : Symbol(N, Decl(t1.ts, 14, 1)) >N1 : Symbol(N1, Decl(t1.ts, 22, 71)) ->T : Symbol(T1, Decl(t1.ts, 22, 80)) +>T : Symbol(T, Decl(t1.ts, 18, 1)) >T1 : Symbol(T1, Decl(t1.ts, 22, 80)) ->a : Symbol(a1, Decl(t1.ts, 22, 89)) +>a : Symbol(a, Decl(t1.ts, 19, 23)) >a1 : Symbol(a1, Decl(t1.ts, 22, 89)) === tests/cases/conformance/es6/modules/t2.ts === export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1"; ->v1 : Symbol(v, Decl(t2.ts, 0, 8)) +>v1 : Symbol(v1, Decl(t1.ts, 22, 8)) >v : Symbol(v, Decl(t2.ts, 0, 8)) ->f1 : Symbol(f, Decl(t2.ts, 0, 17)) +>f1 : Symbol(f1, Decl(t1.ts, 22, 17)) >f : Symbol(f, Decl(t2.ts, 0, 17)) ->C1 : Symbol(C, Decl(t2.ts, 0, 26)) +>C1 : Symbol(C1, Decl(t1.ts, 22, 26)) >C : Symbol(C, Decl(t2.ts, 0, 26)) ->I1 : Symbol(I, Decl(t2.ts, 0, 35)) +>I1 : Symbol(I1, Decl(t1.ts, 22, 35)) >I : Symbol(I, Decl(t2.ts, 0, 35)) ->E1 : Symbol(E, Decl(t2.ts, 0, 44)) +>E1 : Symbol(E1, Decl(t1.ts, 22, 44)) >E : Symbol(E, Decl(t2.ts, 0, 44)) ->D1 : Symbol(D, Decl(t2.ts, 0, 53)) +>D1 : Symbol(D1, Decl(t1.ts, 22, 53)) >D : Symbol(D, Decl(t2.ts, 0, 53)) ->M1 : Symbol(M, Decl(t2.ts, 0, 62)) +>M1 : Symbol(M1, Decl(t1.ts, 22, 62)) >M : Symbol(M, Decl(t2.ts, 0, 62)) ->N1 : Symbol(N, Decl(t2.ts, 0, 71)) +>N1 : Symbol(N1, Decl(t1.ts, 22, 71)) >N : Symbol(N, Decl(t2.ts, 0, 71)) ->T1 : Symbol(T, Decl(t2.ts, 0, 80)) +>T1 : Symbol(T1, Decl(t1.ts, 22, 80)) >T : Symbol(T, Decl(t2.ts, 0, 80)) ->a1 : Symbol(a, Decl(t2.ts, 0, 89)) +>a1 : Symbol(a1, Decl(t1.ts, 22, 89)) >a : Symbol(a, Decl(t2.ts, 0, 89)) === tests/cases/conformance/es6/modules/t3.ts === import { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1"; ->v1 : Symbol(v, Decl(t3.ts, 0, 8)) +>v1 : Symbol(v1, Decl(t1.ts, 22, 8)) >v : Symbol(v, Decl(t3.ts, 0, 8)) ->f1 : Symbol(f, Decl(t3.ts, 0, 17)) +>f1 : Symbol(f1, Decl(t1.ts, 22, 17)) >f : Symbol(f, Decl(t3.ts, 0, 17)) ->C1 : Symbol(C, Decl(t3.ts, 0, 26)) +>C1 : Symbol(C1, Decl(t1.ts, 22, 26)) >C : Symbol(C, Decl(t3.ts, 0, 26)) ->I1 : Symbol(I, Decl(t3.ts, 0, 35)) +>I1 : Symbol(I1, Decl(t1.ts, 22, 35)) >I : Symbol(I, Decl(t3.ts, 0, 35)) ->E1 : Symbol(E, Decl(t3.ts, 0, 44)) +>E1 : Symbol(E1, Decl(t1.ts, 22, 44)) >E : Symbol(E, Decl(t3.ts, 0, 44)) ->D1 : Symbol(D, Decl(t3.ts, 0, 53)) +>D1 : Symbol(D1, Decl(t1.ts, 22, 53)) >D : Symbol(D, Decl(t3.ts, 0, 53)) ->M1 : Symbol(M, Decl(t3.ts, 0, 62)) +>M1 : Symbol(M1, Decl(t1.ts, 22, 62)) >M : Symbol(M, Decl(t3.ts, 0, 62)) ->N1 : Symbol(N, Decl(t3.ts, 0, 71)) +>N1 : Symbol(N1, Decl(t1.ts, 22, 71)) >N : Symbol(N, Decl(t3.ts, 0, 71)) ->T1 : Symbol(T, Decl(t3.ts, 0, 80)) +>T1 : Symbol(T1, Decl(t1.ts, 22, 80)) >T : Symbol(T, Decl(t3.ts, 0, 80)) ->a1 : Symbol(a, Decl(t3.ts, 0, 89)) +>a1 : Symbol(a1, Decl(t1.ts, 22, 89)) >a : Symbol(a, Decl(t3.ts, 0, 89)) export { v, f, C, I, E, D, M, N, T, a }; diff --git a/tests/baselines/reference/exportsAndImports4-amd.symbols b/tests/baselines/reference/exportsAndImports4-amd.symbols index ed522576398..6dfbc067c2e 100644 --- a/tests/baselines/reference/exportsAndImports4-amd.symbols +++ b/tests/baselines/reference/exportsAndImports4-amd.symbols @@ -22,7 +22,7 @@ c.default; >default : Symbol(a.default, Decl(t1.ts, 0, 0)) import { default as d } from "./t1"; ->default : Symbol(d, Decl(t3.ts, 6, 8)) +>default : Symbol(a.default, Decl(t1.ts, 0, 0)) >d : Symbol(d, Decl(t3.ts, 6, 8)) d; @@ -42,7 +42,7 @@ e2.default; import f1, { default as f2 } from "./t1"; >f1 : Symbol(f1, Decl(t3.ts, 11, 6)) ->default : Symbol(f2, Decl(t3.ts, 11, 12)) +>default : Symbol(a.default, Decl(t1.ts, 0, 0)) >f2 : Symbol(f2, Decl(t3.ts, 11, 12)) f1; diff --git a/tests/baselines/reference/exportsAndImports4-es6.symbols b/tests/baselines/reference/exportsAndImports4-es6.symbols index ed522576398..6dfbc067c2e 100644 --- a/tests/baselines/reference/exportsAndImports4-es6.symbols +++ b/tests/baselines/reference/exportsAndImports4-es6.symbols @@ -22,7 +22,7 @@ c.default; >default : Symbol(a.default, Decl(t1.ts, 0, 0)) import { default as d } from "./t1"; ->default : Symbol(d, Decl(t3.ts, 6, 8)) +>default : Symbol(a.default, Decl(t1.ts, 0, 0)) >d : Symbol(d, Decl(t3.ts, 6, 8)) d; @@ -42,7 +42,7 @@ e2.default; import f1, { default as f2 } from "./t1"; >f1 : Symbol(f1, Decl(t3.ts, 11, 6)) ->default : Symbol(f2, Decl(t3.ts, 11, 12)) +>default : Symbol(a.default, Decl(t1.ts, 0, 0)) >f2 : Symbol(f2, Decl(t3.ts, 11, 12)) f1; diff --git a/tests/baselines/reference/exportsAndImports4.symbols b/tests/baselines/reference/exportsAndImports4.symbols index ed522576398..6dfbc067c2e 100644 --- a/tests/baselines/reference/exportsAndImports4.symbols +++ b/tests/baselines/reference/exportsAndImports4.symbols @@ -22,7 +22,7 @@ c.default; >default : Symbol(a.default, Decl(t1.ts, 0, 0)) import { default as d } from "./t1"; ->default : Symbol(d, Decl(t3.ts, 6, 8)) +>default : Symbol(a.default, Decl(t1.ts, 0, 0)) >d : Symbol(d, Decl(t3.ts, 6, 8)) d; @@ -42,7 +42,7 @@ e2.default; import f1, { default as f2 } from "./t1"; >f1 : Symbol(f1, Decl(t3.ts, 11, 6)) ->default : Symbol(f2, Decl(t3.ts, 11, 12)) +>default : Symbol(a.default, Decl(t1.ts, 0, 0)) >f2 : Symbol(f2, Decl(t3.ts, 11, 12)) f1; diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.symbols b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.symbols index c492a03a3b6..919e6f52334 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.symbols +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.symbols @@ -20,7 +20,7 @@ import * as set from "./t1"; === tests/cases/conformance/es6/modules/t3.ts === import { set as yield } from "./t1"; ->set : Symbol(yield, Decl(t3.ts, 0, 8)) +>set : Symbol(set, Decl(t1.ts, 6, 8)) >yield : Symbol(yield, Decl(t3.ts, 0, 8)) === tests/cases/conformance/es6/modules/t4.ts === diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.symbols b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.symbols index a8945c88cc6..2e210cd0bd7 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.symbols +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.symbols @@ -3,7 +3,7 @@ let as = 100; >as : Symbol(as, Decl(t1.ts, 0, 3)) export { as as return, as }; ->as : Symbol(return, Decl(t1.ts, 2, 8)) +>as : Symbol(as, Decl(t1.ts, 0, 3)) >return : Symbol(return, Decl(t1.ts, 2, 8)) >as : Symbol(as, Decl(t1.ts, 2, 22)) @@ -25,7 +25,7 @@ var y = as.return; === tests/cases/conformance/es6/modules/t3.ts === import { as as as } from "./t1"; ->as : Symbol(as, Decl(t3.ts, 0, 8)) +>as : Symbol(as, Decl(t1.ts, 2, 22)) >as : Symbol(as, Decl(t3.ts, 0, 8)) === tests/cases/conformance/es6/modules/t4.ts === diff --git a/tests/baselines/reference/importExportInternalComments.symbols b/tests/baselines/reference/importExportInternalComments.symbols index 07fd64c5190..87eeb2d31e9 100644 --- a/tests/baselines/reference/importExportInternalComments.symbols +++ b/tests/baselines/reference/importExportInternalComments.symbols @@ -10,7 +10,7 @@ declare module "foo"; /*1*/ import /*2*/ D /*3*/, /*4*/ { /*5*/ A /*6*/, /*7*/ B /*8*/ as /*9*/ C /*10*/ } /*11*/ from /*12*/ "foo"; >D : Symbol(D, Decl(index.ts, 0, 12)) >A : Symbol(A, Decl(index.ts, 0, 35)) ->B : Symbol(C, Decl(index.ts, 0, 50)) +>B : Symbol(D, Decl(include.d.ts, 0, 0)) >C : Symbol(C, Decl(index.ts, 0, 50)) /*1*/ import /*2*/ * /*3*/ as /*4*/ foo /*5*/ from /*6*/ "foo"; @@ -24,7 +24,7 @@ void D, A, C, foo; // Use the variables to prevent ellision /*1*/ export /*2*/ { /*3*/ A /*4*/, /*5*/ B /*6*/ as /*7*/ C /*8*/ } /*9*/ from /*10*/ "foo"; >A : Symbol(A, Decl(index.ts, 5, 20)) ->B : Symbol(C, Decl(index.ts, 5, 35)) +>B : Symbol(D, Decl(include.d.ts, 0, 0)) >C : Symbol(C, Decl(index.ts, 5, 35)) /*1*/ export /*2*/ * /*3*/ from /*4*/ "foo" diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarations.symbols b/tests/baselines/reference/inlineJsxFactoryDeclarations.symbols index 43a53ec9df2..aa2dc903202 100644 --- a/tests/baselines/reference/inlineJsxFactoryDeclarations.symbols +++ b/tests/baselines/reference/inlineJsxFactoryDeclarations.symbols @@ -23,7 +23,7 @@ export function createElement(): void; >createElement : Symbol(createElement, Decl(renderer.d.ts, 8, 33)) export { dom as default }; ->dom : Symbol(default, Decl(renderer.d.ts, 10, 8)) +>dom : Symbol(dom, Decl(renderer.d.ts, 6, 1)) >default : Symbol(default, Decl(renderer.d.ts, 10, 8)) === tests/cases/conformance/jsx/inline/otherreacty.tsx === @@ -38,7 +38,7 @@ import * as React from "./renderer"; === tests/cases/conformance/jsx/inline/other.tsx === /** @jsx h */ import { dom as h } from "./renderer" ->dom : Symbol(h, Decl(other.tsx, 1, 8)) +>dom : Symbol(h, Decl(renderer.d.ts, 6, 1)) >h : Symbol(h, Decl(other.tsx, 1, 8)) export const prerendered = ; diff --git a/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.symbols b/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.symbols index d3c513c5876..8ebd6770703 100644 --- a/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.symbols +++ b/tests/baselines/reference/inlineJsxFactoryOverridesCompilerOption.symbols @@ -17,7 +17,7 @@ export function dom(): void; >dom : Symbol(dom, Decl(renderer.d.ts, 6, 1)) export { dom as p }; ->dom : Symbol(p, Decl(renderer.d.ts, 8, 8)) +>dom : Symbol(dom, Decl(renderer.d.ts, 6, 1)) >p : Symbol(p, Decl(renderer.d.ts, 8, 8)) === tests/cases/conformance/jsx/inline/reacty.tsx === diff --git a/tests/baselines/reference/isolatedModulesReExportType.symbols b/tests/baselines/reference/isolatedModulesReExportType.symbols index ee4aa38040a..b64f0cae462 100644 --- a/tests/baselines/reference/isolatedModulesReExportType.symbols +++ b/tests/baselines/reference/isolatedModulesReExportType.symbols @@ -27,7 +27,7 @@ import { T } from "./exportT"; >T : Symbol(T, Decl(user.ts, 15, 8)) export { T as T4 }; ->T : Symbol(T4, Decl(user.ts, 16, 8)) +>T : Symbol(T, Decl(user.ts, 15, 8)) >T4 : Symbol(T4, Decl(user.ts, 16, 8)) === /exportT.ts === diff --git a/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.symbols b/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.symbols index 38f41fd31c4..b728d20942f 100644 --- a/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.symbols +++ b/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.symbols @@ -15,7 +15,7 @@ interface Account2 { >myAccNum : Symbol(Account2.myAccNum, Decl(account.ts, 3, 20)) } export { Account2 as Acc }; ->Account2 : Symbol(Acc, Decl(account.ts, 6, 8)) +>Account2 : Symbol(Account2, Decl(account.ts, 2, 1)) >Acc : Symbol(Acc, Decl(account.ts, 6, 8)) === tests/cases/compiler/index.ts === diff --git a/tests/baselines/reference/moduleElementsInWrongContext.symbols b/tests/baselines/reference/moduleElementsInWrongContext.symbols index 734712e1e28..153898bc3fe 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.symbols +++ b/tests/baselines/reference/moduleElementsInWrongContext.symbols @@ -33,7 +33,6 @@ >foo : Symbol(foo, Decl(moduleElementsInWrongContext.ts, 14, 10), Decl(moduleElementsInWrongContext.ts, 17, 12)) export { baz as b } from "ambient"; ->baz : Symbol(b, Decl(moduleElementsInWrongContext.ts, 18, 12)) >b : Symbol(b, Decl(moduleElementsInWrongContext.ts, 18, 12)) export default v; diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.symbols b/tests/baselines/reference/moduleElementsInWrongContext2.symbols index 2fc47ae7e1f..cf159205889 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.symbols +++ b/tests/baselines/reference/moduleElementsInWrongContext2.symbols @@ -35,7 +35,6 @@ function blah () { >foo : Symbol(foo, Decl(moduleElementsInWrongContext2.ts, 14, 10), Decl(moduleElementsInWrongContext2.ts, 17, 12)) export { baz as b } from "ambient"; ->baz : Symbol(b, Decl(moduleElementsInWrongContext2.ts, 18, 12)) >b : Symbol(b, Decl(moduleElementsInWrongContext2.ts, 18, 12)) export default v; diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.symbols b/tests/baselines/reference/moduleElementsInWrongContext3.symbols index a34d5502457..3ccc27deadd 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.symbols +++ b/tests/baselines/reference/moduleElementsInWrongContext3.symbols @@ -35,7 +35,6 @@ module P { >foo : Symbol(foo, Decl(moduleElementsInWrongContext3.ts, 18, 16)) export { baz as b } from "ambient"; ->baz : Symbol(b, Decl(moduleElementsInWrongContext3.ts, 19, 16)) >b : Symbol(b, Decl(moduleElementsInWrongContext3.ts, 19, 16)) export default v; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks.symbols index ede12be3555..71c00dde785 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks.symbols +++ b/tests/baselines/reference/moduleResolutionWithSymlinks.symbols @@ -53,6 +53,6 @@ import {MyClass} from "library-a"; >MyClass : Symbol(MyClass, Decl(index.ts, 0, 8)) export { MyClass as MyClass2 } ->MyClass : Symbol(MyClass2, Decl(index.ts, 1, 8)) +>MyClass : Symbol(MyClass, Decl(index.ts, 0, 8)) >MyClass2 : Symbol(MyClass2, Decl(index.ts, 1, 8)) diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols index b496e1b76ac..efe81751027 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols @@ -3,7 +3,7 @@ import { x } from "./shared/abc"; >x : Symbol(x, Decl(app.ts, 0, 8)) import { x as x2 } from "./shared2/abc"; ->x : Symbol(x2, Decl(app.ts, 1, 8)) +>x : Symbol(x2, Decl(abc.ts, 4, 12)) >x2 : Symbol(x2, Decl(app.ts, 1, 8)) x + x2; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_preserveSymlinks.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks_preserveSymlinks.symbols index c82200780ba..52e6827a319 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_preserveSymlinks.symbols +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_preserveSymlinks.symbols @@ -3,11 +3,11 @@ /// import { C as C1 } from "linked"; ->C : Symbol(C1, Decl(app.ts, 3, 8)) +>C : Symbol(C1, Decl(index.d.ts, 0, 28)) >C1 : Symbol(C1, Decl(app.ts, 3, 8)) import { C as C2 } from "linked2"; ->C : Symbol(C2, Decl(app.ts, 4, 8)) +>C : Symbol(C2, Decl(index.d.ts, 0, 28)) >C2 : Symbol(C2, Decl(app.ts, 4, 8)) let x = new C1(); diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols index 3e7598815de..da4080a10a1 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols @@ -33,6 +33,6 @@ import {MyClass} from "library-a"; >MyClass : Symbol(MyClass, Decl(index.ts, 0, 8)) export { MyClass as MyClass2 } ->MyClass : Symbol(MyClass2, Decl(index.ts, 1, 8)) +>MyClass : Symbol(MyClass, Decl(index.ts, 0, 8)) >MyClass2 : Symbol(MyClass2, Decl(index.ts, 1, 8)) diff --git a/tests/baselines/reference/narrowedImports.symbols b/tests/baselines/reference/narrowedImports.symbols index 86dc798c837..3ab8277df3a 100644 --- a/tests/baselines/reference/narrowedImports.symbols +++ b/tests/baselines/reference/narrowedImports.symbols @@ -2,7 +2,7 @@ import a0, { a1, a1 as a2 } from "./a"; >a0 : Symbol(a0, Decl(x.ts, 0, 6)) >a1 : Symbol(a1, Decl(x.ts, 0, 12)) ->a1 : Symbol(a2, Decl(x.ts, 0, 16)) +>a1 : Symbol(a1, Decl(a.d.ts, 2, 12)) >a2 : Symbol(a2, Decl(x.ts, 0, 16)) import * as b0 from "./b"; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols index d07bae7f93a..166f8afbfa0 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols @@ -16,11 +16,11 @@ use(x.toExponential()); === c:/root/folder2/file2.ts === import {x as a} from "./file3" // found with baseurl ->x : Symbol(a, Decl(file2.ts, 0, 8)) +>x : Symbol(a, Decl(file3.ts, 0, 10)) >a : Symbol(a, Decl(file2.ts, 0, 8)) import {y as b} from "file4" // found with fallback ->y : Symbol(b, Decl(file2.ts, 1, 8)) +>y : Symbol(b, Decl(file4.ts, 0, 10)) >b : Symbol(b, Decl(file2.ts, 1, 8)) export var x = a + b; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols index 503163cf8ad..48a86044b2b 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols @@ -16,11 +16,11 @@ use(x.toExponential()); === c:/root/folder2/file2.ts === import {x as a} from "./file3" // found with baseurl ->x : Symbol(a, Decl(file2.ts, 0, 8)) +>x : Symbol(a, Decl(file3.ts, 0, 10)) >a : Symbol(a, Decl(file2.ts, 0, 8)) import {y as b} from "file4" // found with fallback ->y : Symbol(b, Decl(file2.ts, 1, 8)) +>y : Symbol(b, Decl(index.d.ts, 0, 10)) >b : Symbol(b, Decl(file2.ts, 1, 8)) export var x = a + b; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.symbols index b1853b5c4e1..1b0efddc05d 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.symbols @@ -14,11 +14,11 @@ use(x.toExponential()); === c:/root/folder2/file2.ts === import {x as a} from "./file3" // found with baseurl ->x : Symbol(a, Decl(file2.ts, 0, 8)) +>x : Symbol(a, Decl(file3.ts, 0, 10)) >a : Symbol(a, Decl(file2.ts, 0, 8)) import {y as b} from "file4" // found with fallback ->y : Symbol(b, Decl(file2.ts, 1, 8)) +>y : Symbol(b, Decl(file4.ts, 0, 10)) >b : Symbol(b, Decl(file2.ts, 1, 8)) export var x = a + b; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols index 31b294d1e04..c397cd582b3 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols @@ -14,11 +14,11 @@ use(x.toExponential()); === c:/root/folder2/file2.ts === import {x as a} from "./file3" // found with baseurl ->x : Symbol(a, Decl(file2.ts, 0, 8)) +>x : Symbol(a, Decl(file3.ts, 0, 10)) >a : Symbol(a, Decl(file2.ts, 0, 8)) import {y as b} from "file4" // found with fallback ->y : Symbol(b, Decl(file2.ts, 1, 8)) +>y : Symbol(b, Decl(index.d.ts, 0, 10)) >b : Symbol(b, Decl(file2.ts, 1, 8)) export var x = a + b; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols index 9314c6eecc8..3d5f0864ce8 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols @@ -29,7 +29,7 @@ import {b} from "templates/module2"; >b : Symbol(b, Decl(file2.ts, 1, 8)) import {x as c} from "../file3"; ->x : Symbol(c, Decl(file2.ts, 2, 8)) +>x : Symbol(c, Decl(file3.d.ts, 0, 10)) >c : Symbol(c, Decl(file2.ts, 2, 8)) export let x = a + b + c; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols index 3ea7ab3517f..5da6a8717ca 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols @@ -29,7 +29,7 @@ import {b} from "templates/module2"; >b : Symbol(b, Decl(file2.ts, 1, 8)) import {x as c} from "../file3"; ->x : Symbol(c, Decl(file2.ts, 2, 8)) +>x : Symbol(c, Decl(index.d.ts, 0, 10)) >c : Symbol(c, Decl(file2.ts, 2, 8)) export let x = a + b + c; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols index 5572ccfb5d0..98d7599139e 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols @@ -1,74 +1,74 @@ === /root/a.ts === import { foo as foo1 } from "/foo"; ->foo : Symbol(foo1, Decl(a.ts, 0, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo1 : Symbol(foo1, Decl(a.ts, 0, 8)) import { bar as bar1 } from "/bar"; ->bar : Symbol(bar1, Decl(a.ts, 1, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar1 : Symbol(bar1, Decl(a.ts, 1, 8)) import { foo as foo2 } from "c:/foo"; ->foo : Symbol(foo2, Decl(a.ts, 2, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo2 : Symbol(foo2, Decl(a.ts, 2, 8)) import { bar as bar2 } from "c:/bar"; ->bar : Symbol(bar2, Decl(a.ts, 3, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar2 : Symbol(bar2, Decl(a.ts, 3, 8)) import { foo as foo3 } from "c:\\foo"; ->foo : Symbol(foo3, Decl(a.ts, 4, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo3 : Symbol(foo3, Decl(a.ts, 4, 8)) import { bar as bar3 } from "c:\\bar"; ->bar : Symbol(bar3, Decl(a.ts, 5, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar3 : Symbol(bar3, Decl(a.ts, 5, 8)) import { foo as foo4 } from "//server/foo"; ->foo : Symbol(foo4, Decl(a.ts, 6, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo4 : Symbol(foo4, Decl(a.ts, 6, 8)) import { bar as bar4 } from "//server/bar"; ->bar : Symbol(bar4, Decl(a.ts, 7, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar4 : Symbol(bar4, Decl(a.ts, 7, 8)) import { foo as foo5 } from "\\\\server\\foo"; ->foo : Symbol(foo5, Decl(a.ts, 8, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo5 : Symbol(foo5, Decl(a.ts, 8, 8)) import { bar as bar5 } from "\\\\server\\bar"; ->bar : Symbol(bar5, Decl(a.ts, 9, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar5 : Symbol(bar5, Decl(a.ts, 9, 8)) import { foo as foo6 } from "file:///foo"; ->foo : Symbol(foo6, Decl(a.ts, 10, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo6 : Symbol(foo6, Decl(a.ts, 10, 8)) import { bar as bar6 } from "file:///bar"; ->bar : Symbol(bar6, Decl(a.ts, 11, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar6 : Symbol(bar6, Decl(a.ts, 11, 8)) import { foo as foo7 } from "file://c:/foo"; ->foo : Symbol(foo7, Decl(a.ts, 12, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo7 : Symbol(foo7, Decl(a.ts, 12, 8)) import { bar as bar7 } from "file://c:/bar"; ->bar : Symbol(bar7, Decl(a.ts, 13, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar7 : Symbol(bar7, Decl(a.ts, 13, 8)) import { foo as foo8 } from "file://server/foo"; ->foo : Symbol(foo8, Decl(a.ts, 14, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo8 : Symbol(foo8, Decl(a.ts, 14, 8)) import { bar as bar8 } from "file://server/bar"; ->bar : Symbol(bar8, Decl(a.ts, 15, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar8 : Symbol(bar8, Decl(a.ts, 15, 8)) import { foo as foo9 } from "http://server/foo"; ->foo : Symbol(foo9, Decl(a.ts, 16, 8)) +>foo : Symbol(foo1, Decl(foo.ts, 0, 0)) >foo9 : Symbol(foo9, Decl(a.ts, 16, 8)) import { bar as bar9 } from "http://server/bar"; ->bar : Symbol(bar9, Decl(a.ts, 17, 8)) +>bar : Symbol(bar1, Decl(bar.js, 0, 0)) >bar9 : Symbol(bar9, Decl(a.ts, 17, 8)) === /root/src/foo.ts === diff --git a/tests/baselines/reference/reExportGlobalDeclaration1.symbols b/tests/baselines/reference/reExportGlobalDeclaration1.symbols index 7c43090cce9..c3b4be189c8 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration1.symbols +++ b/tests/baselines/reference/reExportGlobalDeclaration1.symbols @@ -14,38 +14,38 @@ declare let {a, b}: {a: number, b: number}; === tests/cases/compiler/file2.ts === export {x, x as y}; >x : Symbol(x, Decl(file2.ts, 0, 8)) ->x : Symbol(y, Decl(file2.ts, 0, 10)) +>x : Symbol(x, Decl(file1.d.ts, 0, 11)) >y : Symbol(y, Decl(file2.ts, 0, 10)) export {x1, x1 as y1}; >x1 : Symbol(x1, Decl(file2.ts, 1, 8)) ->x1 : Symbol(y1, Decl(file2.ts, 1, 11)) +>x1 : Symbol(x1, Decl(file1.d.ts, 1, 11)) >y1 : Symbol(y1, Decl(file2.ts, 1, 11)) export {a, a as a1}; >a : Symbol(a, Decl(file2.ts, 3, 8)) ->a : Symbol(a1, Decl(file2.ts, 3, 10)) +>a : Symbol(a, Decl(file1.d.ts, 2, 13)) >a1 : Symbol(a1, Decl(file2.ts, 3, 10)) export {b, b as b1}; >b : Symbol(b, Decl(file2.ts, 4, 8)) ->b : Symbol(b1, Decl(file2.ts, 4, 10)) +>b : Symbol(b, Decl(file1.d.ts, 2, 15)) >b1 : Symbol(b1, Decl(file2.ts, 4, 10)) export {x as z}; ->x : Symbol(z, Decl(file2.ts, 7, 8)) +>x : Symbol(x, Decl(file1.d.ts, 0, 11)) >z : Symbol(z, Decl(file2.ts, 7, 8)) export {x1 as z1}; ->x1 : Symbol(z1, Decl(file2.ts, 8, 8)) +>x1 : Symbol(x1, Decl(file1.d.ts, 1, 11)) >z1 : Symbol(z1, Decl(file2.ts, 8, 8)) export {a as a2}; ->a : Symbol(a2, Decl(file2.ts, 9, 8)) +>a : Symbol(a, Decl(file1.d.ts, 2, 13)) >a2 : Symbol(a2, Decl(file2.ts, 9, 8)) export {b as b2}; ->b : Symbol(b2, Decl(file2.ts, 10, 8)) +>b : Symbol(b, Decl(file1.d.ts, 2, 15)) >b2 : Symbol(b2, Decl(file2.ts, 10, 8)) diff --git a/tests/baselines/reference/reExportGlobalDeclaration2.symbols b/tests/baselines/reference/reExportGlobalDeclaration2.symbols index bd12a59b055..4771354d7f3 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration2.symbols +++ b/tests/baselines/reference/reExportGlobalDeclaration2.symbols @@ -16,19 +16,19 @@ declare interface I2 { === tests/cases/compiler/file2.ts === export {I1, I1 as II1}; >I1 : Symbol(I1, Decl(file2.ts, 0, 8)) ->I1 : Symbol(II1, Decl(file2.ts, 0, 11)) +>I1 : Symbol(I1, Decl(file1.d.ts, 0, 0)) >II1 : Symbol(II1, Decl(file2.ts, 0, 11)) export {I2, I2 as II2}; >I2 : Symbol(I2, Decl(file2.ts, 1, 8)) ->I2 : Symbol(II2, Decl(file2.ts, 1, 11)) +>I2 : Symbol(I2, Decl(file1.d.ts, 2, 1)) >II2 : Symbol(II2, Decl(file2.ts, 1, 11)) export {I1 as III1}; ->I1 : Symbol(III1, Decl(file2.ts, 2, 8)) +>I1 : Symbol(I1, Decl(file1.d.ts, 0, 0)) >III1 : Symbol(III1, Decl(file2.ts, 2, 8)) export {I2 as III2}; ->I2 : Symbol(III2, Decl(file2.ts, 3, 8)) +>I2 : Symbol(I2, Decl(file1.d.ts, 2, 1)) >III2 : Symbol(III2, Decl(file2.ts, 3, 8)) diff --git a/tests/baselines/reference/reExportGlobalDeclaration3.symbols b/tests/baselines/reference/reExportGlobalDeclaration3.symbols index 3b3bb70cbc2..607c376b7bb 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration3.symbols +++ b/tests/baselines/reference/reExportGlobalDeclaration3.symbols @@ -16,19 +16,19 @@ declare namespace NS2 { === tests/cases/compiler/file2.ts === export {NS1, NS1 as NNS1}; >NS1 : Symbol(NS1, Decl(file2.ts, 0, 8)) ->NS1 : Symbol(NNS1, Decl(file2.ts, 0, 12)) +>NS1 : Symbol(NS1, Decl(file1.d.ts, 0, 0)) >NNS1 : Symbol(NNS1, Decl(file2.ts, 0, 12)) export {NS2, NS2 as NNS2}; >NS2 : Symbol(NS2, Decl(file2.ts, 1, 8)) ->NS2 : Symbol(NNS2, Decl(file2.ts, 1, 12)) +>NS2 : Symbol(NS2, Decl(file1.d.ts, 2, 1)) >NNS2 : Symbol(NNS2, Decl(file2.ts, 1, 12)) export {NS1 as NNNS1}; ->NS1 : Symbol(NNNS1, Decl(file2.ts, 2, 8)) +>NS1 : Symbol(NS1, Decl(file1.d.ts, 0, 0)) >NNNS1 : Symbol(NNNS1, Decl(file2.ts, 2, 8)) export {NS2 as NNNS2}; ->NS2 : Symbol(NNNS2, Decl(file2.ts, 3, 8)) +>NS2 : Symbol(NS2, Decl(file1.d.ts, 2, 1)) >NNNS2 : Symbol(NNNS2, Decl(file2.ts, 3, 8)) diff --git a/tests/baselines/reference/reExportGlobalDeclaration4.symbols b/tests/baselines/reference/reExportGlobalDeclaration4.symbols index 4af274b9a9d..1fa696bee43 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration4.symbols +++ b/tests/baselines/reference/reExportGlobalDeclaration4.symbols @@ -16,19 +16,19 @@ declare class Cls2 { === tests/cases/compiler/file2.ts === export {Cls1, Cls1 as CCls1}; >Cls1 : Symbol(Cls1, Decl(file2.ts, 0, 8)) ->Cls1 : Symbol(CCls1, Decl(file2.ts, 0, 13)) +>Cls1 : Symbol(Cls1, Decl(file1.d.ts, 0, 0)) >CCls1 : Symbol(CCls1, Decl(file2.ts, 0, 13)) export {Cls2, Cls2 as CCls2}; >Cls2 : Symbol(Cls2, Decl(file2.ts, 1, 8)) ->Cls2 : Symbol(CCls2, Decl(file2.ts, 1, 13)) +>Cls2 : Symbol(Cls2, Decl(file1.d.ts, 2, 1)) >CCls2 : Symbol(CCls2, Decl(file2.ts, 1, 13)) export {Cls1 as CCCls1}; ->Cls1 : Symbol(CCCls1, Decl(file2.ts, 2, 8)) +>Cls1 : Symbol(Cls1, Decl(file1.d.ts, 0, 0)) >CCCls1 : Symbol(CCCls1, Decl(file2.ts, 2, 8)) export {Cls2 as CCCls2}; ->Cls2 : Symbol(CCCls2, Decl(file2.ts, 3, 8)) +>Cls2 : Symbol(Cls2, Decl(file1.d.ts, 2, 1)) >CCCls2 : Symbol(CCCls2, Decl(file2.ts, 3, 8)) diff --git a/tests/baselines/reference/strictModeWordInExportDeclaration.symbols b/tests/baselines/reference/strictModeWordInExportDeclaration.symbols index 6e744a66a09..2cdb1a07439 100644 --- a/tests/baselines/reference/strictModeWordInExportDeclaration.symbols +++ b/tests/baselines/reference/strictModeWordInExportDeclaration.symbols @@ -4,14 +4,14 @@ var x = 1; >x : Symbol(x, Decl(strictModeWordInExportDeclaration.ts, 1, 3)) export { x as foo } ->x : Symbol(foo, Decl(strictModeWordInExportDeclaration.ts, 2, 8)) +>x : Symbol(x, Decl(strictModeWordInExportDeclaration.ts, 1, 3)) >foo : Symbol(foo, Decl(strictModeWordInExportDeclaration.ts, 2, 8)) export { x as implements } ->x : Symbol(implements, Decl(strictModeWordInExportDeclaration.ts, 3, 8)) +>x : Symbol(x, Decl(strictModeWordInExportDeclaration.ts, 1, 3)) >implements : Symbol(implements, Decl(strictModeWordInExportDeclaration.ts, 3, 8)) export { x as while } ->x : Symbol(while, Decl(strictModeWordInExportDeclaration.ts, 4, 8)) +>x : Symbol(x, Decl(strictModeWordInExportDeclaration.ts, 1, 3)) >while : Symbol(while, Decl(strictModeWordInExportDeclaration.ts, 4, 8)) diff --git a/tests/baselines/reference/strictModeWordInImportDeclaration.symbols b/tests/baselines/reference/strictModeWordInImportDeclaration.symbols index 0ad56f0535f..dbc7bed1c33 100644 --- a/tests/baselines/reference/strictModeWordInImportDeclaration.symbols +++ b/tests/baselines/reference/strictModeWordInImportDeclaration.symbols @@ -4,7 +4,6 @@ import * as package from "./1" >package : Symbol(package, Decl(strictModeWordInImportDeclaration.ts, 1, 6)) import {foo as private} from "./1" ->foo : Symbol(private, Decl(strictModeWordInImportDeclaration.ts, 2, 8)) >private : Symbol(private, Decl(strictModeWordInImportDeclaration.ts, 2, 8)) import public from "./1" diff --git a/tests/baselines/reference/systemModule10.symbols b/tests/baselines/reference/systemModule10.symbols index 99df79da11f..a8ecd74e8b1 100644 --- a/tests/baselines/reference/systemModule10.symbols +++ b/tests/baselines/reference/systemModule10.symbols @@ -10,20 +10,20 @@ export {x} >x : Symbol(x, Decl(systemModule10.ts, 2, 8)) export {x as y} ->x : Symbol(y, Decl(systemModule10.ts, 3, 8)) +>x : Symbol(x, Decl(systemModule10.ts, 0, 11)) >y : Symbol(y, Decl(systemModule10.ts, 3, 8)) export {n} >n : Symbol(n, Decl(systemModule10.ts, 4, 8)) export {n as n1} ->n : Symbol(n1, Decl(systemModule10.ts, 5, 8)) +>n : Symbol(n, Decl(systemModule10.ts, 0, 6)) >n1 : Symbol(n1, Decl(systemModule10.ts, 5, 8)) export {n2} >n2 : Symbol(n2, Decl(systemModule10.ts, 6, 8)) export {n2 as n3} ->n2 : Symbol(n3, Decl(systemModule10.ts, 7, 8)) +>n2 : Symbol(n2, Decl(systemModule10.ts, 0, 26)) >n3 : Symbol(n3, Decl(systemModule10.ts, 7, 8)) diff --git a/tests/baselines/reference/systemModule10_ES5.symbols b/tests/baselines/reference/systemModule10_ES5.symbols index 9bab8aaf4c2..58f5cf77809 100644 --- a/tests/baselines/reference/systemModule10_ES5.symbols +++ b/tests/baselines/reference/systemModule10_ES5.symbols @@ -10,20 +10,20 @@ export {x} >x : Symbol(x, Decl(systemModule10_ES5.ts, 2, 8)) export {x as y} ->x : Symbol(y, Decl(systemModule10_ES5.ts, 3, 8)) +>x : Symbol(x, Decl(systemModule10_ES5.ts, 0, 11)) >y : Symbol(y, Decl(systemModule10_ES5.ts, 3, 8)) export {n} >n : Symbol(n, Decl(systemModule10_ES5.ts, 4, 8)) export {n as n1} ->n : Symbol(n1, Decl(systemModule10_ES5.ts, 5, 8)) +>n : Symbol(n, Decl(systemModule10_ES5.ts, 0, 6)) >n1 : Symbol(n1, Decl(systemModule10_ES5.ts, 5, 8)) export {n2} >n2 : Symbol(n2, Decl(systemModule10_ES5.ts, 6, 8)) export {n2 as n3} ->n2 : Symbol(n3, Decl(systemModule10_ES5.ts, 7, 8)) +>n2 : Symbol(n2, Decl(systemModule10_ES5.ts, 0, 26)) >n3 : Symbol(n3, Decl(systemModule10_ES5.ts, 7, 8)) diff --git a/tests/baselines/reference/systemModule11.symbols b/tests/baselines/reference/systemModule11.symbols index 8d13e62ce35..2c0d5e3f0f1 100644 --- a/tests/baselines/reference/systemModule11.symbols +++ b/tests/baselines/reference/systemModule11.symbols @@ -21,7 +21,7 @@ export {x}; >x : Symbol(x, Decl(file2.ts, 2, 8)) export {y as y1} ->y : Symbol(y1, Decl(file2.ts, 3, 8)) +>y : Symbol(y, Decl(file2.ts, 1, 3)) >y1 : Symbol(y1, Decl(file2.ts, 3, 8)) export * from 'bar'; @@ -29,7 +29,6 @@ export * from 'bar'; === tests/cases/compiler/file3.ts === export {x, y as z} from 'a'; >x : Symbol(x, Decl(file3.ts, 0, 8)) ->y : Symbol(z, Decl(file3.ts, 0, 10)) >z : Symbol(z, Decl(file3.ts, 0, 10)) export default function foo() {} @@ -52,12 +51,11 @@ var z, z1; export {z, z1 as z2}; >z : Symbol(z, Decl(file4.ts, 5, 8)) ->z1 : Symbol(z2, Decl(file4.ts, 5, 10)) +>z1 : Symbol(z1, Decl(file4.ts, 4, 6)) >z2 : Symbol(z2, Decl(file4.ts, 5, 10)) export {s, s1 as s2} from 'a' >s : Symbol(s, Decl(file4.ts, 7, 8)) ->s1 : Symbol(s2, Decl(file4.ts, 7, 10)) >s2 : Symbol(s2, Decl(file4.ts, 7, 10)) === tests/cases/compiler/file5.ts === diff --git a/tests/baselines/reference/systemModule14.symbols b/tests/baselines/reference/systemModule14.symbols index cbfe9a1137f..bfc865155a3 100644 --- a/tests/baselines/reference/systemModule14.symbols +++ b/tests/baselines/reference/systemModule14.symbols @@ -16,6 +16,6 @@ var x = 1; >x : Symbol(x, Decl(systemModule14.ts, 7, 3)) export {foo as b} ->foo : Symbol(b, Decl(systemModule14.ts, 8, 8)) +>foo : Symbol(foo, Decl(systemModule14.ts, 0, 0)) >b : Symbol(b, Decl(systemModule14.ts, 8, 8)) diff --git a/tests/baselines/reference/systemModule16.symbols b/tests/baselines/reference/systemModule16.symbols index 85a35533393..67868dca3a8 100644 --- a/tests/baselines/reference/systemModule16.symbols +++ b/tests/baselines/reference/systemModule16.symbols @@ -16,13 +16,11 @@ export {y} import {a1, b1, c1 as d1} from "foo"; >a1 : Symbol(a1, Decl(systemModule16.ts, 6, 8)) >b1 : Symbol(b1, Decl(systemModule16.ts, 6, 11)) ->c1 : Symbol(d1, Decl(systemModule16.ts, 6, 15)) >d1 : Symbol(d1, Decl(systemModule16.ts, 6, 15)) export {a2, b2, c2 as d2} from "bar"; >a2 : Symbol(a2, Decl(systemModule16.ts, 7, 8)) >b2 : Symbol(b2, Decl(systemModule16.ts, 7, 11)) ->c2 : Symbol(d2, Decl(systemModule16.ts, 7, 15)) >d2 : Symbol(d2, Decl(systemModule16.ts, 7, 15)) x,y,a1,b1,d1; diff --git a/tests/baselines/reference/systemModule17.symbols b/tests/baselines/reference/systemModule17.symbols index 358ef26542c..426e8e9638c 100644 --- a/tests/baselines/reference/systemModule17.symbols +++ b/tests/baselines/reference/systemModule17.symbols @@ -34,57 +34,57 @@ import II = N.I; import { A, A as EA, I as EI } from "f1"; >A : Symbol(A, Decl(f2.ts, 10, 8)) ->A : Symbol(EA, Decl(f2.ts, 10, 11)) +>A : Symbol(A, Decl(f1.ts, 0, 0)) >EA : Symbol(EA, Decl(f2.ts, 10, 11)) ->I : Symbol(EI, Decl(f2.ts, 10, 20)) +>I : Symbol(EI, Decl(f1.ts, 0, 17)) >EI : Symbol(EI, Decl(f2.ts, 10, 20)) export {x}; >x : Symbol(x, Decl(f2.ts, 12, 8)) export {x as x1}; ->x : Symbol(x1, Decl(f2.ts, 13, 8)) +>x : Symbol(x, Decl(f2.ts, 0, 3)) >x1 : Symbol(x1, Decl(f2.ts, 13, 8)) export {I}; >I : Symbol(I, Decl(f2.ts, 15, 8)) export {I as I1}; ->I : Symbol(I1, Decl(f2.ts, 16, 8)) +>I : Symbol(I, Decl(f2.ts, 0, 10)) >I1 : Symbol(I1, Decl(f2.ts, 16, 8)) export {A}; >A : Symbol(A, Decl(f2.ts, 18, 8)) export {A as A1}; ->A : Symbol(A1, Decl(f2.ts, 19, 8)) +>A : Symbol(A, Decl(f2.ts, 10, 8)) >A1 : Symbol(A1, Decl(f2.ts, 19, 8)) export {EA}; >EA : Symbol(EA, Decl(f2.ts, 21, 8)) export {EA as EA1}; ->EA : Symbol(EA1, Decl(f2.ts, 22, 8)) +>EA : Symbol(EA, Decl(f2.ts, 10, 11)) >EA1 : Symbol(EA1, Decl(f2.ts, 22, 8)) export {EI }; >EI : Symbol(EI, Decl(f2.ts, 24, 8)) export {EI as EI1}; ->EI : Symbol(EI1, Decl(f2.ts, 25, 8)) +>EI : Symbol(EI, Decl(f2.ts, 10, 20)) >EI1 : Symbol(EI1, Decl(f2.ts, 25, 8)) export {IX}; >IX : Symbol(IX, Decl(f2.ts, 27, 8)) export {IX as IX1}; ->IX : Symbol(IX1, Decl(f2.ts, 28, 8)) +>IX : Symbol(IX, Decl(f2.ts, 6, 1)) >IX1 : Symbol(IX1, Decl(f2.ts, 28, 8)) export {II}; >II : Symbol(II, Decl(f2.ts, 30, 8)) export {II as II1}; ->II : Symbol(II1, Decl(f2.ts, 31, 8)) +>II : Symbol(II, Decl(f2.ts, 8, 16)) >II1 : Symbol(II1, Decl(f2.ts, 31, 8)) diff --git a/tests/baselines/reference/systemModule9.symbols b/tests/baselines/reference/systemModule9.symbols index 1203ff2a7e3..79633b774e1 100644 --- a/tests/baselines/reference/systemModule9.symbols +++ b/tests/baselines/reference/systemModule9.symbols @@ -4,7 +4,6 @@ import * as ns from 'file1'; import {a, b as c} from 'file2'; >a : Symbol(a, Decl(systemModule9.ts, 1, 8)) ->b : Symbol(c, Decl(systemModule9.ts, 1, 10)) >c : Symbol(c, Decl(systemModule9.ts, 1, 10)) import d from 'file3' @@ -49,6 +48,6 @@ export {x}; >x : Symbol(x, Decl(systemModule9.ts, 18, 8)) export {y as z}; ->y : Symbol(z, Decl(systemModule9.ts, 19, 8)) +>y : Symbol(y, Decl(systemModule9.ts, 17, 6)) >z : Symbol(z, Decl(systemModule9.ts, 19, 8)) diff --git a/tests/baselines/reference/systemNamespaceAliasEmit.symbols b/tests/baselines/reference/systemNamespaceAliasEmit.symbols index 7e9c2434586..eb6091d4ce9 100644 --- a/tests/baselines/reference/systemNamespaceAliasEmit.symbols +++ b/tests/baselines/reference/systemNamespaceAliasEmit.symbols @@ -19,8 +19,8 @@ enum AnEnum { export {ns, AnEnum, ns as FooBar, AnEnum as BarEnum}; >ns : Symbol(ns, Decl(systemNamespaceAliasEmit.ts, 9, 8)) >AnEnum : Symbol(AnEnum, Decl(systemNamespaceAliasEmit.ts, 9, 11)) ->ns : Symbol(FooBar, Decl(systemNamespaceAliasEmit.ts, 9, 19)) +>ns : Symbol(ns, Decl(systemNamespaceAliasEmit.ts, 0, 0)) >FooBar : Symbol(FooBar, Decl(systemNamespaceAliasEmit.ts, 9, 19)) ->AnEnum : Symbol(BarEnum, Decl(systemNamespaceAliasEmit.ts, 9, 33)) +>AnEnum : Symbol(AnEnum, Decl(systemNamespaceAliasEmit.ts, 2, 1)) >BarEnum : Symbol(BarEnum, Decl(systemNamespaceAliasEmit.ts, 9, 33)) diff --git a/tests/baselines/reference/tsxDefaultImports.symbols b/tests/baselines/reference/tsxDefaultImports.symbols index 2c47e1e30f3..c63f326dd1a 100644 --- a/tests/baselines/reference/tsxDefaultImports.symbols +++ b/tests/baselines/reference/tsxDefaultImports.symbols @@ -15,7 +15,7 @@ export default class SomeClass { === tests/cases/compiler/b.ts === import {default as Def} from "./a" ->default : Symbol(Def, Decl(b.ts, 0, 8)) +>default : Symbol(Def, Decl(a.ts, 2, 1)) >Def : Symbol(Def, Decl(b.ts, 0, 8)) let a = Def.E.one; diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.symbols b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.symbols index 892e521994b..702742e5cb2 100644 --- a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.symbols +++ b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToUnmapped.symbols @@ -22,7 +22,7 @@ import { fa } from "ext"; >fa : Symbol(fa, Decl(main.ts, 0, 8)) import { fa as fa2 } from "ext/other"; ->fa : Symbol(fa2, Decl(main.ts, 1, 8)) +>fa : Symbol(fa, Decl(other.d.ts, 0, 22)) >fa2 : Symbol(fa2, Decl(main.ts, 1, 8)) export const va = fa(); diff --git a/tests/baselines/reference/unclosedExportClause01.symbols b/tests/baselines/reference/unclosedExportClause01.symbols index 11ca5b78c4b..e0a8ffae7c1 100644 --- a/tests/baselines/reference/unclosedExportClause01.symbols +++ b/tests/baselines/reference/unclosedExportClause01.symbols @@ -13,13 +13,13 @@ export { from "./t1" === tests/cases/compiler/t4.ts === export { x as a from "./t1" ->x : Symbol(a, Decl(t4.ts, 0, 8)) +>x : Symbol(x, Decl(t1.ts, 0, 10)) >a : Symbol(a, Decl(t4.ts, 0, 8)) >from : Symbol(from, Decl(t4.ts, 0, 15)) === tests/cases/compiler/t5.ts === export { x as a, from "./t1" ->x : Symbol(a, Decl(t5.ts, 0, 8)) +>x : Symbol(x, Decl(t1.ts, 0, 10)) >a : Symbol(a, Decl(t5.ts, 0, 8)) >from : Symbol(from, Decl(t5.ts, 0, 16)) diff --git a/tests/baselines/reference/unclosedExportClause02.symbols b/tests/baselines/reference/unclosedExportClause02.symbols index c879c95c9a6..791857197e5 100644 --- a/tests/baselines/reference/unclosedExportClause02.symbols +++ b/tests/baselines/reference/unclosedExportClause02.symbols @@ -17,7 +17,6 @@ export { from === tests/cases/compiler/t4.ts === export { x as a from ->x : Symbol(a, Decl(t4.ts, 0, 8)) >a : Symbol(a, Decl(t4.ts, 0, 8)) >from : Symbol(from, Decl(t4.ts, 0, 15)) @@ -25,7 +24,6 @@ export { x as a from === tests/cases/compiler/t5.ts === export { x as a, from ->x : Symbol(a, Decl(t5.ts, 0, 8)) >a : Symbol(a, Decl(t5.ts, 0, 8)) >from : Symbol(from, Decl(t5.ts, 0, 16)) diff --git a/tests/baselines/reference/unusedImports11.symbols b/tests/baselines/reference/unusedImports11.symbols index cc9a8b11dc1..812d9871a28 100644 --- a/tests/baselines/reference/unusedImports11.symbols +++ b/tests/baselines/reference/unusedImports11.symbols @@ -4,7 +4,7 @@ import { Member } from './b'; import d, { Member as M } from './b'; >d : Symbol(d, Decl(a.ts, 1, 6)) ->Member : Symbol(M, Decl(a.ts, 1, 11)) +>Member : Symbol(Member, Decl(b.ts, 0, 0)) >M : Symbol(M, Decl(a.ts, 1, 11)) import * as ns from './b'; diff --git a/tests/baselines/reference/unusedImports12.symbols b/tests/baselines/reference/unusedImports12.symbols index 078a0976c09..33e6824e1f8 100644 --- a/tests/baselines/reference/unusedImports12.symbols +++ b/tests/baselines/reference/unusedImports12.symbols @@ -4,7 +4,7 @@ import { Member } from './b'; import d, { Member as M } from './b'; >d : Symbol(d, Decl(a.ts, 1, 6)) ->Member : Symbol(M, Decl(a.ts, 1, 11)) +>Member : Symbol(Member, Decl(b.ts, 0, 0)) >M : Symbol(M, Decl(a.ts, 1, 11)) import * as ns from './b'; diff --git a/tests/baselines/reference/unusedImports8.symbols b/tests/baselines/reference/unusedImports8.symbols index 71656b79d59..5721cdacee1 100644 --- a/tests/baselines/reference/unusedImports8.symbols +++ b/tests/baselines/reference/unusedImports8.symbols @@ -18,11 +18,11 @@ export function test2() { === tests/cases/compiler/file2.ts === import {Calculator as calc, test as t1, test2 as t2} from "./file1" ->Calculator : Symbol(calc, Decl(file2.ts, 0, 8)) +>Calculator : Symbol(calc, Decl(file1.ts, 0, 0)) >calc : Symbol(calc, Decl(file2.ts, 0, 8)) ->test : Symbol(t1, Decl(file2.ts, 0, 27)) +>test : Symbol(t1, Decl(file1.ts, 2, 1)) >t1 : Symbol(t1, Decl(file2.ts, 0, 27)) ->test2 : Symbol(t2, Decl(file2.ts, 0, 39)) +>test2 : Symbol(t2, Decl(file1.ts, 6, 1)) >t2 : Symbol(t2, Decl(file2.ts, 0, 39)) var x = new calc(); diff --git a/tests/baselines/reference/unusedImports_entireImportDeclaration.symbols b/tests/baselines/reference/unusedImports_entireImportDeclaration.symbols index bd02fe90992..df1b1c9e18a 100644 --- a/tests/baselines/reference/unusedImports_entireImportDeclaration.symbols +++ b/tests/baselines/reference/unusedImports_entireImportDeclaration.symbols @@ -10,9 +10,9 @@ export default 0; === /b.ts === import d1, { a as a1, b as b1 } from "./a"; >d1 : Symbol(d1, Decl(b.ts, 0, 6)) ->a : Symbol(a1, Decl(b.ts, 0, 12)) +>a : Symbol(a1, Decl(a.ts, 0, 12)) >a1 : Symbol(a1, Decl(b.ts, 0, 12)) ->b : Symbol(b1, Decl(b.ts, 0, 21)) +>b : Symbol(b1, Decl(a.ts, 1, 12)) >b1 : Symbol(b1, Decl(b.ts, 0, 21)) import d2, * as ns from "./a"; @@ -21,9 +21,9 @@ import d2, * as ns from "./a"; import d3, { a as a2, b as b2 } from "./a"; >d3 : Symbol(d3, Decl(b.ts, 3, 6)) ->a : Symbol(a2, Decl(b.ts, 3, 12)) +>a : Symbol(a1, Decl(a.ts, 0, 12)) >a2 : Symbol(a2, Decl(b.ts, 3, 12)) ->b : Symbol(b2, Decl(b.ts, 3, 21)) +>b : Symbol(b1, Decl(a.ts, 1, 12)) >b2 : Symbol(b2, Decl(b.ts, 3, 21)) d3; diff --git a/tests/cases/fourslash/findAllRefsBadImport.ts b/tests/cases/fourslash/findAllRefsBadImport.ts index e04b72df384..a54454ea365 100644 --- a/tests/cases/fourslash/findAllRefsBadImport.ts +++ b/tests/cases/fourslash/findAllRefsBadImport.ts @@ -3,4 +3,5 @@ ////import { [|ab|] as [|{| "isWriteAccess": true, "isDefinition": true |}cd|] } from "doesNotExist"; const [r0, r1] = test.ranges(); -verify.referenceGroups([r0, r1], [{ definition: "import cd", ranges: [r1] }]); +verify.referenceGroups(r0, undefined); +verify.singleReferenceGroup("import cd", [r1]); diff --git a/tests/cases/fourslash/findAllRefsReExportLocal.ts b/tests/cases/fourslash/findAllRefsReExportLocal.ts index 603971a2294..502c7fdde46 100644 --- a/tests/cases/fourslash/findAllRefsReExportLocal.ts +++ b/tests/cases/fourslash/findAllRefsReExportLocal.ts @@ -27,4 +27,8 @@ verify.referenceGroups(bxRanges, [bxGroup, axGroup, ayGroup, byGroup]); verify.referenceGroups(ay, [ayGroup, byGroup]); verify.referenceGroups(byRanges, [byGroup, ayGroup]); -verify.rangesWithSameTextAreRenameLocations(); +verify.renameLocations([ax0, ax2], [ax0, { range: ax1, suffixText: " as x" }, ax2]); +verify.renameLocations(ax1, [{ range: ax1, prefixText: "x as " }, bx0, bx1]); +verify.renameLocations(bxRanges, [{ range: bx0, prefixText: "x as " }, bx1]); +verify.renameLocations(ay, [ay, ...byRanges]); +verify.renameLocations(byRanges, [{ range: by0, prefixText: "y as " }, by1]); diff --git a/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts b/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts index 8f4f61a90c3..c44bdd2fffc 100644 --- a/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts +++ b/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts @@ -33,5 +33,8 @@ verify.referenceGroups(cFromARanges, [cFromAGroup, aGroup]); verify.referenceGroups(d, [dGroup, cFromBGroup, bGroup]); -verify.rangesAreRenameLocations([a, cFromA, cUse]); -verify.rangesAreRenameLocations([b, cFromB, d]); +verify.renameLocations(a, [a, cFromA, cUse]); +verify.renameLocations([cFromA, cUse], [{ range: cFromA, prefixText: "x as " }, cUse]); +verify.renameLocations(b, [b, { range: cFromB, suffixText: " as x" }]); +verify.renameLocations(cFromB, [{ range: cFromB, prefixText: "x as " }, d]); +verify.renameLocations(d, [{ range: d, prefixText: "x as " }]); diff --git a/tests/cases/fourslash/findAllRefsReExports.ts b/tests/cases/fourslash/findAllRefsReExports.ts index aafb13e3f5f..89e65d5bb37 100644 --- a/tests/cases/fourslash/findAllRefsReExports.ts +++ b/tests/cases/fourslash/findAllRefsReExports.ts @@ -43,13 +43,21 @@ verify.referenceGroups([bang0, bang1], [eBang]); verify.referenceGroups([boom0, boom1], [eBoom, d, a, b, eBar, c, eBaz, eBang]); test.rangesByText().forEach((ranges, text) => { - if (text === "default") { - for (const range of ranges) { - goTo.rangeStart(defaultC); - verify.renameInfoFailed(); + switch (text) { + case "default": + for (const range of ranges) { + goTo.rangeStart(range); + verify.renameInfoFailed(); + } + break; + case "bar": { + const [r0, r1, ...tail] = ranges; + verify.renameLocations(r0, ranges); + verify.renameLocations([r1, ...tail], [{ range: r1, prefixText: "bar as " }, ...tail]); + break; } - } - else { - verify.rangesAreRenameLocations(ranges); + default: + verify.rangesAreRenameLocations(ranges); + break; } }); diff --git a/tests/cases/fourslash/renameCrossJsTs01.ts b/tests/cases/fourslash/renameCrossJsTs01.ts index 025118ef7f7..fbe0d4395cd 100644 --- a/tests/cases/fourslash/renameCrossJsTs01.ts +++ b/tests/cases/fourslash/renameCrossJsTs01.ts @@ -8,4 +8,6 @@ ////import { [|area|] } from './a'; ////var t = [|area|](10); -verify.rangesAreRenameLocations() +const [r0, r1, r2] = test.ranges(); +verify.renameLocations(r0, [r0, r1, r2]); +verify.renameLocations([r1, r2], [{ range: r1, prefixText: "area as " }, r2]); diff --git a/tests/cases/fourslash/renameImportAndExport.ts b/tests/cases/fourslash/renameImportAndExport.ts index fe8bce4b208..6a9cac061a4 100644 --- a/tests/cases/fourslash/renameImportAndExport.ts +++ b/tests/cases/fourslash/renameImportAndExport.ts @@ -3,4 +3,6 @@ ////import [|a|] from "module"; ////export { [|a|] }; -verify.rangesAreRenameLocations(); +const [r0, r1] = test.ranges(); +verify.renameLocations(r0, [r0, { range: r1, suffixText: " as a" }]); +verify.renameLocations(r1, [{ range: r1, prefixText: "a as " }]); diff --git a/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts index 96d423529c2..28297fc7255 100644 --- a/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts +++ b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts @@ -7,11 +7,13 @@ ////import { [|{| "isWriteAccess": true, "isDefinition": true |}a|] } from './a'; ////export { [|{| "isWriteAccess": true, "isDefinition": true |}a|] }; -const ranges = test.ranges(); -const [r0, r1, r2] = ranges; +const [r0, r1, r2] = test.ranges(); const vars = { definition: "var a: any", ranges: [r0] }; const imports = { definition: "(alias) var a: any\nimport a", ranges: [r1, r2] }; verify.referenceGroups(r0, [vars, imports]); verify.referenceGroups(r1, [imports, vars]); verify.referenceGroups(r2, [imports, vars]); -verify.rangesAreRenameLocations(); + +verify.renameLocations(r0, [r0, r1, { range: r2, suffixText: " as a" }]); +verify.renameLocations(r1, [{ range: r1, prefixText: "a as " }, { range: r2, suffixText: " as a" }]); +verify.renameLocations(r2, [{ range: r2, prefixText: "a as " }]); diff --git a/tests/cases/fourslash/renameImportOfExportEquals.ts b/tests/cases/fourslash/renameImportOfExportEquals.ts index 65c65a62400..6dfe8270c6b 100644 --- a/tests/cases/fourslash/renameImportOfExportEquals.ts +++ b/tests/cases/fourslash/renameImportOfExportEquals.ts @@ -30,6 +30,8 @@ verify.referenceGroups([a0, a1], [aGroup, nGroup, bGroup]); verify.referenceGroups(bRanges, [bGroup, aGroup, nGroup]); verify.singleReferenceGroup("var N.x: number", xRanges); -verify.renameLocations(nRanges, nRanges.concat(aRanges, bRanges)); -verify.rangesAreRenameLocations(aRanges.concat(bRanges)); +verify.renameLocations(nRanges, [N0, N1, a0, { range: a1, suffixText: " as N" }]); +verify.renameLocations(a0, [a0, { range: a1, suffixText: " as N" }]); +verify.renameLocations(a1, [{ range: a1, prefixText: "N as " }, ...bRanges]); +verify.renameLocations(bRanges, [{ range: b0, prefixText: "N as " }, b1]); verify.rangesAreRenameLocations(xRanges); diff --git a/tests/cases/fourslash/renameImportOfReExport.ts b/tests/cases/fourslash/renameImportOfReExport.ts index 2c684fde193..ced67d43b9c 100644 --- a/tests/cases/fourslash/renameImportOfReExport.ts +++ b/tests/cases/fourslash/renameImportOfReExport.ts @@ -14,11 +14,13 @@ verify.noErrors(); -verify.rangesAreRenameLocations(); - const ranges = test.ranges(); const [r0, r1, r2, r3] = ranges; const importRanges = [r2, r3]; +verify.renameLocations(r0, [r0, { range: r1, suffixText: " as C" }]); //, r1 +verify.renameLocations(r1, [{ range: r1, prefixText: "C as " }, r2, r3]); +verify.renameLocations(importRanges, [{ range: r2, prefixText: "C as " }, r3]); + const classes = { definition: "class C", ranges: [r0] }; const bs = { definition: "(alias) class C\nexport C", ranges: [r1] }; const imports = { definition: "(alias) class C\nimport C", ranges: importRanges }; diff --git a/tests/cases/fourslash/renameImportOfReExport2.ts b/tests/cases/fourslash/renameImportOfReExport2.ts index 81b62249441..a6389d4aeb8 100644 --- a/tests/cases/fourslash/renameImportOfReExport2.ts +++ b/tests/cases/fourslash/renameImportOfReExport2.ts @@ -15,7 +15,8 @@ verify.noErrors(); const ranges = test.rangesByText(); const cRanges = ranges.get("C"); -const [d0, d1, d2] = ranges.get("D"); +const dRanges = ranges.get("D"); +const [d0, d1, d2] = dRanges; const classes = { definition: "class C", ranges: cRanges }; const bImports = { definition: "(alias) class D\nexport D", ranges: [d0] }; @@ -25,4 +26,7 @@ verify.referenceGroups(cRanges, [classes, bImports, cImports]); verify.referenceGroups(d0, [bImports, cImports]); verify.referenceGroups([d1, d2], [cImports, bImports]); -verify.rangesWithSameTextAreRenameLocations(); +verify.rangesAreRenameLocations(cRanges); +verify.renameLocations(cRanges[1], cRanges); +verify.renameLocations(d0, dRanges); +verify.renameLocations([d1, d2], [{ range: d1, prefixText: "D as " }, d2]); diff --git a/tests/cases/fourslash/renameImportRequire.ts b/tests/cases/fourslash/renameImportRequire.ts index bf29a0999b1..915143263dd 100644 --- a/tests/cases/fourslash/renameImportRequire.ts +++ b/tests/cases/fourslash/renameImportRequire.ts @@ -1,10 +1,17 @@ /// +// @Filename: /a.ts ////import [|e|] = require("mod4"); ////[|e|]; ////a = { [|e|] }; ////export { [|e|] }; -const [r0, r1, r2, r3] = test.ranges(); -//TODO: export should have prefix/suffix too -verify.renameLocations([r0, r1, r2, r3], [r0, r1, { range: r2, prefixText: "e: " }, r3]); +// @Filename: /b.ts +////import { [|e|] } from "./a"; +////export { [|e|] }; + +const [r0, r1, r2, r3, r4, r5] = test.ranges(); +verify.renameLocations([r0, r1, r2], [r0, r1, { range: r2, prefixText: "e: " }, { range: r3, suffixText: " as e" }]); +verify.renameLocations(r3, [{ range: r3, prefixText: "e as " }, r4, { range: r5, suffixText: " as e" }]); +verify.renameLocations(r4, [{ range: r4, prefixText: "e as " }, { range: r5, suffixText: " as e" }]); +verify.renameLocations(r5, [{ range: r5, prefixText: "e as " }]); diff --git a/tests/cases/fourslash/transitiveExportImports2.ts b/tests/cases/fourslash/transitiveExportImports2.ts index 73e1e828b0c..7ec1e61c02b 100644 --- a/tests/cases/fourslash/transitiveExportImports2.ts +++ b/tests/cases/fourslash/transitiveExportImports2.ts @@ -27,4 +27,6 @@ verify.referenceGroups(aRanges, [aGroup, bGroup, cGroup]); verify.referenceGroups(bRanges, [bGroup, cGroup]); verify.referenceGroups(cRanges, [cGroup, bGroup]); -verify.rangesWithSameTextAreRenameLocations(); +verify.rangesAreRenameLocations(aRanges); +verify.renameLocations([B0, B1], [...bRanges, ...cRanges]); +verify.renameLocations(B2, [{ range: B2, prefixText: "B as " }]); diff --git a/tests/cases/fourslash/transitiveExportImports3.ts b/tests/cases/fourslash/transitiveExportImports3.ts index aeac07476e4..c5d6dfe9afc 100644 --- a/tests/cases/fourslash/transitiveExportImports3.ts +++ b/tests/cases/fourslash/transitiveExportImports3.ts @@ -22,4 +22,7 @@ verify.referenceGroups(g0, [g0Group, g1Group]); verify.referenceGroups(g1, [g1Group, g0Group]); verify.referenceGroups(f2, [bf, af, g0Group, g1Group]); -verify.rangesWithSameTextAreRenameLocations(); +verify.renameLocations([f0, f1], [f0, f1, f2]); +verify.renameLocations(f2, [{ range: f2, prefixText: "f as " }]); +verify.renameLocations(g0, [g0, g1]); +verify.renameLocations(g1, [{ range: g1, prefixText: "g as " }]);