From 8f8ed2c2e111cd16212c4f5785293ed933ac1741 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 17 Jan 2017 13:51:00 -0800 Subject: [PATCH 1/6] Resolve Json file when module resolution strategy is node --- src/compiler/checker.ts | 1 - src/compiler/core.ts | 3 +- src/compiler/moduleNameResolver.ts | 14 +++++++--- src/compiler/parser.ts | 16 +++++++++-- src/compiler/program.ts | 3 +- src/compiler/types.ts | 1 + src/compiler/utilities.ts | 2 ++ src/harness/harness.ts | 2 +- .../unittests/tsserverProjectSystem.ts | 4 +++ src/server/utilities.ts | 2 -- src/services/signatureHelp.ts | 2 -- src/services/utilities.ts | 1 - .../cachedModuleResolution6.trace.json | 7 +++++ .../cachedModuleResolution7.trace.json | 5 ++++ ...portWithTrailingSlash_noResolve.trace.json | 2 ++ ...lutionWithExtensions_unexpected.trace.json | 10 +++++++ ...utionWithExtensions_unexpected2.trace.json | 5 ++++ ...tion_withExtension_failedLookup.trace.json | 7 +++++ .../reference/requireOfJsonFile.errors.txt | 23 +++++++++++++++ .../baselines/reference/requireOfJsonFile.js | 28 +++++++++++++++++++ ...mMultipleNodeModulesDirectories.trace.json | 12 ++++++++ ...romNodeModulesInParentDirectory.trace.json | 3 ++ tests/cases/compiler/requireOfJsonFile.ts | 16 +++++++++++ 23 files changed, 153 insertions(+), 16 deletions(-) create mode 100644 tests/baselines/reference/requireOfJsonFile.errors.txt create mode 100644 tests/baselines/reference/requireOfJsonFile.js create mode 100644 tests/cases/compiler/requireOfJsonFile.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c7f5cdad9fec1..555772e9bea7c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -54,7 +54,6 @@ namespace ts { let typeCount = 0; let symbolCount = 0; - const emptyArray: any[] = []; const emptySymbols = createMap(); const compilerOptions = host.getCompilerOptions(); diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 63c169588e0b2..4ce0adf17662c 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -1994,6 +1994,7 @@ namespace ts { /** * List of supported extensions in order of file resolution precedence. */ + export const supportedJsonExtension = ".json"; export const supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"]; /** Must have ".d.ts" first because if ".ts" goes first, that will be detected as the extension instead of ".d.ts". */ export const supportedTypescriptExtensionsForExtractExtension = [".d.ts", ".ts", ".tsx"]; @@ -2086,7 +2087,7 @@ namespace ts { } } - const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"]; + const extensionsToRemove = supportedTypescriptExtensionsForExtractExtension.concat(supportedJavascriptExtensions, [supportedJsonExtension]); export function removeFileExtension(path: string): string { for (const ext of extensionsToRemove) { const extensionless = tryRemoveExtension(path, ext); diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 0300ff71ec565..d606c15ccd63e 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -35,7 +35,8 @@ namespace ts { enum Extensions { TypeScript, /** '.ts', '.tsx', or '.d.ts' */ JavaScript, /** '.js' or '.jsx' */ - DtsOnly /** Only '.d.ts' */ + Json, /** '.json' */ + DtsOnly, /** Only '.d.ts' */ } /** Used with `Extensions.DtsOnly` to extract the path from TypeScript results. */ @@ -76,6 +77,7 @@ namespace ts { return tryReadFromField("typings") || tryReadFromField("types"); case Extensions.JavaScript: + case Extensions.Json: if (typeof jsonContent.main === "string") { if (state.traceEnabled) { trace(state.host, Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main); @@ -690,7 +692,7 @@ namespace ts { const failedLookupLocations: string[] = []; const state: ModuleResolutionState = { compilerOptions, host, traceEnabled }; - const result = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript); + const result = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript) || tryResolve(Extensions.Json); if (result && result.value) { const { resolved, isExternalLibraryImport } = result.value; return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations); @@ -781,7 +783,7 @@ namespace ts { // If that didn't work, try stripping a ".js" or ".jsx" extension and replacing it with a TypeScript one; // e.g. "./foo.js" can be matched by "./foo.ts" or "./foo.d.ts" - if (hasJavaScriptFileExtension(candidate)) { + if (hasJavaScriptFileExtension(candidate) || fileExtensionIs(candidate, supportedJsonExtension)) { const extensionless = removeFileExtension(candidate); if (state.traceEnabled) { const extension = candidate.substring(extensionless.length); @@ -808,6 +810,8 @@ namespace ts { return tryExtension(".ts", Extension.Ts) || tryExtension(".tsx", Extension.Tsx) || tryExtension(".d.ts", Extension.Dts); case Extensions.JavaScript: return tryExtension(".js", Extension.Js) || tryExtension(".jsx", Extension.Jsx); + case Extensions.Json: + return tryExtension(".json", Extension.Json); } function tryExtension(ext: string, extension: Extension): Resolved | undefined { @@ -890,6 +894,8 @@ namespace ts { switch (extensions) { case Extensions.JavaScript: return extension === Extension.Js || extension === Extension.Jsx; + case Extensions.Json: + return extension === Extension.Json; case Extensions.TypeScript: return extension === Extension.Ts || extension === Extension.Tsx || extension === Extension.Dts; case Extensions.DtsOnly: @@ -941,7 +947,7 @@ namespace ts { if (packageResult) { return packageResult; } - if (extensions !== Extensions.JavaScript) { + if (extensions !== Extensions.JavaScript && extensions !== Extensions.Json) { const nodeModulesAtTypes = combinePaths(nodeModulesFolder, "@types"); let nodeModulesAtTypesExists = nodeModulesFolderExists; if (nodeModulesFolderExists && !directoryProbablyExists(nodeModulesAtTypes, state.host)) { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index a8fdcfd7d58b7..6058a7829cf0f 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -212,6 +212,7 @@ namespace ts { return visitNodes(cbNodes, (node).statements); case SyntaxKind.SourceFile: return visitNodes(cbNodes, (node).statements) || + visitNode(cbNode, (node).jsonObject) || visitNode(cbNode, (node).endOfFileToken); case SyntaxKind.VariableStatement: return visitNodes(cbNodes, node.decorators) || @@ -603,6 +604,13 @@ namespace ts { export function parseSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, syntaxCursor: IncrementalParser.SyntaxCursor, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile { scriptKind = ensureScriptKind(fileName, scriptKind); + if (scriptKind === ScriptKind.JSON) { + const result = parseJsonText(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes); + result.statements = emptyArray; + result.typeReferenceDirectives = emptyArray; + result.amdDependencies = emptyArray; + return result; + } initializeState(sourceText, languageVersion, syntaxCursor, scriptKind); @@ -623,8 +631,8 @@ namespace ts { return isInvalid ? entityName : undefined; } - export function parseJsonText(fileName: string, sourceText: string): JsonSourceFile { - initializeState(sourceText, ScriptTarget.ES2015, /*syntaxCursor*/ undefined, ScriptKind.JSON); + export function parseJsonText(fileName: string, sourceText: string, languageVersion: ScriptTarget = ScriptTarget.ES2015, syntaxCursor?: IncrementalParser.SyntaxCursor, setParentNodes?: boolean): JsonSourceFile { + initializeState(sourceText, languageVersion, syntaxCursor, ScriptKind.JSON); // Set source file so that errors will be reported with this file name sourceFile = createSourceFile(fileName, ScriptTarget.ES2015, ScriptKind.JSON); const result = sourceFile; @@ -643,6 +651,10 @@ namespace ts { parseExpected(SyntaxKind.OpenBraceToken); } + if (setParentNodes) { + fixupParentReferences(sourceFile); + } + sourceFile.parseDiagnostics = parseDiagnostics; clearState(); return result; diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 994603e0944c6..e57f82888f54d 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -3,8 +3,6 @@ /// namespace ts { - const emptyArray: any[] = []; - export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName = "tsconfig.json"): string { while (true) { const fileName = combinePaths(searchPath, configName); @@ -1847,6 +1845,7 @@ namespace ts { switch (extension) { case Extension.Ts: case Extension.Dts: + case Extension.Json: // These are always allowed. return undefined; case Extension.Tsx: diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 44d177d82a394..6d1674578eb1c 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -3594,6 +3594,7 @@ Dts, Js, Jsx, + Json, LastTypeScriptExtension = Dts } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 85a46fb6a2af1..9540bda2a9969 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2,6 +2,8 @@ /* @internal */ namespace ts { + export const emptyArray: any[] = []; + export const externalHelpersModuleNameText = "tslib"; export interface ReferencePathMatchResult { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 7e45032c1df3e..e770f45a46299 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1226,7 +1226,7 @@ namespace Harness { } - const programFileNames = programFiles.map(file => file.unitName); + const programFileNames = programFiles.map(file => file.unitName).filter(fileName => !ts.fileExtensionIs(fileName, ".json")); const compilerHost = createCompilerHost( programFiles.concat(otherFiles), diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts index a6cf0ac6cd802..fa9dca56a6c96 100644 --- a/src/harness/unittests/tsserverProjectSystem.ts +++ b/src/harness/unittests/tsserverProjectSystem.ts @@ -2073,6 +2073,10 @@ namespace ts.projectSystem { "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.", "Directory '/a/node_modules' does not exist, skipping all lookups in it.", "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Loading module 'lib' from 'node_modules' folder, target file type 'Json'.", + "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.", + "Directory '/a/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name 'lib' was not resolved. ========", `Auto discovery for typings is enabled in project '${proj.getProjectName()}'. Running extra resolution pass for module 'lib' using cache location '/a/cache'.`, "File '/a/cache/node_modules/lib.d.ts' does not exist.", diff --git a/src/server/utilities.ts b/src/server/utilities.ts index af1f8e9826fa7..55507f5d18621 100644 --- a/src/server/utilities.ts +++ b/src/server/utilities.ts @@ -9,8 +9,6 @@ namespace ts.server { verbose } - export const emptyArray: ReadonlyArray = []; - export interface Logger { close(): void; hasLevel(level: LogLevel): boolean; diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index a78370dba7283..f1b195785a04d 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -163,8 +163,6 @@ namespace ts.SignatureHelp { // return null; // } - const emptyArray: any[] = []; - export const enum ArgumentListKind { TypeArguments, CallArguments, diff --git a/src/services/utilities.ts b/src/services/utilities.ts index bd54fb9c987eb..984ac0ccd931d 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -2,7 +2,6 @@ /* @internal */ namespace ts { export const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); - export const emptyArray: any[] = []; export const enum SemanticMeaning { None = 0x0, diff --git a/tests/baselines/reference/cachedModuleResolution6.trace.json b/tests/baselines/reference/cachedModuleResolution6.trace.json index 50c1c15b3e1be..efb20f4ddc1be 100644 --- a/tests/baselines/reference/cachedModuleResolution6.trace.json +++ b/tests/baselines/reference/cachedModuleResolution6.trace.json @@ -15,6 +15,13 @@ "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.", "Directory '/a/node_modules' does not exist, skipping all lookups in it.", "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Loading module 'foo' from 'node_modules' folder, target file type 'Json'.", + "Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it.", + "Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it.", + "Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it.", + "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.", + "Directory '/a/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name 'foo' was not resolved. ========", "======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========", "Explicitly specified module resolution kind: 'NodeJs'.", diff --git a/tests/baselines/reference/cachedModuleResolution7.trace.json b/tests/baselines/reference/cachedModuleResolution7.trace.json index fa1db9d115e28..74c57e042503a 100644 --- a/tests/baselines/reference/cachedModuleResolution7.trace.json +++ b/tests/baselines/reference/cachedModuleResolution7.trace.json @@ -11,6 +11,11 @@ "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.", "Directory '/a/node_modules' does not exist, skipping all lookups in it.", "Directory '/node_modules' does not exist, skipping all lookups in it.", + "Loading module 'foo' from 'node_modules' folder, target file type 'Json'.", + "Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it.", + "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.", + "Directory '/a/node_modules' does not exist, skipping all lookups in it.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name 'foo' was not resolved. ========", "======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========", "Explicitly specified module resolution kind: 'NodeJs'.", diff --git a/tests/baselines/reference/importWithTrailingSlash_noResolve.trace.json b/tests/baselines/reference/importWithTrailingSlash_noResolve.trace.json index 1ee467c378905..0f66680ea4439 100644 --- a/tests/baselines/reference/importWithTrailingSlash_noResolve.trace.json +++ b/tests/baselines/reference/importWithTrailingSlash_noResolve.trace.json @@ -5,5 +5,7 @@ "Directory '/foo/' does not exist, skipping all lookups in it.", "Loading module as file / folder, candidate module location '/foo/', target file type 'JavaScript'.", "Directory '/foo/' does not exist, skipping all lookups in it.", + "Loading module as file / folder, candidate module location '/foo/', target file type 'Json'.", + "Directory '/foo/' does not exist, skipping all lookups in it.", "======== Module name './foo/' was not resolved. ========" ] \ No newline at end of file diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json index e1b1673b32a70..19e3750762156 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json @@ -23,5 +23,15 @@ "File '/node_modules/normalize.css/normalize.css.d.ts' does not exist.", "File '/node_modules/normalize.css/index.js' does not exist.", "File '/node_modules/normalize.css/index.jsx' does not exist.", + "Loading module 'normalize.css' from 'node_modules' folder, target file type 'Json'.", + "File '/node_modules/normalize.css.json' does not exist.", + "Found 'package.json' at '/node_modules/normalize.css/package.json'.", + "No types specified in 'package.json', so returning 'main' value of 'normalize.css'", + "File '/node_modules/normalize.css/normalize.css' exist - use it as a name resolution result.", + "File '/node_modules/normalize.css/normalize.css' has an unsupported extension, so skipping it.", + "File '/node_modules/normalize.css/normalize.css.ts' does not exist.", + "File '/node_modules/normalize.css/normalize.css.tsx' does not exist.", + "File '/node_modules/normalize.css/normalize.css.d.ts' does not exist.", + "File '/node_modules/normalize.css/index.json' does not exist.", "======== Module name 'normalize.css' was not resolved. ========" ] \ No newline at end of file diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json index 11dd95ebe45a5..2339084ff52e6 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json @@ -23,5 +23,10 @@ "'package.json' does not have a 'types' or 'main' field.", "File '/node_modules/foo/index.js' does not exist.", "File '/node_modules/foo/index.jsx' does not exist.", + "Loading module 'foo' from 'node_modules' folder, target file type 'Json'.", + "File '/node_modules/foo.json' does not exist.", + "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' does not have a 'types' or 'main' field.", + "File '/node_modules/foo/index.json' does not exist.", "======== Module name 'foo' was not resolved. ========" ] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json index 197b7f5c249ef..b43da2d50131c 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json @@ -15,5 +15,12 @@ "File '/foo/foo.ts' does not exist.", "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.", "Directory '/node_modules' does not exist, skipping all lookups in it.", + "'baseUrl' option is set to '/', using this value to resolve non-relative module name 'foo'", + "'paths' option is specified, looking for a pattern to match module name 'foo'.", + "Module name 'foo', matched pattern 'foo'.", + "Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'.", + "File '/foo/foo.ts' does not exist.", + "Loading module 'foo' from 'node_modules' folder, target file type 'Json'.", + "Directory '/node_modules' does not exist, skipping all lookups in it.", "======== Module name 'foo' was not resolved. ========" ] \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFile.errors.txt b/tests/baselines/reference/requireOfJsonFile.errors.txt new file mode 100644 index 0000000000000..4d787f9f0a540 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFile.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/file1.ts(2,21): error TS2306: File 'tests/cases/compiler/b.json' is not a module. +tests/cases/compiler/file1.ts(4,21): error TS2306: File 'tests/cases/compiler/b.json' is not a module. + + +==== tests/cases/compiler/file1.ts (2 errors) ==== + + import b1 = require('./b'); + ~~~~~ +!!! error TS2306: File 'tests/cases/compiler/b.json' is not a module. + let x = b1.a; + import b2 = require('./b.json'); + ~~~~~~~~~~ +!!! error TS2306: File 'tests/cases/compiler/b.json' is not a module. + if (x) { + let b = b2.b; + x = (b1.b === b); + } + +==== tests/cases/compiler/b.json (0 errors) ==== + { + "a": true, + "b": "hello" + } \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFile.js b/tests/baselines/reference/requireOfJsonFile.js new file mode 100644 index 0000000000000..3cb1acd164176 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFile.js @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/requireOfJsonFile.ts] //// + +//// [file1.ts] + +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +//// [b.json] +{ + "a": true, + "b": "hello" +} + +//// [b.js] +//// [file1.js] +"use strict"; +var b1 = require("./b"); +var x = b1.a; +var b2 = require("./b.json"); +if (x) { + var b = b2.b; + x = (b1.b === b); +} diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json index 8074424995e7d..10951e280ba4d 100644 --- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json +++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json @@ -17,6 +17,10 @@ "File '/foo/node_modules/xyz.jsx' does not exist.", "File '/node_modules/xyz.js' does not exist.", "File '/node_modules/xyz.jsx' does not exist.", + "Loading module 'xyz' from 'node_modules' folder, target file type 'Json'.", + "Directory '/foo/bar/node_modules' does not exist, skipping all lookups in it.", + "File '/foo/node_modules/xyz.json' does not exist.", + "File '/node_modules/xyz.json' does not exist.", "======== Module name 'xyz' was not resolved. ========", "======== Resolving module 'pdq' from '/foo/bar/a.ts'. ========", "Module resolution kind is not specified, using 'NodeJs'.", @@ -36,6 +40,10 @@ "File '/foo/node_modules/pdq.jsx' does not exist.", "File '/node_modules/pdq.js' does not exist.", "File '/node_modules/pdq.jsx' does not exist.", + "Loading module 'pdq' from 'node_modules' folder, target file type 'Json'.", + "Directory '/foo/bar/node_modules' does not exist, skipping all lookups in it.", + "File '/foo/node_modules/pdq.json' does not exist.", + "File '/node_modules/pdq.json' does not exist.", "======== Module name 'pdq' was not resolved. ========", "======== Resolving module 'abc' from '/foo/bar/a.ts'. ========", "Module resolution kind is not specified, using 'NodeJs'.", @@ -55,6 +63,10 @@ "File '/foo/node_modules/abc.jsx' does not exist.", "File '/node_modules/abc.js' does not exist.", "File '/node_modules/abc.jsx' does not exist.", + "Loading module 'abc' from 'node_modules' folder, target file type 'Json'.", + "Directory '/foo/bar/node_modules' does not exist, skipping all lookups in it.", + "File '/foo/node_modules/abc.json' does not exist.", + "File '/node_modules/abc.json' does not exist.", "======== Module name 'abc' was not resolved. ========", "======== Resolving type reference directive 'grumpy', containing file '/foo/bar/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========", "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'", diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json index dc21070f1ae9b..6f6199e594e66 100644 --- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json +++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json @@ -11,6 +11,9 @@ "Directory '/src/node_modules' does not exist, skipping all lookups in it.", "File '/node_modules/xyz.js' does not exist.", "File '/node_modules/xyz.jsx' does not exist.", + "Loading module 'xyz' from 'node_modules' folder, target file type 'Json'.", + "Directory '/src/node_modules' does not exist, skipping all lookups in it.", + "File '/node_modules/xyz.json' does not exist.", "======== Module name 'xyz' was not resolved. ========", "======== Resolving type reference directive 'foo', containing file '/src/__inferred type names__.ts', root directory '/node_modules/@types'. ========", "Resolving with primary search path '/node_modules/@types'", diff --git a/tests/cases/compiler/requireOfJsonFile.ts b/tests/cases/compiler/requireOfJsonFile.ts new file mode 100644 index 0000000000000..7295dac0179cf --- /dev/null +++ b/tests/cases/compiler/requireOfJsonFile.ts @@ -0,0 +1,16 @@ +// @module: commonjs + +// @Filename: file1.ts +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +// @Filename: b.json +{ + "a": true, + "b": "hello" +} \ No newline at end of file From 10560af6f5d36d214d4b30bdcb4e5322f11ffb53 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 17 Jan 2017 13:51:00 -0800 Subject: [PATCH 2/6] Bind and resolve the module for json file --- src/compiler/binder.ts | 9 ++++ src/compiler/checker.ts | 8 ++++ src/compiler/utilities.ts | 4 ++ .../reference/requireOfJsonFile.errors.txt | 23 ---------- .../reference/requireOfJsonFile.symbols | 37 ++++++++++++++++ .../reference/requireOfJsonFile.types | 44 +++++++++++++++++++ 6 files changed, 102 insertions(+), 23 deletions(-) delete mode 100644 tests/baselines/reference/requireOfJsonFile.errors.txt create mode 100644 tests/baselines/reference/requireOfJsonFile.symbols create mode 100644 tests/baselines/reference/requireOfJsonFile.types diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 712c96a49f93b..f9d4d0a7203e9 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -258,6 +258,10 @@ namespace ts { return "__export"; case SyntaxKind.ExportAssignment: return (node).isExportEquals ? "export=" : "default"; + case SyntaxKind.SourceFile: + // json file should behave as + // module.exports = ... + return "export="; case SyntaxKind.BinaryExpression: switch (getSpecialPropertyAssignmentKind(node)) { case SpecialPropertyAssignmentKind.ModuleExports: @@ -2085,6 +2089,11 @@ namespace ts { if (isExternalModule(file)) { bindSourceFileAsExternalModule(); } + else if (isJsonSourceFile(file)) { + bindSourceFileAsExternalModule(); + // Create symbol equivalent for the module.exports = {} + declareSymbol(file.symbol.exports, file.symbol, file, SymbolFlags.Property | SymbolFlags.Export | SymbolFlags.ValueModule, SymbolFlags.None); + } } function bindSourceFileAsExternalModule() { diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 555772e9bea7c..1c988c3bea40b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3513,6 +3513,11 @@ namespace ts { return links.type = anyType; } // Handle export default expressions + if (declaration.kind === SyntaxKind.SourceFile) { + // JSON file + const jsonSourceFile = declaration; + return links.type = jsonSourceFile.jsonObject ? checkObjectLiteral(jsonSourceFile.jsonObject) : emptyObjectType; + } if (declaration.kind === SyntaxKind.ExportAssignment) { return links.type = checkExpression((declaration).expression); } @@ -19605,6 +19610,9 @@ namespace ts { deferredUnusedIdentifierNodes = produceDiagnostics && noUnusedIdentifiers ? [] : undefined; forEach(node.statements, checkSourceElement); + if (isJsonSourceFile(node) && node.jsonObject) { + checkObjectLiteral(node.jsonObject); + } checkDeferredNodes(); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 9540bda2a9969..a1fe0ce388622 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -601,6 +601,10 @@ namespace ts { return file.isDeclarationFile; } + export function isJsonSourceFile(file: SourceFile): file is JsonSourceFile { + return file.scriptKind === ScriptKind.JSON; + } + export function isConstEnumDeclaration(node: Node): boolean { return node.kind === SyntaxKind.EnumDeclaration && isConst(node); } diff --git a/tests/baselines/reference/requireOfJsonFile.errors.txt b/tests/baselines/reference/requireOfJsonFile.errors.txt deleted file mode 100644 index 4d787f9f0a540..0000000000000 --- a/tests/baselines/reference/requireOfJsonFile.errors.txt +++ /dev/null @@ -1,23 +0,0 @@ -tests/cases/compiler/file1.ts(2,21): error TS2306: File 'tests/cases/compiler/b.json' is not a module. -tests/cases/compiler/file1.ts(4,21): error TS2306: File 'tests/cases/compiler/b.json' is not a module. - - -==== tests/cases/compiler/file1.ts (2 errors) ==== - - import b1 = require('./b'); - ~~~~~ -!!! error TS2306: File 'tests/cases/compiler/b.json' is not a module. - let x = b1.a; - import b2 = require('./b.json'); - ~~~~~~~~~~ -!!! error TS2306: File 'tests/cases/compiler/b.json' is not a module. - if (x) { - let b = b2.b; - x = (b1.b === b); - } - -==== tests/cases/compiler/b.json (0 errors) ==== - { - "a": true, - "b": "hello" - } \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFile.symbols b/tests/baselines/reference/requireOfJsonFile.symbols new file mode 100644 index 0000000000000..e8b5fee532ec7 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFile.symbols @@ -0,0 +1,37 @@ +=== tests/cases/compiler/file1.ts === + +import b1 = require('./b'); +>b1 : Symbol(b1, Decl(file1.ts, 0, 0)) + +let x = b1.a; +>x : Symbol(x, Decl(file1.ts, 2, 3)) +>b1.a : Symbol("a", Decl(b.json, 0, 1)) +>b1 : Symbol(b1, Decl(file1.ts, 0, 0)) +>a : Symbol("a", Decl(b.json, 0, 1)) + +import b2 = require('./b.json'); +>b2 : Symbol(b2, Decl(file1.ts, 2, 13)) + +if (x) { +>x : Symbol(x, Decl(file1.ts, 2, 3)) + + let b = b2.b; +>b : Symbol(b, Decl(file1.ts, 5, 7)) +>b2.b : Symbol("b", Decl(b.json, 1, 14)) +>b2 : Symbol(b2, Decl(file1.ts, 2, 13)) +>b : Symbol("b", Decl(b.json, 1, 14)) + + x = (b1.b === b); +>x : Symbol(x, Decl(file1.ts, 2, 3)) +>b1.b : Symbol("b", Decl(b.json, 1, 14)) +>b1 : Symbol(b1, Decl(file1.ts, 0, 0)) +>b : Symbol("b", Decl(b.json, 1, 14)) +>b : Symbol(b, Decl(file1.ts, 5, 7)) +} + +=== tests/cases/compiler/b.json === +{ +No type information for this code. "a": true, +No type information for this code. "b": "hello" +No type information for this code.} +No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFile.types b/tests/baselines/reference/requireOfJsonFile.types new file mode 100644 index 0000000000000..3b8b6e747f7ff --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFile.types @@ -0,0 +1,44 @@ +=== tests/cases/compiler/file1.ts === + +import b1 = require('./b'); +>b1 : { "a": boolean; "b": string; } + +let x = b1.a; +>x : boolean +>b1.a : boolean +>b1 : { "a": boolean; "b": string; } +>a : boolean + +import b2 = require('./b.json'); +>b2 : { "a": boolean; "b": string; } + +if (x) { +>x : boolean + + let b = b2.b; +>b : string +>b2.b : string +>b2 : { "a": boolean; "b": string; } +>b : string + + x = (b1.b === b); +>x = (b1.b === b) : boolean +>x : boolean +>(b1.b === b) : boolean +>b1.b === b : boolean +>b1.b : string +>b1 : { "a": boolean; "b": string; } +>b : string +>b : string +} + +=== tests/cases/compiler/b.json === +{ +>{ "a": true, "b": "hello"} : { "a": boolean; "b": string; } + + "a": true, +>true : true + + "b": "hello" +>"hello" : "hello" +} From 1f349221fb291baf2c60ad5a43e25befaab1fecd Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 17 Jan 2017 13:51:00 -0800 Subject: [PATCH 3/6] Emit the symbol information for declaration names (could be string literals and more) --- src/harness/typeWriter.ts | 2 +- .../reference/ambientDeclarations.symbols | 2 + .../reference/ambientDeclarations.types | 2 + .../ambientDeclarationsExternal.symbols | 4 ++ .../ambientDeclarationsExternal.types | 4 ++ .../ambientDeclarationsPatterns.symbols | 8 +++ .../ambientDeclarationsPatterns.types | 8 +++ .../ambientExternalModuleMerging.symbols | 4 ++ .../ambientExternalModuleMerging.types | 4 ++ .../ambientExternalModuleReopen.symbols | 4 ++ .../ambientExternalModuleReopen.types | 4 ++ ...oduleWithInternalImportDeclaration.symbols | 2 + ...lModuleWithInternalImportDeclaration.types | 2 + ...leWithoutInternalImportDeclaration.symbols | 2 + ...duleWithoutInternalImportDeclaration.types | 2 + .../reference/ambientRequireFunction.symbols | 2 + .../reference/ambientRequireFunction.types | 2 + .../reference/ambientShorthand.symbols | 10 ++-- .../reference/ambientShorthand.types | 10 ++-- .../ambientShorthand_declarationEmit.symbols | 4 +- .../ambientShorthand_declarationEmit.types | 4 +- .../ambientShorthand_duplicate.symbols | 4 +- .../ambientShorthand_duplicate.types | 4 +- .../ambientShorthand_merging.symbols | 4 +- .../reference/ambientShorthand_merging.types | 4 +- .../ambientShorthand_reExport.symbols | 5 +- .../reference/ambientShorthand_reExport.types | 5 +- ...ompatWithObjectMembersNumericNames.symbols | 8 +++ ...tCompatWithObjectMembersNumericNames.types | 8 +++ .../reference/augmentExportEquals3.symbols | 2 + .../reference/augmentExportEquals3.types | 2 + .../reference/augmentExportEquals3_1.symbols | 4 ++ .../reference/augmentExportEquals3_1.types | 4 ++ .../reference/augmentExportEquals4.symbols | 2 + .../reference/augmentExportEquals4.types | 2 + .../reference/augmentExportEquals4_1.symbols | 4 ++ .../reference/augmentExportEquals4_1.types | 4 ++ .../reference/augmentExportEquals5.symbols | 4 ++ .../reference/augmentExportEquals5.types | 4 ++ .../reference/augmentExportEquals6.symbols | 2 + .../reference/augmentExportEquals6.types | 2 + .../reference/augmentExportEquals6_1.symbols | 4 ++ .../reference/augmentExportEquals6_1.types | 4 ++ .../reference/bangInModuleName.symbols | 3 ++ .../reference/bangInModuleName.types | 3 ++ .../reference/binaryIntegerLiteral.symbols | 6 +++ .../reference/binaryIntegerLiteral.types | 4 ++ .../reference/binaryIntegerLiteralES6.symbols | 6 +++ .../reference/binaryIntegerLiteralES6.types | 4 ++ .../bitwiseNotOperatorWithEnumType.symbols | 1 + .../bitwiseNotOperatorWithEnumType.types | 1 + ...PublicMembersEquivalentToInterface.symbols | 2 + ...lyPublicMembersEquivalentToInterface.types | 2 + ...ublicMembersEquivalentToInterface2.symbols | 2 + ...yPublicMembersEquivalentToInterface2.types | 2 + .../reference/commonSourceDirectory.symbols | 2 + .../reference/commonSourceDirectory.types | 2 + ...edPropertyNamesContextualType6_ES5.symbols | 2 + ...utedPropertyNamesContextualType6_ES5.types | 1 + ...edPropertyNamesContextualType6_ES6.symbols | 2 + ...utedPropertyNamesContextualType6_ES6.types | 1 + ...edPropertyNamesContextualType7_ES5.symbols | 2 + ...utedPropertyNamesContextualType7_ES5.types | 1 + ...edPropertyNamesContextualType7_ES6.symbols | 2 + ...utedPropertyNamesContextualType7_ES6.types | 1 + .../constEnumPropertyAccess1.symbols | 2 + .../reference/constEnumPropertyAccess1.types | 1 + .../reference/constIndexedAccess.symbols | 3 ++ .../reference/constIndexedAccess.types | 3 ++ .../contextualTypeArrayReturnType.symbols | 2 + .../contextualTypeArrayReturnType.types | 1 + ...alTypeWithUnionTypeIndexSignatures.symbols | 6 +++ ...tualTypeWithUnionTypeIndexSignatures.types | 6 +++ .../reference/cyclicModuleImport.symbols | 4 ++ .../reference/cyclicModuleImport.types | 4 ++ ...declFileAliasUseBeforeDeclaration2.symbols | 2 + .../declFileAliasUseBeforeDeclaration2.types | 2 + ...rnalModuleWithSingleExportedModule.symbols | 2 + ...ternalModuleWithSingleExportedModule.types | 2 + .../baselines/reference/declFileEnums.symbols | 7 +++ tests/baselines/reference/declFileEnums.types | 7 +++ ...leImportedTypeUseInTypeArgPosition.symbols | 4 ++ ...FileImportedTypeUseInTypeArgPosition.types | 4 ++ .../reference/declarationMerging2.symbols | 2 + .../reference/declarationMerging2.types | 2 + ...nalModuleWithExportAssignedFundule.symbols | 1 + ...ernalModuleWithExportAssignedFundule.types | 1 + .../reference/declaredExternalModule.symbols | 1 + .../reference/declaredExternalModule.types | 1 + ...ExternalModuleWithExportAssignment.symbols | 2 + ...edExternalModuleWithExportAssignment.types | 2 + ...ectBindingPatternAndAssignment1ES5.symbols | 6 +++ ...bjectBindingPatternAndAssignment1ES5.types | 4 ++ ...ectBindingPatternAndAssignment1ES6.symbols | 6 +++ ...bjectBindingPatternAndAssignment1ES6.types | 4 ++ ...rationWithLiteralPropertyNameInES6.symbols | 21 ++++++++ ...larationWithLiteralPropertyNameInES6.types | 14 ++++++ ...iationAssignmentWithIndexingOnLHS2.symbols | 1 + ...ntiationAssignmentWithIndexingOnLHS2.types | 1 + ...iationAssignmentWithIndexingOnLHS3.symbols | 3 ++ ...ntiationAssignmentWithIndexingOnLHS3.types | 3 ++ .../enumWithNegativeInfinityProperty.symbols | 1 + .../enumWithNegativeInfinityProperty.types | 1 + .../enumWithQuotedElementName1.symbols | 1 + .../enumWithQuotedElementName1.types | 1 + .../enumWithQuotedElementName2.symbols | 1 + .../enumWithQuotedElementName2.types | 1 + .../reference/enumWithUnicodeEscape1.symbols | 1 + .../reference/enumWithUnicodeEscape1.types | 1 + .../es5ExportDefaultClassDeclaration4.symbols | 2 + .../es5ExportDefaultClassDeclaration4.types | 2 + ...5ExportDefaultFunctionDeclaration4.symbols | 2 + ...es5ExportDefaultFunctionDeclaration4.types | 2 + .../reference/es6ExportAssignment4.symbols | 2 + .../reference/es6ExportAssignment4.types | 2 + .../es6ImportEqualsDeclaration2.symbols | 4 ++ .../es6ImportEqualsDeclaration2.types | 4 ++ ...pedReservedCompilerNamedIdentifier.symbols | 6 +++ ...capedReservedCompilerNamedIdentifier.types | 3 ++ .../reference/exportDefaultProperty.symbols | 4 ++ .../reference/exportDefaultProperty.types | 4 ++ .../reference/exportDefaultVariable.symbols | 2 + .../reference/exportDefaultVariable.types | 2 + .../exportEqualsDefaultProperty.symbols | 4 ++ .../exportEqualsDefaultProperty.types | 2 + .../reference/exportEqualsOfModule.symbols | 8 +++ .../reference/exportEqualsOfModule.types | 8 +++ .../reference/exportEqualsProperty.symbols | 4 ++ .../reference/exportEqualsProperty.types | 4 ++ ...cifierAndExportedMemberDeclaration.symbols | 4 ++ ...pecifierAndExportedMemberDeclaration.types | 4 ++ .../exportsAndImportsWithUnderscores2.symbols | 3 ++ .../exportsAndImportsWithUnderscores2.types | 2 + .../exportsAndImportsWithUnderscores3.symbols | 5 ++ .../exportsAndImportsWithUnderscores3.types | 3 ++ .../exportsInAmbientModules1.symbols | 2 + .../reference/exportsInAmbientModules1.types | 2 + .../exportsInAmbientModules2.symbols | 9 ++-- .../reference/exportsInAmbientModules2.types | 9 ++-- ...ingClassFromAliasAndUsageInIndexer.symbols | 2 + ...ndingClassFromAliasAndUsageInIndexer.types | 2 + ...alModuleReferenceDoubleUnderscore1.symbols | 4 ++ ...rnalModuleReferenceDoubleUnderscore1.types | 4 ++ .../reference/implicitIndexSignatures.symbols | 4 ++ .../reference/implicitIndexSignatures.types | 4 ++ ...WithExportModifierInAmbientContext.symbols | 2 + ...clWithExportModifierInAmbientContext.types | 2 + ...renecing-aliased-type-throug-array.symbols | 2 + ...ferenecing-aliased-type-throug-array.types | 2 + .../importsInAmbientModules1.symbols | 2 + .../reference/importsInAmbientModules1.types | 2 + .../importsInAmbientModules2.symbols | 2 + .../reference/importsInAmbientModules2.types | 2 + .../importsInAmbientModules3.symbols | 2 + .../reference/importsInAmbientModules3.types | 2 + .../reference/inOperatorWithFunction.symbols | 1 + .../reference/inOperatorWithFunction.types | 1 + .../indexSignaturesInferentialTyping.symbols | 4 ++ .../indexSignaturesInferentialTyping.types | 4 ++ tests/baselines/reference/indexer.symbols | 2 + tests/baselines/reference/indexer.types | 2 + tests/baselines/reference/indexerA.symbols | 2 + tests/baselines/reference/indexerA.types | 2 + .../reference/indexersInClassType.symbols | 2 + .../reference/indexersInClassType.types | 2 + .../inferringAnyFunctionType1.symbols | 1 + .../reference/inferringAnyFunctionType1.types | 1 + .../reference/jsxImportInAttribute.symbols | 2 + .../reference/jsxImportInAttribute.types | 2 + .../reference/jsxViaImport.2.symbols | 2 + .../baselines/reference/jsxViaImport.2.types | 2 + .../reference/mergedDeclarations6.symbols | 2 + .../reference/mergedDeclarations6.types | 2 + .../missingImportAfterModuleImport.symbols | 2 + .../missingImportAfterModuleImport.types | 2 + ...ationCollidingNamesInAugmentation1.symbols | 4 ++ ...ntationCollidingNamesInAugmentation1.types | 4 ++ ...moduleAugmentationDeclarationEmit1.symbols | 2 + .../moduleAugmentationDeclarationEmit1.types | 2 + ...moduleAugmentationDeclarationEmit2.symbols | 2 + .../moduleAugmentationDeclarationEmit2.types | 2 + ...leAugmentationExtendAmbientModule1.symbols | 4 ++ ...duleAugmentationExtendAmbientModule1.types | 4 ++ ...leAugmentationExtendAmbientModule2.symbols | 4 ++ ...duleAugmentationExtendAmbientModule2.types | 4 ++ ...oduleAugmentationExtendFileModule1.symbols | 2 + .../moduleAugmentationExtendFileModule1.types | 2 + ...oduleAugmentationExtendFileModule2.symbols | 2 + .../moduleAugmentationExtendFileModule2.types | 2 + .../moduleAugmentationGlobal5.symbols | 4 ++ .../reference/moduleAugmentationGlobal5.types | 4 ++ ...duleAugmentationImportsAndExports1.symbols | 2 + ...moduleAugmentationImportsAndExports1.types | 2 + ...duleAugmentationImportsAndExports4.symbols | 2 + ...moduleAugmentationImportsAndExports4.types | 2 + ...duleAugmentationImportsAndExports6.symbols | 2 + ...moduleAugmentationImportsAndExports6.types | 2 + ...moduleAugmentationInAmbientModule1.symbols | 8 +++ .../moduleAugmentationInAmbientModule1.types | 8 +++ ...moduleAugmentationInAmbientModule2.symbols | 8 +++ .../moduleAugmentationInAmbientModule2.types | 8 +++ ...moduleAugmentationInAmbientModule3.symbols | 12 +++++ .../moduleAugmentationInAmbientModule3.types | 12 +++++ ...moduleAugmentationInAmbientModule4.symbols | 12 +++++ .../moduleAugmentationInAmbientModule4.types | 12 +++++ ...moduleAugmentationInAmbientModule5.symbols | 4 ++ .../moduleAugmentationInAmbientModule5.types | 4 ++ .../moduleAugmentationInDependency.symbols | 9 ++-- .../moduleAugmentationInDependency.types | 9 ++-- .../moduleAugmentationNoNewNames.symbols | 2 + .../moduleAugmentationNoNewNames.types | 2 + .../moduleAugmentationsBundledOutput1.symbols | 8 +++ .../moduleAugmentationsBundledOutput1.types | 8 +++ .../moduleAugmentationsImports1.symbols | 6 +++ .../moduleAugmentationsImports1.types | 6 +++ .../moduleAugmentationsImports2.symbols | 6 +++ .../moduleAugmentationsImports2.types | 6 +++ .../moduleAugmentationsImports3.symbols | 8 +++ .../moduleAugmentationsImports3.types | 8 +++ .../moduleAugmentationsImports4.symbols | 10 ++++ .../moduleAugmentationsImports4.types | 10 ++++ .../reference/moduleMergeConstructor.symbols | 4 ++ .../reference/moduleMergeConstructor.types | 4 ++ ...nWithExtensions_withAmbientPresent.symbols | 2 + ...ionWithExtensions_withAmbientPresent.types | 2 + ...module_augmentUninstantiatedModule.symbols | 5 ++ .../module_augmentUninstantiatedModule.types | 5 ++ tests/baselines/reference/moduledecl.symbols | 2 + tests/baselines/reference/moduledecl.types | 2 + .../reference/newWithSpreadES5.symbols | 2 + .../reference/newWithSpreadES5.types | 2 + .../reference/newWithSpreadES6.symbols | 2 + .../reference/newWithSpreadES6.types | 2 + .../noImplicitAnyIndexingSuppressed.symbols | 7 +++ .../noImplicitAnyIndexingSuppressed.types | 4 ++ .../reference/nodeResolution5.symbols | 2 + .../baselines/reference/nodeResolution5.types | 2 + .../reference/nodeResolution7.symbols | 2 + .../baselines/reference/nodeResolution7.types | 2 + .../numericIndexerConstraint3.symbols | 1 + .../reference/numericIndexerConstraint3.types | 1 + .../numericIndexerConstraint4.symbols | 1 + .../reference/numericIndexerConstraint4.types | 1 + .../reference/numericIndexingResults.symbols | 15 ++++++ .../reference/numericIndexingResults.types | 14 ++++++ .../reference/numericMethodName1.symbols | 1 + .../reference/numericMethodName1.types | 1 + .../reference/objectLiteralIndexers.symbols | 3 ++ .../reference/objectLiteralIndexers.types | 3 ++ .../baselines/reference/objectSpread.symbols | 3 ++ tests/baselines/reference/objectSpread.types | 3 ++ .../objectTypeWithNumericProperty.symbols | 12 +++++ .../objectTypeWithNumericProperty.types | 11 +++++ ...TypeWithStringNamedNumericProperty.symbols | 49 +++++++++++++++++++ ...ctTypeWithStringNamedNumericProperty.types | 44 +++++++++++++++++ ...ngNamedPropertyOfIllegalCharacters.symbols | 24 +++++++++ ...ringNamedPropertyOfIllegalCharacters.types | 22 +++++++++ ...tTypesIdentityWithNumericIndexers1.symbols | 1 + ...ectTypesIdentityWithNumericIndexers1.types | 1 + ...tTypesIdentityWithNumericIndexers2.symbols | 1 + ...ectTypesIdentityWithNumericIndexers2.types | 1 + ...tTypesIdentityWithNumericIndexers3.symbols | 1 + ...ectTypesIdentityWithNumericIndexers3.types | 1 + .../reference/octalIntegerLiteral.symbols | 6 +++ .../reference/octalIntegerLiteral.types | 4 ++ .../reference/octalIntegerLiteralES6.symbols | 6 +++ .../reference/octalIntegerLiteralES6.types | 4 ++ .../parserClassDeclaration19.symbols | 1 + .../reference/parserClassDeclaration19.types | 1 + .../parserClassDeclaration20.symbols | 3 ++ .../reference/parserClassDeclaration20.types | 3 ++ tests/baselines/reference/parserEnum6.symbols | 3 ++ tests/baselines/reference/parserEnum6.types | 3 ++ .../parserFunctionPropertyAssignment2.symbols | 1 + .../parserFunctionPropertyAssignment2.types | 1 + .../parserFunctionPropertyAssignment3.symbols | 1 + .../parserFunctionPropertyAssignment3.types | 1 + .../parserFunctionPropertyAssignment4.symbols | 1 + .../parserFunctionPropertyAssignment4.types | 1 + .../parserMemberAccessorDeclaration5.symbols | 1 + .../parserMemberAccessorDeclaration5.types | 1 + .../parserMemberAccessorDeclaration6.symbols | 1 + .../parserMemberAccessorDeclaration6.types | 1 + .../reference/parserMethodSignature10.symbols | 1 + .../reference/parserMethodSignature10.types | 1 + .../reference/parserMethodSignature11.symbols | 1 + .../reference/parserMethodSignature11.types | 1 + .../reference/parserMethodSignature12.symbols | 1 + .../reference/parserMethodSignature12.types | 1 + .../reference/parserMethodSignature5.symbols | 1 + .../reference/parserMethodSignature5.types | 1 + .../reference/parserMethodSignature6.symbols | 1 + .../reference/parserMethodSignature6.types | 1 + .../reference/parserMethodSignature7.symbols | 1 + .../reference/parserMethodSignature7.types | 1 + .../reference/parserMethodSignature8.symbols | 1 + .../reference/parserMethodSignature8.types | 1 + .../reference/parserMethodSignature9.symbols | 1 + .../reference/parserMethodSignature9.types | 1 + .../parserModuleDeclaration2.symbols | 4 +- .../reference/parserModuleDeclaration2.types | 4 +- .../parserPropertySignature10.symbols | 1 + .../reference/parserPropertySignature10.types | 1 + .../parserPropertySignature11.symbols | 1 + .../reference/parserPropertySignature11.types | 1 + .../parserPropertySignature12.symbols | 1 + .../reference/parserPropertySignature12.types | 1 + .../parserPropertySignature5.symbols | 1 + .../reference/parserPropertySignature5.types | 1 + .../parserPropertySignature6.symbols | 1 + .../reference/parserPropertySignature6.types | 1 + .../parserPropertySignature7.symbols | 1 + .../reference/parserPropertySignature7.types | 1 + .../parserPropertySignature8.symbols | 1 + .../reference/parserPropertySignature8.types | 1 + .../parserPropertySignature9.symbols | 1 + .../reference/parserPropertySignature9.types | 1 + .../propertyNamesWithStringLiteral.symbols | 2 + .../propertyNamesWithStringLiteral.types | 2 + .../protoAsIndexInIndexExpression.symbols | 3 ++ .../protoAsIndexInIndexExpression.types | 2 + .../reference/quotedFunctionName1.symbols | 1 + .../reference/quotedFunctionName1.types | 1 + .../reference/quotedFunctionName2.symbols | 1 + .../reference/quotedFunctionName2.types | 1 + .../reference/quotedPropertyName1.symbols | 1 + .../reference/quotedPropertyName1.types | 1 + .../reference/quotedPropertyName2.symbols | 1 + .../reference/quotedPropertyName2.types | 1 + .../reference/quotedPropertyName3.symbols | 2 + .../reference/quotedPropertyName3.types | 2 + .../reactNamespaceImportPresevation.symbols | 2 + .../reactNamespaceImportPresevation.types | 2 + .../reference/requireOfJsonFile.symbols | 10 ++-- .../reference/requireOfJsonFile.types | 2 + ...uleNameWithSameLetDeclarationName2.symbols | 2 + ...oduleNameWithSameLetDeclarationName2.types | 2 + .../reference/shebangBeforeReferences.symbols | 2 + .../reference/shebangBeforeReferences.types | 2 + ...aticMemberWithStringAndNumberNames.symbols | 3 ++ ...staticMemberWithStringAndNumberNames.types | 2 + ...ngLiteralObjectLiteralDeclaration1.symbols | 1 + ...ringLiteralObjectLiteralDeclaration1.types | 1 + ...lPropertyNameWithLineContinuation1.symbols | 2 + ...ralPropertyNameWithLineContinuation1.types | 1 + .../stringNamedPropertyAccess.symbols | 6 +++ .../reference/stringNamedPropertyAccess.types | 6 +++ .../reference/stringPropCodeGen.symbols | 3 ++ .../reference/stringPropCodeGen.types | 2 + .../subtypingWithObjectMembers4.symbols | 4 ++ .../subtypingWithObjectMembers4.types | 4 ++ ...typingWithObjectMembersOptionality.symbols | 8 +++ ...ubtypingWithObjectMembersOptionality.types | 8 +++ ...ypingWithObjectMembersOptionality3.symbols | 4 ++ ...btypingWithObjectMembersOptionality3.types | 4 ++ ...ypingWithObjectMembersOptionality4.symbols | 4 ++ ...btypingWithObjectMembersOptionality4.types | 4 ++ .../reference/systemExportAssignment3.symbols | 2 + .../reference/systemExportAssignment3.types | 2 + .../reference/topLevelAmbientModule.symbols | 2 + .../reference/topLevelAmbientModule.types | 2 + .../transformNestedGeneratorsWithTry.symbols | 2 + .../transformNestedGeneratorsWithTry.types | 2 + .../reference/tsxDynamicTagName5.symbols | 2 + .../reference/tsxDynamicTagName5.types | 2 + .../reference/tsxDynamicTagName8.symbols | 2 + .../reference/tsxDynamicTagName8.types | 2 + .../reference/tsxDynamicTagName9.symbols | 2 + .../reference/tsxDynamicTagName9.types | 2 + .../reference/tsxElementResolution.symbols | 3 ++ .../reference/tsxElementResolution.types | 3 ++ .../reference/tsxElementResolution17.symbols | 4 ++ .../reference/tsxElementResolution17.types | 4 ++ .../reference/tsxElementResolution19.symbols | 11 +++-- .../reference/tsxElementResolution19.types | 11 +++-- .../reference/tsxExternalModuleEmit1.symbols | 2 + .../reference/tsxExternalModuleEmit1.types | 2 + .../reference/tsxExternalModuleEmit2.symbols | 2 + .../reference/tsxExternalModuleEmit2.types | 2 + .../reference/tsxPreserveEmit1.symbols | 4 ++ .../reference/tsxPreserveEmit1.types | 4 ++ .../reference/typeAliasExport.symbols | 2 + .../baselines/reference/typeAliasExport.types | 2 + ...tationBestCommonTypeInArrayLiteral.symbols | 15 ++++++ ...notationBestCommonTypeInArrayLiteral.types | 8 +++ .../typeReferenceDirectives9.symbols | 2 + .../reference/typeReferenceDirectives9.types | 2 + ...FromMultipleNodeModulesDirectories.symbols | 6 +++ ...tsFromMultipleNodeModulesDirectories.types | 6 +++ ...tsFromNodeModulesInParentDirectory.symbols | 2 + ...ootsFromNodeModulesInParentDirectory.types | 2 + .../reference/umd-augmentation-1.symbols | 2 + .../reference/umd-augmentation-1.types | 2 + .../reference/umd-augmentation-2.symbols | 2 + .../reference/umd-augmentation-2.types | 2 + .../reference/umd-augmentation-3.symbols | 2 + .../reference/umd-augmentation-3.types | 2 + .../reference/umd-augmentation-4.symbols | 2 + .../reference/umd-augmentation-4.types | 2 + .../reference/underscoreTest1.symbols | 9 ++++ .../baselines/reference/underscoreTest1.types | 9 ++++ .../unionAndIntersectionInference1.symbols | 1 + .../unionAndIntersectionInference1.types | 1 + .../unionTypeFromArrayLiteral.symbols | 4 ++ .../reference/unionTypeFromArrayLiteral.types | 4 ++ .../untypedModuleImport_vsAmbient.symbols | 2 + .../untypedModuleImport_vsAmbient.types | 2 + .../voidOperatorWithEnumType.symbols | 1 + .../reference/voidOperatorWithEnumType.types | 1 + 409 files changed, 1387 insertions(+), 59 deletions(-) diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts index 145e81f30a8cf..16680c575560e 100644 --- a/src/harness/typeWriter.ts +++ b/src/harness/typeWriter.ts @@ -29,7 +29,7 @@ class TypeWriterWalker { } private visitNode(node: ts.Node): void { - if (ts.isPartOfExpression(node) || node.kind === ts.SyntaxKind.Identifier) { + if (ts.isPartOfExpression(node) || node.kind === ts.SyntaxKind.Identifier || ts.isDeclarationName(node)) { this.logTypeAndSymbol(node); } diff --git a/tests/baselines/reference/ambientDeclarations.symbols b/tests/baselines/reference/ambientDeclarations.symbols index ef5c5403ccf5b..1436c698cff51 100644 --- a/tests/baselines/reference/ambientDeclarations.symbols +++ b/tests/baselines/reference/ambientDeclarations.symbols @@ -160,6 +160,8 @@ var q = M1.fn(); // Ambient external module in the global module // Ambient external module with a string literal name that is a top level external module name declare module 'external1' { +>'external1' : Symbol('external1', Decl(ambientDeclarations.ts, 67, 16)) + var q; >q : Symbol(q, Decl(ambientDeclarations.ts, 72, 7)) } diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types index a571eb9fa7bf7..3d0b53ee19d2d 100644 --- a/tests/baselines/reference/ambientDeclarations.types +++ b/tests/baselines/reference/ambientDeclarations.types @@ -163,6 +163,8 @@ var q = M1.fn(); // Ambient external module in the global module // Ambient external module with a string literal name that is a top level external module name declare module 'external1' { +>'external1' : typeof 'external1' + var q; >q : any } diff --git a/tests/baselines/reference/ambientDeclarationsExternal.symbols b/tests/baselines/reference/ambientDeclarationsExternal.symbols index f160751a19bc6..2a2ec0e1b17e2 100644 --- a/tests/baselines/reference/ambientDeclarationsExternal.symbols +++ b/tests/baselines/reference/ambientDeclarationsExternal.symbols @@ -21,6 +21,8 @@ var n: number; // Ambient external module with export assignment declare module 'equ' { +>'equ' : Symbol('equ', Decl(decls.ts, 0, 0)) + var x; >x : Symbol(x, Decl(decls.ts, 3, 7)) @@ -29,6 +31,8 @@ declare module 'equ' { } declare module 'equ2' { +>'equ2' : Symbol('equ2', Decl(decls.ts, 5, 1)) + var x: number; >x : Symbol(x, Decl(decls.ts, 8, 7)) } diff --git a/tests/baselines/reference/ambientDeclarationsExternal.types b/tests/baselines/reference/ambientDeclarationsExternal.types index 062e006cf0a97..6afcc237b80e5 100644 --- a/tests/baselines/reference/ambientDeclarationsExternal.types +++ b/tests/baselines/reference/ambientDeclarationsExternal.types @@ -21,6 +21,8 @@ var n: number; // Ambient external module with export assignment declare module 'equ' { +>'equ' : typeof 'equ' + var x; >x : any @@ -29,6 +31,8 @@ declare module 'equ' { } declare module 'equ2' { +>'equ2' : typeof 'equ2' + var x: number; >x : number } diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.symbols b/tests/baselines/reference/ambientDeclarationsPatterns.symbols index 4c0acc93f8f93..22fc293787269 100644 --- a/tests/baselines/reference/ambientDeclarationsPatterns.symbols +++ b/tests/baselines/reference/ambientDeclarationsPatterns.symbols @@ -25,23 +25,31 @@ foo(fileText); === tests/cases/conformance/ambient/declarations.d.ts === declare module "foo*baz" { +>"foo*baz" : Symbol("foo*baz", Decl(declarations.d.ts, 0, 0), Decl(declarations.d.ts, 2, 1)) + export function foo(s: string): void; >foo : Symbol(foo, Decl(declarations.d.ts, 0, 26)) >s : Symbol(s, Decl(declarations.d.ts, 1, 24)) } // Augmentations still work declare module "foo*baz" { +>"foo*baz" : Symbol("foo*baz", Decl(declarations.d.ts, 0, 0), Decl(declarations.d.ts, 2, 1)) + export const baz: string; >baz : Symbol(baz, Decl(declarations.d.ts, 5, 16)) } // Longest prefix wins declare module "foos*" { +>"foos*" : Symbol("foos*", Decl(declarations.d.ts, 6, 1)) + export const foos: string; >foos : Symbol(foos, Decl(declarations.d.ts, 10, 16)) } declare module "*!text" { +>"*!text" : Symbol("*!text", Decl(declarations.d.ts, 11, 1)) + const x: string; >x : Symbol(x, Decl(declarations.d.ts, 14, 9)) diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.types b/tests/baselines/reference/ambientDeclarationsPatterns.types index adf8ae1ab3b20..77cef7515b269 100644 --- a/tests/baselines/reference/ambientDeclarationsPatterns.types +++ b/tests/baselines/reference/ambientDeclarationsPatterns.types @@ -28,23 +28,31 @@ foo(fileText); === tests/cases/conformance/ambient/declarations.d.ts === declare module "foo*baz" { +>"foo*baz" : typeof "foo*baz" + export function foo(s: string): void; >foo : (s: string) => void >s : string } // Augmentations still work declare module "foo*baz" { +>"foo*baz" : typeof "foo*baz" + export const baz: string; >baz : string } // Longest prefix wins declare module "foos*" { +>"foos*" : typeof "foos*" + export const foos: string; >foos : string } declare module "*!text" { +>"*!text" : typeof "*!text" + const x: string; >x : string diff --git a/tests/baselines/reference/ambientExternalModuleMerging.symbols b/tests/baselines/reference/ambientExternalModuleMerging.symbols index 7fea7fea89fbd..b99157b11422c 100644 --- a/tests/baselines/reference/ambientExternalModuleMerging.symbols +++ b/tests/baselines/reference/ambientExternalModuleMerging.symbols @@ -17,12 +17,16 @@ var y = M.y; === tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts === declare module "M" { +>"M" : Symbol("M", Decl(ambientExternalModuleMerging_declare.ts, 0, 0), Decl(ambientExternalModuleMerging_declare.ts, 2, 1)) + export var x: string; >x : Symbol(x, Decl(ambientExternalModuleMerging_declare.ts, 1, 14)) } // Merge declare module "M" { +>"M" : Symbol("M", Decl(ambientExternalModuleMerging_declare.ts, 0, 0), Decl(ambientExternalModuleMerging_declare.ts, 2, 1)) + export var y: string; >y : Symbol(y, Decl(ambientExternalModuleMerging_declare.ts, 6, 14)) } diff --git a/tests/baselines/reference/ambientExternalModuleMerging.types b/tests/baselines/reference/ambientExternalModuleMerging.types index 1c1be0fd25665..8150f6c6dfc03 100644 --- a/tests/baselines/reference/ambientExternalModuleMerging.types +++ b/tests/baselines/reference/ambientExternalModuleMerging.types @@ -17,12 +17,16 @@ var y = M.y; === tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts === declare module "M" { +>"M" : typeof "M" + export var x: string; >x : string } // Merge declare module "M" { +>"M" : typeof "M" + export var y: string; >y : string } diff --git a/tests/baselines/reference/ambientExternalModuleReopen.symbols b/tests/baselines/reference/ambientExternalModuleReopen.symbols index a2a1ba72fab62..74bc430550b77 100644 --- a/tests/baselines/reference/ambientExternalModuleReopen.symbols +++ b/tests/baselines/reference/ambientExternalModuleReopen.symbols @@ -1,9 +1,13 @@ === tests/cases/compiler/ambientExternalModuleReopen.ts === declare module "fs" { +>"fs" : Symbol("fs", Decl(ambientExternalModuleReopen.ts, 0, 0), Decl(ambientExternalModuleReopen.ts, 2, 1)) + var x: string; >x : Symbol(x, Decl(ambientExternalModuleReopen.ts, 1, 7)) } declare module 'fs' { +>'fs' : Symbol("fs", Decl(ambientExternalModuleReopen.ts, 0, 0), Decl(ambientExternalModuleReopen.ts, 2, 1)) + var y: number; >y : Symbol(y, Decl(ambientExternalModuleReopen.ts, 4, 7)) } diff --git a/tests/baselines/reference/ambientExternalModuleReopen.types b/tests/baselines/reference/ambientExternalModuleReopen.types index 842d634344cdc..dffba752e0555 100644 --- a/tests/baselines/reference/ambientExternalModuleReopen.types +++ b/tests/baselines/reference/ambientExternalModuleReopen.types @@ -1,9 +1,13 @@ === tests/cases/compiler/ambientExternalModuleReopen.ts === declare module "fs" { +>"fs" : typeof "fs" + var x: string; >x : string } declare module 'fs' { +>'fs' : typeof "fs" + var y: number; >y : number } diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols index d7e3b5925b107..621c7b3ebfc20 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols @@ -9,6 +9,8 @@ var c = new A(); === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts === declare module 'M' { +>'M' : Symbol('M', Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 0, 0)) + module C { >C : Symbol(C, Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 3, 5)) diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types index 4e9043d1b75f8..1737229413118 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types @@ -10,6 +10,8 @@ var c = new A(); === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts === declare module 'M' { +>'M' : typeof 'M' + module C { >C : typeof C diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols index 15ddf4ac48838..6827122959d55 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols @@ -9,6 +9,8 @@ var c = new A(); === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts === declare module 'M' { +>'M' : Symbol('M', Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 0)) + module C { >C : Symbol(C, Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 3, 5)) diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types index 0029817400bc5..c943603fb52ee 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types @@ -10,6 +10,8 @@ var c = new A(); === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts === declare module 'M' { +>'M' : typeof 'M' + module C { >C : typeof C diff --git a/tests/baselines/reference/ambientRequireFunction.symbols b/tests/baselines/reference/ambientRequireFunction.symbols index 6afb47e37fb0a..9c859b57784e7 100644 --- a/tests/baselines/reference/ambientRequireFunction.symbols +++ b/tests/baselines/reference/ambientRequireFunction.symbols @@ -20,6 +20,8 @@ declare function require(moduleName: string): any; >moduleName : Symbol(moduleName, Decl(node.d.ts, 2, 25)) declare module "fs" { +>"fs" : Symbol("fs", Decl(node.d.ts, 2, 50)) + export function readFileSync(s: string): string; >readFileSync : Symbol(readFileSync, Decl(node.d.ts, 4, 21)) >s : Symbol(s, Decl(node.d.ts, 5, 33)) diff --git a/tests/baselines/reference/ambientRequireFunction.types b/tests/baselines/reference/ambientRequireFunction.types index e0341d97ec3e4..4d9bfac56d275 100644 --- a/tests/baselines/reference/ambientRequireFunction.types +++ b/tests/baselines/reference/ambientRequireFunction.types @@ -23,6 +23,8 @@ declare function require(moduleName: string): any; >moduleName : string declare module "fs" { +>"fs" : typeof "fs" + export function readFileSync(s: string): string; >readFileSync : (s: string) => string >s : string diff --git a/tests/baselines/reference/ambientShorthand.symbols b/tests/baselines/reference/ambientShorthand.symbols index 6747fd6517304..c2231ac5c3deb 100644 --- a/tests/baselines/reference/ambientShorthand.symbols +++ b/tests/baselines/reference/ambientShorthand.symbols @@ -18,7 +18,9 @@ foo(bar, baz, boom); === tests/cases/conformance/ambient/declarations.d.ts === declare module "jquery" -No type information for this code.// Semicolon is optional -No type information for this code.declare module "fs"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"jquery" : Symbol("jquery", Decl(declarations.d.ts, 0, 0)) + +// Semicolon is optional +declare module "fs"; +>"fs" : Symbol("fs", Decl(declarations.d.ts, 0, 23)) + diff --git a/tests/baselines/reference/ambientShorthand.types b/tests/baselines/reference/ambientShorthand.types index 054349b1a6a44..4c93cc7fd8f0c 100644 --- a/tests/baselines/reference/ambientShorthand.types +++ b/tests/baselines/reference/ambientShorthand.types @@ -19,7 +19,9 @@ foo(bar, baz, boom); === tests/cases/conformance/ambient/declarations.d.ts === declare module "jquery" -No type information for this code.// Semicolon is optional -No type information for this code.declare module "fs"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"jquery" : any + +// Semicolon is optional +declare module "fs"; +>"fs" : any + diff --git a/tests/baselines/reference/ambientShorthand_declarationEmit.symbols b/tests/baselines/reference/ambientShorthand_declarationEmit.symbols index f1b3284b0f2f8..f1eabac0e9ebb 100644 --- a/tests/baselines/reference/ambientShorthand_declarationEmit.symbols +++ b/tests/baselines/reference/ambientShorthand_declarationEmit.symbols @@ -1,4 +1,4 @@ === tests/cases/conformance/ambient/ambientShorthand_declarationEmit.ts === declare module "foo"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"foo" : Symbol("foo", Decl(ambientShorthand_declarationEmit.ts, 0, 0)) + diff --git a/tests/baselines/reference/ambientShorthand_declarationEmit.types b/tests/baselines/reference/ambientShorthand_declarationEmit.types index f1b3284b0f2f8..c5c8411bb0311 100644 --- a/tests/baselines/reference/ambientShorthand_declarationEmit.types +++ b/tests/baselines/reference/ambientShorthand_declarationEmit.types @@ -1,4 +1,4 @@ === tests/cases/conformance/ambient/ambientShorthand_declarationEmit.ts === declare module "foo"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"foo" : any + diff --git a/tests/baselines/reference/ambientShorthand_duplicate.symbols b/tests/baselines/reference/ambientShorthand_duplicate.symbols index 05856b47b92af..6d5716a193c49 100644 --- a/tests/baselines/reference/ambientShorthand_duplicate.symbols +++ b/tests/baselines/reference/ambientShorthand_duplicate.symbols @@ -6,5 +6,5 @@ import foo from "foo"; === tests/cases/conformance/ambient/declarations1.d.ts === declare module "foo"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"foo" : Symbol("foo", Decl(declarations1.d.ts, 0, 0)) + diff --git a/tests/baselines/reference/ambientShorthand_duplicate.types b/tests/baselines/reference/ambientShorthand_duplicate.types index 1520c5447ecd8..8abf9f7b230d7 100644 --- a/tests/baselines/reference/ambientShorthand_duplicate.types +++ b/tests/baselines/reference/ambientShorthand_duplicate.types @@ -6,5 +6,5 @@ import foo from "foo"; === tests/cases/conformance/ambient/declarations1.d.ts === declare module "foo"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"foo" : any + diff --git a/tests/baselines/reference/ambientShorthand_merging.symbols b/tests/baselines/reference/ambientShorthand_merging.symbols index 8a0ca5acb74eb..d37bdb060789d 100644 --- a/tests/baselines/reference/ambientShorthand_merging.symbols +++ b/tests/baselines/reference/ambientShorthand_merging.symbols @@ -7,5 +7,5 @@ import foo, {bar} from "foo"; === tests/cases/conformance/ambient/declarations1.d.ts === declare module "foo"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"foo" : Symbol("foo", Decl(declarations1.d.ts, 0, 0)) + diff --git a/tests/baselines/reference/ambientShorthand_merging.types b/tests/baselines/reference/ambientShorthand_merging.types index 78390a35dd836..ad9827f47ebab 100644 --- a/tests/baselines/reference/ambientShorthand_merging.types +++ b/tests/baselines/reference/ambientShorthand_merging.types @@ -7,5 +7,5 @@ import foo, {bar} from "foo"; === tests/cases/conformance/ambient/declarations1.d.ts === declare module "foo"; -No type information for this code. -No type information for this code. \ No newline at end of file +>"foo" : any + diff --git a/tests/baselines/reference/ambientShorthand_reExport.symbols b/tests/baselines/reference/ambientShorthand_reExport.symbols index 1e8d531801115..3aa3ddcec3d48 100644 --- a/tests/baselines/reference/ambientShorthand_reExport.symbols +++ b/tests/baselines/reference/ambientShorthand_reExport.symbols @@ -1,7 +1,8 @@ === tests/cases/conformance/ambient/declarations.d.ts === declare module "jquery"; -No type information for this code. -No type information for this code.=== tests/cases/conformance/ambient/reExportX.ts === +>"jquery" : Symbol("jquery", Decl(declarations.d.ts, 0, 0)) + +=== tests/cases/conformance/ambient/reExportX.ts === export {x} from "jquery"; >x : Symbol(x, Decl(reExportX.ts, 0, 8)) diff --git a/tests/baselines/reference/ambientShorthand_reExport.types b/tests/baselines/reference/ambientShorthand_reExport.types index 5765c7e033176..e3e6c9742fdc4 100644 --- a/tests/baselines/reference/ambientShorthand_reExport.types +++ b/tests/baselines/reference/ambientShorthand_reExport.types @@ -1,7 +1,8 @@ === tests/cases/conformance/ambient/declarations.d.ts === declare module "jquery"; -No type information for this code. -No type information for this code.=== tests/cases/conformance/ambient/reExportX.ts === +>"jquery" : any + +=== tests/cases/conformance/ambient/reExportX.ts === export {x} from "jquery"; >x : any diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols index ce63368333991..4bd6397936dee 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols @@ -4,9 +4,11 @@ class S { 1: string; } >S : Symbol(S, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 0, 0)) +>1 : Symbol(S[1], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 3, 9)) class T { 1.: string; } >T : Symbol(T, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 3, 22)) +>1. : Symbol(T[1.], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 4, 9)) var s: S; >s : Symbol(s, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 5, 3)) @@ -18,10 +20,12 @@ var t: T; interface S2 { 1: string; bar?: string } >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 6, 9)) +>1 : Symbol(S2[1], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 14)) >bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 25)) interface T2 { 1.0: string; baz?: string } >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 40)) +>1.0 : Symbol(T2[1.0], Decl(assignmentCompatWithObjectMembersNumericNames.ts, 9, 14)) >baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 9, 27)) var s2: S2; @@ -34,17 +38,21 @@ var t2: T2; var a: { 1.: string; bar?: string } >a : Symbol(a, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 13, 3)) +>1. : Symbol(1., Decl(assignmentCompatWithObjectMembersNumericNames.ts, 13, 8)) >bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 13, 20)) var b: { 1.0: string; baz?: string } >b : Symbol(b, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 14, 3)) +>1.0 : Symbol(1.0, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 14, 8)) >baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 14, 21)) var a2 = { 1.0: '' }; >a2 : Symbol(a2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 16, 3)) +>1.0 : Symbol(1.0, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 16, 10)) var b2 = { 1: '' }; >b2 : Symbol(b2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 17, 3)) +>1 : Symbol(1, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 17, 10)) s = t; >s : Symbol(s, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 5, 3)) diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types index 0c44316d3249b..aea92a9aa3f9d 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.types @@ -4,9 +4,11 @@ class S { 1: string; } >S : S +>1 : string class T { 1.: string; } >T : T +>1. : string var s: S; >s : S @@ -18,10 +20,12 @@ var t: T; interface S2 { 1: string; bar?: string } >S2 : S2 +>1 : string >bar : string interface T2 { 1.0: string; baz?: string } >T2 : T2 +>1.0 : string >baz : string var s2: S2; @@ -34,20 +38,24 @@ var t2: T2; var a: { 1.: string; bar?: string } >a : { 1.: string; bar?: string; } +>1. : string >bar : string var b: { 1.0: string; baz?: string } >b : { 1.0: string; baz?: string; } +>1.0 : string >baz : string var a2 = { 1.0: '' }; >a2 : { 1.0: string; } >{ 1.0: '' } : { 1.0: string; } +>1.0 : string >'' : "" var b2 = { 1: '' }; >b2 : { 1: string; } >{ 1: '' } : { 1: string; } +>1 : string >'' : "" s = t; diff --git a/tests/baselines/reference/augmentExportEquals3.symbols b/tests/baselines/reference/augmentExportEquals3.symbols index 485f977321f6f..9c01411fe7358 100644 --- a/tests/baselines/reference/augmentExportEquals3.symbols +++ b/tests/baselines/reference/augmentExportEquals3.symbols @@ -23,6 +23,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "./file1" { +>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 1, 17), Decl(file2.ts, 1, 8)) + interface A { a } >A : Symbol(A, Decl(file2.ts, 4, 26)) >a : Symbol(A.a, Decl(file2.ts, 5, 17)) diff --git a/tests/baselines/reference/augmentExportEquals3.types b/tests/baselines/reference/augmentExportEquals3.types index f900d59735ea4..dd167f37ad1a2 100644 --- a/tests/baselines/reference/augmentExportEquals3.types +++ b/tests/baselines/reference/augmentExportEquals3.types @@ -26,6 +26,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "./file1" { +>"./file1" : typeof x + interface A { a } >A : A >a : any diff --git a/tests/baselines/reference/augmentExportEquals3_1.symbols b/tests/baselines/reference/augmentExportEquals3_1.symbols index ad3505c2835ca..2431b293deae2 100644 --- a/tests/baselines/reference/augmentExportEquals3_1.symbols +++ b/tests/baselines/reference/augmentExportEquals3_1.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/file1.d.ts === declare module "file1" { +>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0)) + function foo(): void; >foo : Symbol(foo, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 25), Decl(file2.ts, 2, 8)) @@ -26,6 +28,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "file1" { +>"file1" : Symbol(x, Decl(file1.d.ts, 0, 24), Decl(file1.d.ts, 1, 25), Decl(file2.ts, 2, 8)) + interface A { a } >A : Symbol(A, Decl(file2.ts, 5, 24)) >a : Symbol(A.a, Decl(file2.ts, 6, 17)) diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types index 2457e91530a14..f841fb315352e 100644 --- a/tests/baselines/reference/augmentExportEquals3_1.types +++ b/tests/baselines/reference/augmentExportEquals3_1.types @@ -1,5 +1,7 @@ === tests/cases/compiler/file1.d.ts === declare module "file1" { +>"file1" : typeof "file1" + function foo(): void; >foo : typeof foo @@ -28,6 +30,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "file1" { +>"file1" : typeof x + interface A { a } >A : A >a : any diff --git a/tests/baselines/reference/augmentExportEquals4.symbols b/tests/baselines/reference/augmentExportEquals4.symbols index 7394e8c6b2828..197d3f7986175 100644 --- a/tests/baselines/reference/augmentExportEquals4.symbols +++ b/tests/baselines/reference/augmentExportEquals4.symbols @@ -23,6 +23,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "./file1" { +>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 1, 12), Decl(file2.ts, 1, 8)) + interface A { a } >A : Symbol(A, Decl(file2.ts, 4, 26)) >a : Symbol(A.a, Decl(file2.ts, 5, 17)) diff --git a/tests/baselines/reference/augmentExportEquals4.types b/tests/baselines/reference/augmentExportEquals4.types index c7ffe8bd774fa..48af438e3bde4 100644 --- a/tests/baselines/reference/augmentExportEquals4.types +++ b/tests/baselines/reference/augmentExportEquals4.types @@ -26,6 +26,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "./file1" { +>"./file1" : typeof x + interface A { a } >A : A >a : any diff --git a/tests/baselines/reference/augmentExportEquals4_1.symbols b/tests/baselines/reference/augmentExportEquals4_1.symbols index 9954f71bfbc70..bdb2f4854aa63 100644 --- a/tests/baselines/reference/augmentExportEquals4_1.symbols +++ b/tests/baselines/reference/augmentExportEquals4_1.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/file1.d.ts === declare module "file1" { +>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0)) + class foo {} >foo : Symbol(foo, Decl(file1.d.ts, 1, 24), Decl(file1.d.ts, 2, 16), Decl(file2.ts, 2, 8)) @@ -27,6 +29,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "file1" { +>"file1" : Symbol(x, Decl(file1.d.ts, 1, 24), Decl(file1.d.ts, 2, 16), Decl(file2.ts, 2, 8)) + interface A { a } >A : Symbol(A, Decl(file2.ts, 5, 24)) >a : Symbol(A.a, Decl(file2.ts, 6, 17)) diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types index 60a7c2d77bba0..374b588df29aa 100644 --- a/tests/baselines/reference/augmentExportEquals4_1.types +++ b/tests/baselines/reference/augmentExportEquals4_1.types @@ -1,6 +1,8 @@ === tests/cases/compiler/file1.d.ts === declare module "file1" { +>"file1" : typeof "file1" + class foo {} >foo : foo @@ -29,6 +31,8 @@ x.b = 1; // OK - './file1' is a namespace declare module "file1" { +>"file1" : typeof x + interface A { a } >A : A >a : any diff --git a/tests/baselines/reference/augmentExportEquals5.symbols b/tests/baselines/reference/augmentExportEquals5.symbols index 09da5f32d72be..e3fd54df231a3 100644 --- a/tests/baselines/reference/augmentExportEquals5.symbols +++ b/tests/baselines/reference/augmentExportEquals5.symbols @@ -15,6 +15,8 @@ declare module Express { } declare module "express" { +>"express" : Symbol("express", Decl(express.d.ts, 6, 1)) + function e(): e.Express; >e : Symbol(e, Decl(express.d.ts, 8, 26), Decl(express.d.ts, 9, 28), Decl(augmentation.ts, 1, 29)) >e : Symbol(e, Decl(express.d.ts, 8, 26), Decl(express.d.ts, 9, 28)) @@ -169,6 +171,8 @@ import * as e from "express"; >e : Symbol(e, Decl(augmentation.ts, 1, 6)) declare module "express" { +>"express" : Symbol(e, Decl(express.d.ts, 8, 26), Decl(express.d.ts, 9, 28), Decl(augmentation.ts, 1, 29)) + interface Request { >Request : Symbol(Request, Decl(express.d.ts, 27, 49), Decl(augmentation.ts, 2, 26)) diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types index 7d4d765e5ee32..aa93571eef3c9 100644 --- a/tests/baselines/reference/augmentExportEquals5.types +++ b/tests/baselines/reference/augmentExportEquals5.types @@ -15,6 +15,8 @@ declare module Express { } declare module "express" { +>"express" : typeof "express" + function e(): e.Express; >e : typeof e >e : any @@ -169,6 +171,8 @@ import * as e from "express"; >e : typeof e declare module "express" { +>"express" : typeof e + interface Request { >Request : Request diff --git a/tests/baselines/reference/augmentExportEquals6.symbols b/tests/baselines/reference/augmentExportEquals6.symbols index 9ccf8685af776..742df03727b0a 100644 --- a/tests/baselines/reference/augmentExportEquals6.symbols +++ b/tests/baselines/reference/augmentExportEquals6.symbols @@ -29,6 +29,8 @@ x.B.b = 1; // OK - './file1' is a namespace declare module "./file1" { +>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 1, 12), Decl(file2.ts, 1, 10)) + interface A { a: number } >A : Symbol(A, Decl(file1.ts, 2, 15), Decl(file2.ts, 4, 26)) >a : Symbol(A.a, Decl(file2.ts, 5, 17)) diff --git a/tests/baselines/reference/augmentExportEquals6.types b/tests/baselines/reference/augmentExportEquals6.types index e2342e96dfb4f..a42de434e1f0d 100644 --- a/tests/baselines/reference/augmentExportEquals6.types +++ b/tests/baselines/reference/augmentExportEquals6.types @@ -31,6 +31,8 @@ x.B.b = 1; // OK - './file1' is a namespace declare module "./file1" { +>"./file1" : typeof x + interface A { a: number } >A : A >a : number diff --git a/tests/baselines/reference/augmentExportEquals6_1.symbols b/tests/baselines/reference/augmentExportEquals6_1.symbols index c66f01e2d14f3..369960f15158b 100644 --- a/tests/baselines/reference/augmentExportEquals6_1.symbols +++ b/tests/baselines/reference/augmentExportEquals6_1.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/file1.d.ts === declare module "file1" { +>"file1" : Symbol("file1", Decl(file1.d.ts, 0, 0)) + class foo {} >foo : Symbol(foo, Decl(file1.d.ts, 1, 24), Decl(file1.d.ts, 2, 16), Decl(file2.ts, 1, 28)) @@ -22,6 +24,8 @@ import x = require("file1"); // OK - './file1' is a namespace declare module "file1" { +>"file1" : Symbol(x, Decl(file1.d.ts, 1, 24), Decl(file1.d.ts, 2, 16), Decl(file2.ts, 1, 28)) + interface A { a: number } >A : Symbol(A, Decl(file1.d.ts, 3, 19), Decl(file2.ts, 4, 24)) >a : Symbol(A.a, Decl(file2.ts, 5, 17)) diff --git a/tests/baselines/reference/augmentExportEquals6_1.types b/tests/baselines/reference/augmentExportEquals6_1.types index 9d6042ee65969..bb8870f16838e 100644 --- a/tests/baselines/reference/augmentExportEquals6_1.types +++ b/tests/baselines/reference/augmentExportEquals6_1.types @@ -1,6 +1,8 @@ === tests/cases/compiler/file1.d.ts === declare module "file1" { +>"file1" : typeof "file1" + class foo {} >foo : foo @@ -22,6 +24,8 @@ import x = require("file1"); // OK - './file1' is a namespace declare module "file1" { +>"file1" : typeof x + interface A { a: number } >A : A >a : number diff --git a/tests/baselines/reference/bangInModuleName.symbols b/tests/baselines/reference/bangInModuleName.symbols index 63ba5d106d800..a6074f54d29be 100644 --- a/tests/baselines/reference/bangInModuleName.symbols +++ b/tests/baselines/reference/bangInModuleName.symbols @@ -9,9 +9,12 @@ import * as http from 'intern/dojo/node!http'; declare module "http" { +>"http" : Symbol("http", Decl(a.d.ts, 0, 0)) } declare module 'intern/dojo/node!http' { +>'intern/dojo/node!http' : Symbol('intern/dojo/node!http', Decl(a.d.ts, 3, 1)) + import http = require('http'); >http : Symbol(http, Decl(a.d.ts, 5, 40)) diff --git a/tests/baselines/reference/bangInModuleName.types b/tests/baselines/reference/bangInModuleName.types index 06a602e2ff831..972c3a3da7d7f 100644 --- a/tests/baselines/reference/bangInModuleName.types +++ b/tests/baselines/reference/bangInModuleName.types @@ -9,9 +9,12 @@ import * as http from 'intern/dojo/node!http'; declare module "http" { +>"http" : typeof "http" } declare module 'intern/dojo/node!http' { +>'intern/dojo/node!http' : typeof 'intern/dojo/node!http' + import http = require('http'); >http : typeof http diff --git a/tests/baselines/reference/binaryIntegerLiteral.symbols b/tests/baselines/reference/binaryIntegerLiteral.symbols index 31e28819657b0..fb15a8b6e6ca0 100644 --- a/tests/baselines/reference/binaryIntegerLiteral.symbols +++ b/tests/baselines/reference/binaryIntegerLiteral.symbols @@ -15,6 +15,8 @@ var obj1 = { >obj1 : Symbol(obj1, Decl(binaryIntegerLiteral.ts, 5, 3)) 0b11010: "Hello", +>0b11010 : Symbol(0b11010, Decl(binaryIntegerLiteral.ts, 5, 12)) + a: bin1, >a : Symbol(a, Decl(binaryIntegerLiteral.ts, 6, 21)) >bin1 : Symbol(bin1, Decl(binaryIntegerLiteral.ts, 0, 3)) @@ -26,12 +28,15 @@ var obj1 = { >b : Symbol(b, Decl(binaryIntegerLiteral.ts, 8, 9)) 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true, +>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteral.ts, 9, 15)) } var obj2 = { >obj2 : Symbol(obj2, Decl(binaryIntegerLiteral.ts, 13, 3)) 0B11010: "World", +>0B11010 : Symbol(0B11010, Decl(binaryIntegerLiteral.ts, 13, 12)) + a: bin2, >a : Symbol(a, Decl(binaryIntegerLiteral.ts, 14, 21)) >bin2 : Symbol(bin2, Decl(binaryIntegerLiteral.ts, 1, 3)) @@ -43,6 +48,7 @@ var obj2 = { >b : Symbol(b, Decl(binaryIntegerLiteral.ts, 16, 9)) 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false, +>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteral.ts, 17, 15)) } obj1[0b11010]; // string diff --git a/tests/baselines/reference/binaryIntegerLiteral.types b/tests/baselines/reference/binaryIntegerLiteral.types index 5cee371fdbeb7..070ae22d79661 100644 --- a/tests/baselines/reference/binaryIntegerLiteral.types +++ b/tests/baselines/reference/binaryIntegerLiteral.types @@ -20,6 +20,7 @@ var obj1 = { >{ 0b11010: "Hello", a: bin1, bin1, b: 0b11010, 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,} : { 0b11010: string; a: number; bin1: number; b: number; 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; } 0b11010: "Hello", +>0b11010 : string >"Hello" : "Hello" a: bin1, @@ -34,6 +35,7 @@ var obj1 = { >0b11010 : 26 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true, +>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean >true : true } @@ -42,6 +44,7 @@ var obj2 = { >{ 0B11010: "World", a: bin2, bin2, b: 0B11010, 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,} : { 0B11010: string; a: number; bin2: number; b: number; 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; } 0B11010: "World", +>0B11010 : string >"World" : "World" a: bin2, @@ -56,6 +59,7 @@ var obj2 = { >0B11010 : 26 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false, +>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean >false : false } diff --git a/tests/baselines/reference/binaryIntegerLiteralES6.symbols b/tests/baselines/reference/binaryIntegerLiteralES6.symbols index 4fb7aaff82dcf..15c8c633019e3 100644 --- a/tests/baselines/reference/binaryIntegerLiteralES6.symbols +++ b/tests/baselines/reference/binaryIntegerLiteralES6.symbols @@ -15,6 +15,8 @@ var obj1 = { >obj1 : Symbol(obj1, Decl(binaryIntegerLiteralES6.ts, 5, 3)) 0b11010: "Hello", +>0b11010 : Symbol(0b11010, Decl(binaryIntegerLiteralES6.ts, 5, 12)) + a: bin1, >a : Symbol(a, Decl(binaryIntegerLiteralES6.ts, 6, 21)) >bin1 : Symbol(bin1, Decl(binaryIntegerLiteralES6.ts, 0, 3)) @@ -26,12 +28,15 @@ var obj1 = { >b : Symbol(b, Decl(binaryIntegerLiteralES6.ts, 8, 9)) 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true, +>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteralES6.ts, 9, 15)) } var obj2 = { >obj2 : Symbol(obj2, Decl(binaryIntegerLiteralES6.ts, 13, 3)) 0B11010: "World", +>0B11010 : Symbol(0B11010, Decl(binaryIntegerLiteralES6.ts, 13, 12)) + a: bin2, >a : Symbol(a, Decl(binaryIntegerLiteralES6.ts, 14, 21)) >bin2 : Symbol(bin2, Decl(binaryIntegerLiteralES6.ts, 1, 3)) @@ -43,6 +48,7 @@ var obj2 = { >b : Symbol(b, Decl(binaryIntegerLiteralES6.ts, 16, 9)) 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false, +>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : Symbol(0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111, Decl(binaryIntegerLiteralES6.ts, 17, 15)) } obj1[0b11010]; // string diff --git a/tests/baselines/reference/binaryIntegerLiteralES6.types b/tests/baselines/reference/binaryIntegerLiteralES6.types index ab28010283bea..fe9f65a1f7163 100644 --- a/tests/baselines/reference/binaryIntegerLiteralES6.types +++ b/tests/baselines/reference/binaryIntegerLiteralES6.types @@ -20,6 +20,7 @@ var obj1 = { >{ 0b11010: "Hello", a: bin1, bin1, b: 0b11010, 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true,} : { 0b11010: string; a: number; bin1: number; b: number; 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; } 0b11010: "Hello", +>0b11010 : string >"Hello" : "Hello" a: bin1, @@ -34,6 +35,7 @@ var obj1 = { >0b11010 : 26 0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111: true, +>0B111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean >true : true } @@ -42,6 +44,7 @@ var obj2 = { >{ 0B11010: "World", a: bin2, bin2, b: 0B11010, 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false,} : { 0B11010: string; a: number; bin2: number; b: number; 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: boolean; } 0B11010: "World", +>0B11010 : string >"World" : "World" a: bin2, @@ -56,6 +59,7 @@ var obj2 = { >0B11010 : 26 0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111: false, +>0B11111111111111111111111111111111111111111111111101001010100000010111110001111111111 : boolean >false : false } diff --git a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols index 6bd0aa8ad5578..aeb7f0dd11868 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols +++ b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.symbols @@ -6,6 +6,7 @@ enum ENUM1 { A, B, "" }; >ENUM1 : Symbol(ENUM1, Decl(bitwiseNotOperatorWithEnumType.ts, 0, 0)) >A : Symbol(ENUM1.A, Decl(bitwiseNotOperatorWithEnumType.ts, 3, 12)) >B : Symbol(ENUM1.B, Decl(bitwiseNotOperatorWithEnumType.ts, 3, 15)) +>"" : Symbol(ENUM1[""], Decl(bitwiseNotOperatorWithEnumType.ts, 3, 18)) // enum type var var ResultIsNumber1 = ~ENUM1; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types index 53d44f584eaa2..8deff0174e670 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types +++ b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.types @@ -6,6 +6,7 @@ enum ENUM1 { A, B, "" }; >ENUM1 : ENUM1 >A : ENUM1.A >B : ENUM1.B +>"" : ENUM1."" // enum type var var ResultIsNumber1 = ~ENUM1; diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols index b09c819cf65e8..e55bfd99aa8e4 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols @@ -27,6 +27,7 @@ class C { >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 0: number; +>0 : Symbol(C[0], Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 8, 24)) } interface I { @@ -51,6 +52,7 @@ interface I { >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 0: number; +>0 : Symbol(I[0], Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 17, 24)) } var c: C; diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types index 272ba94f7f22d..65e01240b7229 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types @@ -29,6 +29,7 @@ class C { >Object : Object 0: number; +>0 : number } interface I { @@ -53,6 +54,7 @@ interface I { >Object : Object 0: number; +>0 : number } var c: C; diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols index 80658b0531c6b..ab33778751712 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols @@ -27,6 +27,7 @@ class C { >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 0: number; +>0 : Symbol(C[0], Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 8, 24)) public static foo: string; // doesn't effect equivalence >foo : Symbol(C.foo, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 9, 14)) @@ -54,6 +55,7 @@ interface I { >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 0: number; +>0 : Symbol(I[0], Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 19, 24)) } var c: C; diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types index 22440da176824..a5fbc06e0af16 100644 --- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types +++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types @@ -29,6 +29,7 @@ class C { >Object : Object 0: number; +>0 : number public static foo: string; // doesn't effect equivalence >foo : string @@ -56,6 +57,7 @@ interface I { >Object : Object 0: number; +>0 : number } var c: C; diff --git a/tests/baselines/reference/commonSourceDirectory.symbols b/tests/baselines/reference/commonSourceDirectory.symbols index 5409286ede59e..89233ddd3cca4 100644 --- a/tests/baselines/reference/commonSourceDirectory.symbols +++ b/tests/baselines/reference/commonSourceDirectory.symbols @@ -18,6 +18,8 @@ export const x = 0; === /types/bar.d.ts === declare module "bar" { +>"bar" : Symbol("bar", Decl(bar.d.ts, 0, 0)) + export const y = 0; >y : Symbol(y, Decl(bar.d.ts, 1, 16)) } diff --git a/tests/baselines/reference/commonSourceDirectory.types b/tests/baselines/reference/commonSourceDirectory.types index ce0169582d784..ea16e24b8513f 100644 --- a/tests/baselines/reference/commonSourceDirectory.types +++ b/tests/baselines/reference/commonSourceDirectory.types @@ -20,6 +20,8 @@ export const x = 0; === /types/bar.d.ts === declare module "bar" { +>"bar" : typeof "bar" + export const y = 0; >y : 0 >0 : 0 diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols index fb303b1f8b371..23179820592b2 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.symbols @@ -23,6 +23,8 @@ foo({ >p : Symbol(p, Decl(computedPropertyNamesContextualType6_ES5.ts, 6, 5)) 0: () => { }, +>0 : Symbol(0, Decl(computedPropertyNamesContextualType6_ES5.ts, 7, 10)) + ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0] diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types index f144bb9d020e9..de6474695a45a 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types @@ -26,6 +26,7 @@ foo({ >"" : "" 0: () => { }, +>0 : () => void >() => { } : () => void ["hi" + "bye"]: true, diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols index b3e371447e200..d441c593fb3e1 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.symbols @@ -23,6 +23,8 @@ foo({ >p : Symbol(p, Decl(computedPropertyNamesContextualType6_ES6.ts, 6, 5)) 0: () => { }, +>0 : Symbol(0, Decl(computedPropertyNamesContextualType6_ES6.ts, 7, 10)) + ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0] diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types index 6b8c8ae2e34fc..07110d604e29b 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types +++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types @@ -26,6 +26,7 @@ foo({ >"" : "" 0: () => { }, +>0 : () => void >() => { } : () => void ["hi" + "bye"]: true, diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols index d6889f9912d93..77e87a5bf4891 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols +++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.symbols @@ -36,6 +36,8 @@ foo({ >foo : Symbol(foo, Decl(computedPropertyNamesContextualType7_ES5.ts, 5, 1)) 0: () => { }, +>0 : Symbol(0, Decl(computedPropertyNamesContextualType7_ES5.ts, 10, 5)) + ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0] diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types index b77a129a0b43e..e838c06bfa160 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types +++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types @@ -38,6 +38,7 @@ foo({ >{ 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]} : { [x: string]: number | boolean | (() => void) | number[]; [x: number]: number | (() => void) | number[]; 0: () => void; } 0: () => { }, +>0 : () => void >() => { } : () => void ["hi" + "bye"]: true, diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols index d04c8f913bdbb..5f798731dbabf 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols +++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.symbols @@ -36,6 +36,8 @@ foo({ >foo : Symbol(foo, Decl(computedPropertyNamesContextualType7_ES6.ts, 5, 1)) 0: () => { }, +>0 : Symbol(0, Decl(computedPropertyNamesContextualType7_ES6.ts, 10, 5)) + ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0] diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types index f041b2b4eb49a..ace52b05bcbb7 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types +++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types @@ -38,6 +38,7 @@ foo({ >{ 0: () => { }, ["hi" + "bye"]: true, [0 + 1]: 0, [+"hi"]: [0]} : { [x: string]: number | boolean | (() => void) | number[]; [x: number]: number | (() => void) | number[]; 0: () => void; } 0: () => { }, +>0 : () => void >() => { } : () => void ["hi" + "bye"]: true, diff --git a/tests/baselines/reference/constEnumPropertyAccess1.symbols b/tests/baselines/reference/constEnumPropertyAccess1.symbols index e5f2853f15738..01f0010f4292a 100644 --- a/tests/baselines/reference/constEnumPropertyAccess1.symbols +++ b/tests/baselines/reference/constEnumPropertyAccess1.symbols @@ -31,6 +31,8 @@ var o: { } = { 1: true +>1 : Symbol(1, Decl(constEnumPropertyAccess1.ts, 14, 5)) + }; var a = G.A; diff --git a/tests/baselines/reference/constEnumPropertyAccess1.types b/tests/baselines/reference/constEnumPropertyAccess1.types index 869a31d5e1f9b..07c536766c381 100644 --- a/tests/baselines/reference/constEnumPropertyAccess1.types +++ b/tests/baselines/reference/constEnumPropertyAccess1.types @@ -38,6 +38,7 @@ var o: { >{ 1: true } : { 1: true; } 1: true +>1 : boolean >true : true }; diff --git a/tests/baselines/reference/constIndexedAccess.symbols b/tests/baselines/reference/constIndexedAccess.symbols index f7ce6b78c2dd2..dfdeddd784546 100644 --- a/tests/baselines/reference/constIndexedAccess.symbols +++ b/tests/baselines/reference/constIndexedAccess.symbols @@ -14,7 +14,10 @@ interface indexAccess { >indexAccess : Symbol(indexAccess, Decl(constIndexedAccess.ts, 4, 1)) 0: string; +>0 : Symbol(indexAccess[0], Decl(constIndexedAccess.ts, 6, 23)) + 1: number; +>1 : Symbol(indexAccess[1], Decl(constIndexedAccess.ts, 7, 14)) } let test: indexAccess; diff --git a/tests/baselines/reference/constIndexedAccess.types b/tests/baselines/reference/constIndexedAccess.types index 9e08cf08f4983..a0850e49a6503 100644 --- a/tests/baselines/reference/constIndexedAccess.types +++ b/tests/baselines/reference/constIndexedAccess.types @@ -14,7 +14,10 @@ interface indexAccess { >indexAccess : indexAccess 0: string; +>0 : string + 1: number; +>1 : number } let test: indexAccess; diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.symbols b/tests/baselines/reference/contextualTypeArrayReturnType.symbols index 2982a1ce893af..0688e810c08f7 100644 --- a/tests/baselines/reference/contextualTypeArrayReturnType.symbols +++ b/tests/baselines/reference/contextualTypeArrayReturnType.symbols @@ -33,6 +33,8 @@ var style: IBookStyle = { return [ {'ry': null } +>'ry' : Symbol('ry', Decl(contextualTypeArrayReturnType.ts, 15, 13)) + ]; } } diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.types b/tests/baselines/reference/contextualTypeArrayReturnType.types index 6c91fd7b8b964..aee8eae59f5a1 100644 --- a/tests/baselines/reference/contextualTypeArrayReturnType.types +++ b/tests/baselines/reference/contextualTypeArrayReturnType.types @@ -38,6 +38,7 @@ var style: IBookStyle = { {'ry': null } >{'ry': null } : { 'ry': null; } +>'ry' : null >null : null ]; diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols index 985bb52f243d9..207b4dab689cb 100644 --- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols +++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols @@ -24,6 +24,7 @@ interface IWithNoNumberIndexSignature { >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1)) 0: string; +>0 : Symbol(IWithNoNumberIndexSignature[0], Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 12, 39)) } interface IWithStringIndexSignature1 { >IWithStringIndexSignature1 : Symbol(IWithStringIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 14, 1)) @@ -113,6 +114,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a } >x3 : Symbol(x3, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 3)) >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1)) >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1)) +>1 : Symbol(1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 68)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 71)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 71)) @@ -120,6 +122,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a } >x3 : Symbol(x3, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 3)) >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1)) >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1)) +>0 : Symbol(0, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 68)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 71)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 71)) @@ -127,11 +130,13 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello" >x3 : Symbol(x3, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 3)) >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1)) >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1)) +>0 : Symbol(0, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 68)) var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number >x4 : Symbol(x4, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 3)) >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1)) >IWithNumberIndexSignature2 : Symbol(IWithNumberIndexSignature2, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 23, 1)) +>1 : Symbol(1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 67)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 70)) >a.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 70)) @@ -141,6 +146,7 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a }; >x4 : Symbol(x4, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 52, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 3)) >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1)) >IWithNumberIndexSignature2 : Symbol(IWithNumberIndexSignature2, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 23, 1)) +>1 : Symbol(1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 67)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 70)) >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 53, 70)) diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types index 97c5f0fdf9035..c44afae7cd507 100644 --- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types +++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types @@ -24,6 +24,7 @@ interface IWithNoNumberIndexSignature { >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature 0: string; +>0 : string } interface IWithStringIndexSignature1 { >IWithStringIndexSignature1 : IWithStringIndexSignature1 @@ -125,6 +126,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a } >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature >IWithNumberIndexSignature1 : IWithNumberIndexSignature1 >{ 1: a => a } : { 1: (a: number) => number; } +>1 : (a: number) => number >a => a : (a: number) => number >a : number >a : number @@ -134,6 +136,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a } >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature >IWithNumberIndexSignature1 : IWithNumberIndexSignature1 >{ 0: a => a } : { 0: (a: any) => any; } +>0 : (a: any) => any >a => a : (a: any) => any >a : any >a : any @@ -143,6 +146,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello" >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature >IWithNumberIndexSignature1 : IWithNumberIndexSignature1 >{ 0: "hello" } : { 0: string; } +>0 : string >"hello" : "hello" var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number @@ -150,6 +154,7 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.to >IWithNumberIndexSignature1 : IWithNumberIndexSignature1 >IWithNumberIndexSignature2 : IWithNumberIndexSignature2 >{ 1: a => a.toString() } : { 1: (a: number) => string; } +>1 : (a: number) => string >a => a.toString() : (a: number) => string >a : number >a.toString() : string @@ -162,6 +167,7 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a }; >IWithNumberIndexSignature1 : IWithNumberIndexSignature1 >IWithNumberIndexSignature2 : IWithNumberIndexSignature2 >{ 1: a => a } : { 1: (a: number) => number; } +>1 : (a: number) => number >a => a : (a: number) => number >a : number >a : number diff --git a/tests/baselines/reference/cyclicModuleImport.symbols b/tests/baselines/reference/cyclicModuleImport.symbols index 14bdf2d47d376..58f64f386f28a 100644 --- a/tests/baselines/reference/cyclicModuleImport.symbols +++ b/tests/baselines/reference/cyclicModuleImport.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/cyclicModuleImport.ts === declare module "SubModule" { +>"SubModule" : Symbol("SubModule", Decl(cyclicModuleImport.ts, 0, 0)) + import MainModule = require('MainModule'); >MainModule : Symbol(MainModule, Decl(cyclicModuleImport.ts, 0, 28)) @@ -22,6 +24,8 @@ declare module "SubModule" { >SubModule : Symbol(SubModule, Decl(cyclicModuleImport.ts, 1, 46)) } declare module "MainModule" { +>"MainModule" : Symbol("MainModule", Decl(cyclicModuleImport.ts, 9, 1)) + import SubModule = require('SubModule'); >SubModule : Symbol(SubModule, Decl(cyclicModuleImport.ts, 10, 29)) diff --git a/tests/baselines/reference/cyclicModuleImport.types b/tests/baselines/reference/cyclicModuleImport.types index c581dd63c6d3e..6d4d08084a3b5 100644 --- a/tests/baselines/reference/cyclicModuleImport.types +++ b/tests/baselines/reference/cyclicModuleImport.types @@ -1,5 +1,7 @@ === tests/cases/compiler/cyclicModuleImport.ts === declare module "SubModule" { +>"SubModule" : typeof "SubModule" + import MainModule = require('MainModule'); >MainModule : typeof MainModule @@ -22,6 +24,8 @@ declare module "SubModule" { >SubModule : SubModule } declare module "MainModule" { +>"MainModule" : typeof "MainModule" + import SubModule = require('SubModule'); >SubModule : typeof SubModule diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols index c0ad98bbe3d90..9b8755c8d734d 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts === declare module "test" { +>"test" : Symbol("test", Decl(declFileAliasUseBeforeDeclaration2.ts, 0, 0)) + module A { >A : Symbol(A, Decl(declFileAliasUseBeforeDeclaration2.ts, 1, 23)) diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types index 362dd031e092e..e1e67c45e59e6 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types @@ -1,6 +1,8 @@ === tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts === declare module "test" { +>"test" : typeof "test" + module A { >A : typeof A diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols index 4a4077836cd2a..99786228685f5 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.symbols @@ -14,6 +14,8 @@ export var x: SubModule.m.m3.c; === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts === declare module "SubModule" { +>"SubModule" : Symbol("SubModule", Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 0, 0)) + export module m { >m : Symbol(m, Decl(declFileAmbientExternalModuleWithSingleExportedModule_0.ts, 1, 28)) diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types index 792f1f0282f71..bc6180f1481f7 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types @@ -14,6 +14,8 @@ export var x: SubModule.m.m3.c; === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts === declare module "SubModule" { +>"SubModule" : typeof "SubModule" + export module m { >m : any diff --git a/tests/baselines/reference/declFileEnums.symbols b/tests/baselines/reference/declFileEnums.symbols index bea118ea96729..47cb2ac22787d 100644 --- a/tests/baselines/reference/declFileEnums.symbols +++ b/tests/baselines/reference/declFileEnums.symbols @@ -67,9 +67,16 @@ enum e5 { >e5 : Symbol(e5, Decl(declFileEnums.ts, 25, 1)) "Friday", +>"Friday" : Symbol(e5["Friday"], Decl(declFileEnums.ts, 27, 9)) + "Saturday", +>"Saturday" : Symbol(e5["Saturday"], Decl(declFileEnums.ts, 28, 13)) + "Sunday", +>"Sunday" : Symbol(e5["Sunday"], Decl(declFileEnums.ts, 29, 15)) + "Weekend days" +>"Weekend days" : Symbol(e5["Weekend days"], Decl(declFileEnums.ts, 30, 13)) } diff --git a/tests/baselines/reference/declFileEnums.types b/tests/baselines/reference/declFileEnums.types index 5b0bfff5beda7..e6aa1b2f9af1d 100644 --- a/tests/baselines/reference/declFileEnums.types +++ b/tests/baselines/reference/declFileEnums.types @@ -75,9 +75,16 @@ enum e5 { >e5 : e5 "Friday", +>"Friday" : e5."Friday" + "Saturday", +>"Saturday" : e5."Saturday" + "Sunday", +>"Sunday" : e5."Sunday" + "Weekend days" +>"Weekend days" : e5."Weekend days" } diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols index 9efd94c029e55..f9ee7a85bcdf3 100644 --- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols +++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.symbols @@ -4,12 +4,16 @@ class List { } >T : Symbol(T, Decl(declFileImportedTypeUseInTypeArgPosition.ts, 0, 11)) declare module 'mod1' { +>'mod1' : Symbol('mod1', Decl(declFileImportedTypeUseInTypeArgPosition.ts, 0, 17)) + class Foo { >Foo : Symbol(Foo, Decl(declFileImportedTypeUseInTypeArgPosition.ts, 1, 23)) } } declare module 'moo' { +>'moo' : Symbol('moo', Decl(declFileImportedTypeUseInTypeArgPosition.ts, 4, 1)) + import x = require('mod1'); >x : Symbol(x, Decl(declFileImportedTypeUseInTypeArgPosition.ts, 6, 22)) diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types index 317f071efc0b6..705cb99417d6d 100644 --- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types +++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types @@ -4,12 +4,16 @@ class List { } >T : T declare module 'mod1' { +>'mod1' : typeof 'mod1' + class Foo { >Foo : Foo } } declare module 'moo' { +>'moo' : typeof 'moo' + import x = require('mod1'); >x : typeof x diff --git a/tests/baselines/reference/declarationMerging2.symbols b/tests/baselines/reference/declarationMerging2.symbols index 050b5414da55f..637e5d83acaa8 100644 --- a/tests/baselines/reference/declarationMerging2.symbols +++ b/tests/baselines/reference/declarationMerging2.symbols @@ -16,6 +16,8 @@ export class A { === tests/cases/compiler/b.ts === export {} declare module "./a" { +>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 9)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22)) diff --git a/tests/baselines/reference/declarationMerging2.types b/tests/baselines/reference/declarationMerging2.types index 79e2818cf52b0..69179b8f58fad 100644 --- a/tests/baselines/reference/declarationMerging2.types +++ b/tests/baselines/reference/declarationMerging2.types @@ -16,6 +16,8 @@ export class A { === tests/cases/compiler/b.ts === export {} declare module "./a" { +>"./a" : typeof "tests/cases/compiler/a" + interface A { >A : A diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols index af691ce828ce8..5aeb48b32a7d2 100644 --- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols +++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols @@ -1,5 +1,6 @@ === tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts === declare module "express" { +>"express" : Symbol("express", Decl(declareExternalModuleWithExportAssignedFundule.ts, 0, 0)) export = express; >express : Symbol(express, Decl(declareExternalModuleWithExportAssignedFundule.ts, 2, 21), Decl(declareExternalModuleWithExportAssignedFundule.ts, 4, 46)) diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types index 2206c8044484e..e0936614fb24a 100644 --- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types +++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types @@ -1,5 +1,6 @@ === tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts === declare module "express" { +>"express" : typeof "express" export = express; >express : typeof express diff --git a/tests/baselines/reference/declaredExternalModule.symbols b/tests/baselines/reference/declaredExternalModule.symbols index fb331ecf01167..9d60a99a2c27b 100644 --- a/tests/baselines/reference/declaredExternalModule.symbols +++ b/tests/baselines/reference/declaredExternalModule.symbols @@ -1,5 +1,6 @@ === tests/cases/compiler/declaredExternalModule.ts === declare module 'connect' { +>'connect' : Symbol('connect', Decl(declaredExternalModule.ts, 0, 0)) interface connectModule { >connectModule : Symbol(connectModule, Decl(declaredExternalModule.ts, 0, 26)) diff --git a/tests/baselines/reference/declaredExternalModule.types b/tests/baselines/reference/declaredExternalModule.types index 5ce504e7f4b84..4ac6fcb8be58b 100644 --- a/tests/baselines/reference/declaredExternalModule.types +++ b/tests/baselines/reference/declaredExternalModule.types @@ -1,5 +1,6 @@ === tests/cases/compiler/declaredExternalModule.ts === declare module 'connect' { +>'connect' : typeof 'connect' interface connectModule { >connectModule : connectModule diff --git a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols index efba0c20c417f..955cc2489d258 100644 --- a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols +++ b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts === declare module 'connect' { +>'connect' : Symbol('connect', Decl(declaredExternalModuleWithExportAssignment.ts, 0, 0)) + interface connectModule { >connectModule : Symbol(connectModule, Decl(declaredExternalModuleWithExportAssignment.ts, 0, 26)) diff --git a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types index e550e8ee13dfc..b020c11ab624b 100644 --- a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types +++ b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.types @@ -1,5 +1,7 @@ === tests/cases/compiler/declaredExternalModuleWithExportAssignment.ts === declare module 'connect' { +>'connect' : typeof 'connect' + interface connectModule { >connectModule : connectModule diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols index 718af66047de6..ccf9841eba0b9 100644 --- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols +++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols @@ -27,6 +27,7 @@ var { b2: { b21 } = { b21: "string" } } = { b2: { b21: "world" } }; var {1: b3} = { 1: "string" }; >b3 : Symbol(b3, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 13, 5)) +>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 13, 15)) var {b4 = 1}: any = { b4: 100000 }; >b4 : Symbol(b4, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 14, 5)) @@ -55,6 +56,8 @@ function foo(): F { return { 1: true +>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 26, 12)) + }; } @@ -64,6 +67,8 @@ function bar(): F { return { 2: true +>2 : Symbol(2, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 32, 12)) + }; } var {1: c0} = foo(); @@ -90,6 +95,7 @@ function foo1(): F1 { return { "prop1": 2 +>"prop1" : Symbol("prop1", Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 47, 12)) } } diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types index e0aedcbb16709..cc9bf0f3c8df8 100644 --- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types +++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types @@ -36,6 +36,7 @@ var { b2: { b21 } = { b21: "string" } } = { b2: { b21: "world" } }; var {1: b3} = { 1: "string" }; >b3 : string >{ 1: "string" } : { 1: string; } +>1 : string >"string" : "string" var {b4 = 1}: any = { b4: 100000 }; @@ -72,6 +73,7 @@ function foo(): F { >{ 1: true } : { 1: true; } 1: true +>1 : boolean >true : true }; @@ -85,6 +87,7 @@ function bar(): F { >{ 2: true } : { 2: true; } 2: true +>2 : boolean >true : true }; @@ -117,6 +120,7 @@ function foo1(): F1 { >{ "prop1": 2 } : { "prop1": number; } "prop1": 2 +>"prop1" : number >2 : 2 } } diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols index 57d739cbbfc47..4e1987a06efb8 100644 --- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols +++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols @@ -27,6 +27,7 @@ var { b2: { b21 } = { b21: "string" } } = { b2: { b21: "world" } }; var {1: b3} = { 1: "string" }; >b3 : Symbol(b3, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 13, 5)) +>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 13, 15)) var {b4 = 1}: any = { b4: 100000 }; >b4 : Symbol(b4, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 14, 5)) @@ -55,6 +56,8 @@ function foo(): F { return { 1: true +>1 : Symbol(1, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 26, 12)) + }; } @@ -64,6 +67,8 @@ function bar(): F { return { 2: true +>2 : Symbol(2, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 32, 12)) + }; } var {1: c0} = foo(); @@ -90,6 +95,7 @@ function foo1(): F1 { return { "prop1": 2 +>"prop1" : Symbol("prop1", Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 47, 12)) } } diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types index 7d68d32ac514d..9c5905f2b1196 100644 --- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types +++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types @@ -36,6 +36,7 @@ var { b2: { b21 } = { b21: "string" } } = { b2: { b21: "world" } }; var {1: b3} = { 1: "string" }; >b3 : string >{ 1: "string" } : { 1: string; } +>1 : string >"string" : "string" var {b4 = 1}: any = { b4: 100000 }; @@ -72,6 +73,7 @@ function foo(): F { >{ 1: true } : { 1: true; } 1: true +>1 : boolean >true : true }; @@ -85,6 +87,7 @@ function bar(): F { >{ 2: true } : { 2: true; } 2: true +>2 : boolean >true : true }; @@ -117,6 +120,7 @@ function foo1(): F1 { >{ "prop1": 2 } : { "prop1": number; } "prop1": 2 +>"prop1" : number >2 : 2 } } diff --git a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols index cb716163d6a07..781ae78493072 100644 --- a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols +++ b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols @@ -3,17 +3,38 @@ class B { >B : Symbol(B, Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 0, 0)) "hello" = 10; +>"hello" : Symbol(B["hello"], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 0, 9)) + 0b110 = "world"; +>0b110 : Symbol(B[0b110], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 1, 17)) + 0o23534 = "WORLD"; +>0o23534 : Symbol(B[0o23534], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 2, 20)) + 20 = "twenty"; +>20 : Symbol(B[20], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 3, 22)) + "foo"() { } +>"foo" : Symbol(B["foo"], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 4, 18)) + 0b1110() {} +>0b1110 : Symbol(B[0b1110], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 5, 15)) + 11() { } +>11 : Symbol(B[11], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 6, 15)) + interface() { } >interface : Symbol(B.interface, Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 7, 12)) static "hi" = 10000; +>"hi" : Symbol(B["hi"], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 8, 19)) + static 22 = "twenty-two"; +>22 : Symbol(B[22], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 9, 24)) + static 0b101 = "binary"; +>0b101 : Symbol(B[0b101], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 10, 29)) + static 0o3235 = "octal"; +>0o3235 : Symbol(B[0o3235], Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 11, 28)) } diff --git a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types index 203d5071a155b..a2236b561e7fa 100644 --- a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types +++ b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.types @@ -3,32 +3,46 @@ class B { >B : B "hello" = 10; +>"hello" : number >10 : 10 0b110 = "world"; +>0b110 : string >"world" : "world" 0o23534 = "WORLD"; +>0o23534 : string >"WORLD" : "WORLD" 20 = "twenty"; +>20 : string >"twenty" : "twenty" "foo"() { } +>"foo" : () => void + 0b1110() {} +>0b1110 : () => void + 11() { } +>11 : () => void + interface() { } >interface : () => void static "hi" = 10000; +>"hi" : number >10000 : 10000 static 22 = "twenty-two"; +>22 : string >"twenty-two" : "twenty-two" static 0b101 = "binary"; +>0b101 : string >"binary" : "binary" static 0o3235 = "octal"; +>0o3235 : string >"octal" : "octal" } diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols index 923c0bac1ef48..661ead70c896f 100644 --- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols +++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.symbols @@ -9,6 +9,7 @@ function foo() { >globalCounter : Symbol(globalCounter, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS2.ts, 0, 3)) return { 0: 2 }; +>0 : Symbol(0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS2.ts, 3, 12)) } foo()[0] **= foo()[0]; >foo : Symbol(foo, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS2.ts, 0, 22)) diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types index cd057d31390c3..53914f558c9f4 100644 --- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types +++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS2.types @@ -13,6 +13,7 @@ function foo() { return { 0: 2 }; >{ 0: 2 } : { 0: number; } +>0 : number >2 : 2 } foo()[0] **= foo()[0]; diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols index dbd5aa150dc5e..cc83f5d8cf29c 100644 --- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols +++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols @@ -7,9 +7,12 @@ var object = { >_0 : Symbol(_0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 14)) get 0() { +>0 : Symbol(0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 2, 10), Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 5, 6)) + return this._0; }, set 0(x: number) { +>0 : Symbol(0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 2, 10), Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 5, 6)) >x : Symbol(x, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 6, 10)) this._0 = x; diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types index 32e5b33e41132..3d1c6be9e86b7 100644 --- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types +++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types @@ -9,6 +9,8 @@ var object = { >2 : 2 get 0() { +>0 : number + return this._0; >this._0 : any >this : any @@ -16,6 +18,7 @@ var object = { }, set 0(x: number) { +>0 : number >x : number this._0 = x; diff --git a/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols b/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols index 51c61196ca6b6..f57daaeba01f1 100644 --- a/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols +++ b/tests/baselines/reference/enumWithNegativeInfinityProperty.symbols @@ -3,5 +3,6 @@ enum A { >A : Symbol(A, Decl(enumWithNegativeInfinityProperty.ts, 0, 0)) "-Infinity" = 1 +>"-Infinity" : Symbol(A["-Infinity"], Decl(enumWithNegativeInfinityProperty.ts, 0, 8)) } diff --git a/tests/baselines/reference/enumWithNegativeInfinityProperty.types b/tests/baselines/reference/enumWithNegativeInfinityProperty.types index dad61ad87cc49..951f8969769a8 100644 --- a/tests/baselines/reference/enumWithNegativeInfinityProperty.types +++ b/tests/baselines/reference/enumWithNegativeInfinityProperty.types @@ -3,6 +3,7 @@ enum A { >A : A "-Infinity" = 1 +>"-Infinity" : A >1 : 1 } diff --git a/tests/baselines/reference/enumWithQuotedElementName1.symbols b/tests/baselines/reference/enumWithQuotedElementName1.symbols index 48f861f9726bf..70efcaa4ddf67 100644 --- a/tests/baselines/reference/enumWithQuotedElementName1.symbols +++ b/tests/baselines/reference/enumWithQuotedElementName1.symbols @@ -3,4 +3,5 @@ enum E { >E : Symbol(E, Decl(enumWithQuotedElementName1.ts, 0, 0)) 'fo"o', +>'fo"o' : Symbol(E['fo"o'], Decl(enumWithQuotedElementName1.ts, 0, 8)) } diff --git a/tests/baselines/reference/enumWithQuotedElementName1.types b/tests/baselines/reference/enumWithQuotedElementName1.types index 135a74a510324..4e3db0ca4822d 100644 --- a/tests/baselines/reference/enumWithQuotedElementName1.types +++ b/tests/baselines/reference/enumWithQuotedElementName1.types @@ -3,4 +3,5 @@ enum E { >E : E 'fo"o', +>'fo"o' : E } diff --git a/tests/baselines/reference/enumWithQuotedElementName2.symbols b/tests/baselines/reference/enumWithQuotedElementName2.symbols index 245eaa55748f1..0e6e43aa3d4fd 100644 --- a/tests/baselines/reference/enumWithQuotedElementName2.symbols +++ b/tests/baselines/reference/enumWithQuotedElementName2.symbols @@ -3,4 +3,5 @@ enum E { >E : Symbol(E, Decl(enumWithQuotedElementName2.ts, 0, 0)) "fo'o", +>"fo'o" : Symbol(E["fo'o"], Decl(enumWithQuotedElementName2.ts, 0, 8)) } diff --git a/tests/baselines/reference/enumWithQuotedElementName2.types b/tests/baselines/reference/enumWithQuotedElementName2.types index ab222764f7564..9b07138e5abbd 100644 --- a/tests/baselines/reference/enumWithQuotedElementName2.types +++ b/tests/baselines/reference/enumWithQuotedElementName2.types @@ -3,4 +3,5 @@ enum E { >E : E "fo'o", +>"fo'o" : E } diff --git a/tests/baselines/reference/enumWithUnicodeEscape1.symbols b/tests/baselines/reference/enumWithUnicodeEscape1.symbols index a146f87247d29..de6390a875f2e 100644 --- a/tests/baselines/reference/enumWithUnicodeEscape1.symbols +++ b/tests/baselines/reference/enumWithUnicodeEscape1.symbols @@ -3,5 +3,6 @@ enum E { >E : Symbol(E, Decl(enumWithUnicodeEscape1.ts, 0, 0)) 'gold \u2730' +>'gold \u2730' : Symbol(E['gold \u2730'], Decl(enumWithUnicodeEscape1.ts, 0, 8)) } diff --git a/tests/baselines/reference/enumWithUnicodeEscape1.types b/tests/baselines/reference/enumWithUnicodeEscape1.types index 8376685ca6b84..ee9dbbf5c2a08 100644 --- a/tests/baselines/reference/enumWithUnicodeEscape1.types +++ b/tests/baselines/reference/enumWithUnicodeEscape1.types @@ -3,5 +3,6 @@ enum E { >E : E 'gold \u2730' +>'gold \u2730' : E } diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols index 15faf638ca1f8..f4165d0299a98 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts === declare module "foo" { +>"foo" : Symbol("foo", Decl(es5ExportDefaultClassDeclaration4.ts, 0, 0)) + export var before: C; >before : Symbol(before, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 14)) >C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25)) diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types index de27b4b5fb031..1f01f03a1d61e 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types @@ -1,6 +1,8 @@ === tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts === declare module "foo" { +>"foo" : typeof "foo" + export var before: C; >before : C >C : C diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols index 940c095d11f67..400f794622dc1 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts === declare module "bar" { +>"bar" : Symbol("bar", Decl(es5ExportDefaultFunctionDeclaration4.ts, 0, 0)) + var before: typeof func; >before : Symbol(before, Decl(es5ExportDefaultFunctionDeclaration4.ts, 2, 7)) >func : Symbol(func, Decl(es5ExportDefaultFunctionDeclaration4.ts, 2, 28)) diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types index 163311fbd1487..c41d8920b0017 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types @@ -1,6 +1,8 @@ === tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts === declare module "bar" { +>"bar" : typeof "bar" + var before: typeof func; >before : () => typeof func >func : () => typeof func diff --git a/tests/baselines/reference/es6ExportAssignment4.symbols b/tests/baselines/reference/es6ExportAssignment4.symbols index 42d4a9d009fcc..2b9a1461b60a0 100644 --- a/tests/baselines/reference/es6ExportAssignment4.symbols +++ b/tests/baselines/reference/es6ExportAssignment4.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/modules.d.ts === declare module "a" { +>"a" : Symbol("a", Decl(modules.d.ts, 0, 0)) + var a: number; >a : Symbol(a, Decl(modules.d.ts, 2, 7)) diff --git a/tests/baselines/reference/es6ExportAssignment4.types b/tests/baselines/reference/es6ExportAssignment4.types index c32bc14ec9064..48b6a7e62f148 100644 --- a/tests/baselines/reference/es6ExportAssignment4.types +++ b/tests/baselines/reference/es6ExportAssignment4.types @@ -1,6 +1,8 @@ === tests/cases/compiler/modules.d.ts === declare module "a" { +>"a" : typeof "a" + var a: number; >a : number diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols b/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols index a7c556f5be041..9ab79961df875 100644 --- a/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols +++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.symbols @@ -1,11 +1,15 @@ === tests/cases/compiler/server.d.ts === declare module "other" { +>"other" : Symbol("other", Decl(server.d.ts, 0, 0)) + export class C { } >C : Symbol(C, Decl(server.d.ts, 1, 24)) } declare module "server" { +>"server" : Symbol("server", Decl(server.d.ts, 3, 1)) + import events = require("other"); // Ambient declaration, no error expected. >events : Symbol(events, Decl(server.d.ts, 5, 25)) diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.types b/tests/baselines/reference/es6ImportEqualsDeclaration2.types index a483d10f25c60..8317d08acf492 100644 --- a/tests/baselines/reference/es6ImportEqualsDeclaration2.types +++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.types @@ -1,11 +1,15 @@ === tests/cases/compiler/server.d.ts === declare module "other" { +>"other" : typeof "other" + export class C { } >C : C } declare module "server" { +>"server" : typeof "server" + import events = require("other"); // Ambient declaration, no error expected. >events : typeof events diff --git a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols index b629c5bd8750c..ece199dbfc05a 100644 --- a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols +++ b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.symbols @@ -7,6 +7,8 @@ var o = { >o : Symbol(o, Decl(escapedReservedCompilerNamedIdentifier.ts, 2, 3)) "__proto__": 0 +>"__proto__" : Symbol("__proto__", Decl(escapedReservedCompilerNamedIdentifier.ts, 2, 9)) + }; var b = o["__proto__"]; >b : Symbol(b, Decl(escapedReservedCompilerNamedIdentifier.ts, 5, 3)) @@ -33,6 +35,8 @@ var o2 = { >o2 : Symbol(o2, Decl(escapedReservedCompilerNamedIdentifier.ts, 12, 3)) "___proto__": 0 +>"___proto__" : Symbol("___proto__", Decl(escapedReservedCompilerNamedIdentifier.ts, 12, 10)) + }; var b2 = o2["___proto__"]; >b2 : Symbol(b2, Decl(escapedReservedCompilerNamedIdentifier.ts, 15, 3)) @@ -59,6 +63,8 @@ var o4 = { >o4 : Symbol(o4, Decl(escapedReservedCompilerNamedIdentifier.ts, 22, 3)) "_proto__": 0 +>"_proto__" : Symbol("_proto__", Decl(escapedReservedCompilerNamedIdentifier.ts, 22, 10)) + }; var b4 = o4["_proto__"]; >b4 : Symbol(b4, Decl(escapedReservedCompilerNamedIdentifier.ts, 25, 3)) diff --git a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types index 1cecaaa74f0f4..8ce3372b36ee3 100644 --- a/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types +++ b/tests/baselines/reference/escapedReservedCompilerNamedIdentifier.types @@ -9,6 +9,7 @@ var o = { >{ "__proto__": 0} : { "__proto__": number; } "__proto__": 0 +>"__proto__" : number >0 : 0 }; @@ -43,6 +44,7 @@ var o2 = { >{ "___proto__": 0} : { "___proto__": number; } "___proto__": 0 +>"___proto__" : number >0 : 0 }; @@ -77,6 +79,7 @@ var o4 = { >{ "_proto__": 0} : { "_proto__": number; } "_proto__": 0 +>"_proto__" : number >0 : 0 }; diff --git a/tests/baselines/reference/exportDefaultProperty.symbols b/tests/baselines/reference/exportDefaultProperty.symbols index f9edcd154cc05..709bf6c3f371d 100644 --- a/tests/baselines/reference/exportDefaultProperty.symbols +++ b/tests/baselines/reference/exportDefaultProperty.symbols @@ -53,6 +53,8 @@ declare namespace foo.bar { } declare module "foobar" { +>"foobar" : Symbol("foobar", Decl(declarations.d.ts, 5, 1)) + export default foo.bar; >foo.bar : Symbol(default, Decl(declarations.d.ts, 2, 22)) >foo : Symbol(foo, Decl(declarations.d.ts, 0, 0)) @@ -60,6 +62,8 @@ declare module "foobar" { } declare module "foobarx" { +>"foobarx" : Symbol("foobarx", Decl(declarations.d.ts, 9, 1)) + export default foo.bar.X; >foo.bar.X : Symbol(default, Decl(declarations.d.ts, 2, 27), Decl(declarations.d.ts, 4, 16)) >foo.bar : Symbol(foo.bar, Decl(declarations.d.ts, 2, 22)) diff --git a/tests/baselines/reference/exportDefaultProperty.types b/tests/baselines/reference/exportDefaultProperty.types index 67de741fde40d..c7439f7050cc8 100644 --- a/tests/baselines/reference/exportDefaultProperty.types +++ b/tests/baselines/reference/exportDefaultProperty.types @@ -56,6 +56,8 @@ declare namespace foo.bar { } declare module "foobar" { +>"foobar" : typeof "foobar" + export default foo.bar; >foo.bar : typeof default >foo : typeof foo @@ -63,6 +65,8 @@ declare module "foobar" { } declare module "foobarx" { +>"foobarx" : typeof "foobarx" + export default foo.bar.X; >foo.bar.X : number >foo.bar : typeof foo.bar diff --git a/tests/baselines/reference/exportDefaultVariable.symbols b/tests/baselines/reference/exportDefaultVariable.symbols index cd7ebed926c78..0e4df718d2343 100644 --- a/tests/baselines/reference/exportDefaultVariable.symbols +++ b/tests/baselines/reference/exportDefaultVariable.symbols @@ -5,6 +5,8 @@ declare var io: any; >io : Symbol(io, Decl(exportDefaultVariable.ts, 2, 11)) declare module 'module' { +>'module' : Symbol('module', Decl(exportDefaultVariable.ts, 2, 20)) + export default io; >io : Symbol(default, Decl(exportDefaultVariable.ts, 2, 11)) } diff --git a/tests/baselines/reference/exportDefaultVariable.types b/tests/baselines/reference/exportDefaultVariable.types index a61c64b4685d7..109ff9e0f93ce 100644 --- a/tests/baselines/reference/exportDefaultVariable.types +++ b/tests/baselines/reference/exportDefaultVariable.types @@ -5,6 +5,8 @@ declare var io: any; >io : any declare module 'module' { +>'module' : typeof 'module' + export default io; >io : any } diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.symbols b/tests/baselines/reference/exportEqualsDefaultProperty.symbols index 54bbbde69564a..8ac29b01cad71 100644 --- a/tests/baselines/reference/exportEqualsDefaultProperty.symbols +++ b/tests/baselines/reference/exportEqualsDefaultProperty.symbols @@ -4,7 +4,11 @@ var x = { >x : Symbol(x, Decl(exp.ts, 1, 3)) "greeting": "hello, world", +>"greeting" : Symbol("greeting", Decl(exp.ts, 1, 9)) + "default": 42 +>"default" : Symbol("default", Decl(exp.ts, 2, 31)) + }; export = x diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.types b/tests/baselines/reference/exportEqualsDefaultProperty.types index b6e3be008a1c8..1068c7565d6ec 100644 --- a/tests/baselines/reference/exportEqualsDefaultProperty.types +++ b/tests/baselines/reference/exportEqualsDefaultProperty.types @@ -5,9 +5,11 @@ var x = { >{ "greeting": "hello, world", "default": 42} : { "greeting": string; "default": number; } "greeting": "hello, world", +>"greeting" : string >"hello, world" : "hello, world" "default": 42 +>"default" : number >42 : 42 }; diff --git a/tests/baselines/reference/exportEqualsOfModule.symbols b/tests/baselines/reference/exportEqualsOfModule.symbols index 20548930f03fd..f664137d18b07 100644 --- a/tests/baselines/reference/exportEqualsOfModule.symbols +++ b/tests/baselines/reference/exportEqualsOfModule.symbols @@ -1,10 +1,14 @@ === tests/cases/compiler/exportEqualsOfModule.ts === declare module '~popsicle/dist/request' { +>'~popsicle/dist/request' : Symbol('~popsicle/dist/request', Decl(exportEqualsOfModule.ts, 0, 0)) + export class Request {} >Request : Symbol(Request, Decl(exportEqualsOfModule.ts, 0, 41)) } declare module '~popsicle/dist/common' { +>'~popsicle/dist/common' : Symbol('~popsicle/dist/common', Decl(exportEqualsOfModule.ts, 2, 1)) + import { Request } from '~popsicle/dist/request'; >Request : Symbol(Request, Decl(exportEqualsOfModule.ts, 5, 12)) @@ -13,6 +17,8 @@ declare module '~popsicle/dist/common' { } declare module 'popsicle' { +>'popsicle' : Symbol('popsicle', Decl(exportEqualsOfModule.ts, 7, 1)) + import alias = require('~popsicle/dist/common'); >alias : Symbol(alias, Decl(exportEqualsOfModule.ts, 9, 27)) @@ -21,6 +27,8 @@ declare module 'popsicle' { } declare module 'popsicle-proxy-agent' { +>'popsicle-proxy-agent' : Symbol('popsicle-proxy-agent', Decl(exportEqualsOfModule.ts, 12, 1)) + import { Request } from 'popsicle'; >Request : Symbol(Request, Decl(exportEqualsOfModule.ts, 15, 12)) diff --git a/tests/baselines/reference/exportEqualsOfModule.types b/tests/baselines/reference/exportEqualsOfModule.types index d96557c93be81..8356742f0e57c 100644 --- a/tests/baselines/reference/exportEqualsOfModule.types +++ b/tests/baselines/reference/exportEqualsOfModule.types @@ -1,10 +1,14 @@ === tests/cases/compiler/exportEqualsOfModule.ts === declare module '~popsicle/dist/request' { +>'~popsicle/dist/request' : typeof '~popsicle/dist/request' + export class Request {} >Request : Request } declare module '~popsicle/dist/common' { +>'~popsicle/dist/common' : typeof '~popsicle/dist/common' + import { Request } from '~popsicle/dist/request'; >Request : typeof Request @@ -13,6 +17,8 @@ declare module '~popsicle/dist/common' { } declare module 'popsicle' { +>'popsicle' : typeof 'popsicle' + import alias = require('~popsicle/dist/common'); >alias : typeof alias @@ -21,6 +27,8 @@ declare module 'popsicle' { } declare module 'popsicle-proxy-agent' { +>'popsicle-proxy-agent' : typeof 'popsicle-proxy-agent' + import { Request } from 'popsicle'; >Request : typeof Request diff --git a/tests/baselines/reference/exportEqualsProperty.symbols b/tests/baselines/reference/exportEqualsProperty.symbols index 43c9ed3251868..7c1c08c520b3a 100644 --- a/tests/baselines/reference/exportEqualsProperty.symbols +++ b/tests/baselines/reference/exportEqualsProperty.symbols @@ -48,6 +48,8 @@ declare namespace foo.bar { } declare module "foobar" { +>"foobar" : Symbol("foobar", Decl(declarations.d.ts, 5, 1)) + export = foo.bar; >foo.bar : Symbol(foo.bar, Decl(declarations.d.ts, 2, 22)) >foo : Symbol(foo, Decl(declarations.d.ts, 0, 0)) @@ -55,6 +57,8 @@ declare module "foobar" { } declare module "foobarx" { +>"foobarx" : Symbol("foobarx", Decl(declarations.d.ts, 9, 1)) + export = foo.bar.X; >foo.bar.X : Symbol(foo.bar.X, Decl(declarations.d.ts, 2, 27), Decl(declarations.d.ts, 4, 16)) >foo.bar : Symbol(foo.bar, Decl(declarations.d.ts, 2, 22)) diff --git a/tests/baselines/reference/exportEqualsProperty.types b/tests/baselines/reference/exportEqualsProperty.types index 9386a60a7f93d..cb89e4c1df090 100644 --- a/tests/baselines/reference/exportEqualsProperty.types +++ b/tests/baselines/reference/exportEqualsProperty.types @@ -51,6 +51,8 @@ declare namespace foo.bar { } declare module "foobar" { +>"foobar" : typeof "foobar" + export = foo.bar; >foo.bar : typeof foo.bar >foo : typeof foo @@ -58,6 +60,8 @@ declare module "foobar" { } declare module "foobarx" { +>"foobarx" : typeof "foobarx" + export = foo.bar.X; >foo.bar.X : number >foo.bar : typeof foo.bar diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols index 7e2de735c47c0..0afd5fe304637 100644 --- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols +++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts === declare module "m2" { +>"m2" : Symbol("m2", Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 7, 1)) + export module X { >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12)) @@ -20,6 +22,8 @@ declare module "m2" { } declare module "m2" { +>"m2" : Symbol("m2", Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 0), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 7, 1)) + function Z2(): X.I; >Z2 : Symbol(Z2, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 9, 21)) >X : Symbol(X, Decl(exportSpecifierAndExportedMemberDeclaration.ts, 0, 21), Decl(exportSpecifierAndExportedMemberDeclaration.ts, 5, 12)) diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types index 931552819c7b0..a7c05f2c722b8 100644 --- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types +++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types @@ -1,5 +1,7 @@ === tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts === declare module "m2" { +>"m2" : typeof "m2" + export module X { >X : () => any @@ -20,6 +22,8 @@ declare module "m2" { } declare module "m2" { +>"m2" : typeof "m2" + function Z2(): X.I; >Z2 : () => X.I >X : any diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols index d5f5ef17a62c2..08492557833c8 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols @@ -7,7 +7,10 @@ export default R = { >R : Symbol(R, Decl(m1.ts, 1, 3)) "__esmodule": true, +>"__esmodule" : Symbol("__esmodule", Decl(m1.ts, 2, 20)) + "__proto__": {} +>"__proto__" : Symbol("__proto__", Decl(m1.ts, 3, 23)) } === tests/cases/conformance/es6/modules/m2.ts === diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.types b/tests/baselines/reference/exportsAndImportsWithUnderscores2.types index 3b86789cc44d0..f888f6be1c7fa 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.types +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.types @@ -9,9 +9,11 @@ export default R = { >{ "__esmodule": true, "__proto__": {}} : { "__esmodule": boolean; "__proto__": {}; } "__esmodule": true, +>"__esmodule" : boolean >true : true "__proto__": {} +>"__proto__" : {} >{} : {} } diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols index cd4ba38e8c9db..7aab1b3935ca5 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols @@ -7,8 +7,13 @@ export default R = { >R : Symbol(R, Decl(m1.ts, 1, 3)) "___": 30, +>"___" : Symbol("___", Decl(m1.ts, 2, 20)) + "___hello": 21, +>"___hello" : Symbol("___hello", Decl(m1.ts, 3, 14)) + "_hi": 40, +>"_hi" : Symbol("_hi", Decl(m1.ts, 4, 19)) } === tests/cases/conformance/es6/modules/m2.ts === diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.types b/tests/baselines/reference/exportsAndImportsWithUnderscores3.types index b860928aa6208..94bb55c1e3d30 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.types +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.types @@ -9,12 +9,15 @@ export default R = { >{ "___": 30, "___hello": 21, "_hi": 40,} : { "___": number; "___hello": number; "_hi": number; } "___": 30, +>"___" : number >30 : 30 "___hello": 21, +>"___hello" : number >21 : 21 "_hi": 40, +>"_hi" : number >40 : 40 } diff --git a/tests/baselines/reference/exportsInAmbientModules1.symbols b/tests/baselines/reference/exportsInAmbientModules1.symbols index 58cdf8663a79a..f41d6efac70fb 100644 --- a/tests/baselines/reference/exportsInAmbientModules1.symbols +++ b/tests/baselines/reference/exportsInAmbientModules1.symbols @@ -6,6 +6,8 @@ export var x: number === tests/cases/compiler/main.ts === declare module "M" { +>"M" : Symbol("M", Decl(main.ts, 0, 0)) + export {x} from "external" >x : Symbol(x, Decl(main.ts, 2, 12)) } diff --git a/tests/baselines/reference/exportsInAmbientModules1.types b/tests/baselines/reference/exportsInAmbientModules1.types index 490a63caf925a..6ac23d28710bd 100644 --- a/tests/baselines/reference/exportsInAmbientModules1.types +++ b/tests/baselines/reference/exportsInAmbientModules1.types @@ -6,6 +6,8 @@ export var x: number === tests/cases/compiler/main.ts === declare module "M" { +>"M" : typeof "M" + export {x} from "external" >x : number } diff --git a/tests/baselines/reference/exportsInAmbientModules2.symbols b/tests/baselines/reference/exportsInAmbientModules2.symbols index 54e8b44ec3418..bae6587e0286a 100644 --- a/tests/baselines/reference/exportsInAmbientModules2.symbols +++ b/tests/baselines/reference/exportsInAmbientModules2.symbols @@ -5,7 +5,8 @@ export default class C {} === tests/cases/compiler/main.ts === -No type information for this code.declare module "M" { -No type information for this code. export * from "external" -No type information for this code.} -No type information for this code. \ No newline at end of file +declare module "M" { +>"M" : Symbol("M", Decl(main.ts, 0, 0)) + + export * from "external" +} diff --git a/tests/baselines/reference/exportsInAmbientModules2.types b/tests/baselines/reference/exportsInAmbientModules2.types index 3472a35bf7537..a6e51ca0c8f98 100644 --- a/tests/baselines/reference/exportsInAmbientModules2.types +++ b/tests/baselines/reference/exportsInAmbientModules2.types @@ -5,7 +5,8 @@ export default class C {} === tests/cases/compiler/main.ts === -No type information for this code.declare module "M" { -No type information for this code. export * from "external" -No type information for this code.} -No type information for this code. \ No newline at end of file +declare module "M" { +>"M" : typeof "M" + + export * from "external" +} diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols index fcf5a71330afd..39606b9f4dce3 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols @@ -28,9 +28,11 @@ var moduleMap: { [key: string]: IHasVisualizationModel } = { >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 79)) "moduleA": moduleA, +>"moduleA" : Symbol("moduleA", Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 7, 60)) >moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 81)) "moduleB": moduleB +>"moduleB" : Symbol("moduleB", Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 8, 23)) >moduleB : Symbol(moduleB, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 1, 79)) }; diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types index 9825a75a220d6..21893a33f7573 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types @@ -29,9 +29,11 @@ var moduleMap: { [key: string]: IHasVisualizationModel } = { >{ "moduleA": moduleA, "moduleB": moduleB} : { "moduleA": typeof moduleA; "moduleB": typeof moduleB; } "moduleA": moduleA, +>"moduleA" : typeof moduleA >moduleA : typeof moduleA "moduleB": moduleB +>"moduleB" : typeof moduleB >moduleB : typeof moduleB }; diff --git a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols index d4b995af6b2bb..7abc62fd42213 100644 --- a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols +++ b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/externalModuleReferenceDoubleUnderscore1.ts === declare module 'timezonecomplete' { +>'timezonecomplete' : Symbol('timezonecomplete', Decl(externalModuleReferenceDoubleUnderscore1.ts, 0, 0)) + import basics = require("__timezonecomplete/basics"); >basics : Symbol(basics, Decl(externalModuleReferenceDoubleUnderscore1.ts, 0, 35)) @@ -10,6 +12,8 @@ declare module 'timezonecomplete' { } declare module '__timezonecomplete/basics' { +>'__timezonecomplete/basics' : Symbol('__timezonecomplete/basics', Decl(externalModuleReferenceDoubleUnderscore1.ts, 3, 1)) + export enum TimeUnit { >TimeUnit : Symbol(TimeUnit, Decl(externalModuleReferenceDoubleUnderscore1.ts, 5, 44)) diff --git a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types index ad292656d259c..5452c6afcbb44 100644 --- a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types +++ b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types @@ -1,5 +1,7 @@ === tests/cases/compiler/externalModuleReferenceDoubleUnderscore1.ts === declare module 'timezonecomplete' { +>'timezonecomplete' : typeof 'timezonecomplete' + import basics = require("__timezonecomplete/basics"); >basics : typeof basics @@ -10,6 +12,8 @@ declare module 'timezonecomplete' { } declare module '__timezonecomplete/basics' { +>'__timezonecomplete/basics' : typeof '__timezonecomplete/basics' + export enum TimeUnit { >TimeUnit : TimeUnit diff --git a/tests/baselines/reference/implicitIndexSignatures.symbols b/tests/baselines/reference/implicitIndexSignatures.symbols index a014e7e942c2c..1c8f06acc11ed 100644 --- a/tests/baselines/reference/implicitIndexSignatures.symbols +++ b/tests/baselines/reference/implicitIndexSignatures.symbols @@ -137,10 +137,14 @@ function f4() { const o1 = { 0: "0", 1: "1", count: 2 }; >o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 38, 9)) +>0 : Symbol(0, Decl(implicitIndexSignatures.ts, 38, 16)) +>1 : Symbol(1, Decl(implicitIndexSignatures.ts, 38, 24)) >count : Symbol(count, Decl(implicitIndexSignatures.ts, 38, 32)) let o2: { 0: string, 1: string, count: number }; >o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 39, 7)) +>0 : Symbol(0, Decl(implicitIndexSignatures.ts, 39, 13)) +>1 : Symbol(1, Decl(implicitIndexSignatures.ts, 39, 24)) >count : Symbol(count, Decl(implicitIndexSignatures.ts, 39, 35)) const v1 = getStringIndexValue(o1); diff --git a/tests/baselines/reference/implicitIndexSignatures.types b/tests/baselines/reference/implicitIndexSignatures.types index 0b68f136e2e5f..d9b7b57a16bc4 100644 --- a/tests/baselines/reference/implicitIndexSignatures.types +++ b/tests/baselines/reference/implicitIndexSignatures.types @@ -165,13 +165,17 @@ function f4() { const o1 = { 0: "0", 1: "1", count: 2 }; >o1 : { 0: string; 1: string; count: number; } >{ 0: "0", 1: "1", count: 2 } : { 0: string; 1: string; count: number; } +>0 : string >"0" : "0" +>1 : string >"1" : "1" >count : number >2 : 2 let o2: { 0: string, 1: string, count: number }; >o2 : { 0: string; 1: string; count: number; } +>0 : string +>1 : string >count : number const v1 = getStringIndexValue(o1); diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols index 892cbf7464efb..95d49477493bf 100644 --- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols +++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts === declare module "m" { +>"m" : Symbol("m", Decl(importDeclWithExportModifierInAmbientContext.ts, 0, 0)) + module x { >x : Symbol(x, Decl(importDeclWithExportModifierInAmbientContext.ts, 0, 20)) diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types index 617c133aeeee4..4818b04acb4a3 100644 --- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types +++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types @@ -1,5 +1,7 @@ === tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts === declare module "m" { +>"m" : typeof "m" + module x { >x : any diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols index c8de5db1707b2..413ed1dfd68cb 100644 --- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols +++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols @@ -15,6 +15,8 @@ var p = testData[0].name; === tests/cases/compiler/b.ts === declare module "ITest" { +>"ITest" : Symbol("ITest", Decl(b.ts, 0, 0)) + interface Name { >Name : Symbol(Name, Decl(b.ts, 0, 24)) diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types index 0449bfd16bf68..986c65ca0fe2c 100644 --- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types +++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types @@ -17,6 +17,8 @@ var p = testData[0].name; === tests/cases/compiler/b.ts === declare module "ITest" { +>"ITest" : typeof "ITest" + interface Name { >Name : Name diff --git a/tests/baselines/reference/importsInAmbientModules1.symbols b/tests/baselines/reference/importsInAmbientModules1.symbols index d220ba2bf4543..849253cb703fd 100644 --- a/tests/baselines/reference/importsInAmbientModules1.symbols +++ b/tests/baselines/reference/importsInAmbientModules1.symbols @@ -6,6 +6,8 @@ export var x: number === tests/cases/compiler/main.ts === declare module "M" { +>"M" : Symbol("M", Decl(main.ts, 0, 0)) + import {x} from "external" >x : Symbol(x, Decl(main.ts, 2, 12)) } diff --git a/tests/baselines/reference/importsInAmbientModules1.types b/tests/baselines/reference/importsInAmbientModules1.types index 634de9f1f0f4a..4fcb729ccab73 100644 --- a/tests/baselines/reference/importsInAmbientModules1.types +++ b/tests/baselines/reference/importsInAmbientModules1.types @@ -6,6 +6,8 @@ export var x: number === tests/cases/compiler/main.ts === declare module "M" { +>"M" : typeof "M" + import {x} from "external" >x : number } diff --git a/tests/baselines/reference/importsInAmbientModules2.symbols b/tests/baselines/reference/importsInAmbientModules2.symbols index 02333798e8b32..7b5971e29ff36 100644 --- a/tests/baselines/reference/importsInAmbientModules2.symbols +++ b/tests/baselines/reference/importsInAmbientModules2.symbols @@ -6,6 +6,8 @@ export default class C {} === tests/cases/compiler/main.ts === declare module "M" { +>"M" : Symbol("M", Decl(main.ts, 0, 0)) + import C from "external" >C : Symbol(C, Decl(main.ts, 2, 10)) } diff --git a/tests/baselines/reference/importsInAmbientModules2.types b/tests/baselines/reference/importsInAmbientModules2.types index d6c4eddc07c27..fb4846317ffcd 100644 --- a/tests/baselines/reference/importsInAmbientModules2.types +++ b/tests/baselines/reference/importsInAmbientModules2.types @@ -6,6 +6,8 @@ export default class C {} === tests/cases/compiler/main.ts === declare module "M" { +>"M" : typeof "M" + import C from "external" >C : typeof C } diff --git a/tests/baselines/reference/importsInAmbientModules3.symbols b/tests/baselines/reference/importsInAmbientModules3.symbols index 15b2c7173dcaa..b24cdeabb9f13 100644 --- a/tests/baselines/reference/importsInAmbientModules3.symbols +++ b/tests/baselines/reference/importsInAmbientModules3.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/main.ts === declare module "M" { +>"M" : Symbol("M", Decl(main.ts, 0, 0)) + import C = require("external"); >C : Symbol(C, Decl(main.ts, 1, 20)) } diff --git a/tests/baselines/reference/importsInAmbientModules3.types b/tests/baselines/reference/importsInAmbientModules3.types index 6c613687b0839..9efe5f3f901b4 100644 --- a/tests/baselines/reference/importsInAmbientModules3.types +++ b/tests/baselines/reference/importsInAmbientModules3.types @@ -1,6 +1,8 @@ === tests/cases/compiler/main.ts === declare module "M" { +>"M" : typeof "M" + import C = require("external"); >C : typeof C } diff --git a/tests/baselines/reference/inOperatorWithFunction.symbols b/tests/baselines/reference/inOperatorWithFunction.symbols index 1e915ba107d80..cc1cfe4daf0a0 100644 --- a/tests/baselines/reference/inOperatorWithFunction.symbols +++ b/tests/baselines/reference/inOperatorWithFunction.symbols @@ -6,4 +6,5 @@ var fn = function (val: boolean) { return val; } fn("a" in { "a": true }); >fn : Symbol(fn, Decl(inOperatorWithFunction.ts, 0, 3)) +>"a" : Symbol("a", Decl(inOperatorWithFunction.ts, 1, 11)) diff --git a/tests/baselines/reference/inOperatorWithFunction.types b/tests/baselines/reference/inOperatorWithFunction.types index 21e9da3f0409f..353a7165d7a42 100644 --- a/tests/baselines/reference/inOperatorWithFunction.types +++ b/tests/baselines/reference/inOperatorWithFunction.types @@ -11,5 +11,6 @@ fn("a" in { "a": true }); >"a" in { "a": true } : boolean >"a" : "a" >{ "a": true } : { "a": boolean; } +>"a" : boolean >true : true diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.symbols b/tests/baselines/reference/indexSignaturesInferentialTyping.symbols index 754fe0390a4ab..dcb329f74ca2d 100644 --- a/tests/baselines/reference/indexSignaturesInferentialTyping.symbols +++ b/tests/baselines/reference/indexSignaturesInferentialTyping.symbols @@ -20,10 +20,14 @@ function bar(items: { [index: string]: T }): T { return undefined; } var x1 = foo({ 0: 0, 1: 1 }); // type should be number >x1 : Symbol(x1, Decl(indexSignaturesInferentialTyping.ts, 3, 3)) >foo : Symbol(foo, Decl(indexSignaturesInferentialTyping.ts, 0, 0)) +>0 : Symbol(0, Decl(indexSignaturesInferentialTyping.ts, 3, 14)) +>1 : Symbol(1, Decl(indexSignaturesInferentialTyping.ts, 3, 20)) var x2 = bar({ 0: 0, 1: 1 }); >x2 : Symbol(x2, Decl(indexSignaturesInferentialTyping.ts, 4, 3)) >bar : Symbol(bar, Decl(indexSignaturesInferentialTyping.ts, 0, 71)) +>0 : Symbol(0, Decl(indexSignaturesInferentialTyping.ts, 4, 14)) +>1 : Symbol(1, Decl(indexSignaturesInferentialTyping.ts, 4, 20)) var x3 = bar({ zero: 0, one: 1 }); // type should be number >x3 : Symbol(x3, Decl(indexSignaturesInferentialTyping.ts, 5, 3)) diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types index 202e14898184d..594dab7c3e60d 100644 --- a/tests/baselines/reference/indexSignaturesInferentialTyping.types +++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types @@ -22,7 +22,9 @@ var x1 = foo({ 0: 0, 1: 1 }); // type should be number >foo({ 0: 0, 1: 1 }) : number >foo : (items: { [index: number]: T; }) => T >{ 0: 0, 1: 1 } : { 0: number; 1: number; } +>0 : number >0 : 0 +>1 : number >1 : 1 var x2 = bar({ 0: 0, 1: 1 }); @@ -30,7 +32,9 @@ var x2 = bar({ 0: 0, 1: 1 }); >bar({ 0: 0, 1: 1 }) : number >bar : (items: { [index: string]: T; }) => T >{ 0: 0, 1: 1 } : { 0: number; 1: number; } +>0 : number >0 : 0 +>1 : number >1 : 1 var x3 = bar({ zero: 0, one: 1 }); // type should be number diff --git a/tests/baselines/reference/indexer.symbols b/tests/baselines/reference/indexer.symbols index a713beadccddd..7dc0545d3a1a7 100644 --- a/tests/baselines/reference/indexer.symbols +++ b/tests/baselines/reference/indexer.symbols @@ -17,7 +17,9 @@ interface JQuery { var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } }; >jq : Symbol(jq, Decl(indexer.ts, 8, 3)) >JQuery : Symbol(JQuery, Decl(indexer.ts, 2, 1)) +>0 : Symbol(0, Decl(indexer.ts, 8, 15)) >id : Symbol(id, Decl(indexer.ts, 8, 20)) +>1 : Symbol(1, Decl(indexer.ts, 8, 32)) >id : Symbol(id, Decl(indexer.ts, 8, 37)) jq[0].id; diff --git a/tests/baselines/reference/indexer.types b/tests/baselines/reference/indexer.types index 6f648d8d2321b..b7576baefa06e 100644 --- a/tests/baselines/reference/indexer.types +++ b/tests/baselines/reference/indexer.types @@ -18,9 +18,11 @@ var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } }; >jq : JQuery >JQuery : JQuery >{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; } +>0 : { id: string; } >{ id : "a" } : { id: string; } >id : string >"a" : "a" +>1 : { id: string; } >{ id : "b" } : { id: string; } >id : string >"b" : "b" diff --git a/tests/baselines/reference/indexerA.symbols b/tests/baselines/reference/indexerA.symbols index b254618673ad2..3911906ec34f4 100644 --- a/tests/baselines/reference/indexerA.symbols +++ b/tests/baselines/reference/indexerA.symbols @@ -17,7 +17,9 @@ class JQuery { var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } }; >jq : Symbol(jq, Decl(indexerA.ts, 8, 3)) >JQuery : Symbol(JQuery, Decl(indexerA.ts, 2, 1)) +>0 : Symbol(0, Decl(indexerA.ts, 8, 15)) >id : Symbol(id, Decl(indexerA.ts, 8, 20)) +>1 : Symbol(1, Decl(indexerA.ts, 8, 32)) >id : Symbol(id, Decl(indexerA.ts, 8, 37)) jq[0].id; diff --git a/tests/baselines/reference/indexerA.types b/tests/baselines/reference/indexerA.types index e0eadbc06b4d1..ec25283315291 100644 --- a/tests/baselines/reference/indexerA.types +++ b/tests/baselines/reference/indexerA.types @@ -18,9 +18,11 @@ var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } }; >jq : JQuery >JQuery : JQuery >{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; } +>0 : { id: string; } >{ id : "a" } : { id: string; } >id : string >"a" : "a" +>1 : { id: string; } >{ id : "b" } : { id: string; } >id : string >"b" : "b" diff --git a/tests/baselines/reference/indexersInClassType.symbols b/tests/baselines/reference/indexersInClassType.symbols index c57c7cf752207..ac03f6f2dcf0e 100644 --- a/tests/baselines/reference/indexersInClassType.symbols +++ b/tests/baselines/reference/indexersInClassType.symbols @@ -11,9 +11,11 @@ class C { >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 1: Date; +>1 : Symbol(C[1], Decl(indexersInClassType.ts, 2, 24)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 'a': {} +>'a' : Symbol(C['a'], Decl(indexersInClassType.ts, 3, 12)) fn() { >fn : Symbol(C.fn, Decl(indexersInClassType.ts, 4, 11)) diff --git a/tests/baselines/reference/indexersInClassType.types b/tests/baselines/reference/indexersInClassType.types index 02316d810b97a..0898d07038223 100644 --- a/tests/baselines/reference/indexersInClassType.types +++ b/tests/baselines/reference/indexersInClassType.types @@ -11,9 +11,11 @@ class C { >Object : Object 1: Date; +>1 : Date >Date : Date 'a': {} +>'a' : {} fn() { >fn : () => this diff --git a/tests/baselines/reference/inferringAnyFunctionType1.symbols b/tests/baselines/reference/inferringAnyFunctionType1.symbols index 6a43952d770d8..e8710a132be16 100644 --- a/tests/baselines/reference/inferringAnyFunctionType1.symbols +++ b/tests/baselines/reference/inferringAnyFunctionType1.symbols @@ -2,6 +2,7 @@ function f number }>(p: T): T { >f : Symbol(f, Decl(inferringAnyFunctionType1.ts, 0, 0)) >T : Symbol(T, Decl(inferringAnyFunctionType1.ts, 0, 11)) +>"0" : Symbol("0", Decl(inferringAnyFunctionType1.ts, 0, 22)) >p1 : Symbol(p1, Decl(inferringAnyFunctionType1.ts, 0, 29)) >p : Symbol(p, Decl(inferringAnyFunctionType1.ts, 0, 54)) >T : Symbol(T, Decl(inferringAnyFunctionType1.ts, 0, 11)) diff --git a/tests/baselines/reference/inferringAnyFunctionType1.types b/tests/baselines/reference/inferringAnyFunctionType1.types index 16402cc3ced7e..a898685db2d91 100644 --- a/tests/baselines/reference/inferringAnyFunctionType1.types +++ b/tests/baselines/reference/inferringAnyFunctionType1.types @@ -2,6 +2,7 @@ function f number }>(p: T): T { >f : number; }>(p: T) => T >T : T +>"0" : (p1: number) => number >p1 : number >p : T >T : T diff --git a/tests/baselines/reference/jsxImportInAttribute.symbols b/tests/baselines/reference/jsxImportInAttribute.symbols index 252b5cc98e42a..87816e88a88a7 100644 --- a/tests/baselines/reference/jsxImportInAttribute.symbols +++ b/tests/baselines/reference/jsxImportInAttribute.symbols @@ -15,6 +15,8 @@ let x = Test; // emit test_1.default === tests/cases/compiler/component.d.ts === declare module "Test" { +>"Test" : Symbol("Test", Decl(component.d.ts, 0, 0)) + export default class Text { } >Text : Symbol(Text, Decl(component.d.ts, 1, 23)) } diff --git a/tests/baselines/reference/jsxImportInAttribute.types b/tests/baselines/reference/jsxImportInAttribute.types index 8dc5c370fa84d..d57e2595d781b 100644 --- a/tests/baselines/reference/jsxImportInAttribute.types +++ b/tests/baselines/reference/jsxImportInAttribute.types @@ -16,6 +16,8 @@ let x = Test; // emit test_1.default === tests/cases/compiler/component.d.ts === declare module "Test" { +>"Test" : typeof "Test" + export default class Text { } >Text : Text } diff --git a/tests/baselines/reference/jsxViaImport.2.symbols b/tests/baselines/reference/jsxViaImport.2.symbols index 5fb24088d2e85..427b9e8f9357d 100644 --- a/tests/baselines/reference/jsxViaImport.2.symbols +++ b/tests/baselines/reference/jsxViaImport.2.symbols @@ -35,6 +35,8 @@ declare module React { >U : Symbol(U, Decl(component.d.ts, 5, 20)) } declare module "BaseComponent" { +>"BaseComponent" : Symbol("BaseComponent", Decl(component.d.ts, 6, 1)) + export default class extends React.Component { >React.Component : Symbol(React.Component, Decl(component.d.ts, 4, 22)) >React : Symbol(React, Decl(component.d.ts, 3, 1)) diff --git a/tests/baselines/reference/jsxViaImport.2.types b/tests/baselines/reference/jsxViaImport.2.types index c1e418c6b3221..753ccbfbe1f67 100644 --- a/tests/baselines/reference/jsxViaImport.2.types +++ b/tests/baselines/reference/jsxViaImport.2.types @@ -36,6 +36,8 @@ declare module React { >U : U } declare module "BaseComponent" { +>"BaseComponent" : typeof "BaseComponent" + export default class extends React.Component { >React.Component : React.Component >React : typeof React diff --git a/tests/baselines/reference/mergedDeclarations6.symbols b/tests/baselines/reference/mergedDeclarations6.symbols index a51dcf75e9c42..71ea536041377 100644 --- a/tests/baselines/reference/mergedDeclarations6.symbols +++ b/tests/baselines/reference/mergedDeclarations6.symbols @@ -23,6 +23,8 @@ import {A} from './a'; >A : Symbol(A, Decl(b.ts, 0, 8)) declare module "./a" { +>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(b.ts, 0, 22)) + interface A { } >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 2, 22)) } diff --git a/tests/baselines/reference/mergedDeclarations6.types b/tests/baselines/reference/mergedDeclarations6.types index 6198c08f6b5d2..0b29c0eb867e8 100644 --- a/tests/baselines/reference/mergedDeclarations6.types +++ b/tests/baselines/reference/mergedDeclarations6.types @@ -24,6 +24,8 @@ import {A} from './a'; >A : typeof A declare module "./a" { +>"./a" : typeof "tests/cases/compiler/a" + interface A { } >A : A } diff --git a/tests/baselines/reference/missingImportAfterModuleImport.symbols b/tests/baselines/reference/missingImportAfterModuleImport.symbols index 5493d58c528c1..1d4f1ad47f020 100644 --- a/tests/baselines/reference/missingImportAfterModuleImport.symbols +++ b/tests/baselines/reference/missingImportAfterModuleImport.symbols @@ -20,6 +20,8 @@ export = MainModule; === tests/cases/compiler/missingImportAfterModuleImport_0.ts === declare module "SubModule" { +>"SubModule" : Symbol("SubModule", Decl(missingImportAfterModuleImport_0.ts, 0, 0)) + class SubModule { >SubModule : Symbol(SubModule, Decl(missingImportAfterModuleImport_0.ts, 1, 28)) diff --git a/tests/baselines/reference/missingImportAfterModuleImport.types b/tests/baselines/reference/missingImportAfterModuleImport.types index b8602ca06d019..2ff0136d8d351 100644 --- a/tests/baselines/reference/missingImportAfterModuleImport.types +++ b/tests/baselines/reference/missingImportAfterModuleImport.types @@ -20,6 +20,8 @@ export = MainModule; === tests/cases/compiler/missingImportAfterModuleImport_0.ts === declare module "SubModule" { +>"SubModule" : typeof "SubModule" + class SubModule { >SubModule : SubModule diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols index ce701a7c59d77..17dc75ae27ccd 100644 --- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols +++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.symbols @@ -9,6 +9,8 @@ import { Observable } from "./observable" >prototype : Symbol(Observable.prototype) declare module "./observable" { +>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map1.ts, 3, 48), Decl(map2.ts, 2, 48)) + interface I {x0} >I : Symbol(I, Decl(map1.ts, 5, 31), Decl(map2.ts, 4, 31)) >x0 : Symbol(I.x0, Decl(map1.ts, 6, 17)) @@ -24,6 +26,8 @@ import { Observable } from "./observable" >prototype : Symbol(Observable.prototype) declare module "./observable" { +>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map1.ts, 3, 48), Decl(map2.ts, 2, 48)) + interface I {x1} >I : Symbol(I, Decl(map1.ts, 5, 31), Decl(map2.ts, 4, 31)) >x1 : Symbol(I.x1, Decl(map2.ts, 5, 17)) diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types index e87560c6a3d1e..f0eba18062132 100644 --- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types +++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types @@ -15,6 +15,8 @@ import { Observable } from "./observable" >function() { } : () => void declare module "./observable" { +>"./observable" : typeof "tests/cases/compiler/observable" + interface I {x0} >I : I >x0 : any @@ -36,6 +38,8 @@ import { Observable } from "./observable" >function() { } : () => void declare module "./observable" { +>"./observable" : typeof "tests/cases/compiler/observable" + interface I {x1} >I : I >x1 : any diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols index 17e31591be00b..fb87b6adc9f86 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols @@ -9,6 +9,8 @@ import { Observable } from "./observable" >prototype : Symbol(Observable.prototype) declare module "./observable" { +>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 3, 48)) + interface Observable { >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 5, 31), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25)) diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types index 6c693b2b23bec..55a09e8337bcf 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types @@ -15,6 +15,8 @@ import { Observable } from "./observable" >function() { } : () => void declare module "./observable" { +>"./observable" : typeof "tests/cases/compiler/observable" + interface Observable { >Observable : Observable >T : T diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols index 38a0506d179cc..789317bb402aa 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols @@ -9,6 +9,8 @@ import { Observable } from "./observable" >prototype : Symbol(Observable.prototype) declare module "./observable" { +>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 3, 48)) + interface Observable { >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 5, 31), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25)) diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types index ee302e6407ec9..44ed1f4ce7a3e 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types @@ -15,6 +15,8 @@ import { Observable } from "./observable" >function() { } : () => void declare module "./observable" { +>"./observable" : typeof "tests/cases/compiler/observable" + interface Observable { >Observable : Observable >T : T diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols index 62ac82b695319..bf196ecda32fa 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols @@ -29,6 +29,8 @@ import { Observable } from "observable" >prototype : Symbol(Observable.prototype) declare module "observable" { +>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 3, 48)) + interface Observable { >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 5, 29), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25)) @@ -53,6 +55,8 @@ declare module "observable" { === tests/cases/compiler/observable.d.ts === declare module "observable" { +>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 3, 48)) + class Observable { >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 5, 29), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25)) diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types index 6c2c8c8e781ae..deaba0869e084 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types @@ -39,6 +39,8 @@ import { Observable } from "observable" >function() { } : () => void declare module "observable" { +>"observable" : typeof "observable" + interface Observable { >Observable : Observable >T : T @@ -63,6 +65,8 @@ declare module "observable" { === tests/cases/compiler/observable.d.ts === declare module "observable" { +>"observable" : typeof "observable" + class Observable { >Observable : Observable >T : T diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols index bbd3b6e5f791e..e839f42f1de00 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols @@ -45,6 +45,8 @@ import { Observable } from "observable" >prototype : Symbol(Observable.prototype) declare module "observable" { +>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 3, 48)) + interface Observable { >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 5, 29), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25)) @@ -69,6 +71,8 @@ declare module "observable" { === tests/cases/compiler/observable.d.ts === declare module "observable" { +>"observable" : Symbol("observable", Decl(observable.d.ts, 0, 0), Decl(map.ts, 3, 48)) + class Observable { >Observable : Symbol(Observable, Decl(observable.d.ts, 0, 29), Decl(observable.d.ts, 3, 5), Decl(map.ts, 5, 29), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25)) diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types index b938cf9944e45..46f8f5cce62eb 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types @@ -57,6 +57,8 @@ import { Observable } from "observable" >function() { } : () => void declare module "observable" { +>"observable" : typeof "observable" + interface Observable { >Observable : Observable >T : T @@ -81,6 +83,8 @@ declare module "observable" { === tests/cases/compiler/observable.d.ts === declare module "observable" { +>"observable" : typeof "observable" + class Observable { >Observable : Observable >T : T diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols b/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols index 17e31591be00b..fb87b6adc9f86 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols @@ -9,6 +9,8 @@ import { Observable } from "./observable" >prototype : Symbol(Observable.prototype) declare module "./observable" { +>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 3, 48)) + interface Observable { >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 5, 31), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25)) diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types index 6c693b2b23bec..55a09e8337bcf 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types @@ -15,6 +15,8 @@ import { Observable } from "./observable" >function() { } : () => void declare module "./observable" { +>"./observable" : typeof "tests/cases/compiler/observable" + interface Observable { >Observable : Observable >T : T diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols b/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols index 38a0506d179cc..789317bb402aa 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols @@ -9,6 +9,8 @@ import { Observable } from "./observable" >prototype : Symbol(Observable.prototype) declare module "./observable" { +>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 3, 48)) + interface Observable { >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(observable.ts, 2, 1), Decl(map.ts, 5, 31), Decl(map.ts, 8, 5)) >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25)) diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types index ee302e6407ec9..44ed1f4ce7a3e 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types @@ -15,6 +15,8 @@ import { Observable } from "./observable" >function() { } : () => void declare module "./observable" { +>"./observable" : typeof "tests/cases/compiler/observable" + interface Observable { >Observable : Observable >T : T diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.symbols b/tests/baselines/reference/moduleAugmentationGlobal5.symbols index 4c4693601e816..f47d23987f4eb 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal5.symbols +++ b/tests/baselines/reference/moduleAugmentationGlobal5.symbols @@ -8,6 +8,8 @@ No type information for this code. No type information for this code.=== tests/cases/compiler/f1.d.ts === declare module "A" { +>"A" : Symbol("A", Decl(f1.d.ts, 0, 0)) + global { >global : Symbol(global, Decl(f1.d.ts, 1, 20)) @@ -18,6 +20,8 @@ declare module "A" { } === tests/cases/compiler/f2.d.ts === declare module "B" { +>"B" : Symbol("B", Decl(f2.d.ts, 0, 0)) + global { >global : Symbol(global, Decl(f2.d.ts, 0, 20)) diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.types b/tests/baselines/reference/moduleAugmentationGlobal5.types index b2e6139eb267f..ff436700567e7 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal5.types +++ b/tests/baselines/reference/moduleAugmentationGlobal5.types @@ -8,6 +8,8 @@ No type information for this code. No type information for this code.=== tests/cases/compiler/f1.d.ts === declare module "A" { +>"A" : typeof "A" + global { >global : any @@ -18,6 +20,8 @@ declare module "A" { } === tests/cases/compiler/f2.d.ts === declare module "B" { +>"B" : typeof "B" + global { >global : any diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols index 84daab19bf579..102639f9b82f7 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols @@ -27,6 +27,8 @@ A.prototype.foo = function () { return undefined; } >undefined : Symbol(undefined) declare module "./f1" { +>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 3, 51)) + interface A { >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 4, 23)) diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types index 886a04b54ef6b..650a51bea12f1 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types @@ -29,6 +29,8 @@ A.prototype.foo = function () { return undefined; } >undefined : undefined declare module "./f1" { +>"./f1" : typeof "tests/cases/compiler/f1" + interface A { >A : A diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols index fd1ec87b2a274..61fcf7be7ece6 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols @@ -48,6 +48,8 @@ import C = N.Cls; >Cls : Symbol(C, Decl(f3.ts, 6, 39)) declare module "./f1" { +>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17)) + interface A { >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23)) diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types index 454dc5d27ecd5..982ad00dfd990 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types @@ -50,6 +50,8 @@ import C = N.Cls; >Cls : C declare module "./f1" { +>"./f1" : typeof "tests/cases/compiler/f1" + interface A { >A : A diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols index 5c9be6d944853..33e14183c0cbd 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols @@ -48,6 +48,8 @@ import C = N.Cls; >Cls : Symbol(C, Decl(f3.ts, 6, 39)) declare module "./f1" { +>"./f1" : Symbol("tests/cases/compiler/f1", Decl(f1.ts, 0, 0), Decl(f3.ts, 10, 17)) + interface A { >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23)) diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types index 0c201599b52a0..972ca26512a33 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types @@ -50,6 +50,8 @@ import C = N.Cls; >Cls : C declare module "./f1" { +>"./f1" : typeof "tests/cases/compiler/f1" + interface A { >A : A diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols index 6d9c185ca0812..c3085279e1587 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols @@ -19,21 +19,29 @@ x.foo().x; declare module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 11, 28)) + class Observable {} >Observable : Symbol(Observable, Decl(O.d.ts, 2, 29), Decl(O.d.ts, 12, 25)) } declare module "M" { +>"M" : Symbol("M", Decl(O.d.ts, 4, 1)) + class Cls { x: number } >Cls : Symbol(Cls, Decl(O.d.ts, 6, 20)) >x : Symbol(Cls.x, Decl(O.d.ts, 7, 15)) } declare module "Map" { +>"Map" : Symbol("Map", Decl(O.d.ts, 8, 1)) + import { Cls } from "M"; >Cls : Symbol(Cls, Decl(O.d.ts, 11, 12)) module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 11, 28)) + interface Observable { >Observable : Symbol(Observable, Decl(O.d.ts, 2, 29), Decl(O.d.ts, 12, 25)) diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types index 0be2a787cb605..8b8b4096003f5 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types @@ -20,21 +20,29 @@ x.foo().x; declare module "Observable" { +>"Observable" : typeof "Observable" + class Observable {} >Observable : Observable } declare module "M" { +>"M" : typeof "M" + class Cls { x: number } >Cls : Cls >x : number } declare module "Map" { +>"Map" : typeof "Map" + import { Cls } from "M"; >Cls : typeof Cls module "Observable" { +>"Observable" : typeof "Observable" + interface Observable { >Observable : Observable diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols index 5bf797dcf0810..03d70b5c708cc 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols @@ -19,21 +19,29 @@ x.foo().x; === tests/cases/compiler/O.d.ts === declare module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28)) + class Observable {} >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25)) } declare module "M" { +>"M" : Symbol("M", Decl(O.d.ts, 3, 1)) + class Cls { x: number } >Cls : Symbol(Cls, Decl(O.d.ts, 5, 20)) >x : Symbol(Cls.x, Decl(O.d.ts, 6, 15)) } declare module "Map" { +>"Map" : Symbol("Map", Decl(O.d.ts, 7, 1)) + import { Cls } from "M"; >Cls : Symbol(Cls, Decl(O.d.ts, 10, 12)) module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28)) + interface Observable { >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25)) diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types index 31ea8904c2af9..b1604eeccba3f 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types @@ -20,21 +20,29 @@ x.foo().x; === tests/cases/compiler/O.d.ts === declare module "Observable" { +>"Observable" : typeof "Observable" + class Observable {} >Observable : Observable } declare module "M" { +>"M" : typeof "M" + class Cls { x: number } >Cls : Cls >x : number } declare module "Map" { +>"Map" : typeof "Map" + import { Cls } from "M"; >Cls : typeof Cls module "Observable" { +>"Observable" : typeof "Observable" + interface Observable { >Observable : Observable diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols index 2bde1316107df..3e3676e4235d2 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols @@ -26,21 +26,29 @@ x.foo2().x2; === tests/cases/compiler/O.d.ts === declare module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28), Decl(O.d.ts, 19, 29)) + class Observable {} >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O.d.ts, 20, 25)) } declare module "M" { +>"M" : Symbol("M", Decl(O.d.ts, 3, 1)) + class Cls { x: number } >Cls : Symbol(Cls, Decl(O.d.ts, 5, 20)) >x : Symbol(Cls.x, Decl(O.d.ts, 6, 15)) } declare module "Map" { +>"Map" : Symbol("Map", Decl(O.d.ts, 7, 1), Decl(O.d.ts, 16, 1)) + import { Cls } from "M"; >Cls : Symbol(Cls, Decl(O.d.ts, 10, 12)) module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28), Decl(O.d.ts, 19, 29)) + interface Observable { >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O.d.ts, 20, 25)) @@ -52,11 +60,15 @@ declare module "Map" { } declare module "Map" { +>"Map" : Symbol("Map", Decl(O.d.ts, 7, 1), Decl(O.d.ts, 16, 1)) + class Cls2 { x2: number } >Cls2 : Symbol(Cls2, Decl(O.d.ts, 18, 22)) >x2 : Symbol(Cls2.x2, Decl(O.d.ts, 19, 16)) module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28), Decl(O.d.ts, 19, 29)) + interface Observable { >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O.d.ts, 20, 25)) diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types index 2cec5edc6bf8f..35526a80e5d2c 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types @@ -28,21 +28,29 @@ x.foo2().x2; === tests/cases/compiler/O.d.ts === declare module "Observable" { +>"Observable" : typeof "Observable" + class Observable {} >Observable : Observable } declare module "M" { +>"M" : typeof "M" + class Cls { x: number } >Cls : Cls >x : number } declare module "Map" { +>"Map" : typeof "Map" + import { Cls } from "M"; >Cls : typeof Cls module "Observable" { +>"Observable" : typeof "Observable" + interface Observable { >Observable : Observable @@ -54,11 +62,15 @@ declare module "Map" { } declare module "Map" { +>"Map" : typeof "Map" + class Cls2 { x2: number } >Cls2 : Cls2 >x2 : number module "Observable" { +>"Observable" : typeof "Observable" + interface Observable { >Observable : Observable diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols index 6e01ff8a20416..1a14a1baec6a2 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols @@ -27,21 +27,29 @@ x.foo2().x2; === tests/cases/compiler/O.d.ts === declare module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28), Decl(O2.d.ts, 1, 29)) + class Observable {} >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O2.d.ts, 2, 25)) } declare module "M" { +>"M" : Symbol("M", Decl(O.d.ts, 3, 1)) + class Cls { x: number } >Cls : Symbol(Cls, Decl(O.d.ts, 5, 20)) >x : Symbol(Cls.x, Decl(O.d.ts, 6, 15)) } declare module "Map" { +>"Map" : Symbol("Map", Decl(O.d.ts, 7, 1), Decl(O2.d.ts, 0, 0)) + import { Cls } from "M"; >Cls : Symbol(Cls, Decl(O.d.ts, 10, 12)) module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28), Decl(O2.d.ts, 1, 29)) + interface Observable { >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O2.d.ts, 2, 25)) @@ -54,11 +62,15 @@ declare module "Map" { === tests/cases/compiler/O2.d.ts === declare module "Map" { +>"Map" : Symbol("Map", Decl(O.d.ts, 7, 1), Decl(O2.d.ts, 0, 0)) + class Cls2 { x2: number } >Cls2 : Symbol(Cls2, Decl(O2.d.ts, 0, 22)) >x2 : Symbol(Cls2.x2, Decl(O2.d.ts, 1, 16)) module "Observable" { +>"Observable" : Symbol("Observable", Decl(O.d.ts, 0, 0), Decl(O.d.ts, 10, 28), Decl(O2.d.ts, 1, 29)) + interface Observable { >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O2.d.ts, 2, 25)) diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types index 04791aef860f4..09b507991a2fe 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types @@ -29,21 +29,29 @@ x.foo2().x2; === tests/cases/compiler/O.d.ts === declare module "Observable" { +>"Observable" : typeof "Observable" + class Observable {} >Observable : Observable } declare module "M" { +>"M" : typeof "M" + class Cls { x: number } >Cls : Cls >x : number } declare module "Map" { +>"Map" : typeof "Map" + import { Cls } from "M"; >Cls : typeof Cls module "Observable" { +>"Observable" : typeof "Observable" + interface Observable { >Observable : Observable @@ -56,11 +64,15 @@ declare module "Map" { === tests/cases/compiler/O2.d.ts === declare module "Map" { +>"Map" : typeof "Map" + class Cls2 { x2: number } >Cls2 : Cls2 >x2 : number module "Observable" { +>"Observable" : typeof "Observable" + interface Observable { >Observable : Observable diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols index a8cc1a3412e0b..f135517ad7043 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols @@ -16,12 +16,16 @@ let y = x.getA().x; === tests/cases/compiler/array.d.ts === declare module "A" { +>"A" : Symbol("A", Decl(array.d.ts, 0, 0)) + class A { x: number; } >A : Symbol(A, Decl(array.d.ts, 1, 20)) >x : Symbol(A.x, Decl(array.d.ts, 2, 13)) } declare module "array" { +>"array" : Symbol("array", Decl(array.d.ts, 3, 1)) + import {A} from "A"; >A : Symbol(A, Decl(array.d.ts, 6, 12)) diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types index d6d81f97a3a82..847bb595e8bbf 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types @@ -19,12 +19,16 @@ let y = x.getA().x; === tests/cases/compiler/array.d.ts === declare module "A" { +>"A" : typeof "A" + class A { x: number; } >A : A >x : number } declare module "array" { +>"array" : typeof "array" + import {A} from "A"; >A : typeof A diff --git a/tests/baselines/reference/moduleAugmentationInDependency.symbols b/tests/baselines/reference/moduleAugmentationInDependency.symbols index 82f1faedbf516..1913a2fbda60c 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency.symbols +++ b/tests/baselines/reference/moduleAugmentationInDependency.symbols @@ -1,8 +1,9 @@ === /node_modules/A/index.d.ts === declare module "ext" { -No type information for this code.} -No type information for this code.export {}; -No type information for this code. -No type information for this code.=== /src/app.ts === +>"ext" : Symbol("ext", Decl(index.d.ts, 0, 0)) +} +export {}; + +=== /src/app.ts === import "A" No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/moduleAugmentationInDependency.types b/tests/baselines/reference/moduleAugmentationInDependency.types index 82f1faedbf516..7dfd3b02a005b 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency.types +++ b/tests/baselines/reference/moduleAugmentationInDependency.types @@ -1,8 +1,9 @@ === /node_modules/A/index.d.ts === declare module "ext" { -No type information for this code.} -No type information for this code.export {}; -No type information for this code. -No type information for this code.=== /src/app.ts === +>"ext" : any +} +export {}; + +=== /src/app.ts === import "A" No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.symbols b/tests/baselines/reference/moduleAugmentationNoNewNames.symbols index a340d3820a2f1..c8c4a31c3f2b2 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.symbols +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.symbols @@ -9,6 +9,8 @@ import { Observable } from "./observable" >prototype : Symbol(Observable.prototype) declare module "./observable" { +>"./observable" : Symbol("tests/cases/compiler/observable", Decl(observable.ts, 0, 0), Decl(map.ts, 3, 48)) + interface Observable { >Observable : Symbol(Observable, Decl(observable.ts, 0, 0), Decl(map.ts, 5, 31)) >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25)) diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.types b/tests/baselines/reference/moduleAugmentationNoNewNames.types index 06eab66c8d148..d827b92ec85e2 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.types +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.types @@ -15,6 +15,8 @@ import { Observable } from "./observable" >function() { } : () => void declare module "./observable" { +>"./observable" : typeof "tests/cases/compiler/observable" + interface Observable { >Observable : Observable >T : T diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols b/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols index 5f98b39c2286b..3cfd1904001d0 100644 --- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols +++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols @@ -19,6 +19,8 @@ import {Cls} from "./m1"; >prototype : Symbol(Cls.prototype) declare module "./m1" { +>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1)) + interface Cls { >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23)) @@ -28,6 +30,8 @@ declare module "./m1" { } declare module "./m1" { +>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1)) + interface Cls { >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23)) @@ -66,6 +70,8 @@ import {C1, C2} from "./m3"; >undefined : Symbol(undefined) declare module "./m1" { +>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1)) + interface Cls { >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23)) @@ -76,6 +82,8 @@ declare module "./m1" { } declare module "./m1" { +>"./m1" : Symbol("tests/cases/compiler/m1", Decl(m1.ts, 0, 0), Decl(m2.ts, 2, 54), Decl(m2.ts, 8, 1), Decl(m4.ts, 3, 60), Decl(m4.ts, 9, 1)) + interface Cls { >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23)) diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types index c3cac91fa38ad..efe45787eac3f 100644 --- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types +++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types @@ -33,6 +33,8 @@ import {Cls} from "./m1"; >"1" : "1" declare module "./m1" { +>"./m1" : typeof "tests/cases/compiler/m1" + interface Cls { >Cls : Cls @@ -42,6 +44,8 @@ declare module "./m1" { } declare module "./m1" { +>"./m1" : typeof "tests/cases/compiler/m1" + interface Cls { >Cls : Cls @@ -92,6 +96,8 @@ import {C1, C2} from "./m3"; >undefined : undefined declare module "./m1" { +>"./m1" : typeof "tests/cases/compiler/m1" + interface Cls { >Cls : Cls @@ -102,6 +108,8 @@ declare module "./m1" { } declare module "./m1" { +>"./m1" : typeof "tests/cases/compiler/m1" + interface Cls { >Cls : Cls diff --git a/tests/baselines/reference/moduleAugmentationsImports1.symbols b/tests/baselines/reference/moduleAugmentationsImports1.symbols index 685ee9bb31c45..97b615d1a440d 100644 --- a/tests/baselines/reference/moduleAugmentationsImports1.symbols +++ b/tests/baselines/reference/moduleAugmentationsImports1.symbols @@ -10,6 +10,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : Symbol("C", Decl(c.d.ts, 0, 0)) + class Cls {y: string; } >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20)) >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15)) @@ -44,6 +46,8 @@ A.prototype.getCls = function () { return undefined; } >undefined : Symbol(undefined) declare module "./a" { +>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 7, 54), Decl(d.ts, 13, 1)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 9, 22), Decl(d.ts, 15, 22)) @@ -54,6 +58,8 @@ declare module "./a" { } declare module "./a" { +>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 7, 54), Decl(d.ts, 13, 1)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 9, 22), Decl(d.ts, 15, 22)) diff --git a/tests/baselines/reference/moduleAugmentationsImports1.types b/tests/baselines/reference/moduleAugmentationsImports1.types index bf0bfee0a7a6d..3028c413ae062 100644 --- a/tests/baselines/reference/moduleAugmentationsImports1.types +++ b/tests/baselines/reference/moduleAugmentationsImports1.types @@ -10,6 +10,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : typeof "C" + class Cls {y: string; } >Cls : Cls >y : string @@ -48,6 +50,8 @@ A.prototype.getCls = function () { return undefined; } >undefined : undefined declare module "./a" { +>"./a" : typeof "tests/cases/compiler/a" + interface A { >A : A @@ -58,6 +62,8 @@ declare module "./a" { } declare module "./a" { +>"./a" : typeof "tests/cases/compiler/a" + interface A { >A : A diff --git a/tests/baselines/reference/moduleAugmentationsImports2.symbols b/tests/baselines/reference/moduleAugmentationsImports2.symbols index 126e407da8a2d..b224b0256358e 100644 --- a/tests/baselines/reference/moduleAugmentationsImports2.symbols +++ b/tests/baselines/reference/moduleAugmentationsImports2.symbols @@ -10,6 +10,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : Symbol("C", Decl(c.d.ts, 0, 0)) + class Cls {y: string; } >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20)) >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15)) @@ -33,6 +35,8 @@ A.prototype.getB = function () { return undefined; } >undefined : Symbol(undefined) declare module "./a" { +>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 5, 52), Decl(e.ts, 3, 54)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 7, 22), Decl(e.ts, 5, 22)) @@ -58,6 +62,8 @@ A.prototype.getCls = function () { return undefined; } >undefined : Symbol(undefined) declare module "./a" { +>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.ts, 5, 52), Decl(e.ts, 3, 54)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 7, 22), Decl(e.ts, 5, 22)) diff --git a/tests/baselines/reference/moduleAugmentationsImports2.types b/tests/baselines/reference/moduleAugmentationsImports2.types index 56b40625600aa..35cc74c27c781 100644 --- a/tests/baselines/reference/moduleAugmentationsImports2.types +++ b/tests/baselines/reference/moduleAugmentationsImports2.types @@ -10,6 +10,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : typeof "C" + class Cls {y: string; } >Cls : Cls >y : string @@ -35,6 +37,8 @@ A.prototype.getB = function () { return undefined; } >undefined : undefined declare module "./a" { +>"./a" : typeof "tests/cases/compiler/a" + interface A { >A : A @@ -62,6 +66,8 @@ A.prototype.getCls = function () { return undefined; } >undefined : undefined declare module "./a" { +>"./a" : typeof "tests/cases/compiler/a" + interface A { >A : A diff --git a/tests/baselines/reference/moduleAugmentationsImports3.symbols b/tests/baselines/reference/moduleAugmentationsImports3.symbols index fba58ffad8a97..c55f621c7fb46 100644 --- a/tests/baselines/reference/moduleAugmentationsImports3.symbols +++ b/tests/baselines/reference/moduleAugmentationsImports3.symbols @@ -42,6 +42,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : Symbol("C", Decl(c.d.ts, 0, 0)) + class Cls {y: string; } >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20)) >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15)) @@ -49,6 +51,8 @@ declare module "C" { === tests/cases/compiler/d.d.ts === declare module "D" { +>"D" : Symbol("D", Decl(d.d.ts, 0, 0)) + import {A} from "a"; >A : Symbol(A, Decl(d.d.ts, 1, 12)) @@ -56,6 +60,8 @@ declare module "D" { >B : Symbol(B, Decl(d.d.ts, 2, 12)) module "a" { +>"a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.ts, 4, 54)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.ts, 6, 22)) @@ -83,6 +89,8 @@ A.prototype.getCls = function () { return undefined; } >undefined : Symbol(undefined) declare module "./a" { +>"./a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.ts, 4, 54)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.ts, 6, 22)) diff --git a/tests/baselines/reference/moduleAugmentationsImports3.types b/tests/baselines/reference/moduleAugmentationsImports3.types index 04d17296c5694..1b9c2d51c3044 100644 --- a/tests/baselines/reference/moduleAugmentationsImports3.types +++ b/tests/baselines/reference/moduleAugmentationsImports3.types @@ -46,6 +46,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : typeof "C" + class Cls {y: string; } >Cls : Cls >y : string @@ -53,6 +55,8 @@ declare module "C" { === tests/cases/compiler/d.d.ts === declare module "D" { +>"D" : typeof "D" + import {A} from "a"; >A : typeof A @@ -60,6 +64,8 @@ declare module "D" { >B : typeof B module "a" { +>"a" : typeof "tests/cases/compiler/a" + interface A { >A : A @@ -89,6 +95,8 @@ A.prototype.getCls = function () { return undefined; } >undefined : undefined declare module "./a" { +>"./a" : typeof "tests/cases/compiler/a" + interface A { >A : A diff --git a/tests/baselines/reference/moduleAugmentationsImports4.symbols b/tests/baselines/reference/moduleAugmentationsImports4.symbols index 77b5431850eab..7f16894cef0ee 100644 --- a/tests/baselines/reference/moduleAugmentationsImports4.symbols +++ b/tests/baselines/reference/moduleAugmentationsImports4.symbols @@ -43,6 +43,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : Symbol("C", Decl(c.d.ts, 0, 0)) + class Cls {y: string; } >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20)) >y : Symbol(Cls.y, Decl(c.d.ts, 1, 15)) @@ -50,6 +52,8 @@ declare module "C" { === tests/cases/compiler/d.d.ts === declare module "D" { +>"D" : Symbol("D", Decl(d.d.ts, 0, 0)) + import {A} from "a"; >A : Symbol(A, Decl(d.d.ts, 1, 12)) @@ -57,6 +61,8 @@ declare module "D" { >B : Symbol(B, Decl(d.d.ts, 2, 12)) module "a" { +>"a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.d.ts, 3, 26)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.d.ts, 5, 16)) @@ -70,6 +76,8 @@ declare module "D" { === tests/cases/compiler/e.d.ts === /// declare module "E" { +>"E" : Symbol("E", Decl(e.d.ts, 0, 0)) + import {A} from "a"; >A : Symbol(A, Decl(e.d.ts, 2, 12)) @@ -77,6 +85,8 @@ declare module "E" { >Cls : Symbol(Cls, Decl(e.d.ts, 3, 12)) module "a" { +>"a" : Symbol("tests/cases/compiler/a", Decl(a.ts, 0, 0), Decl(d.d.ts, 2, 24), Decl(e.d.ts, 3, 26)) + interface A { >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.d.ts, 5, 16)) diff --git a/tests/baselines/reference/moduleAugmentationsImports4.types b/tests/baselines/reference/moduleAugmentationsImports4.types index 53d570e14e66f..7654d7351184d 100644 --- a/tests/baselines/reference/moduleAugmentationsImports4.types +++ b/tests/baselines/reference/moduleAugmentationsImports4.types @@ -47,6 +47,8 @@ export class B {x: number;} === tests/cases/compiler/c.d.ts === declare module "C" { +>"C" : typeof "C" + class Cls {y: string; } >Cls : Cls >y : string @@ -54,6 +56,8 @@ declare module "C" { === tests/cases/compiler/d.d.ts === declare module "D" { +>"D" : typeof "D" + import {A} from "a"; >A : typeof A @@ -61,6 +65,8 @@ declare module "D" { >B : typeof B module "a" { +>"a" : typeof "tests/cases/compiler/a" + interface A { >A : A @@ -74,6 +80,8 @@ declare module "D" { === tests/cases/compiler/e.d.ts === /// declare module "E" { +>"E" : typeof "E" + import {A} from "a"; >A : typeof A @@ -81,6 +89,8 @@ declare module "E" { >Cls : typeof Cls module "a" { +>"a" : typeof "tests/cases/compiler/a" + interface A { >A : A diff --git a/tests/baselines/reference/moduleMergeConstructor.symbols b/tests/baselines/reference/moduleMergeConstructor.symbols index 8d9a773f144d7..f8d7cd31a4ad5 100644 --- a/tests/baselines/reference/moduleMergeConstructor.symbols +++ b/tests/baselines/reference/moduleMergeConstructor.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/foo.d.ts === declare module "foo" { +>"foo" : Symbol("foo", Decl(foo.d.ts, 0, 0), Decl(foo-ext.d.ts, 0, 0)) + export class Foo { >Foo : Symbol(Foo, Decl(foo.d.ts, 1, 22), Decl(foo-ext.d.ts, 0, 22)) @@ -12,6 +14,8 @@ declare module "foo" { === tests/cases/compiler/foo-ext.d.ts === declare module "foo" { +>"foo" : Symbol("foo", Decl(foo.d.ts, 0, 0), Decl(foo-ext.d.ts, 0, 0)) + export interface Foo { >Foo : Symbol(Foo, Decl(foo.d.ts, 1, 22), Decl(foo-ext.d.ts, 0, 22)) diff --git a/tests/baselines/reference/moduleMergeConstructor.types b/tests/baselines/reference/moduleMergeConstructor.types index 48a2f01029358..35e5f6c4ff2e6 100644 --- a/tests/baselines/reference/moduleMergeConstructor.types +++ b/tests/baselines/reference/moduleMergeConstructor.types @@ -1,6 +1,8 @@ === tests/cases/compiler/foo.d.ts === declare module "foo" { +>"foo" : typeof "foo" + export class Foo { >Foo : Foo @@ -12,6 +14,8 @@ declare module "foo" { === tests/cases/compiler/foo-ext.d.ts === declare module "foo" { +>"foo" : typeof "foo" + export interface Foo { >Foo : Foo diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols index 1259c83ccdea3..09ae8fd7b82f3 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols +++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.symbols @@ -5,6 +5,8 @@ import { x } from "js"; === /declarations.d.ts === declare module "js" { +>"js" : Symbol("js", Decl(declarations.d.ts, 0, 0)) + export const x = 0; >x : Symbol(x, Decl(declarations.d.ts, 1, 16)) } diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types index 1e5af4e7579ec..23c4b4164e7a8 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types +++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types @@ -5,6 +5,8 @@ import { x } from "js"; === /declarations.d.ts === declare module "js" { +>"js" : typeof "js" + export const x = 0; >x : 0 >0 : 0 diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.symbols b/tests/baselines/reference/module_augmentUninstantiatedModule.symbols index 4ea073b0254e9..e75f6b5567c1e 100644 --- a/tests/baselines/reference/module_augmentUninstantiatedModule.symbols +++ b/tests/baselines/reference/module_augmentUninstantiatedModule.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/module_augmentUninstantiatedModule.ts === declare module "foo" { +>"foo" : Symbol("foo", Decl(module_augmentUninstantiatedModule.ts, 0, 0)) + namespace M {} >M : Symbol(M, Decl(module_augmentUninstantiatedModule.ts, 0, 22), Decl(module_augmentUninstantiatedModule.ts, 2, 6), Decl(module_augmentUninstantiatedModule.ts, 6, 22)) @@ -11,5 +13,8 @@ declare module "foo" { } declare module "bar" { +>"bar" : Symbol("bar", Decl(module_augmentUninstantiatedModule.ts, 4, 1)) + module "foo" {} +>"foo" : Symbol(M, Decl(module_augmentUninstantiatedModule.ts, 0, 22), Decl(module_augmentUninstantiatedModule.ts, 2, 6), Decl(module_augmentUninstantiatedModule.ts, 6, 22)) } diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.types b/tests/baselines/reference/module_augmentUninstantiatedModule.types index 0c27cc3acf963..1fad9ee86091f 100644 --- a/tests/baselines/reference/module_augmentUninstantiatedModule.types +++ b/tests/baselines/reference/module_augmentUninstantiatedModule.types @@ -1,5 +1,7 @@ === tests/cases/compiler/module_augmentUninstantiatedModule.ts === declare module "foo" { +>"foo" : typeof "foo" + namespace M {} >M : any @@ -11,5 +13,8 @@ declare module "foo" { } declare module "bar" { +>"bar" : typeof "bar" + module "foo" {} +>"foo" : any } diff --git a/tests/baselines/reference/moduledecl.symbols b/tests/baselines/reference/moduledecl.symbols index f0b2db9121caa..28acf52a3bc53 100644 --- a/tests/baselines/reference/moduledecl.symbols +++ b/tests/baselines/reference/moduledecl.symbols @@ -301,6 +301,8 @@ declare module m55 { } declare module "m3" { +>"m3" : Symbol("m3", Decl(moduledecl.ts, 132, 1)) + export var b: number; >b : Symbol(b, Decl(moduledecl.ts, 135, 14)) } diff --git a/tests/baselines/reference/moduledecl.types b/tests/baselines/reference/moduledecl.types index e638286197228..ad3001ecd7fb5 100644 --- a/tests/baselines/reference/moduledecl.types +++ b/tests/baselines/reference/moduledecl.types @@ -304,6 +304,8 @@ declare module m55 { } declare module "m3" { +>"m3" : typeof "m3" + export var b: number; >b : number } diff --git a/tests/baselines/reference/newWithSpreadES5.symbols b/tests/baselines/reference/newWithSpreadES5.symbols index 7db4e6f106360..7b4db7a8243c0 100644 --- a/tests/baselines/reference/newWithSpreadES5.symbols +++ b/tests/baselines/reference/newWithSpreadES5.symbols @@ -37,6 +37,7 @@ interface C { >C : Symbol(C, Decl(newWithSpreadES5.ts, 14, 1)) "a-b": typeof B; +>"a-b" : Symbol(C["a-b"], Decl(newWithSpreadES5.ts, 16, 13)) >B : Symbol(B, Decl(newWithSpreadES5.ts, 10, 1)) } @@ -44,6 +45,7 @@ interface D { >D : Symbol(D, Decl(newWithSpreadES5.ts, 18, 1)) 1: typeof B; +>1 : Symbol(D[1], Decl(newWithSpreadES5.ts, 20, 13)) >B : Symbol(B, Decl(newWithSpreadES5.ts, 10, 1)) } diff --git a/tests/baselines/reference/newWithSpreadES5.types b/tests/baselines/reference/newWithSpreadES5.types index dfa45b33ee1b5..68a29d5be3759 100644 --- a/tests/baselines/reference/newWithSpreadES5.types +++ b/tests/baselines/reference/newWithSpreadES5.types @@ -37,6 +37,7 @@ interface C { >C : C "a-b": typeof B; +>"a-b" : typeof B >B : typeof B } @@ -44,6 +45,7 @@ interface D { >D : D 1: typeof B; +>1 : typeof B >B : typeof B } diff --git a/tests/baselines/reference/newWithSpreadES6.symbols b/tests/baselines/reference/newWithSpreadES6.symbols index 946aeeb5c1ada..e411afce52c9f 100644 --- a/tests/baselines/reference/newWithSpreadES6.symbols +++ b/tests/baselines/reference/newWithSpreadES6.symbols @@ -38,6 +38,7 @@ interface C { >C : Symbol(C, Decl(newWithSpreadES6.ts, 15, 1)) "a-b": typeof B; +>"a-b" : Symbol(C["a-b"], Decl(newWithSpreadES6.ts, 17, 13)) >B : Symbol(B, Decl(newWithSpreadES6.ts, 11, 1)) } @@ -45,6 +46,7 @@ interface D { >D : Symbol(D, Decl(newWithSpreadES6.ts, 19, 1)) 1: typeof B; +>1 : Symbol(D[1], Decl(newWithSpreadES6.ts, 21, 13)) >B : Symbol(B, Decl(newWithSpreadES6.ts, 11, 1)) } diff --git a/tests/baselines/reference/newWithSpreadES6.types b/tests/baselines/reference/newWithSpreadES6.types index 587e7683e6a83..0111a9ee633d0 100644 --- a/tests/baselines/reference/newWithSpreadES6.types +++ b/tests/baselines/reference/newWithSpreadES6.types @@ -38,6 +38,7 @@ interface C { >C : C "a-b": typeof B; +>"a-b" : typeof B >B : typeof B } @@ -45,6 +46,7 @@ interface D { >D : D 1: typeof B; +>1 : typeof B >B : typeof B } diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols index 96b3840856062..2b5f7f96d4bb1 100644 --- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols +++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols @@ -71,9 +71,16 @@ var m: MyMap = { >MyMap : Symbol(MyMap, Decl(noImplicitAnyIndexingSuppressed.ts, 30, 29)) "0": 0, +>"0" : Symbol("0", Decl(noImplicitAnyIndexingSuppressed.ts, 36, 24)) + "1": 1, +>"1" : Symbol("1", Decl(noImplicitAnyIndexingSuppressed.ts, 37, 11)) + "2": 2, +>"2" : Symbol("2", Decl(noImplicitAnyIndexingSuppressed.ts, 38, 11)) + "Okay that's enough for today.": NaN +>"Okay that's enough for today." : Symbol("Okay that's enough for today.", Decl(noImplicitAnyIndexingSuppressed.ts, 39, 11)) >NaN : Symbol(NaN, Decl(lib.d.ts, --, --)) }; diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types index 6bb0c04fbb0f4..c5df2eb4de0f8 100644 --- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types +++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types @@ -90,15 +90,19 @@ var m: MyMap = { >{ "0": 0, "1": 1, "2": 2, "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; } "0": 0, +>"0" : number >0 : 0 "1": 1, +>"1" : number >1 : 1 "2": 2, +>"2" : number >2 : 2 "Okay that's enough for today.": NaN +>"Okay that's enough for today." : number >NaN : number }; diff --git a/tests/baselines/reference/nodeResolution5.symbols b/tests/baselines/reference/nodeResolution5.symbols index be4aa2be0e966..6992b94f99ca3 100644 --- a/tests/baselines/reference/nodeResolution5.symbols +++ b/tests/baselines/reference/nodeResolution5.symbols @@ -5,6 +5,8 @@ import y = require("a"); === tests/cases/compiler/node_modules/a.d.ts === declare module "a" { +>"a" : Symbol("a", Decl(a.d.ts, 0, 0)) + var x: number; >x : Symbol(x, Decl(a.d.ts, 2, 7)) } diff --git a/tests/baselines/reference/nodeResolution5.types b/tests/baselines/reference/nodeResolution5.types index 14f5bd24f5d37..50a3fddd9bce9 100644 --- a/tests/baselines/reference/nodeResolution5.types +++ b/tests/baselines/reference/nodeResolution5.types @@ -5,6 +5,8 @@ import y = require("a"); === tests/cases/compiler/node_modules/a.d.ts === declare module "a" { +>"a" : typeof "a" + var x: number; >x : number } diff --git a/tests/baselines/reference/nodeResolution7.symbols b/tests/baselines/reference/nodeResolution7.symbols index ea8d636b61b11..0d34a1f17acbe 100644 --- a/tests/baselines/reference/nodeResolution7.symbols +++ b/tests/baselines/reference/nodeResolution7.symbols @@ -5,6 +5,8 @@ import y = require("a"); === tests/cases/compiler/node_modules/a/index.d.ts === declare module "a" { +>"a" : Symbol("a", Decl(index.d.ts, 0, 0)) + var x: number; >x : Symbol(x, Decl(index.d.ts, 2, 7)) } diff --git a/tests/baselines/reference/nodeResolution7.types b/tests/baselines/reference/nodeResolution7.types index 1cb14150bdee5..c441333634754 100644 --- a/tests/baselines/reference/nodeResolution7.types +++ b/tests/baselines/reference/nodeResolution7.types @@ -5,6 +5,8 @@ import y = require("a"); === tests/cases/compiler/node_modules/a/index.d.ts === declare module "a" { +>"a" : typeof "a" + var x: number; >x : number } diff --git a/tests/baselines/reference/numericIndexerConstraint3.symbols b/tests/baselines/reference/numericIndexerConstraint3.symbols index 5b784742ad819..b3b030b25c30d 100644 --- a/tests/baselines/reference/numericIndexerConstraint3.symbols +++ b/tests/baselines/reference/numericIndexerConstraint3.symbols @@ -18,6 +18,7 @@ class C { >C : Symbol(C, Decl(numericIndexerConstraint3.ts, 6, 1)) 0: B; +>0 : Symbol(C[0], Decl(numericIndexerConstraint3.ts, 8, 9)) >B : Symbol(B, Decl(numericIndexerConstraint3.ts, 2, 1)) [x: number]: A; diff --git a/tests/baselines/reference/numericIndexerConstraint3.types b/tests/baselines/reference/numericIndexerConstraint3.types index 2e249c89b8c84..a562e1727abc7 100644 --- a/tests/baselines/reference/numericIndexerConstraint3.types +++ b/tests/baselines/reference/numericIndexerConstraint3.types @@ -18,6 +18,7 @@ class C { >C : C 0: B; +>0 : B >B : B [x: number]: A; diff --git a/tests/baselines/reference/numericIndexerConstraint4.symbols b/tests/baselines/reference/numericIndexerConstraint4.symbols index 8edf7d0f6fe3f..05b54c512bd7d 100644 --- a/tests/baselines/reference/numericIndexerConstraint4.symbols +++ b/tests/baselines/reference/numericIndexerConstraint4.symbols @@ -22,5 +22,6 @@ var x: { >A : Symbol(A, Decl(numericIndexerConstraint4.ts, 0, 0)) } = { 0: new B() } +>0 : Symbol(0, Decl(numericIndexerConstraint4.ts, 10, 5)) >B : Symbol(B, Decl(numericIndexerConstraint4.ts, 2, 1)) diff --git a/tests/baselines/reference/numericIndexerConstraint4.types b/tests/baselines/reference/numericIndexerConstraint4.types index c8cda0e6be2be..e434ec83b4040 100644 --- a/tests/baselines/reference/numericIndexerConstraint4.types +++ b/tests/baselines/reference/numericIndexerConstraint4.types @@ -23,6 +23,7 @@ var x: { } = { 0: new B() } >{ 0: new B() } : { 0: B; } +>0 : B >new B() : B >B : typeof B diff --git a/tests/baselines/reference/numericIndexingResults.symbols b/tests/baselines/reference/numericIndexingResults.symbols index 49a38fef56708..f1357c272f156 100644 --- a/tests/baselines/reference/numericIndexingResults.symbols +++ b/tests/baselines/reference/numericIndexingResults.symbols @@ -6,7 +6,10 @@ class C { >x : Symbol(x, Decl(numericIndexingResults.ts, 1, 5)) 1 = ''; +>1 : Symbol(C[1], Decl(numericIndexingResults.ts, 1, 24)) + "2" = '' +>"2" : Symbol(C["2"], Decl(numericIndexingResults.ts, 2, 11)) } var c: C; @@ -48,7 +51,10 @@ interface I { >x : Symbol(x, Decl(numericIndexingResults.ts, 15, 5)) 1: string; +>1 : Symbol(I[1], Decl(numericIndexingResults.ts, 15, 24)) + "2": string; +>"2" : Symbol(I["2"], Decl(numericIndexingResults.ts, 16, 14)) } var i: I @@ -90,7 +96,10 @@ var a: { >x : Symbol(x, Decl(numericIndexingResults.ts, 29, 5)) 1: string; +>1 : Symbol(1, Decl(numericIndexingResults.ts, 29, 24)) + "2": string; +>"2" : Symbol("2", Decl(numericIndexingResults.ts, 30, 14)) } var r1 = a['1']; @@ -124,6 +133,8 @@ var r6 = a[3]; var b: { [x: number]: string } = { 1: '', "2": '' } >b : Symbol(b, Decl(numericIndexingResults.ts, 41, 3)) >x : Symbol(x, Decl(numericIndexingResults.ts, 41, 10)) +>1 : Symbol(1, Decl(numericIndexingResults.ts, 41, 34)) +>"2" : Symbol("2", Decl(numericIndexingResults.ts, 41, 41)) var r1a = b['1']; >r1a : Symbol(r1a, Decl(numericIndexingResults.ts, 42, 3)) @@ -152,6 +163,10 @@ var r6 = b[3]; var b2: { [x: number]: string; 1: string; "2": string; } = { 1: '', "2": '' } >b2 : Symbol(b2, Decl(numericIndexingResults.ts, 49, 3)) >x : Symbol(x, Decl(numericIndexingResults.ts, 49, 11)) +>1 : Symbol(1, Decl(numericIndexingResults.ts, 49, 30)) +>"2" : Symbol("2", Decl(numericIndexingResults.ts, 49, 41)) +>1 : Symbol(1, Decl(numericIndexingResults.ts, 49, 60)) +>"2" : Symbol("2", Decl(numericIndexingResults.ts, 49, 67)) var r1b = b2['1']; >r1b : Symbol(r1b, Decl(numericIndexingResults.ts, 50, 3)) diff --git a/tests/baselines/reference/numericIndexingResults.types b/tests/baselines/reference/numericIndexingResults.types index 8d25a44eab0db..c8f46336721d0 100644 --- a/tests/baselines/reference/numericIndexingResults.types +++ b/tests/baselines/reference/numericIndexingResults.types @@ -6,9 +6,11 @@ class C { >x : number 1 = ''; +>1 : string >'' : "" "2" = '' +>"2" : string >'' : "" } @@ -59,7 +61,10 @@ interface I { >x : number 1: string; +>1 : string + "2": string; +>"2" : string } var i: I @@ -109,7 +114,10 @@ var a: { >x : number 1: string; +>1 : string + "2": string; +>"2" : string } var r1 = a['1']; @@ -152,7 +160,9 @@ var b: { [x: number]: string } = { 1: '', "2": '' } >b : { [x: number]: string; } >x : number >{ 1: '', "2": '' } : { 1: string; "2": string; } +>1 : string >'' : "" +>"2" : string >'' : "" var r1a = b['1']; @@ -194,8 +204,12 @@ var r6 = b[3]; var b2: { [x: number]: string; 1: string; "2": string; } = { 1: '', "2": '' } >b2 : { [x: number]: string; 1: string; "2": string; } >x : number +>1 : string +>"2" : string >{ 1: '', "2": '' } : { 1: string; "2": string; } +>1 : string >'' : "" +>"2" : string >'' : "" var r1b = b2['1']; diff --git a/tests/baselines/reference/numericMethodName1.symbols b/tests/baselines/reference/numericMethodName1.symbols index a2ecd29e8e715..a16a634c9d7d1 100644 --- a/tests/baselines/reference/numericMethodName1.symbols +++ b/tests/baselines/reference/numericMethodName1.symbols @@ -3,5 +3,6 @@ class C { >C : Symbol(C, Decl(numericMethodName1.ts, 0, 0)) 1 = 2; +>1 : Symbol(C[1], Decl(numericMethodName1.ts, 0, 9)) } diff --git a/tests/baselines/reference/numericMethodName1.types b/tests/baselines/reference/numericMethodName1.types index 4f907f06feb50..d93723e1b1246 100644 --- a/tests/baselines/reference/numericMethodName1.types +++ b/tests/baselines/reference/numericMethodName1.types @@ -3,6 +3,7 @@ class C { >C : C 1 = 2; +>1 : number >2 : 2 } diff --git a/tests/baselines/reference/objectLiteralIndexers.symbols b/tests/baselines/reference/objectLiteralIndexers.symbols index 53e1c82aca4b5..a1543ed871aa6 100644 --- a/tests/baselines/reference/objectLiteralIndexers.symbols +++ b/tests/baselines/reference/objectLiteralIndexers.symbols @@ -33,17 +33,20 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer i >B : Symbol(B, Decl(objectLiteralIndexers.ts, 2, 1)) >x : Symbol(x, Decl(objectLiteralIndexers.ts, 12, 46)) >a : Symbol(a, Decl(objectLiteralIndexers.ts, 8, 3)) +>0 : Symbol(0, Decl(objectLiteralIndexers.ts, 12, 52)) >b : Symbol(b, Decl(objectLiteralIndexers.ts, 9, 3)) o1 = { x: b, 0: c }; // both indexers are any >o1 : Symbol(o1, Decl(objectLiteralIndexers.ts, 12, 3)) >x : Symbol(x, Decl(objectLiteralIndexers.ts, 13, 6)) >b : Symbol(b, Decl(objectLiteralIndexers.ts, 9, 3)) +>0 : Symbol(0, Decl(objectLiteralIndexers.ts, 13, 12)) >c : Symbol(c, Decl(objectLiteralIndexers.ts, 10, 3)) o1 = { x: c, 0: b }; // string indexer is any, number indexer is B >o1 : Symbol(o1, Decl(objectLiteralIndexers.ts, 12, 3)) >x : Symbol(x, Decl(objectLiteralIndexers.ts, 14, 6)) >c : Symbol(c, Decl(objectLiteralIndexers.ts, 10, 3)) +>0 : Symbol(0, Decl(objectLiteralIndexers.ts, 14, 12)) >b : Symbol(b, Decl(objectLiteralIndexers.ts, 9, 3)) diff --git a/tests/baselines/reference/objectLiteralIndexers.types b/tests/baselines/reference/objectLiteralIndexers.types index ef242fd1fe30f..388d72da14498 100644 --- a/tests/baselines/reference/objectLiteralIndexers.types +++ b/tests/baselines/reference/objectLiteralIndexers.types @@ -34,6 +34,7 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer i >{ x: a, 0: b } : { x: A; 0: B; } >x : A >a : A +>0 : B >b : B o1 = { x: b, 0: c }; // both indexers are any @@ -42,6 +43,7 @@ o1 = { x: b, 0: c }; // both indexers are any >{ x: b, 0: c } : { x: B; 0: any; } >x : B >b : B +>0 : any >c : any o1 = { x: c, 0: b }; // string indexer is any, number indexer is B @@ -50,5 +52,6 @@ o1 = { x: c, 0: b }; // string indexer is any, number indexer is B >{ x: c, 0: b } : { x: any; 0: B; } >x : any >c : any +>0 : B >b : B diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols index 35c10faa9c05d..7b2340ea14b65 100644 --- a/tests/baselines/reference/objectSpread.symbols +++ b/tests/baselines/reference/objectSpread.symbols @@ -277,6 +277,7 @@ let computedFirst: { a: number, b: string, "before everything": number } = >computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 70, 3)) >a : Symbol(a, Decl(objectSpread.ts, 70, 20)) >b : Symbol(b, Decl(objectSpread.ts, 70, 31)) +>"before everything" : Symbol("before everything", Decl(objectSpread.ts, 70, 42)) { ['before everything']: 12, ...o, b: 'yes' } >'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 71, 5)) @@ -288,6 +289,7 @@ let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number >a : Symbol(a, Decl(objectSpread.ts, 72, 21)) >b : Symbol(b, Decl(objectSpread.ts, 72, 32)) >c : Symbol(c, Decl(objectSpread.ts, 72, 43)) +>"in the middle" : Symbol("in the middle", Decl(objectSpread.ts, 72, 55)) { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } >o : Symbol(o, Decl(objectSpread.ts, 0, 3)) @@ -299,6 +301,7 @@ let computedAfter: { a: number, b: string, "at the end": number } = >computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 74, 3)) >a : Symbol(a, Decl(objectSpread.ts, 74, 20)) >b : Symbol(b, Decl(objectSpread.ts, 74, 31)) +>"at the end" : Symbol("at the end", Decl(objectSpread.ts, 74, 42)) { ...o, b: 'yeah', ['at the end']: 14 } >o : Symbol(o, Decl(objectSpread.ts, 0, 3)) diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types index a571bd0bb6330..d5fd47f7f033e 100644 --- a/tests/baselines/reference/objectSpread.types +++ b/tests/baselines/reference/objectSpread.types @@ -357,6 +357,7 @@ let computedFirst: { a: number, b: string, "before everything": number } = >computedFirst : { a: number; b: string; "before everything": number; } >a : number >b : string +>"before everything" : number { ['before everything']: 12, ...o, b: 'yes' } >{ ['before everything']: 12, ...o, b: 'yes' } : { b: string; a: number; ['before everything']: number; } @@ -371,6 +372,7 @@ let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number >a : number >b : string >c : boolean +>"in the middle" : number { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } >{ ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } : { b: string; c: boolean; ['in the middle']: number; a: number; } @@ -385,6 +387,7 @@ let computedAfter: { a: number, b: string, "at the end": number } = >computedAfter : { a: number; b: string; "at the end": number; } >a : number >b : string +>"at the end" : number { ...o, b: 'yeah', ['at the end']: 14 } >{ ...o, b: 'yeah', ['at the end']: 14 } : { b: string; ['at the end']: number; a: number; } diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.symbols b/tests/baselines/reference/objectTypeWithNumericProperty.symbols index 73ff7149d0fb0..72b2ff2417557 100644 --- a/tests/baselines/reference/objectTypeWithNumericProperty.symbols +++ b/tests/baselines/reference/objectTypeWithNumericProperty.symbols @@ -5,7 +5,10 @@ class C { >C : Symbol(C, Decl(objectTypeWithNumericProperty.ts, 0, 0)) 1: number; +>1 : Symbol(C[1], Decl(objectTypeWithNumericProperty.ts, 2, 9)) + 1.1: string; +>1.1 : Symbol(C[1.1], Decl(objectTypeWithNumericProperty.ts, 3, 14)) } var c: C; @@ -36,7 +39,10 @@ interface I { >I : Symbol(I, Decl(objectTypeWithNumericProperty.ts, 11, 18)) 1: number; +>1 : Symbol(I[1], Decl(objectTypeWithNumericProperty.ts, 13, 13)) + 1.1: string; +>1.1 : Symbol(I[1.1], Decl(objectTypeWithNumericProperty.ts, 14, 14)) } var i: I; @@ -67,7 +73,10 @@ var a: { >a : Symbol(a, Decl(objectTypeWithNumericProperty.ts, 24, 3)) 1: number; +>1 : Symbol(1, Decl(objectTypeWithNumericProperty.ts, 24, 8)) + 1.1: string; +>1.1 : Symbol(1.1, Decl(objectTypeWithNumericProperty.ts, 25, 14)) } var r1 = a[1]; @@ -94,7 +103,10 @@ var b = { >b : Symbol(b, Decl(objectTypeWithNumericProperty.ts, 34, 3)) 1: 1, +>1 : Symbol(1, Decl(objectTypeWithNumericProperty.ts, 34, 9)) + 1.1: "" +>1.1 : Symbol(1.1, Decl(objectTypeWithNumericProperty.ts, 35, 9)) } var r1 = b[1]; diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.types b/tests/baselines/reference/objectTypeWithNumericProperty.types index 52a27ea09afed..ceb8ed0e42c18 100644 --- a/tests/baselines/reference/objectTypeWithNumericProperty.types +++ b/tests/baselines/reference/objectTypeWithNumericProperty.types @@ -5,7 +5,10 @@ class C { >C : C 1: number; +>1 : number + 1.1: string; +>1.1 : string } var c: C; @@ -40,7 +43,10 @@ interface I { >I : I 1: number; +>1 : number + 1.1: string; +>1.1 : string } var i: I; @@ -75,7 +81,10 @@ var a: { >a : { 1: number; 1.1: string; } 1: number; +>1 : number + 1.1: string; +>1.1 : string } var r1 = a[1]; @@ -107,9 +116,11 @@ var b = { >{ 1: 1, 1.1: ""} : { 1: number; 1.1: string; } 1: 1, +>1 : number >1 : 1 1.1: "" +>1.1 : string >"" : "" } diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols index 480886711d501..f7c2eae10be40 100644 --- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols +++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols @@ -8,19 +8,31 @@ class C { >C : Symbol(C, Decl(objectTypeWithStringNamedNumericProperty.ts, 0, 0)) "0.1": void; +>"0.1" : Symbol(C["0.1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 5, 9)) + ".1": Object; +>".1" : Symbol(C[".1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 6, 16)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "1": number; +>"1" : Symbol(C["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 7, 17)) + "1.": string; +>"1." : Symbol(C["1."], Decl(objectTypeWithStringNamedNumericProperty.ts, 8, 16)) + "1..": boolean; +>"1.." : Symbol(C["1.."], Decl(objectTypeWithStringNamedNumericProperty.ts, 9, 17)) + "1.0": Date; +>"1.0" : Symbol(C["1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 10, 19)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "-1.0": RegExp; +>"-1.0" : Symbol(C["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 11, 16)) >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "-1": Date; +>"-1" : Symbol(C["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 12, 19)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) } @@ -114,19 +126,31 @@ interface I { >I : Symbol(I, Decl(objectTypeWithStringNamedNumericProperty.ts, 34, 16)) "0.1": void; +>"0.1" : Symbol(I["0.1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 36, 13)) + ".1": Object; +>".1" : Symbol(I[".1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 37, 16)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "1": number; +>"1" : Symbol(I["1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 38, 17)) + "1.": string; +>"1." : Symbol(I["1."], Decl(objectTypeWithStringNamedNumericProperty.ts, 39, 16)) + "1..": boolean; +>"1.." : Symbol(I["1.."], Decl(objectTypeWithStringNamedNumericProperty.ts, 40, 17)) + "1.0": Date; +>"1.0" : Symbol(I["1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 41, 19)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "-1.0": RegExp; +>"-1.0" : Symbol(I["-1.0"], Decl(objectTypeWithStringNamedNumericProperty.ts, 42, 16)) >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "-1": Date; +>"-1" : Symbol(I["-1"], Decl(objectTypeWithStringNamedNumericProperty.ts, 43, 19)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) } @@ -220,19 +244,31 @@ var a: { >a : Symbol(a, Decl(objectTypeWithStringNamedNumericProperty.ts, 67, 3)) "0.1": void; +>"0.1" : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 67, 8)) + ".1": Object; +>".1" : Symbol(".1", Decl(objectTypeWithStringNamedNumericProperty.ts, 68, 16)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "1": number; +>"1" : Symbol("1", Decl(objectTypeWithStringNamedNumericProperty.ts, 69, 17)) + "1.": string; +>"1." : Symbol("1.", Decl(objectTypeWithStringNamedNumericProperty.ts, 70, 16)) + "1..": boolean; +>"1.." : Symbol("1..", Decl(objectTypeWithStringNamedNumericProperty.ts, 71, 17)) + "1.0": Date; +>"1.0" : Symbol("1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 72, 19)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "-1.0": RegExp; +>"-1.0" : Symbol("-1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 73, 16)) >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "-1": Date; +>"-1" : Symbol("-1", Decl(objectTypeWithStringNamedNumericProperty.ts, 74, 19)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) } @@ -322,17 +358,30 @@ var b = { >b : Symbol(b, Decl(objectTypeWithStringNamedNumericProperty.ts, 97, 3)) "0.1": null, +>"0.1" : Symbol("0.1", Decl(objectTypeWithStringNamedNumericProperty.ts, 97, 9)) + ".1": new Object(), +>".1" : Symbol(".1", Decl(objectTypeWithStringNamedNumericProperty.ts, 98, 22)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "1": 1, +>"1" : Symbol("1", Decl(objectTypeWithStringNamedNumericProperty.ts, 99, 23)) + "1.": "", +>"1." : Symbol("1.", Decl(objectTypeWithStringNamedNumericProperty.ts, 100, 11)) + "1..": true, +>"1.." : Symbol("1..", Decl(objectTypeWithStringNamedNumericProperty.ts, 101, 13)) + "1.0": new Date(), +>"1.0" : Symbol("1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 102, 16)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) "-1.0": /123/, +>"-1.0" : Symbol("-1.0", Decl(objectTypeWithStringNamedNumericProperty.ts, 103, 22)) + "-1": Date +>"-1" : Symbol("-1", Decl(objectTypeWithStringNamedNumericProperty.ts, 104, 18)) >Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) }; diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types index 1f34c4fafacb3..f92e06dc564e4 100644 --- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types +++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types @@ -8,19 +8,31 @@ class C { >C : C "0.1": void; +>"0.1" : void + ".1": Object; +>".1" : Object >Object : Object "1": number; +>"1" : number + "1.": string; +>"1." : string + "1..": boolean; +>"1.." : boolean + "1.0": Date; +>"1.0" : Date >Date : Date "-1.0": RegExp; +>"-1.0" : RegExp >RegExp : RegExp "-1": Date; +>"-1" : Date >Date : Date } @@ -139,19 +151,31 @@ interface I { >I : I "0.1": void; +>"0.1" : void + ".1": Object; +>".1" : Object >Object : Object "1": number; +>"1" : number + "1.": string; +>"1." : string + "1..": boolean; +>"1.." : boolean + "1.0": Date; +>"1.0" : Date >Date : Date "-1.0": RegExp; +>"-1.0" : RegExp >RegExp : RegExp "-1": Date; +>"-1" : Date >Date : Date } @@ -270,19 +294,31 @@ var a: { >a : { "0.1": void; ".1": Object; "1": number; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": Date; } "0.1": void; +>"0.1" : void + ".1": Object; +>".1" : Object >Object : Object "1": number; +>"1" : number + "1.": string; +>"1." : string + "1..": boolean; +>"1.." : boolean + "1.0": Date; +>"1.0" : Date >Date : Date "-1.0": RegExp; +>"-1.0" : RegExp >RegExp : RegExp "-1": Date; +>"-1" : Date >Date : Date } @@ -398,30 +434,38 @@ var b = { >{ "0.1": null, ".1": new Object(), "1": 1, "1.": "", "1..": true, "1.0": new Date(), "-1.0": /123/, "-1": Date} : { "0.1": void; ".1": Object; "1": number; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": DateConstructor; } "0.1": null, +>"0.1" : void >null : void >null : null ".1": new Object(), +>".1" : Object >new Object() : Object >Object : ObjectConstructor "1": 1, +>"1" : number >1 : 1 "1.": "", +>"1." : string >"" : "" "1..": true, +>"1.." : boolean >true : true "1.0": new Date(), +>"1.0" : Date >new Date() : Date >Date : DateConstructor "-1.0": /123/, +>"-1.0" : RegExp >/123/ : RegExp "-1": Date +>"-1" : DateConstructor >Date : DateConstructor }; diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols index 773fb3f576069..355b584cb6c0b 100644 --- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols +++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.symbols @@ -3,10 +3,19 @@ class C { >C : Symbol(C, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 0, 0)) " ": number; +>" " : Symbol(C[" "], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 0, 9)) + "a b": string; +>"a b" : Symbol(C["a b"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 1, 18)) + "~!@#$%^&*()_+{}|:'<>?\/.,`": number; +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol(C["~!@#$%^&*()_+{}|:'<>?\/.,`"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 2, 20)) + "a\a": number; +>"a\a" : Symbol(C["a\a"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 3, 41)) + static "a ": number +>"a " : Symbol(C["a "], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 4, 18)) } var c: C; @@ -37,8 +46,13 @@ interface I { >I : Symbol(I, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 13, 41)) " ": number; +>" " : Symbol(I[" "], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 15, 13)) + "a b": string; +>"a b" : Symbol(I["a b"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 16, 18)) + "~!@#$%^&*()_+{}|:'<>?\/.,`": number; +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol(I["~!@#$%^&*()_+{}|:'<>?\/.,`"], Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 17, 20)) } var i: I; @@ -70,8 +84,13 @@ var a: { >a : Symbol(a, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 29, 3)) " ": number; +>" " : Symbol(" ", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 29, 8)) + "a b": string; +>"a b" : Symbol("a b", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 30, 18)) + "~!@#$%^&*()_+{}|:'<>?\/.,`": number; +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol("~!@#$%^&*()_+{}|:'<>?\/.,`", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 31, 20)) } var r = a[" "]; @@ -98,8 +117,13 @@ var b = { >b : Symbol(b, Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 41, 3)) " ": 1, +>" " : Symbol(" ", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 41, 9)) + "a b": "", +>"a b" : Symbol("a b", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 42, 13)) + "~!@#$%^&*()_+{}|:'<>?\/.,`": 1, +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : Symbol("~!@#$%^&*()_+{}|:'<>?\/.,`", Decl(objectTypeWithStringNamedPropertyOfIllegalCharacters.ts, 43, 16)) } var r = b[" "]; diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types index ca200efcebf9e..783e04ba82e6b 100644 --- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types +++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types @@ -3,10 +3,19 @@ class C { >C : C " ": number; +>" " : number + "a b": string; +>"a b" : string + "~!@#$%^&*()_+{}|:'<>?\/.,`": number; +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number + "a\a": number; +>"a\a" : number + static "a ": number +>"a " : number } var c: C; @@ -42,8 +51,13 @@ interface I { >I : I " ": number; +>" " : number + "a b": string; +>"a b" : string + "~!@#$%^&*()_+{}|:'<>?\/.,`": number; +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number } var i: I; @@ -80,8 +94,13 @@ var a: { >a : { " ": number; "a b": string; "~!@#$%^&*()_+{}|:'<>?\/.,`": number; } " ": number; +>" " : number + "a b": string; +>"a b" : string + "~!@#$%^&*()_+{}|:'<>?\/.,`": number; +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number } var r = a[" "]; @@ -114,12 +133,15 @@ var b = { >{ " ": 1, "a b": "", "~!@#$%^&*()_+{}|:'<>?\/.,`": 1,} : { " ": number; "a b": string; "~!@#$%^&*()_+{}|:'<>?\/.,`": number; } " ": 1, +>" " : number >1 : 1 "a b": "", +>"a b" : string >"" : "" "~!@#$%^&*()_+{}|:'<>?\/.,`": 1, +>"~!@#$%^&*()_+{}|:'<>?\/.,`" : number >1 : 1 } diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols index 798fb5c3c57da..44b99bbf6d59b 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.symbols @@ -50,6 +50,7 @@ var a: { var b: { [x: number]: string; } = { 0: '' }; >b : Symbol(b, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 3)) >x : Symbol(x, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 10)) +>0 : Symbol(0, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 35)) function foo1(x: A); >foo1 : Symbol(foo1, Decl(objectTypesIdentityWithNumericIndexers1.ts, 27, 44), Decl(objectTypesIdentityWithNumericIndexers1.ts, 29, 20), Decl(objectTypesIdentityWithNumericIndexers1.ts, 30, 20)) diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types index 8ac7b807cbab8..8447ec7c702e0 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types @@ -51,6 +51,7 @@ var b: { [x: number]: string; } = { 0: '' }; >b : { [x: number]: string; } >x : number >{ 0: '' } : { 0: string; } +>0 : string >'' : "" function foo1(x: A); diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols index b4ad1857748b0..87c7172917aa7 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols @@ -64,6 +64,7 @@ var b: { [x: number]: Derived; } = { 0: null }; >b : Symbol(b, Decl(objectTypesIdentityWithNumericIndexers2.ts, 30, 3)) >x : Symbol(x, Decl(objectTypesIdentityWithNumericIndexers2.ts, 30, 10)) >Derived : Symbol(Derived, Decl(objectTypesIdentityWithNumericIndexers2.ts, 2, 27)) +>0 : Symbol(0, Decl(objectTypesIdentityWithNumericIndexers2.ts, 30, 36)) >Derived : Symbol(Derived, Decl(objectTypesIdentityWithNumericIndexers2.ts, 2, 27)) function foo1(x: A); diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types index ce38d95174b0f..3cf86f1098389 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types @@ -65,6 +65,7 @@ var b: { [x: number]: Derived; } = { 0: null }; >x : number >Derived : Derived >{ 0: null } : { 0: Derived; } +>0 : Derived >null : Derived >Derived : Derived >null : null diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols index ed95b3a7025b7..ff8d854cb1e68 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.symbols @@ -50,6 +50,7 @@ var a: { var b: { [x: number]: string; } = { 0: '' }; >b : Symbol(b, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 3)) >x : Symbol(x, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 10)) +>0 : Symbol(0, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 35)) function foo1(x: A); >foo1 : Symbol(foo1, Decl(objectTypesIdentityWithNumericIndexers3.ts, 27, 44), Decl(objectTypesIdentityWithNumericIndexers3.ts, 29, 20), Decl(objectTypesIdentityWithNumericIndexers3.ts, 30, 20)) diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types index bcf2ef6d73325..8d9e9a3bca35a 100644 --- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types +++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types @@ -51,6 +51,7 @@ var b: { [x: number]: string; } = { 0: '' }; >b : { [x: number]: string; } >x : number >{ 0: '' } : { 0: string; } +>0 : string >'' : "" function foo1(x: A); diff --git a/tests/baselines/reference/octalIntegerLiteral.symbols b/tests/baselines/reference/octalIntegerLiteral.symbols index 6a4839839aab3..7a69c3b56f8c5 100644 --- a/tests/baselines/reference/octalIntegerLiteral.symbols +++ b/tests/baselines/reference/octalIntegerLiteral.symbols @@ -15,6 +15,8 @@ var obj1 = { >obj1 : Symbol(obj1, Decl(octalIntegerLiteral.ts, 5, 3)) 0o45436: "Hello", +>0o45436 : Symbol(0o45436, Decl(octalIntegerLiteral.ts, 5, 12)) + a: 0o45436, >a : Symbol(a, Decl(octalIntegerLiteral.ts, 6, 21)) @@ -26,12 +28,15 @@ var obj1 = { >oct1 : Symbol(oct1, Decl(octalIntegerLiteral.ts, 8, 12)) 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteral.ts, 9, 9)) } var obj2 = { >obj2 : Symbol(obj2, Decl(octalIntegerLiteral.ts, 13, 3)) 0O45436: "hi", +>0O45436 : Symbol(0O45436, Decl(octalIntegerLiteral.ts, 13, 12)) + a: 0O45436, >a : Symbol(a, Decl(octalIntegerLiteral.ts, 14, 18)) @@ -43,6 +48,7 @@ var obj2 = { >oct2 : Symbol(oct2, Decl(octalIntegerLiteral.ts, 16, 12)) 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false, +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteral.ts, 17, 9)) } obj1[0o45436]; // string diff --git a/tests/baselines/reference/octalIntegerLiteral.types b/tests/baselines/reference/octalIntegerLiteral.types index f8f07da9a4bc0..160a1460977aa 100644 --- a/tests/baselines/reference/octalIntegerLiteral.types +++ b/tests/baselines/reference/octalIntegerLiteral.types @@ -20,6 +20,7 @@ var obj1 = { >{ 0o45436: "Hello", a: 0o45436, b: oct1, oct1, 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true} : { 0o45436: string; a: number; b: number; oct1: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; } 0o45436: "Hello", +>0o45436 : string >"Hello" : "Hello" a: 0o45436, @@ -34,6 +35,7 @@ var obj1 = { >oct1 : number 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean >true : true } @@ -42,6 +44,7 @@ var obj2 = { >{ 0O45436: "hi", a: 0O45436, b: oct2, oct2, 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,} : { 0O45436: string; a: number; b: number; oct2: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; } 0O45436: "hi", +>0O45436 : string >"hi" : "hi" a: 0O45436, @@ -56,6 +59,7 @@ var obj2 = { >oct2 : number 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false, +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean >false : false } diff --git a/tests/baselines/reference/octalIntegerLiteralES6.symbols b/tests/baselines/reference/octalIntegerLiteralES6.symbols index ff3f54936cd79..c73b9d2f85d73 100644 --- a/tests/baselines/reference/octalIntegerLiteralES6.symbols +++ b/tests/baselines/reference/octalIntegerLiteralES6.symbols @@ -15,6 +15,8 @@ var obj1 = { >obj1 : Symbol(obj1, Decl(octalIntegerLiteralES6.ts, 5, 3)) 0o45436: "Hello", +>0o45436 : Symbol(0o45436, Decl(octalIntegerLiteralES6.ts, 5, 12)) + a: 0o45436, >a : Symbol(a, Decl(octalIntegerLiteralES6.ts, 6, 21)) @@ -26,12 +28,15 @@ var obj1 = { >oct1 : Symbol(oct1, Decl(octalIntegerLiteralES6.ts, 8, 12)) 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteralES6.ts, 9, 9)) } var obj2 = { >obj2 : Symbol(obj2, Decl(octalIntegerLiteralES6.ts, 13, 3)) 0O45436: "hi", +>0O45436 : Symbol(0O45436, Decl(octalIntegerLiteralES6.ts, 13, 12)) + a: 0O45436, >a : Symbol(a, Decl(octalIntegerLiteralES6.ts, 14, 18)) @@ -43,6 +48,7 @@ var obj2 = { >oct2 : Symbol(oct2, Decl(octalIntegerLiteralES6.ts, 16, 12)) 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false, +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : Symbol(0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777, Decl(octalIntegerLiteralES6.ts, 17, 9)) } obj1[0o45436]; // string diff --git a/tests/baselines/reference/octalIntegerLiteralES6.types b/tests/baselines/reference/octalIntegerLiteralES6.types index 06061be5d582b..0c799a4469745 100644 --- a/tests/baselines/reference/octalIntegerLiteralES6.types +++ b/tests/baselines/reference/octalIntegerLiteralES6.types @@ -20,6 +20,7 @@ var obj1 = { >{ 0o45436: "Hello", a: 0o45436, b: oct1, oct1, 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true} : { 0o45436: string; a: number; b: number; oct1: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; } 0o45436: "Hello", +>0o45436 : string >"Hello" : "Hello" a: 0o45436, @@ -34,6 +35,7 @@ var obj1 = { >oct1 : number 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: true +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean >true : true } @@ -42,6 +44,7 @@ var obj2 = { >{ 0O45436: "hi", a: 0O45436, b: oct2, oct2, 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false,} : { 0O45436: string; a: number; b: number; oct2: number; 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: boolean; } 0O45436: "hi", +>0O45436 : string >"hi" : "hi" a: 0O45436, @@ -56,6 +59,7 @@ var obj2 = { >oct2 : number 0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777: false, +>0o7777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 : boolean >false : false } diff --git a/tests/baselines/reference/parserClassDeclaration19.symbols b/tests/baselines/reference/parserClassDeclaration19.symbols index 9e9f64ca282a7..237cdbddaa46d 100644 --- a/tests/baselines/reference/parserClassDeclaration19.symbols +++ b/tests/baselines/reference/parserClassDeclaration19.symbols @@ -6,4 +6,5 @@ class C { >foo : Symbol(C.foo, Decl(parserClassDeclaration19.ts, 0, 9), Decl(parserClassDeclaration19.ts, 1, 10)) "foo"() { } +>"foo" : Symbol(C.foo, Decl(parserClassDeclaration19.ts, 0, 9), Decl(parserClassDeclaration19.ts, 1, 10)) } diff --git a/tests/baselines/reference/parserClassDeclaration19.types b/tests/baselines/reference/parserClassDeclaration19.types index 1f6a25bbdc8c4..dbaa031b8c539 100644 --- a/tests/baselines/reference/parserClassDeclaration19.types +++ b/tests/baselines/reference/parserClassDeclaration19.types @@ -6,4 +6,5 @@ class C { >foo : () => any "foo"() { } +>"foo" : () => any } diff --git a/tests/baselines/reference/parserClassDeclaration20.symbols b/tests/baselines/reference/parserClassDeclaration20.symbols index 52e83a3f10c4d..b401915bd2a37 100644 --- a/tests/baselines/reference/parserClassDeclaration20.symbols +++ b/tests/baselines/reference/parserClassDeclaration20.symbols @@ -3,5 +3,8 @@ class C { >C : Symbol(C, Decl(parserClassDeclaration20.ts, 0, 0)) 0(); +>0 : Symbol(C[0], Decl(parserClassDeclaration20.ts, 0, 9), Decl(parserClassDeclaration20.ts, 1, 8)) + "0"() { } +>"0" : Symbol(C[0], Decl(parserClassDeclaration20.ts, 0, 9), Decl(parserClassDeclaration20.ts, 1, 8)) } diff --git a/tests/baselines/reference/parserClassDeclaration20.types b/tests/baselines/reference/parserClassDeclaration20.types index e8014bf3af5a8..ceaab7c2cfa4c 100644 --- a/tests/baselines/reference/parserClassDeclaration20.types +++ b/tests/baselines/reference/parserClassDeclaration20.types @@ -3,5 +3,8 @@ class C { >C : C 0(); +>0 : () => any + "0"() { } +>"0" : () => any } diff --git a/tests/baselines/reference/parserEnum6.symbols b/tests/baselines/reference/parserEnum6.symbols index baee1886f249b..001c0af0be961 100644 --- a/tests/baselines/reference/parserEnum6.symbols +++ b/tests/baselines/reference/parserEnum6.symbols @@ -3,4 +3,7 @@ enum E { >E : Symbol(E, Decl(parserEnum6.ts, 0, 0)) "A", "B", "C" +>"A" : Symbol(E["A"], Decl(parserEnum6.ts, 0, 8)) +>"B" : Symbol(E["B"], Decl(parserEnum6.ts, 1, 6)) +>"C" : Symbol(E["C"], Decl(parserEnum6.ts, 1, 11)) } diff --git a/tests/baselines/reference/parserEnum6.types b/tests/baselines/reference/parserEnum6.types index 9b9e2a4909aa3..179a60cb40a7c 100644 --- a/tests/baselines/reference/parserEnum6.types +++ b/tests/baselines/reference/parserEnum6.types @@ -3,4 +3,7 @@ enum E { >E : E "A", "B", "C" +>"A" : E."A" +>"B" : E."B" +>"C" : E."C" } diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols b/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols index 3cd2d8ab32557..e66fc32d6ebbc 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols +++ b/tests/baselines/reference/parserFunctionPropertyAssignment2.symbols @@ -1,4 +1,5 @@ === tests/cases/conformance/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment2.ts === var v = { 0() { } }; >v : Symbol(v, Decl(parserFunctionPropertyAssignment2.ts, 0, 3)) +>0 : Symbol(0, Decl(parserFunctionPropertyAssignment2.ts, 0, 9)) diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment2.types b/tests/baselines/reference/parserFunctionPropertyAssignment2.types index 747b66978af00..e6ee85bba893a 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment2.types +++ b/tests/baselines/reference/parserFunctionPropertyAssignment2.types @@ -2,4 +2,5 @@ var v = { 0() { } }; >v : { 0(): void; } >{ 0() { } } : { 0(): void; } +>0 : () => void diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols b/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols index 9b3135c5ed029..afcf09b03b6e0 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols +++ b/tests/baselines/reference/parserFunctionPropertyAssignment3.symbols @@ -1,4 +1,5 @@ === tests/cases/conformance/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment3.ts === var v = { "foo"() { } }; >v : Symbol(v, Decl(parserFunctionPropertyAssignment3.ts, 0, 3)) +>"foo" : Symbol("foo", Decl(parserFunctionPropertyAssignment3.ts, 0, 9)) diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment3.types b/tests/baselines/reference/parserFunctionPropertyAssignment3.types index 9fb2bb45feff9..1e3dd3be75d25 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment3.types +++ b/tests/baselines/reference/parserFunctionPropertyAssignment3.types @@ -2,4 +2,5 @@ var v = { "foo"() { } }; >v : { "foo"(): void; } >{ "foo"() { } } : { "foo"(): void; } +>"foo" : () => void diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols b/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols index 2cb8b652e33a8..b313d7b5ec0f2 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols +++ b/tests/baselines/reference/parserFunctionPropertyAssignment4.symbols @@ -1,5 +1,6 @@ === tests/cases/conformance/parser/ecmascript5/PropertyAssignments/parserFunctionPropertyAssignment4.ts === var v = { 0() { } }; >v : Symbol(v, Decl(parserFunctionPropertyAssignment4.ts, 0, 3)) +>0 : Symbol(0, Decl(parserFunctionPropertyAssignment4.ts, 0, 9)) >T : Symbol(T, Decl(parserFunctionPropertyAssignment4.ts, 0, 12)) diff --git a/tests/baselines/reference/parserFunctionPropertyAssignment4.types b/tests/baselines/reference/parserFunctionPropertyAssignment4.types index 6ab031518d4fd..f7db89dec4b22 100644 --- a/tests/baselines/reference/parserFunctionPropertyAssignment4.types +++ b/tests/baselines/reference/parserFunctionPropertyAssignment4.types @@ -2,5 +2,6 @@ var v = { 0() { } }; >v : { 0(): void; } >{ 0() { } } : { 0(): void; } +>0 : () => void >T : T diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols b/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols index ac343ff02b10c..179d8c12719c2 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols +++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.symbols @@ -3,5 +3,6 @@ class C { >C : Symbol(C, Decl(parserMemberAccessorDeclaration5.ts, 0, 0)) set "a"(i) { } +>"a" : Symbol(C["a"], Decl(parserMemberAccessorDeclaration5.ts, 0, 9)) >i : Symbol(i, Decl(parserMemberAccessorDeclaration5.ts, 1, 10)) } diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.types b/tests/baselines/reference/parserMemberAccessorDeclaration5.types index d22ee2d775a81..5d9e220c63bde 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration5.types +++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.types @@ -3,5 +3,6 @@ class C { >C : C set "a"(i) { } +>"a" : any >i : any } diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols b/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols index a4b4558e892dd..2465d7786690c 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols +++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.symbols @@ -3,5 +3,6 @@ class C { >C : Symbol(C, Decl(parserMemberAccessorDeclaration6.ts, 0, 0)) set 0(i) { } +>0 : Symbol(C[0], Decl(parserMemberAccessorDeclaration6.ts, 0, 9)) >i : Symbol(i, Decl(parserMemberAccessorDeclaration6.ts, 1, 8)) } diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.types b/tests/baselines/reference/parserMemberAccessorDeclaration6.types index a06b6ddfa0c0a..f530233ba388c 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration6.types +++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.types @@ -3,5 +3,6 @@ class C { >C : C set 0(i) { } +>0 : any >i : any } diff --git a/tests/baselines/reference/parserMethodSignature10.symbols b/tests/baselines/reference/parserMethodSignature10.symbols index 4cefa6c759e47..ccef3e62f39c6 100644 --- a/tests/baselines/reference/parserMethodSignature10.symbols +++ b/tests/baselines/reference/parserMethodSignature10.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature10.ts, 0, 0)) 1?(); +>1 : Symbol(I[1], Decl(parserMethodSignature10.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserMethodSignature10.types b/tests/baselines/reference/parserMethodSignature10.types index 34b3bfcbd331b..4b690b4f8c755 100644 --- a/tests/baselines/reference/parserMethodSignature10.types +++ b/tests/baselines/reference/parserMethodSignature10.types @@ -3,4 +3,5 @@ interface I { >I : I 1?(); +>1 : () => any } diff --git a/tests/baselines/reference/parserMethodSignature11.symbols b/tests/baselines/reference/parserMethodSignature11.symbols index 3217eb47aec9f..a0a418e7b9489 100644 --- a/tests/baselines/reference/parserMethodSignature11.symbols +++ b/tests/baselines/reference/parserMethodSignature11.symbols @@ -3,5 +3,6 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature11.ts, 0, 0)) 2(); +>2 : Symbol(I[2], Decl(parserMethodSignature11.ts, 0, 13)) >T : Symbol(T, Decl(parserMethodSignature11.ts, 1, 4)) } diff --git a/tests/baselines/reference/parserMethodSignature11.types b/tests/baselines/reference/parserMethodSignature11.types index f47eda1e9cde6..9bdaab6e85a6f 100644 --- a/tests/baselines/reference/parserMethodSignature11.types +++ b/tests/baselines/reference/parserMethodSignature11.types @@ -3,5 +3,6 @@ interface I { >I : I 2(); +>2 : () => any >T : T } diff --git a/tests/baselines/reference/parserMethodSignature12.symbols b/tests/baselines/reference/parserMethodSignature12.symbols index 364a89eb970b6..5f1e1b6c0b51b 100644 --- a/tests/baselines/reference/parserMethodSignature12.symbols +++ b/tests/baselines/reference/parserMethodSignature12.symbols @@ -3,5 +3,6 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature12.ts, 0, 0)) 3?(); +>3 : Symbol(I[3], Decl(parserMethodSignature12.ts, 0, 13)) >T : Symbol(T, Decl(parserMethodSignature12.ts, 1, 5)) } diff --git a/tests/baselines/reference/parserMethodSignature12.types b/tests/baselines/reference/parserMethodSignature12.types index b5b38fadb4b6a..3da7315107a1e 100644 --- a/tests/baselines/reference/parserMethodSignature12.types +++ b/tests/baselines/reference/parserMethodSignature12.types @@ -3,5 +3,6 @@ interface I { >I : I 3?(); +>3 : () => any >T : T } diff --git a/tests/baselines/reference/parserMethodSignature5.symbols b/tests/baselines/reference/parserMethodSignature5.symbols index 8cf748ab50c15..579433294fc8a 100644 --- a/tests/baselines/reference/parserMethodSignature5.symbols +++ b/tests/baselines/reference/parserMethodSignature5.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature5.ts, 0, 0)) "E"(); +>"E" : Symbol(I["E"], Decl(parserMethodSignature5.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserMethodSignature5.types b/tests/baselines/reference/parserMethodSignature5.types index 86053a7c1f800..2e20aae09465d 100644 --- a/tests/baselines/reference/parserMethodSignature5.types +++ b/tests/baselines/reference/parserMethodSignature5.types @@ -3,4 +3,5 @@ interface I { >I : I "E"(); +>"E" : () => any } diff --git a/tests/baselines/reference/parserMethodSignature6.symbols b/tests/baselines/reference/parserMethodSignature6.symbols index b15a3d9a4e201..2557a37d51363 100644 --- a/tests/baselines/reference/parserMethodSignature6.symbols +++ b/tests/baselines/reference/parserMethodSignature6.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature6.ts, 0, 0)) "F"?(); +>"F" : Symbol(I["F"], Decl(parserMethodSignature6.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserMethodSignature6.types b/tests/baselines/reference/parserMethodSignature6.types index 184cdc1148ae3..f116fe39aae3e 100644 --- a/tests/baselines/reference/parserMethodSignature6.types +++ b/tests/baselines/reference/parserMethodSignature6.types @@ -3,4 +3,5 @@ interface I { >I : I "F"?(); +>"F" : () => any } diff --git a/tests/baselines/reference/parserMethodSignature7.symbols b/tests/baselines/reference/parserMethodSignature7.symbols index 3b275fa20cb7d..b394534ec22b5 100644 --- a/tests/baselines/reference/parserMethodSignature7.symbols +++ b/tests/baselines/reference/parserMethodSignature7.symbols @@ -3,5 +3,6 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature7.ts, 0, 0)) "G"(); +>"G" : Symbol(I["G"], Decl(parserMethodSignature7.ts, 0, 13)) >T : Symbol(T, Decl(parserMethodSignature7.ts, 1, 6)) } diff --git a/tests/baselines/reference/parserMethodSignature7.types b/tests/baselines/reference/parserMethodSignature7.types index 58a029c0a4a8d..55b2684eb79c2 100644 --- a/tests/baselines/reference/parserMethodSignature7.types +++ b/tests/baselines/reference/parserMethodSignature7.types @@ -3,5 +3,6 @@ interface I { >I : I "G"(); +>"G" : () => any >T : T } diff --git a/tests/baselines/reference/parserMethodSignature8.symbols b/tests/baselines/reference/parserMethodSignature8.symbols index 9fe0a7d64e8dd..2d601b5d38fde 100644 --- a/tests/baselines/reference/parserMethodSignature8.symbols +++ b/tests/baselines/reference/parserMethodSignature8.symbols @@ -3,5 +3,6 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature8.ts, 0, 0)) "H"?(); +>"H" : Symbol(I["H"], Decl(parserMethodSignature8.ts, 0, 13)) >T : Symbol(T, Decl(parserMethodSignature8.ts, 1, 7)) } diff --git a/tests/baselines/reference/parserMethodSignature8.types b/tests/baselines/reference/parserMethodSignature8.types index 7480e3d92a278..33599ca25d239 100644 --- a/tests/baselines/reference/parserMethodSignature8.types +++ b/tests/baselines/reference/parserMethodSignature8.types @@ -3,5 +3,6 @@ interface I { >I : I "H"?(); +>"H" : () => any >T : T } diff --git a/tests/baselines/reference/parserMethodSignature9.symbols b/tests/baselines/reference/parserMethodSignature9.symbols index 2fb7aa56d3b06..2709229bdad05 100644 --- a/tests/baselines/reference/parserMethodSignature9.symbols +++ b/tests/baselines/reference/parserMethodSignature9.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserMethodSignature9.ts, 0, 0)) 0(); +>0 : Symbol(I[0], Decl(parserMethodSignature9.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserMethodSignature9.types b/tests/baselines/reference/parserMethodSignature9.types index ac2f85d002d0e..8bf875a3b09ec 100644 --- a/tests/baselines/reference/parserMethodSignature9.types +++ b/tests/baselines/reference/parserMethodSignature9.types @@ -3,4 +3,5 @@ interface I { >I : I 0(); +>0 : () => any } diff --git a/tests/baselines/reference/parserModuleDeclaration2.symbols b/tests/baselines/reference/parserModuleDeclaration2.symbols index 340cee697f126..5d9ae63cb315e 100644 --- a/tests/baselines/reference/parserModuleDeclaration2.symbols +++ b/tests/baselines/reference/parserModuleDeclaration2.symbols @@ -1,4 +1,4 @@ === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.ts === declare module "Foo" { -No type information for this code.} -No type information for this code. \ No newline at end of file +>"Foo" : Symbol("Foo", Decl(parserModuleDeclaration2.ts, 0, 0)) +} diff --git a/tests/baselines/reference/parserModuleDeclaration2.types b/tests/baselines/reference/parserModuleDeclaration2.types index 340cee697f126..5794fdcca173b 100644 --- a/tests/baselines/reference/parserModuleDeclaration2.types +++ b/tests/baselines/reference/parserModuleDeclaration2.types @@ -1,4 +1,4 @@ === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.ts === declare module "Foo" { -No type information for this code.} -No type information for this code. \ No newline at end of file +>"Foo" : typeof "Foo" +} diff --git a/tests/baselines/reference/parserPropertySignature10.symbols b/tests/baselines/reference/parserPropertySignature10.symbols index a6a755a0891bd..5d28260efd3a0 100644 --- a/tests/baselines/reference/parserPropertySignature10.symbols +++ b/tests/baselines/reference/parserPropertySignature10.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature10.ts, 0, 0)) 1?; +>1 : Symbol(I[1], Decl(parserPropertySignature10.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature10.types b/tests/baselines/reference/parserPropertySignature10.types index 06d1e78f0f155..48c2c3692dd53 100644 --- a/tests/baselines/reference/parserPropertySignature10.types +++ b/tests/baselines/reference/parserPropertySignature10.types @@ -3,4 +3,5 @@ interface I { >I : I 1?; +>1 : any } diff --git a/tests/baselines/reference/parserPropertySignature11.symbols b/tests/baselines/reference/parserPropertySignature11.symbols index 960f16bf52623..43b6fd012ab6c 100644 --- a/tests/baselines/reference/parserPropertySignature11.symbols +++ b/tests/baselines/reference/parserPropertySignature11.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature11.ts, 0, 0)) 2:any; +>2 : Symbol(I[2], Decl(parserPropertySignature11.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature11.types b/tests/baselines/reference/parserPropertySignature11.types index 55776f4f820e3..e5577886476eb 100644 --- a/tests/baselines/reference/parserPropertySignature11.types +++ b/tests/baselines/reference/parserPropertySignature11.types @@ -3,4 +3,5 @@ interface I { >I : I 2:any; +>2 : any } diff --git a/tests/baselines/reference/parserPropertySignature12.symbols b/tests/baselines/reference/parserPropertySignature12.symbols index a6f0eb5faf861..fef4c685e375d 100644 --- a/tests/baselines/reference/parserPropertySignature12.symbols +++ b/tests/baselines/reference/parserPropertySignature12.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature12.ts, 0, 0)) 3?:any; +>3 : Symbol(I[3], Decl(parserPropertySignature12.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature12.types b/tests/baselines/reference/parserPropertySignature12.types index 1c37dcaa4605a..88cde3fb314d4 100644 --- a/tests/baselines/reference/parserPropertySignature12.types +++ b/tests/baselines/reference/parserPropertySignature12.types @@ -3,4 +3,5 @@ interface I { >I : I 3?:any; +>3 : any } diff --git a/tests/baselines/reference/parserPropertySignature5.symbols b/tests/baselines/reference/parserPropertySignature5.symbols index fa56ec758715c..99d3a813c8529 100644 --- a/tests/baselines/reference/parserPropertySignature5.symbols +++ b/tests/baselines/reference/parserPropertySignature5.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature5.ts, 0, 0)) "E"; +>"E" : Symbol(I["E"], Decl(parserPropertySignature5.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature5.types b/tests/baselines/reference/parserPropertySignature5.types index c85c814fc70e9..74c0ba517e2e7 100644 --- a/tests/baselines/reference/parserPropertySignature5.types +++ b/tests/baselines/reference/parserPropertySignature5.types @@ -3,4 +3,5 @@ interface I { >I : I "E"; +>"E" : any } diff --git a/tests/baselines/reference/parserPropertySignature6.symbols b/tests/baselines/reference/parserPropertySignature6.symbols index 1f3831e5610f9..2710a46db8ef0 100644 --- a/tests/baselines/reference/parserPropertySignature6.symbols +++ b/tests/baselines/reference/parserPropertySignature6.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature6.ts, 0, 0)) "F"?; +>"F" : Symbol(I["F"], Decl(parserPropertySignature6.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature6.types b/tests/baselines/reference/parserPropertySignature6.types index 94ca4e313dfe9..b5ad6ca8f9d3e 100644 --- a/tests/baselines/reference/parserPropertySignature6.types +++ b/tests/baselines/reference/parserPropertySignature6.types @@ -3,4 +3,5 @@ interface I { >I : I "F"?; +>"F" : any } diff --git a/tests/baselines/reference/parserPropertySignature7.symbols b/tests/baselines/reference/parserPropertySignature7.symbols index 840b302d6acf8..d21bcadb44690 100644 --- a/tests/baselines/reference/parserPropertySignature7.symbols +++ b/tests/baselines/reference/parserPropertySignature7.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature7.ts, 0, 0)) "G":any; +>"G" : Symbol(I["G"], Decl(parserPropertySignature7.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature7.types b/tests/baselines/reference/parserPropertySignature7.types index 0f78332d75603..de67607980048 100644 --- a/tests/baselines/reference/parserPropertySignature7.types +++ b/tests/baselines/reference/parserPropertySignature7.types @@ -3,4 +3,5 @@ interface I { >I : I "G":any; +>"G" : any } diff --git a/tests/baselines/reference/parserPropertySignature8.symbols b/tests/baselines/reference/parserPropertySignature8.symbols index e124b4c770c55..4352a21e0f114 100644 --- a/tests/baselines/reference/parserPropertySignature8.symbols +++ b/tests/baselines/reference/parserPropertySignature8.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature8.ts, 0, 0)) "H"?:any; +>"H" : Symbol(I["H"], Decl(parserPropertySignature8.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature8.types b/tests/baselines/reference/parserPropertySignature8.types index 79594cec56a1b..1afb5d1bfe2d1 100644 --- a/tests/baselines/reference/parserPropertySignature8.types +++ b/tests/baselines/reference/parserPropertySignature8.types @@ -3,4 +3,5 @@ interface I { >I : I "H"?:any; +>"H" : any } diff --git a/tests/baselines/reference/parserPropertySignature9.symbols b/tests/baselines/reference/parserPropertySignature9.symbols index 3664160fad4b1..fdfdaffcbbf89 100644 --- a/tests/baselines/reference/parserPropertySignature9.symbols +++ b/tests/baselines/reference/parserPropertySignature9.symbols @@ -3,4 +3,5 @@ interface I { >I : Symbol(I, Decl(parserPropertySignature9.ts, 0, 0)) 0; +>0 : Symbol(I[0], Decl(parserPropertySignature9.ts, 0, 13)) } diff --git a/tests/baselines/reference/parserPropertySignature9.types b/tests/baselines/reference/parserPropertySignature9.types index b7dbff8cbeea9..030d9497d33dd 100644 --- a/tests/baselines/reference/parserPropertySignature9.types +++ b/tests/baselines/reference/parserPropertySignature9.types @@ -3,4 +3,5 @@ interface I { >I : I 0; +>0 : any } diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols index 1851629c1344c..8cdc65f9a94c9 100644 --- a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols +++ b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols @@ -17,9 +17,11 @@ interface NamedColors { >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0)) "blue": _Color; +>"blue" : Symbol(NamedColors["blue"], Decl(propertyNamesWithStringLiteral.ts, 5, 18)) >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0)) "pale blue": _Color; +>"pale blue" : Symbol(NamedColors["pale blue"], Decl(propertyNamesWithStringLiteral.ts, 6, 19)) >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0)) } module Color { diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.types b/tests/baselines/reference/propertyNamesWithStringLiteral.types index 4e3c9c6080cf9..83e16e122170a 100644 --- a/tests/baselines/reference/propertyNamesWithStringLiteral.types +++ b/tests/baselines/reference/propertyNamesWithStringLiteral.types @@ -17,9 +17,11 @@ interface NamedColors { >_Color : _Color "blue": _Color; +>"blue" : _Color >_Color : _Color "pale blue": _Color; +>"pale blue" : _Color >_Color : _Color } module Color { diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.symbols b/tests/baselines/reference/protoAsIndexInIndexExpression.symbols index 3a5f39c65c638..09e4057b988e8 100644 --- a/tests/baselines/reference/protoAsIndexInIndexExpression.symbols +++ b/tests/baselines/reference/protoAsIndexInIndexExpression.symbols @@ -19,11 +19,14 @@ var o = { >o : Symbol(o, Decl(protoAsIndexInIndexExpression_1.ts, 8, 3)) "__proto__": 0 +>"__proto__" : Symbol("__proto__", Decl(protoAsIndexInIndexExpression_1.ts, 8, 9)) + }; class C { >C : Symbol(C, Decl(protoAsIndexInIndexExpression_1.ts, 10, 2)) "__proto__" = 0; +>"__proto__" : Symbol(C["__proto__"], Decl(protoAsIndexInIndexExpression_1.ts, 11, 9)) } === tests/cases/compiler/protoAsIndexInIndexExpression_0.ts === export var x; diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.types b/tests/baselines/reference/protoAsIndexInIndexExpression.types index b761aa2c7a70a..3b1782fdcd3d3 100644 --- a/tests/baselines/reference/protoAsIndexInIndexExpression.types +++ b/tests/baselines/reference/protoAsIndexInIndexExpression.types @@ -25,6 +25,7 @@ var o = { >{ "__proto__": 0} : { "__proto__": number; } "__proto__": 0 +>"__proto__" : number >0 : 0 }; @@ -32,6 +33,7 @@ class C { >C : C "__proto__" = 0; +>"__proto__" : number >0 : 0 } === tests/cases/compiler/protoAsIndexInIndexExpression_0.ts === diff --git a/tests/baselines/reference/quotedFunctionName1.symbols b/tests/baselines/reference/quotedFunctionName1.symbols index ea000bd138e28..7d03a3e47d397 100644 --- a/tests/baselines/reference/quotedFunctionName1.symbols +++ b/tests/baselines/reference/quotedFunctionName1.symbols @@ -3,4 +3,5 @@ class Test1 { >Test1 : Symbol(Test1, Decl(quotedFunctionName1.ts, 0, 0)) "prop1"() { } +>"prop1" : Symbol(Test1["prop1"], Decl(quotedFunctionName1.ts, 0, 13)) } diff --git a/tests/baselines/reference/quotedFunctionName1.types b/tests/baselines/reference/quotedFunctionName1.types index 9ebc0abfc4de0..138dd5ade4580 100644 --- a/tests/baselines/reference/quotedFunctionName1.types +++ b/tests/baselines/reference/quotedFunctionName1.types @@ -3,4 +3,5 @@ class Test1 { >Test1 : Test1 "prop1"() { } +>"prop1" : () => void } diff --git a/tests/baselines/reference/quotedFunctionName2.symbols b/tests/baselines/reference/quotedFunctionName2.symbols index 0c26e1db60839..920344efbaac9 100644 --- a/tests/baselines/reference/quotedFunctionName2.symbols +++ b/tests/baselines/reference/quotedFunctionName2.symbols @@ -3,4 +3,5 @@ class Test1 { >Test1 : Symbol(Test1, Decl(quotedFunctionName2.ts, 0, 0)) static "prop1"() { } +>"prop1" : Symbol(Test1["prop1"], Decl(quotedFunctionName2.ts, 0, 13)) } diff --git a/tests/baselines/reference/quotedFunctionName2.types b/tests/baselines/reference/quotedFunctionName2.types index de36a3f969a29..322aa94884199 100644 --- a/tests/baselines/reference/quotedFunctionName2.types +++ b/tests/baselines/reference/quotedFunctionName2.types @@ -3,4 +3,5 @@ class Test1 { >Test1 : Test1 static "prop1"() { } +>"prop1" : () => void } diff --git a/tests/baselines/reference/quotedPropertyName1.symbols b/tests/baselines/reference/quotedPropertyName1.symbols index 3e9045bfa7446..fd3a8c57d3683 100644 --- a/tests/baselines/reference/quotedPropertyName1.symbols +++ b/tests/baselines/reference/quotedPropertyName1.symbols @@ -3,4 +3,5 @@ class Test1 { >Test1 : Symbol(Test1, Decl(quotedPropertyName1.ts, 0, 0)) "prop1" = 0; +>"prop1" : Symbol(Test1["prop1"], Decl(quotedPropertyName1.ts, 0, 13)) } diff --git a/tests/baselines/reference/quotedPropertyName1.types b/tests/baselines/reference/quotedPropertyName1.types index a142d607a7537..517cf2e1e0469 100644 --- a/tests/baselines/reference/quotedPropertyName1.types +++ b/tests/baselines/reference/quotedPropertyName1.types @@ -3,5 +3,6 @@ class Test1 { >Test1 : Test1 "prop1" = 0; +>"prop1" : number >0 : 0 } diff --git a/tests/baselines/reference/quotedPropertyName2.symbols b/tests/baselines/reference/quotedPropertyName2.symbols index e7209196bfd69..847790a1b1ef5 100644 --- a/tests/baselines/reference/quotedPropertyName2.symbols +++ b/tests/baselines/reference/quotedPropertyName2.symbols @@ -3,4 +3,5 @@ class Test1 { >Test1 : Symbol(Test1, Decl(quotedPropertyName2.ts, 0, 0)) static "prop1" = 0; +>"prop1" : Symbol(Test1["prop1"], Decl(quotedPropertyName2.ts, 0, 13)) } diff --git a/tests/baselines/reference/quotedPropertyName2.types b/tests/baselines/reference/quotedPropertyName2.types index 16b116a5e2246..044e65583f22a 100644 --- a/tests/baselines/reference/quotedPropertyName2.types +++ b/tests/baselines/reference/quotedPropertyName2.types @@ -3,5 +3,6 @@ class Test1 { >Test1 : Test1 static "prop1" = 0; +>"prop1" : number >0 : 0 } diff --git a/tests/baselines/reference/quotedPropertyName3.symbols b/tests/baselines/reference/quotedPropertyName3.symbols index 813cf23e33683..6d955d24d9cab 100644 --- a/tests/baselines/reference/quotedPropertyName3.symbols +++ b/tests/baselines/reference/quotedPropertyName3.symbols @@ -3,6 +3,8 @@ class Test { >Test : Symbol(Test, Decl(quotedPropertyName3.ts, 0, 0)) "prop1": number; +>"prop1" : Symbol(Test["prop1"], Decl(quotedPropertyName3.ts, 0, 12)) + foo() { >foo : Symbol(Test.foo, Decl(quotedPropertyName3.ts, 1, 20)) diff --git a/tests/baselines/reference/quotedPropertyName3.types b/tests/baselines/reference/quotedPropertyName3.types index f5f1d47bbc822..40c47212f3e68 100644 --- a/tests/baselines/reference/quotedPropertyName3.types +++ b/tests/baselines/reference/quotedPropertyName3.types @@ -3,6 +3,8 @@ class Test { >Test : Test "prop1": number; +>"prop1" : number + foo() { >foo : () => void diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.symbols b/tests/baselines/reference/reactNamespaceImportPresevation.symbols index e2f530d31ba73..b8d9bb6c0b9e7 100644 --- a/tests/baselines/reference/reactNamespaceImportPresevation.symbols +++ b/tests/baselines/reference/reactNamespaceImportPresevation.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/modules.d.ts === declare module "my-React-Lib" { +>"my-React-Lib" : Symbol("my-React-Lib", Decl(modules.d.ts, 0, 0)) + var a: any; >a : Symbol(a, Decl(modules.d.ts, 2, 7)) diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.types b/tests/baselines/reference/reactNamespaceImportPresevation.types index adb1d60d2d5c9..ac6fc8ddb01e6 100644 --- a/tests/baselines/reference/reactNamespaceImportPresevation.types +++ b/tests/baselines/reference/reactNamespaceImportPresevation.types @@ -1,6 +1,8 @@ === tests/cases/compiler/modules.d.ts === declare module "my-React-Lib" { +>"my-React-Lib" : typeof "my-React-Lib" + var a: any; >a : any diff --git a/tests/baselines/reference/requireOfJsonFile.symbols b/tests/baselines/reference/requireOfJsonFile.symbols index e8b5fee532ec7..1454caf79d6c1 100644 --- a/tests/baselines/reference/requireOfJsonFile.symbols +++ b/tests/baselines/reference/requireOfJsonFile.symbols @@ -31,7 +31,9 @@ if (x) { === tests/cases/compiler/b.json === { -No type information for this code. "a": true, -No type information for this code. "b": "hello" -No type information for this code.} -No type information for this code. \ No newline at end of file + "a": true, +>"a" : Symbol("a", Decl(b.json, 0, 1)) + + "b": "hello" +>"b" : Symbol("b", Decl(b.json, 1, 14)) +} diff --git a/tests/baselines/reference/requireOfJsonFile.types b/tests/baselines/reference/requireOfJsonFile.types index 3b8b6e747f7ff..34a47c80d283f 100644 --- a/tests/baselines/reference/requireOfJsonFile.types +++ b/tests/baselines/reference/requireOfJsonFile.types @@ -37,8 +37,10 @@ if (x) { >{ "a": true, "b": "hello"} : { "a": boolean; "b": string; } "a": true, +>"a" : boolean >true : true "b": "hello" +>"b" : string >"hello" : "hello" } diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols index 7ddb3d5b9e1cb..45f6fd8df3818 100644 --- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols +++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName2.ts === declare module "punycode" { +>"punycode" : Symbol("punycode", Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 0, 0)) + interface ucs2 { >ucs2 : Symbol(ucs2, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 0, 27), Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 6, 14)) diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types index 835e4656f5fcf..fd732fd26201b 100644 --- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types +++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types @@ -1,5 +1,7 @@ === tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName2.ts === declare module "punycode" { +>"punycode" : typeof "punycode" + interface ucs2 { >ucs2 : ucs2 diff --git a/tests/baselines/reference/shebangBeforeReferences.symbols b/tests/baselines/reference/shebangBeforeReferences.symbols index 23bfe58fc6294..721d53816e54b 100644 --- a/tests/baselines/reference/shebangBeforeReferences.symbols +++ b/tests/baselines/reference/shebangBeforeReferences.symbols @@ -17,6 +17,8 @@ use(x); === tests/cases/compiler/f.d.ts === declare module "test" { +>"test" : Symbol("test", Decl(f.d.ts, 0, 0)) + let x: number; >x : Symbol(x, Decl(f.d.ts, 2, 7)) } diff --git a/tests/baselines/reference/shebangBeforeReferences.types b/tests/baselines/reference/shebangBeforeReferences.types index 89b63a1a0b440..6627fd266d7b6 100644 --- a/tests/baselines/reference/shebangBeforeReferences.types +++ b/tests/baselines/reference/shebangBeforeReferences.types @@ -18,6 +18,8 @@ use(x); === tests/cases/compiler/f.d.ts === declare module "test" { +>"test" : typeof "test" + let x: number; >x : number } diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols b/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols index 277a88ce38ffd..c182339cfb539 100644 --- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols +++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols @@ -3,7 +3,10 @@ class C { >C : Symbol(C, Decl(staticMemberWithStringAndNumberNames.ts, 0, 0)) static "foo" = 0; +>"foo" : Symbol(C["foo"], Decl(staticMemberWithStringAndNumberNames.ts, 0, 9)) + static 0 = 1; +>0 : Symbol(C[0], Decl(staticMemberWithStringAndNumberNames.ts, 1, 21)) x = C['foo']; >x : Symbol(C.x, Decl(staticMemberWithStringAndNumberNames.ts, 2, 17)) diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.types b/tests/baselines/reference/staticMemberWithStringAndNumberNames.types index b0826343d2085..79726a26b79b8 100644 --- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.types +++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.types @@ -3,9 +3,11 @@ class C { >C : C static "foo" = 0; +>"foo" : number >0 : 0 static 0 = 1; +>0 : number >1 : 1 x = C['foo']; diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols index b4bdeb71c79a9..608acd4a59791 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.symbols @@ -4,5 +4,6 @@ module m1 { export var n = { 'foo bar': 4 }; >n : Symbol(n, Decl(stringLiteralObjectLiteralDeclaration1.ts, 1, 12)) +>'foo bar' : Symbol('foo bar', Decl(stringLiteralObjectLiteralDeclaration1.ts, 1, 18)) } diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types index 7c4ea1c86bbc4..fb0d8e44ddf48 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types @@ -5,6 +5,7 @@ module m1 { export var n = { 'foo bar': 4 }; >n : { 'foo bar': number; } >{ 'foo bar': 4 } : { 'foo bar': number; } +>'foo bar' : number >4 : 4 } diff --git a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols index 3f7804a18a72b..4c0e7f433ff71 100644 --- a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols +++ b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/stringLiteralPropertyNameWithLineContinuation1.ts === var x = {'text\ >x : Symbol(x, Decl(stringLiteralPropertyNameWithLineContinuation1.ts, 0, 3)) +>'text\' : Symbol('text\ +', Decl(stringLiteralPropertyNameWithLineContinuation1.ts, 0, 9)) ':'hello'} x.text = "bar" diff --git a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types index c5022b5463b6e..11f0108a83f4e 100644 --- a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types +++ b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types @@ -4,6 +4,7 @@ var x = {'text\ ': string; } >{'text\':'hello'} : { 'text\ ': string; } +>'text\' : string ':'hello'} >'hello' : "hello" diff --git a/tests/baselines/reference/stringNamedPropertyAccess.symbols b/tests/baselines/reference/stringNamedPropertyAccess.symbols index 961b03f6e0452..c7515e68cac90 100644 --- a/tests/baselines/reference/stringNamedPropertyAccess.symbols +++ b/tests/baselines/reference/stringNamedPropertyAccess.symbols @@ -3,7 +3,10 @@ class C { >C : Symbol(C, Decl(stringNamedPropertyAccess.ts, 0, 0)) "a b": number; +>"a b" : Symbol(C["a b"], Decl(stringNamedPropertyAccess.ts, 0, 9)) + static "c d": number; +>"c d" : Symbol(C["c d"], Decl(stringNamedPropertyAccess.ts, 1, 18)) } var c: C; >c : Symbol(c, Decl(stringNamedPropertyAccess.ts, 4, 3)) @@ -23,6 +26,7 @@ interface I { >I : Symbol(I, Decl(stringNamedPropertyAccess.ts, 6, 19)) "a b": number; +>"a b" : Symbol(I["a b"], Decl(stringNamedPropertyAccess.ts, 8, 13)) } var i: I; >i : Symbol(i, Decl(stringNamedPropertyAccess.ts, 11, 3)) @@ -37,6 +41,7 @@ var a: { >a : Symbol(a, Decl(stringNamedPropertyAccess.ts, 14, 3)) "a b": number; +>"a b" : Symbol("a b", Decl(stringNamedPropertyAccess.ts, 14, 8)) } var r3 = a["a b"]; >r3 : Symbol(r3, Decl(stringNamedPropertyAccess.ts, 17, 3)) @@ -47,6 +52,7 @@ var b = { >b : Symbol(b, Decl(stringNamedPropertyAccess.ts, 19, 3)) "a b": 1 +>"a b" : Symbol("a b", Decl(stringNamedPropertyAccess.ts, 19, 9)) } var r4 = b["a b"]; >r4 : Symbol(r4, Decl(stringNamedPropertyAccess.ts, 22, 3)) diff --git a/tests/baselines/reference/stringNamedPropertyAccess.types b/tests/baselines/reference/stringNamedPropertyAccess.types index 1b3d56abc10a7..e048608449c67 100644 --- a/tests/baselines/reference/stringNamedPropertyAccess.types +++ b/tests/baselines/reference/stringNamedPropertyAccess.types @@ -3,7 +3,10 @@ class C { >C : C "a b": number; +>"a b" : number + static "c d": number; +>"c d" : number } var c: C; >c : C @@ -25,6 +28,7 @@ interface I { >I : I "a b": number; +>"a b" : number } var i: I; >i : I @@ -40,6 +44,7 @@ var a: { >a : { "a b": number; } "a b": number; +>"a b" : number } var r3 = a["a b"]; >r3 : number @@ -52,6 +57,7 @@ var b = { >{ "a b": 1} : { "a b": number; } "a b": 1 +>"a b" : number >1 : 1 } var r4 = b["a b"]; diff --git a/tests/baselines/reference/stringPropCodeGen.symbols b/tests/baselines/reference/stringPropCodeGen.symbols index d2c966f1b6e29..a590463c94805 100644 --- a/tests/baselines/reference/stringPropCodeGen.symbols +++ b/tests/baselines/reference/stringPropCodeGen.symbols @@ -3,7 +3,10 @@ var a = { >a : Symbol(a, Decl(stringPropCodeGen.ts, 0, 3)) "foo" : function() { }, +>"foo" : Symbol("foo", Decl(stringPropCodeGen.ts, 0, 9)) + "bar" : 5 +>"bar" : Symbol("bar", Decl(stringPropCodeGen.ts, 2, 25)) }; diff --git a/tests/baselines/reference/stringPropCodeGen.types b/tests/baselines/reference/stringPropCodeGen.types index 184718982fa21..c4f84fc627994 100644 --- a/tests/baselines/reference/stringPropCodeGen.types +++ b/tests/baselines/reference/stringPropCodeGen.types @@ -4,9 +4,11 @@ var a = { >{ "foo" : function() { }, "bar" : 5} : { "foo": () => void; "bar": number; } "foo" : function() { }, +>"foo" : () => void >function() { } : () => void "bar" : 5 +>"bar" : number >5 : 5 }; diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.symbols b/tests/baselines/reference/subtypingWithObjectMembers4.symbols index 94b38bc4c9b89..ce307197fb74b 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers4.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembers4.symbols @@ -37,6 +37,7 @@ class A2 { >A2 : Symbol(A2, Decl(subtypingWithObjectMembers4.ts, 16, 1)) 1: Base; +>1 : Symbol(A2[1], Decl(subtypingWithObjectMembers4.ts, 18, 10)) >Base : Symbol(Base, Decl(subtypingWithObjectMembers4.ts, 0, 0)) } @@ -45,6 +46,7 @@ class B2 extends A2 { >A2 : Symbol(A2, Decl(subtypingWithObjectMembers4.ts, 16, 1)) 1.1: Derived; // ok, inherits 1 +>1.1 : Symbol(B2[1.1], Decl(subtypingWithObjectMembers4.ts, 22, 21)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers4.ts, 4, 1)) } @@ -52,6 +54,7 @@ class A3 { >A3 : Symbol(A3, Decl(subtypingWithObjectMembers4.ts, 24, 1)) '1': Base; +>'1' : Symbol(A3['1'], Decl(subtypingWithObjectMembers4.ts, 26, 10)) >Base : Symbol(Base, Decl(subtypingWithObjectMembers4.ts, 0, 0)) } @@ -60,5 +63,6 @@ class B3 extends A3 { >A3 : Symbol(A3, Decl(subtypingWithObjectMembers4.ts, 24, 1)) '1.1': Derived; // ok, inherits '1' +>'1.1' : Symbol(B3['1.1'], Decl(subtypingWithObjectMembers4.ts, 30, 21)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers4.ts, 4, 1)) } diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.types b/tests/baselines/reference/subtypingWithObjectMembers4.types index 6e6475b25786b..5bc53e478093e 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers4.types +++ b/tests/baselines/reference/subtypingWithObjectMembers4.types @@ -37,6 +37,7 @@ class A2 { >A2 : A2 1: Base; +>1 : Base >Base : Base } @@ -45,6 +46,7 @@ class B2 extends A2 { >A2 : A2 1.1: Derived; // ok, inherits 1 +>1.1 : Derived >Derived : Derived } @@ -52,6 +54,7 @@ class A3 { >A3 : A3 '1': Base; +>'1' : Base >Base : Base } @@ -60,5 +63,6 @@ class B3 extends A3 { >A3 : A3 '1.1': Derived; // ok, inherits '1' +>'1.1' : Derived >Derived : Derived } diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols index 5b144baa4283d..f19aeda2c8f0c 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols @@ -44,6 +44,7 @@ interface T2 { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 20, 1)) 1?: Base; +>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality.ts, 22, 14)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0)) } @@ -52,6 +53,7 @@ interface S2 extends T2 { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 20, 1)) 1: Derived; +>1 : Symbol(S2[1], Decl(subtypingWithObjectMembersOptionality.ts, 26, 25)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality.ts, 2, 31)) } @@ -59,6 +61,7 @@ interface T3 { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 28, 1)) '1'?: Base; +>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality.ts, 30, 14)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0)) } @@ -67,6 +70,7 @@ interface S3 extends T3 { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 28, 1)) '1.': Derived; +>'1.' : Symbol(S3['1.'], Decl(subtypingWithObjectMembersOptionality.ts, 34, 25)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality.ts, 2, 31)) } @@ -110,6 +114,7 @@ module TwoLevels { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 50, 5)) 1?: Base; +>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality.ts, 52, 18)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0)) } @@ -118,6 +123,7 @@ module TwoLevels { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality.ts, 50, 5)) 1: Derived2; +>1 : Symbol(S2[1], Decl(subtypingWithObjectMembersOptionality.ts, 56, 29)) >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembersOptionality.ts, 3, 47)) } @@ -125,6 +131,7 @@ module TwoLevels { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 58, 5)) '1'?: Base; +>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality.ts, 60, 18)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0)) } @@ -133,6 +140,7 @@ module TwoLevels { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality.ts, 58, 5)) '1.': Derived2; +>'1.' : Symbol(S3['1.'], Decl(subtypingWithObjectMembersOptionality.ts, 64, 29)) >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembersOptionality.ts, 3, 47)) } diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types index e0198e31d2872..d81404b244928 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types @@ -44,6 +44,7 @@ interface T2 { >T2 : T2 1?: Base; +>1 : Base >Base : Base } @@ -52,6 +53,7 @@ interface S2 extends T2 { >T2 : T2 1: Derived; +>1 : Derived >Derived : Derived } @@ -59,6 +61,7 @@ interface T3 { >T3 : T3 '1'?: Base; +>'1' : Base >Base : Base } @@ -67,6 +70,7 @@ interface S3 extends T3 { >T3 : T3 '1.': Derived; +>'1.' : Derived >Derived : Derived } @@ -115,6 +119,7 @@ module TwoLevels { >T2 : T2 1?: Base; +>1 : Base >Base : Base } @@ -123,6 +128,7 @@ module TwoLevels { >T2 : T2 1: Derived2; +>1 : Derived2 >Derived2 : Derived2 } @@ -130,6 +136,7 @@ module TwoLevels { >T3 : T3 '1'?: Base; +>'1' : Base >Base : Base } @@ -138,6 +145,7 @@ module TwoLevels { >T3 : T3 '1.': Derived2; +>'1.' : Derived2 >Derived2 : Derived2 } diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols index 2a3e806f54081..2559cbb791c4e 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols @@ -31,6 +31,7 @@ interface T2 { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality3.ts, 11, 1)) 1?: Base; +>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality3.ts, 13, 14)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality3.ts, 0, 0)) } @@ -39,6 +40,7 @@ interface S2 extends T2 { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality3.ts, 11, 1)) 2: Derived; // ok +>2 : Symbol(S2[2], Decl(subtypingWithObjectMembersOptionality3.ts, 17, 25)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 31)) } @@ -46,6 +48,7 @@ interface T3 { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality3.ts, 19, 1)) '1'?: Base; +>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality3.ts, 21, 14)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality3.ts, 0, 0)) } @@ -54,6 +57,7 @@ interface S3 extends T3 { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality3.ts, 19, 1)) '1.0': Derived; // ok +>'1.0' : Symbol(S3['1.0'], Decl(subtypingWithObjectMembersOptionality3.ts, 25, 25)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 31)) } diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types index 7f93418506f77..46eb728e1350f 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.types @@ -31,6 +31,7 @@ interface T2 { >T2 : T2 1?: Base; +>1 : Base >Base : Base } @@ -39,6 +40,7 @@ interface S2 extends T2 { >T2 : T2 2: Derived; // ok +>2 : Derived >Derived : Derived } @@ -46,6 +48,7 @@ interface T3 { >T3 : T3 '1'?: Base; +>'1' : Base >Base : Base } @@ -54,6 +57,7 @@ interface S3 extends T3 { >T3 : T3 '1.0': Derived; // ok +>'1.0' : Derived >Derived : Derived } diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols index b1124d49083dc..cd80cd165f73f 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols @@ -31,6 +31,7 @@ interface T2 { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality4.ts, 11, 1)) 1: Base; +>1 : Symbol(T2[1], Decl(subtypingWithObjectMembersOptionality4.ts, 13, 14)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality4.ts, 0, 0)) } @@ -39,6 +40,7 @@ interface S2 extends T2 { >T2 : Symbol(T2, Decl(subtypingWithObjectMembersOptionality4.ts, 11, 1)) 2?: Derived; // ok +>2 : Symbol(S2[2], Decl(subtypingWithObjectMembersOptionality4.ts, 17, 25)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 31)) } @@ -46,6 +48,7 @@ interface T3 { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality4.ts, 19, 1)) '1': Base; +>'1' : Symbol(T3['1'], Decl(subtypingWithObjectMembersOptionality4.ts, 21, 14)) >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality4.ts, 0, 0)) } @@ -54,6 +57,7 @@ interface S3 extends T3 { >T3 : Symbol(T3, Decl(subtypingWithObjectMembersOptionality4.ts, 19, 1)) '1.0'?: Derived; // ok +>'1.0' : Symbol(S3['1.0'], Decl(subtypingWithObjectMembersOptionality4.ts, 25, 25)) >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 31)) } diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types index d1d00e8e1bcf9..eb5d106ad5b03 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.types @@ -31,6 +31,7 @@ interface T2 { >T2 : T2 1: Base; +>1 : Base >Base : Base } @@ -39,6 +40,7 @@ interface S2 extends T2 { >T2 : T2 2?: Derived; // ok +>2 : Derived >Derived : Derived } @@ -46,6 +48,7 @@ interface T3 { >T3 : T3 '1': Base; +>'1' : Base >Base : Base } @@ -54,6 +57,7 @@ interface S3 extends T3 { >T3 : T3 '1.0'?: Derived; // ok +>'1.0' : Derived >Derived : Derived } diff --git a/tests/baselines/reference/systemExportAssignment3.symbols b/tests/baselines/reference/systemExportAssignment3.symbols index 42d4a9d009fcc..2b9a1461b60a0 100644 --- a/tests/baselines/reference/systemExportAssignment3.symbols +++ b/tests/baselines/reference/systemExportAssignment3.symbols @@ -1,6 +1,8 @@ === tests/cases/compiler/modules.d.ts === declare module "a" { +>"a" : Symbol("a", Decl(modules.d.ts, 0, 0)) + var a: number; >a : Symbol(a, Decl(modules.d.ts, 2, 7)) diff --git a/tests/baselines/reference/systemExportAssignment3.types b/tests/baselines/reference/systemExportAssignment3.types index c32bc14ec9064..48b6a7e62f148 100644 --- a/tests/baselines/reference/systemExportAssignment3.types +++ b/tests/baselines/reference/systemExportAssignment3.types @@ -1,6 +1,8 @@ === tests/cases/compiler/modules.d.ts === declare module "a" { +>"a" : typeof "a" + var a: number; >a : number diff --git a/tests/baselines/reference/topLevelAmbientModule.symbols b/tests/baselines/reference/topLevelAmbientModule.symbols index 20ff7eb7d390c..3c8a9a244b21a 100644 --- a/tests/baselines/reference/topLevelAmbientModule.symbols +++ b/tests/baselines/reference/topLevelAmbientModule.symbols @@ -11,6 +11,8 @@ var z = foo.x + 10; === tests/cases/conformance/externalModules/foo_0.ts === declare module "foo" { +>"foo" : Symbol("foo", Decl(foo_0.ts, 0, 0)) + export var x: number; >x : Symbol(x, Decl(foo_0.ts, 1, 11)) } diff --git a/tests/baselines/reference/topLevelAmbientModule.types b/tests/baselines/reference/topLevelAmbientModule.types index aef1bb5486f77..7edf8d7b9878f 100644 --- a/tests/baselines/reference/topLevelAmbientModule.types +++ b/tests/baselines/reference/topLevelAmbientModule.types @@ -13,6 +13,8 @@ var z = foo.x + 10; === tests/cases/conformance/externalModules/foo_0.ts === declare module "foo" { +>"foo" : typeof "foo" + export var x: number; >x : number } diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols b/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols index e966202c2777a..33fe2f56a77bd 100644 --- a/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols +++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols @@ -33,6 +33,8 @@ async function a(): Bluebird { === tests/cases/compiler/bluebird.d.ts === declare module "bluebird" { +>"bluebird" : Symbol("bluebird", Decl(bluebird.d.ts, 0, 0)) + type Bluebird = Promise; >Bluebird : Symbol(Bluebird, Decl(bluebird.d.ts, 0, 27), Decl(bluebird.d.ts, 2, 9)) >T : Symbol(T, Decl(bluebird.d.ts, 1, 18)) diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.types b/tests/baselines/reference/transformNestedGeneratorsWithTry.types index 3e4ef3f0852cf..84cf51794f248 100644 --- a/tests/baselines/reference/transformNestedGeneratorsWithTry.types +++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.types @@ -38,6 +38,8 @@ async function a(): Bluebird { === tests/cases/compiler/bluebird.d.ts === declare module "bluebird" { +>"bluebird" : typeof "bluebird" + type Bluebird = Promise; >Bluebird : Promise >T : T diff --git a/tests/baselines/reference/tsxDynamicTagName5.symbols b/tests/baselines/reference/tsxDynamicTagName5.symbols index 9abac5521c9ad..325b599cc5a26 100644 --- a/tests/baselines/reference/tsxDynamicTagName5.symbols +++ b/tests/baselines/reference/tsxDynamicTagName5.symbols @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : Symbol('react', Decl(react.d.ts, 0, 0)) + class Component { } >Component : Symbol(Component, Decl(react.d.ts, 1, 24)) >T : Symbol(T, Decl(react.d.ts, 2, 17)) diff --git a/tests/baselines/reference/tsxDynamicTagName5.types b/tests/baselines/reference/tsxDynamicTagName5.types index dbc01e894834c..c2297dcbd83e1 100644 --- a/tests/baselines/reference/tsxDynamicTagName5.types +++ b/tests/baselines/reference/tsxDynamicTagName5.types @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : typeof 'react' + class Component { } >Component : Component >T : T diff --git a/tests/baselines/reference/tsxDynamicTagName8.symbols b/tests/baselines/reference/tsxDynamicTagName8.symbols index 87a71e740dee5..d64bd7ca935b9 100644 --- a/tests/baselines/reference/tsxDynamicTagName8.symbols +++ b/tests/baselines/reference/tsxDynamicTagName8.symbols @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : Symbol('react', Decl(react.d.ts, 0, 0)) + class Component { } >Component : Symbol(Component, Decl(react.d.ts, 1, 24)) >T : Symbol(T, Decl(react.d.ts, 2, 17)) diff --git a/tests/baselines/reference/tsxDynamicTagName8.types b/tests/baselines/reference/tsxDynamicTagName8.types index e2d7956a98944..3d9b2d9b00a69 100644 --- a/tests/baselines/reference/tsxDynamicTagName8.types +++ b/tests/baselines/reference/tsxDynamicTagName8.types @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : typeof 'react' + class Component { } >Component : Component >T : T diff --git a/tests/baselines/reference/tsxDynamicTagName9.symbols b/tests/baselines/reference/tsxDynamicTagName9.symbols index 436e12057519a..7e580445a244b 100644 --- a/tests/baselines/reference/tsxDynamicTagName9.symbols +++ b/tests/baselines/reference/tsxDynamicTagName9.symbols @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : Symbol('react', Decl(react.d.ts, 0, 0)) + class Component { } >Component : Symbol(Component, Decl(react.d.ts, 1, 24)) >T : Symbol(T, Decl(react.d.ts, 2, 17)) diff --git a/tests/baselines/reference/tsxDynamicTagName9.types b/tests/baselines/reference/tsxDynamicTagName9.types index e500d3f0ab136..46ddf98a6f53e 100644 --- a/tests/baselines/reference/tsxDynamicTagName9.types +++ b/tests/baselines/reference/tsxDynamicTagName9.types @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : typeof 'react' + class Component { } >Component : Component >T : T diff --git a/tests/baselines/reference/tsxElementResolution.symbols b/tests/baselines/reference/tsxElementResolution.symbols index 729c3fc9f067c..35d59d8bbdff7 100644 --- a/tests/baselines/reference/tsxElementResolution.symbols +++ b/tests/baselines/reference/tsxElementResolution.symbols @@ -11,7 +11,10 @@ declare namespace JSX { >x : Symbol(x, Decl(tsxElementResolution.tsx, 3, 15)) 'string_named'; +>'string_named' : Symbol(IntrinsicElements['string_named'], Decl(tsxElementResolution.tsx, 3, 28)) + 'var'; +>'var' : Symbol(IntrinsicElements['var'], Decl(tsxElementResolution.tsx, 4, 17)) } } diff --git a/tests/baselines/reference/tsxElementResolution.types b/tests/baselines/reference/tsxElementResolution.types index a1c2abcef7c5f..9ee224cd774ac 100644 --- a/tests/baselines/reference/tsxElementResolution.types +++ b/tests/baselines/reference/tsxElementResolution.types @@ -11,7 +11,10 @@ declare namespace JSX { >x : string 'string_named'; +>'string_named' : any + 'var'; +>'var' : any } } diff --git a/tests/baselines/reference/tsxElementResolution17.symbols b/tests/baselines/reference/tsxElementResolution17.symbols index 0225cc35d9141..514fa2bb42f3d 100644 --- a/tests/baselines/reference/tsxElementResolution17.symbols +++ b/tests/baselines/reference/tsxElementResolution17.symbols @@ -25,6 +25,8 @@ declare module JSX { } declare module 'elements1' { +>'elements1' : Symbol('elements1', Decl(file.tsx, 4, 1)) + class MyElement { >MyElement : Symbol(MyElement, Decl(file.tsx, 6, 28)) @@ -32,6 +34,8 @@ declare module 'elements1' { } declare module 'elements2' { +>'elements2' : Symbol('elements2', Decl(file.tsx, 10, 1)) + class MyElement { >MyElement : Symbol(MyElement, Decl(file.tsx, 12, 28)) diff --git a/tests/baselines/reference/tsxElementResolution17.types b/tests/baselines/reference/tsxElementResolution17.types index c68c19f58e73a..e501211102b86 100644 --- a/tests/baselines/reference/tsxElementResolution17.types +++ b/tests/baselines/reference/tsxElementResolution17.types @@ -26,6 +26,8 @@ declare module JSX { } declare module 'elements1' { +>'elements1' : typeof 'elements1' + class MyElement { >MyElement : MyElement @@ -33,6 +35,8 @@ declare module 'elements1' { } declare module 'elements2' { +>'elements2' : typeof 'elements2' + class MyElement { >MyElement : MyElement diff --git a/tests/baselines/reference/tsxElementResolution19.symbols b/tests/baselines/reference/tsxElementResolution19.symbols index 48aa4f962b69a..e812b81886b51 100644 --- a/tests/baselines/reference/tsxElementResolution19.symbols +++ b/tests/baselines/reference/tsxElementResolution19.symbols @@ -1,10 +1,11 @@ === tests/cases/conformance/jsx/react.d.ts === -No type information for this code.declare module "react" { -No type information for this code. -No type information for this code.} -No type information for this code. -No type information for this code.=== tests/cases/conformance/jsx/file1.tsx === +declare module "react" { +>"react" : Symbol("react", Decl(react.d.ts, 0, 0)) + +} + +=== tests/cases/conformance/jsx/file1.tsx === declare module JSX { >JSX : Symbol(JSX, Decl(file1.tsx, 0, 0)) diff --git a/tests/baselines/reference/tsxElementResolution19.types b/tests/baselines/reference/tsxElementResolution19.types index 0fa1eefe5f63c..f03cebb27a624 100644 --- a/tests/baselines/reference/tsxElementResolution19.types +++ b/tests/baselines/reference/tsxElementResolution19.types @@ -1,10 +1,11 @@ === tests/cases/conformance/jsx/react.d.ts === -No type information for this code.declare module "react" { -No type information for this code. -No type information for this code.} -No type information for this code. -No type information for this code.=== tests/cases/conformance/jsx/file1.tsx === +declare module "react" { +>"react" : typeof "react" + +} + +=== tests/cases/conformance/jsx/file1.tsx === declare module JSX { >JSX : any diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.symbols b/tests/baselines/reference/tsxExternalModuleEmit1.symbols index e2d3eee98b0f3..4eec815745514 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit1.symbols +++ b/tests/baselines/reference/tsxExternalModuleEmit1.symbols @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : Symbol('react', Decl(react.d.ts, 0, 0)) + class Component { } >Component : Symbol(Component, Decl(react.d.ts, 1, 24)) >T : Symbol(T, Decl(react.d.ts, 2, 17)) diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.types b/tests/baselines/reference/tsxExternalModuleEmit1.types index 7e28c35dd13b7..80a6e97e42fe2 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit1.types +++ b/tests/baselines/reference/tsxExternalModuleEmit1.types @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : typeof 'react' + class Component { } >Component : Component >T : T diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.symbols b/tests/baselines/reference/tsxExternalModuleEmit2.symbols index ff5fdc4917137..5469588fdf5e4 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit2.symbols +++ b/tests/baselines/reference/tsxExternalModuleEmit2.symbols @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/modules.d.ts === declare module 'mod' { +>'mod' : Symbol('mod', Decl(modules.d.ts, 0, 0)) + var y: any; >y : Symbol(y, Decl(modules.d.ts, 2, 5)) diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.types b/tests/baselines/reference/tsxExternalModuleEmit2.types index b4746fe46c7ce..3a288cc48d165 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit2.types +++ b/tests/baselines/reference/tsxExternalModuleEmit2.types @@ -1,6 +1,8 @@ === tests/cases/conformance/jsx/modules.d.ts === declare module 'mod' { +>'mod' : typeof 'mod' + var y: any; >y : any diff --git a/tests/baselines/reference/tsxPreserveEmit1.symbols b/tests/baselines/reference/tsxPreserveEmit1.symbols index b5651d7c38e9c..e22ea0a4eb98c 100644 --- a/tests/baselines/reference/tsxPreserveEmit1.symbols +++ b/tests/baselines/reference/tsxPreserveEmit1.symbols @@ -34,6 +34,8 @@ module M { === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : Symbol('react', Decl(react.d.ts, 0, 0)) + var x: any; >x : Symbol(x, Decl(react.d.ts, 2, 4)) @@ -51,6 +53,8 @@ declare module ReactRouter { >Thing : Symbol(Thing, Decl(react.d.ts, 7, 16)) } declare module 'react-router' { +>'react-router' : Symbol('react-router', Decl(react.d.ts, 9, 1)) + export = ReactRouter; >ReactRouter : Symbol(ReactRouter, Decl(react.d.ts, 4, 1)) } diff --git a/tests/baselines/reference/tsxPreserveEmit1.types b/tests/baselines/reference/tsxPreserveEmit1.types index 26da75b39e4bc..dd80f300f05a6 100644 --- a/tests/baselines/reference/tsxPreserveEmit1.types +++ b/tests/baselines/reference/tsxPreserveEmit1.types @@ -36,6 +36,8 @@ module M { === tests/cases/conformance/jsx/react.d.ts === declare module 'react' { +>'react' : typeof 'react' + var x: any; >x : any @@ -53,6 +55,8 @@ declare module ReactRouter { >Thing : Thing } declare module 'react-router' { +>'react-router' : typeof 'react-router' + export = ReactRouter; >ReactRouter : typeof ReactRouter } diff --git a/tests/baselines/reference/typeAliasExport.symbols b/tests/baselines/reference/typeAliasExport.symbols index 1f580b03011c5..ccec2c76f01d6 100644 --- a/tests/baselines/reference/typeAliasExport.symbols +++ b/tests/baselines/reference/typeAliasExport.symbols @@ -1,5 +1,7 @@ === tests/cases/compiler/typeAliasExport.ts === declare module "a" { +>"a" : Symbol("a", Decl(typeAliasExport.ts, 0, 0)) + export default 0 export var a; >a : Symbol(a, Decl(typeAliasExport.ts, 2, 12), Decl(typeAliasExport.ts, 2, 15)) diff --git a/tests/baselines/reference/typeAliasExport.types b/tests/baselines/reference/typeAliasExport.types index afa26073061c4..8a0580bef3c11 100644 --- a/tests/baselines/reference/typeAliasExport.types +++ b/tests/baselines/reference/typeAliasExport.types @@ -1,5 +1,7 @@ === tests/cases/compiler/typeAliasExport.ts === declare module "a" { +>"a" : typeof "a" + export default 0 export var a; >a : any diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols index 1e7604b44e736..0edef5db04b36 100644 --- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols +++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols @@ -25,14 +25,29 @@ var menuData: IMenuItem[] = [ >IMenuItem : Symbol(IMenuItem, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 0, 0)) { "id": "ourLogo", +>"id" : Symbol("id", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 9, 5)) + "type": "image", +>"type" : Symbol("type", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 10, 24)) + "link": "", +>"link" : Symbol("link", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 11, 24)) + "icon": "modules/menu/logo.svg" +>"icon" : Symbol("icon", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 12, 19)) + }, { "id": "productName", +>"id" : Symbol("id", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 14, 8)) + "type": "default", +>"type" : Symbol("type", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 15, 28)) + "link": "", +>"link" : Symbol("link", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 16, 26)) + "text": "Product Name" +>"text" : Symbol("text", Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 17, 19)) } ]; diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types index 66e35a5a5356d..8e6fc0e315afd 100644 --- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types +++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types @@ -28,30 +28,38 @@ var menuData: IMenuItem[] = [ >{ "id": "ourLogo", "type": "image", "link": "", "icon": "modules/menu/logo.svg" } : { "id": string; "type": string; "link": string; "icon": string; } "id": "ourLogo", +>"id" : string >"ourLogo" : "ourLogo" "type": "image", +>"type" : string >"image" : "image" "link": "", +>"link" : string >"" : "" "icon": "modules/menu/logo.svg" +>"icon" : string >"modules/menu/logo.svg" : "modules/menu/logo.svg" }, { >{ "id": "productName", "type": "default", "link": "", "text": "Product Name" } : { "id": string; "type": string; "link": string; "text": string; } "id": "productName", +>"id" : string >"productName" : "productName" "type": "default", +>"type" : string >"default" : "default" "link": "", +>"link" : string >"" : "" "text": "Product Name" +>"text" : string >"Product Name" : "Product Name" } ]; diff --git a/tests/baselines/reference/typeReferenceDirectives9.symbols b/tests/baselines/reference/typeReferenceDirectives9.symbols index 30b24c3928464..2126ecc5a0f92 100644 --- a/tests/baselines/reference/typeReferenceDirectives9.symbols +++ b/tests/baselines/reference/typeReferenceDirectives9.symbols @@ -50,6 +50,8 @@ Cls.prototype.foo = function() { return undefined; } >undefined : Symbol(undefined) declare module "./main" { +>"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52)) + interface Cls { >Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5)) diff --git a/tests/baselines/reference/typeReferenceDirectives9.types b/tests/baselines/reference/typeReferenceDirectives9.types index bd429b91f1c1f..4422b538811d7 100644 --- a/tests/baselines/reference/typeReferenceDirectives9.types +++ b/tests/baselines/reference/typeReferenceDirectives9.types @@ -55,6 +55,8 @@ Cls.prototype.foo = function() { return undefined; } >undefined : undefined declare module "./main" { +>"./main" : typeof "/main" + interface Cls { >Cls : Cls diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols index 67fd371f8ee25..4b34d8e6a58bd 100644 --- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols +++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.symbols @@ -16,18 +16,24 @@ x + y + z; === /node_modules/@types/dopey/index.d.ts === declare module "xyz" { +>"xyz" : Symbol("xyz", Decl(index.d.ts, 0, 0)) + export const x: number; >x : Symbol(x, Decl(index.d.ts, 2, 16)) } === /foo/node_modules/@types/grumpy/index.d.ts === declare module "pdq" { +>"pdq" : Symbol("pdq", Decl(index.d.ts, 0, 0)) + export const y: number; >y : Symbol(y, Decl(index.d.ts, 1, 16)) } === /foo/node_modules/@types/sneezy/index.d.ts === declare module "abc" { +>"abc" : Symbol("abc", Decl(index.d.ts, 0, 0)) + export const z: number; >z : Symbol(z, Decl(index.d.ts, 1, 16)) } diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types index c47be9cdab3e2..b805ddb936370 100644 --- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types +++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types @@ -18,18 +18,24 @@ x + y + z; === /node_modules/@types/dopey/index.d.ts === declare module "xyz" { +>"xyz" : typeof "xyz" + export const x: number; >x : number } === /foo/node_modules/@types/grumpy/index.d.ts === declare module "pdq" { +>"pdq" : typeof "pdq" + export const y: number; >y : number } === /foo/node_modules/@types/sneezy/index.d.ts === declare module "abc" { +>"abc" : typeof "abc" + export const z: number; >z : number } diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols index 10cbdaa3c5321..a763fa74747db 100644 --- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols +++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.symbols @@ -8,6 +8,8 @@ x; === /node_modules/@types/foo/index.d.ts === declare module "xyz" { +>"xyz" : Symbol("xyz", Decl(index.d.ts, 0, 0)) + export const x: number; >x : Symbol(x, Decl(index.d.ts, 2, 16)) } diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types index 532a05fcb87c4..21b7b922d74f6 100644 --- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types +++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types @@ -8,6 +8,8 @@ x; === /node_modules/@types/foo/index.d.ts === declare module "xyz" { +>"xyz" : typeof "xyz" + export const x: number; >x : number } diff --git a/tests/baselines/reference/umd-augmentation-1.symbols b/tests/baselines/reference/umd-augmentation-1.symbols index 70715649894c1..9188f491cda59 100644 --- a/tests/baselines/reference/umd-augmentation-1.symbols +++ b/tests/baselines/reference/umd-augmentation-1.symbols @@ -83,6 +83,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : Symbol(Math2d, Decl(index.d.ts, 0, 0), Decl(math2d-augment.d.ts, 0, 33)) + // Add a method to the class interface Vector { >Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25)) diff --git a/tests/baselines/reference/umd-augmentation-1.types b/tests/baselines/reference/umd-augmentation-1.types index 8f759912256b4..3fed420481008 100644 --- a/tests/baselines/reference/umd-augmentation-1.types +++ b/tests/baselines/reference/umd-augmentation-1.types @@ -92,6 +92,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : typeof Math2d + // Add a method to the class interface Vector { >Vector : Vector diff --git a/tests/baselines/reference/umd-augmentation-2.symbols b/tests/baselines/reference/umd-augmentation-2.symbols index a31ed61d531e9..ae3373845d8b9 100644 --- a/tests/baselines/reference/umd-augmentation-2.symbols +++ b/tests/baselines/reference/umd-augmentation-2.symbols @@ -81,6 +81,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : Symbol(Math2d, Decl(index.d.ts, 0, 0), Decl(math2d-augment.d.ts, 0, 33)) + // Add a method to the class interface Vector { >Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25)) diff --git a/tests/baselines/reference/umd-augmentation-2.types b/tests/baselines/reference/umd-augmentation-2.types index 98d1d52ba4d9a..31c93d4890632 100644 --- a/tests/baselines/reference/umd-augmentation-2.types +++ b/tests/baselines/reference/umd-augmentation-2.types @@ -90,6 +90,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : typeof Math2d + // Add a method to the class interface Vector { >Vector : Vector diff --git a/tests/baselines/reference/umd-augmentation-3.symbols b/tests/baselines/reference/umd-augmentation-3.symbols index 3e2df7c8a89ac..c0b0eb0d7f6a5 100644 --- a/tests/baselines/reference/umd-augmentation-3.symbols +++ b/tests/baselines/reference/umd-augmentation-3.symbols @@ -92,6 +92,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : Symbol(Math2d, Decl(index.d.ts, 3, 13), Decl(math2d-augment.d.ts, 0, 33)) + // Add a method to the class interface Vector { >Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25)) diff --git a/tests/baselines/reference/umd-augmentation-3.types b/tests/baselines/reference/umd-augmentation-3.types index c62107cc40f79..78349044bbc85 100644 --- a/tests/baselines/reference/umd-augmentation-3.types +++ b/tests/baselines/reference/umd-augmentation-3.types @@ -101,6 +101,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : typeof Math2d + // Add a method to the class interface Vector { >Vector : Vector diff --git a/tests/baselines/reference/umd-augmentation-4.symbols b/tests/baselines/reference/umd-augmentation-4.symbols index 7be5d278bf26d..7f181fb37b5fc 100644 --- a/tests/baselines/reference/umd-augmentation-4.symbols +++ b/tests/baselines/reference/umd-augmentation-4.symbols @@ -90,6 +90,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : Symbol(Math2d, Decl(index.d.ts, 3, 13), Decl(math2d-augment.d.ts, 0, 33)) + // Add a method to the class interface Vector { >Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25)) diff --git a/tests/baselines/reference/umd-augmentation-4.types b/tests/baselines/reference/umd-augmentation-4.types index e1283c74a7c27..6a6c10bf9b13c 100644 --- a/tests/baselines/reference/umd-augmentation-4.types +++ b/tests/baselines/reference/umd-augmentation-4.types @@ -99,6 +99,8 @@ import * as Math2d from 'math2d'; // Augment the module declare module 'math2d' { +>'math2d' : typeof Math2d + // Add a method to the class interface Vector { >Vector : Vector diff --git a/tests/baselines/reference/underscoreTest1.symbols b/tests/baselines/reference/underscoreTest1.symbols index 89815bd2371a6..8b1d2bdfc9bb5 100644 --- a/tests/baselines/reference/underscoreTest1.symbols +++ b/tests/baselines/reference/underscoreTest1.symbols @@ -1011,9 +1011,11 @@ interface Tuple2 extends Array { >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 0: T0; +>0 : Symbol(Tuple2[0], Decl(underscoreTest1_underscore.ts, 12, 45)) >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 12, 17)) 1: T1; +>1 : Symbol(Tuple2[1], Decl(underscoreTest1_underscore.ts, 13, 10)) >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 12, 20)) } @@ -1025,12 +1027,15 @@ interface Tuple3 extends Array { >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 0: T0; +>0 : Symbol(Tuple3[0], Decl(underscoreTest1_underscore.ts, 17, 49)) >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 17, 17)) 1: T1; +>1 : Symbol(Tuple3[1], Decl(underscoreTest1_underscore.ts, 18, 10)) >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 17, 20)) 2: T2; +>2 : Symbol(Tuple3[2], Decl(underscoreTest1_underscore.ts, 19, 10)) >T2 : Symbol(T2, Decl(underscoreTest1_underscore.ts, 17, 24)) } @@ -1043,15 +1048,19 @@ interface Tuple4 extends Array { >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) 0: T0; +>0 : Symbol(Tuple4[0], Decl(underscoreTest1_underscore.ts, 23, 53)) >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 23, 17)) 1: T1; +>1 : Symbol(Tuple4[1], Decl(underscoreTest1_underscore.ts, 24, 10)) >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 23, 20)) 2: T2; +>2 : Symbol(Tuple4[2], Decl(underscoreTest1_underscore.ts, 25, 10)) >T2 : Symbol(T2, Decl(underscoreTest1_underscore.ts, 23, 24)) 3: T3; +>3 : Symbol(Tuple4[3], Decl(underscoreTest1_underscore.ts, 26, 10)) >T3 : Symbol(T3, Decl(underscoreTest1_underscore.ts, 23, 28)) } diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types index 97e064fb12c45..8a16535f85e2b 100644 --- a/tests/baselines/reference/underscoreTest1.types +++ b/tests/baselines/reference/underscoreTest1.types @@ -1772,9 +1772,11 @@ interface Tuple2 extends Array { >Array : T[] 0: T0; +>0 : T0 >T0 : T0 1: T1; +>1 : T1 >T1 : T1 } @@ -1786,12 +1788,15 @@ interface Tuple3 extends Array { >Array : T[] 0: T0; +>0 : T0 >T0 : T0 1: T1; +>1 : T1 >T1 : T1 2: T2; +>2 : T2 >T2 : T2 } @@ -1804,15 +1809,19 @@ interface Tuple4 extends Array { >Array : T[] 0: T0; +>0 : T0 >T0 : T0 1: T1; +>1 : T1 >T1 : T1 2: T2; +>2 : T2 >T2 : T2 3: T3; +>3 : T3 >T3 : T3 } diff --git a/tests/baselines/reference/unionAndIntersectionInference1.symbols b/tests/baselines/reference/unionAndIntersectionInference1.symbols index 685b21dd215c4..174a9a7cbba1b 100644 --- a/tests/baselines/reference/unionAndIntersectionInference1.symbols +++ b/tests/baselines/reference/unionAndIntersectionInference1.symbols @@ -3,6 +3,7 @@ interface Y { 'i am a very certain type': Y } >Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) +>'i am a very certain type' : Symbol(Y['i am a very certain type'], Decl(unionAndIntersectionInference1.ts, 2, 13)) >Y : Symbol(Y, Decl(unionAndIntersectionInference1.ts, 0, 0)) var y: Y = undefined; diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types index 6d24bffb56d63..2746c9dac922c 100644 --- a/tests/baselines/reference/unionAndIntersectionInference1.types +++ b/tests/baselines/reference/unionAndIntersectionInference1.types @@ -3,6 +3,7 @@ interface Y { 'i am a very certain type': Y } >Y : Y +>'i am a very certain type' : Y >Y : Y var y: Y = undefined; diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols index 7699e89dedd96..b6d2a0d548f1e 100644 --- a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols +++ b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols @@ -23,7 +23,11 @@ var arr5Tuple: { >arr5Tuple : Symbol(arr5Tuple, Decl(unionTypeFromArrayLiteral.ts, 10, 3)) 0: string; +>0 : Symbol(0, Decl(unionTypeFromArrayLiteral.ts, 10, 16)) + 5: number; +>5 : Symbol(5, Decl(unionTypeFromArrayLiteral.ts, 11, 14)) + } = ["hello", true, false, " hello", true, 10, "any"]; // Tuple class C { foo() { } } >C : Symbol(C, Decl(unionTypeFromArrayLiteral.ts, 13, 54)) diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.types b/tests/baselines/reference/unionTypeFromArrayLiteral.types index efff5e5e21909..a2563e7b04cb2 100644 --- a/tests/baselines/reference/unionTypeFromArrayLiteral.types +++ b/tests/baselines/reference/unionTypeFromArrayLiteral.types @@ -37,7 +37,11 @@ var arr5Tuple: { >arr5Tuple : { 0: string; 5: number; } 0: string; +>0 : string + 5: number; +>5 : number + } = ["hello", true, false, " hello", true, 10, "any"]; // Tuple >["hello", true, false, " hello", true, 10, "any"] : [string, boolean, boolean, string, boolean, number, string] >"hello" : "hello" diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols b/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols index 8def3c6a09b6c..11cae5ef356e1 100644 --- a/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols +++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.symbols @@ -8,6 +8,8 @@ x; === /declarations.d.ts === declare module "foo" { +>"foo" : Symbol("foo", Decl(declarations.d.ts, 0, 0)) + export const x: number; >x : Symbol(x, Decl(declarations.d.ts, 1, 16)) } diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.types b/tests/baselines/reference/untypedModuleImport_vsAmbient.types index 58b0eabefdfe3..f1991818ad194 100644 --- a/tests/baselines/reference/untypedModuleImport_vsAmbient.types +++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.types @@ -8,6 +8,8 @@ x; === /declarations.d.ts === declare module "foo" { +>"foo" : typeof "foo" + export const x: number; >x : number } diff --git a/tests/baselines/reference/voidOperatorWithEnumType.symbols b/tests/baselines/reference/voidOperatorWithEnumType.symbols index 26e2ca7095925..36a7960ffb3bd 100644 --- a/tests/baselines/reference/voidOperatorWithEnumType.symbols +++ b/tests/baselines/reference/voidOperatorWithEnumType.symbols @@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" }; >ENUM1 : Symbol(ENUM1, Decl(voidOperatorWithEnumType.ts, 2, 14)) >A : Symbol(ENUM1.A, Decl(voidOperatorWithEnumType.ts, 3, 12)) >B : Symbol(ENUM1.B, Decl(voidOperatorWithEnumType.ts, 3, 15)) +>"" : Symbol(ENUM1[""], Decl(voidOperatorWithEnumType.ts, 3, 18)) // enum type var var ResultIsAny1 = void ENUM; diff --git a/tests/baselines/reference/voidOperatorWithEnumType.types b/tests/baselines/reference/voidOperatorWithEnumType.types index 2133278639029..555dec098d82c 100644 --- a/tests/baselines/reference/voidOperatorWithEnumType.types +++ b/tests/baselines/reference/voidOperatorWithEnumType.types @@ -8,6 +8,7 @@ enum ENUM1 { A, B, "" }; >ENUM1 : ENUM1 >A : ENUM1.A >B : ENUM1.B +>"" : ENUM1."" // enum type var var ResultIsAny1 = void ENUM; From f1fae6a9422c6f07507a495b34c000a06dd2887c Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 17 Jan 2017 13:51:00 -0800 Subject: [PATCH 4/6] Fix emit for json file --- src/compiler/core.ts | 4 ++++ src/compiler/emitter.ts | 3 +++ src/compiler/factory.ts | 1 + src/compiler/moduleNameResolver.ts | 2 +- src/compiler/utilities.ts | 3 +++ src/harness/harness.ts | 2 +- tests/baselines/reference/requireOfJsonFile.js | 6 +++++- tests/cases/compiler/requireOfJsonFile.ts | 1 + 8 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 4ce0adf17662c..177e53d147236 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -2015,6 +2015,10 @@ namespace ts { return extensions; } + export function hasJsonFileExtension(fileName: string) { + return fileExtensionIs(fileName, supportedJsonExtension); + } + export function hasJavaScriptFileExtension(fileName: string) { return forEach(supportedJavascriptExtensions, extension => fileExtensionIs(fileName, extension)); } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index cc006a0663715..2db0d2b70823a 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1986,6 +1986,9 @@ namespace ts { writeLine(); emitShebang(); emitBodyWithDetachedComments(node, node.statements, emitSourceFileWorker); + if (isJsonSourceFile(node) && node.jsonObject) { + emitObjectLiteralExpression(node.jsonObject); + } } function emitSourceFileWorker(node: SourceFile) { diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index 20e2e035af034..1a42c87739ff7 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -1438,6 +1438,7 @@ namespace ts { if (node.statements !== statements) { const updated = createNode(SyntaxKind.SourceFile, /*location*/ node, node.flags); updated.statements = createNodeArray(statements); + if (isJsonSourceFile(node) && node.jsonObject !== undefined) (updated).jsonObject = node.jsonObject; updated.endOfFileToken = node.endOfFileToken; updated.fileName = node.fileName; updated.path = node.path; diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index d606c15ccd63e..307e4d3abc2b3 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -783,7 +783,7 @@ namespace ts { // If that didn't work, try stripping a ".js" or ".jsx" extension and replacing it with a TypeScript one; // e.g. "./foo.js" can be matched by "./foo.ts" or "./foo.d.ts" - if (hasJavaScriptFileExtension(candidate) || fileExtensionIs(candidate, supportedJsonExtension)) { + if (hasJavaScriptFileExtension(candidate) || hasJsonFileExtension(candidate)) { const extensionless = removeFileExtension(candidate); if (state.traceEnabled) { const extension = candidate.substring(extensionless.length); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index a1fe0ce388622..7e16a5d6880f8 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2646,6 +2646,9 @@ namespace ts { return ".jsx"; } } + if (isJsonSourceFile(sourceFile)) { + return ".json"; + } return ".js"; } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index e770f45a46299..2d00fc35d4ace 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1746,7 +1746,7 @@ namespace Harness { // .d.ts file, add to declFiles emit this.declFilesCode.push(emittedFile); } - else if (isJS(emittedFile.fileName) || isJSX(emittedFile.fileName)) { + else if (isJS(emittedFile.fileName) || isJSX(emittedFile.fileName) || ts.hasJsonFileExtension(emittedFile.fileName)) { // .js file, add to files this.files.push(emittedFile); } diff --git a/tests/baselines/reference/requireOfJsonFile.js b/tests/baselines/reference/requireOfJsonFile.js index 3cb1acd164176..edf69a3f48972 100644 --- a/tests/baselines/reference/requireOfJsonFile.js +++ b/tests/baselines/reference/requireOfJsonFile.js @@ -16,7 +16,11 @@ if (x) { "b": "hello" } -//// [b.js] +//// [b.json] +{ + "a": true, + "b": "hello" +} //// [file1.js] "use strict"; var b1 = require("./b"); diff --git a/tests/cases/compiler/requireOfJsonFile.ts b/tests/cases/compiler/requireOfJsonFile.ts index 7295dac0179cf..d214bcda45009 100644 --- a/tests/cases/compiler/requireOfJsonFile.ts +++ b/tests/cases/compiler/requireOfJsonFile.ts @@ -1,4 +1,5 @@ // @module: commonjs +// @outdir: out/ // @Filename: file1.ts import b1 = require('./b'); From 4ebf2d96744654a6dcff98db39442e7b268dad50 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 17 Jan 2017 13:51:00 -0800 Subject: [PATCH 5/6] More tests --- .../requireOfJsonFileWithAmd.errors.txt | 23 ++++++++++++++++ .../reference/requireOfJsonFileWithAmd.js | 27 +++++++++++++++++++ .../requireOfJsonFileWithEmptyObject.js | 25 +++++++++++++++++ .../requireOfJsonFileWithEmptyObject.symbols | 24 +++++++++++++++++ .../requireOfJsonFileWithEmptyObject.types | 25 +++++++++++++++++ ...onFileWithEmptyObjectWithErrors.errors.txt | 24 +++++++++++++++++ ...uireOfJsonFileWithEmptyObjectWithErrors.js | 27 +++++++++++++++++++ .../requireOfJsonFileWithNoContent.errors.txt | 23 ++++++++++++++++ .../requireOfJsonFileWithNoContent.js | 25 +++++++++++++++++ .../compiler/requireOfJsonFileWithAmd.ts | 17 ++++++++++++ .../requireOfJsonFileWithEmptyObject.ts | 14 ++++++++++ ...uireOfJsonFileWithEmptyObjectWithErrors.ts | 15 +++++++++++ .../requireOfJsonFileWithNoContent.ts | 13 +++++++++ 13 files changed, 282 insertions(+) create mode 100644 tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt create mode 100644 tests/baselines/reference/requireOfJsonFileWithAmd.js create mode 100644 tests/baselines/reference/requireOfJsonFileWithEmptyObject.js create mode 100644 tests/baselines/reference/requireOfJsonFileWithEmptyObject.symbols create mode 100644 tests/baselines/reference/requireOfJsonFileWithEmptyObject.types create mode 100644 tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.errors.txt create mode 100644 tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.js create mode 100644 tests/baselines/reference/requireOfJsonFileWithNoContent.errors.txt create mode 100644 tests/baselines/reference/requireOfJsonFileWithNoContent.js create mode 100644 tests/cases/compiler/requireOfJsonFileWithAmd.ts create mode 100644 tests/cases/compiler/requireOfJsonFileWithEmptyObject.ts create mode 100644 tests/cases/compiler/requireOfJsonFileWithEmptyObjectWithErrors.ts create mode 100644 tests/cases/compiler/requireOfJsonFileWithNoContent.ts diff --git a/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt b/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt new file mode 100644 index 0000000000000..048e1652f3f6d --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/file1.ts(2,21): error TS2307: Cannot find module './b'. +tests/cases/compiler/file1.ts(4,21): error TS2307: Cannot find module './b.json'. + + +==== tests/cases/compiler/file1.ts (2 errors) ==== + + import b1 = require('./b'); + ~~~~~ +!!! error TS2307: Cannot find module './b'. + let x = b1.a; + import b2 = require('./b.json'); + ~~~~~~~~~~ +!!! error TS2307: Cannot find module './b.json'. + if (x) { + let b = b2.b; + x = (b1.b === b); + } + +==== tests/cases/compiler/b.json (0 errors) ==== + { + "a": true, + "b": "hello" + } \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFileWithAmd.js b/tests/baselines/reference/requireOfJsonFileWithAmd.js new file mode 100644 index 0000000000000..50e5d96e7a074 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithAmd.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/requireOfJsonFileWithAmd.ts] //// + +//// [file1.ts] + +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +//// [b.json] +{ + "a": true, + "b": "hello" +} + +//// [file1.js] +define(["require", "exports", "./b", "./b.json"], function (require, exports, b1, b2) { + "use strict"; + var x = b1.a; + if (x) { + var b = b2.b; + x = (b1.b === b); + } +}); diff --git a/tests/baselines/reference/requireOfJsonFileWithEmptyObject.js b/tests/baselines/reference/requireOfJsonFileWithEmptyObject.js new file mode 100644 index 0000000000000..1dbfe6b9c4b64 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithEmptyObject.js @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/requireOfJsonFileWithEmptyObject.ts] //// + +//// [file1.ts] + +import b1 = require('./b'); +let x = b1; +import b2 = require('./b.json'); +if (x) { + x = b2; +} + +//// [b.json] +{ +} + +//// [b.json] +{} +//// [file1.js] +"use strict"; +var b1 = require("./b"); +var x = b1; +var b2 = require("./b.json"); +if (x) { + x = b2; +} diff --git a/tests/baselines/reference/requireOfJsonFileWithEmptyObject.symbols b/tests/baselines/reference/requireOfJsonFileWithEmptyObject.symbols new file mode 100644 index 0000000000000..acba5240f4276 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithEmptyObject.symbols @@ -0,0 +1,24 @@ +=== tests/cases/compiler/file1.ts === + +import b1 = require('./b'); +>b1 : Symbol(b1, Decl(file1.ts, 0, 0)) + +let x = b1; +>x : Symbol(x, Decl(file1.ts, 2, 3)) +>b1 : Symbol(b1, Decl(file1.ts, 0, 0)) + +import b2 = require('./b.json'); +>b2 : Symbol(b2, Decl(file1.ts, 2, 11)) + +if (x) { +>x : Symbol(x, Decl(file1.ts, 2, 3)) + + x = b2; +>x : Symbol(x, Decl(file1.ts, 2, 3)) +>b2 : Symbol(b2, Decl(file1.ts, 2, 11)) +} + +=== tests/cases/compiler/b.json === +{ +No type information for this code.} +No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFileWithEmptyObject.types b/tests/baselines/reference/requireOfJsonFileWithEmptyObject.types new file mode 100644 index 0000000000000..1267d670b3556 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithEmptyObject.types @@ -0,0 +1,25 @@ +=== tests/cases/compiler/file1.ts === + +import b1 = require('./b'); +>b1 : {} + +let x = b1; +>x : {} +>b1 : {} + +import b2 = require('./b.json'); +>b2 : {} + +if (x) { +>x : {} + + x = b2; +>x = b2 : {} +>x : {} +>b2 : {} +} + +=== tests/cases/compiler/b.json === +{ +>{} : {} +} diff --git a/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.errors.txt b/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.errors.txt new file mode 100644 index 0000000000000..2eadb52fe3482 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.errors.txt @@ -0,0 +1,24 @@ +tests/cases/compiler/file1.ts(3,12): error TS2339: Property 'a' does not exist on type '{}'. +tests/cases/compiler/file1.ts(6,16): error TS2339: Property 'b' does not exist on type '{}'. +tests/cases/compiler/file1.ts(7,13): error TS2339: Property 'b' does not exist on type '{}'. + + +==== tests/cases/compiler/file1.ts (3 errors) ==== + + import b1 = require('./b'); + let x = b1.a; + ~ +!!! error TS2339: Property 'a' does not exist on type '{}'. + import b2 = require('./b.json'); + if (x) { + let b = b2.b; + ~ +!!! error TS2339: Property 'b' does not exist on type '{}'. + x = (b1.b === b); + ~ +!!! error TS2339: Property 'b' does not exist on type '{}'. + } + +==== tests/cases/compiler/b.json (0 errors) ==== + { + } \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.js b/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.js new file mode 100644 index 0000000000000..659af91b8e900 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/requireOfJsonFileWithEmptyObjectWithErrors.ts] //// + +//// [file1.ts] + +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +//// [b.json] +{ +} + +//// [b.json] +{} +//// [file1.js] +"use strict"; +var b1 = require("./b"); +var x = b1.a; +var b2 = require("./b.json"); +if (x) { + var b = b2.b; + x = (b1.b === b); +} diff --git a/tests/baselines/reference/requireOfJsonFileWithNoContent.errors.txt b/tests/baselines/reference/requireOfJsonFileWithNoContent.errors.txt new file mode 100644 index 0000000000000..b9800dbcafbe8 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithNoContent.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/file1.ts(3,12): error TS2339: Property 'a' does not exist on type '{}'. +tests/cases/compiler/file1.ts(6,16): error TS2339: Property 'b' does not exist on type '{}'. +tests/cases/compiler/file1.ts(7,13): error TS2339: Property 'b' does not exist on type '{}'. + + +==== tests/cases/compiler/file1.ts (3 errors) ==== + + import b1 = require('./b'); + let x = b1.a; + ~ +!!! error TS2339: Property 'a' does not exist on type '{}'. + import b2 = require('./b.json'); + if (x) { + let b = b2.b; + ~ +!!! error TS2339: Property 'b' does not exist on type '{}'. + x = (b1.b === b); + ~ +!!! error TS2339: Property 'b' does not exist on type '{}'. + } + +==== tests/cases/compiler/b.json (0 errors) ==== + \ No newline at end of file diff --git a/tests/baselines/reference/requireOfJsonFileWithNoContent.js b/tests/baselines/reference/requireOfJsonFileWithNoContent.js new file mode 100644 index 0000000000000..50172b91bcdb9 --- /dev/null +++ b/tests/baselines/reference/requireOfJsonFileWithNoContent.js @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/requireOfJsonFileWithNoContent.ts] //// + +//// [file1.ts] + +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +//// [b.json] + + +//// [b.json] +//// [file1.js] +"use strict"; +var b1 = require("./b"); +var x = b1.a; +var b2 = require("./b.json"); +if (x) { + var b = b2.b; + x = (b1.b === b); +} diff --git a/tests/cases/compiler/requireOfJsonFileWithAmd.ts b/tests/cases/compiler/requireOfJsonFileWithAmd.ts new file mode 100644 index 0000000000000..682874fe5c071 --- /dev/null +++ b/tests/cases/compiler/requireOfJsonFileWithAmd.ts @@ -0,0 +1,17 @@ +// @module: amd +// @outdir: out/ + +// @Filename: file1.ts +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +// @Filename: b.json +{ + "a": true, + "b": "hello" +} \ No newline at end of file diff --git a/tests/cases/compiler/requireOfJsonFileWithEmptyObject.ts b/tests/cases/compiler/requireOfJsonFileWithEmptyObject.ts new file mode 100644 index 0000000000000..4ec163b56e550 --- /dev/null +++ b/tests/cases/compiler/requireOfJsonFileWithEmptyObject.ts @@ -0,0 +1,14 @@ +// @module: commonjs +// @outdir: out/ + +// @Filename: file1.ts +import b1 = require('./b'); +let x = b1; +import b2 = require('./b.json'); +if (x) { + x = b2; +} + +// @Filename: b.json +{ +} \ No newline at end of file diff --git a/tests/cases/compiler/requireOfJsonFileWithEmptyObjectWithErrors.ts b/tests/cases/compiler/requireOfJsonFileWithEmptyObjectWithErrors.ts new file mode 100644 index 0000000000000..4e1a21f938ed3 --- /dev/null +++ b/tests/cases/compiler/requireOfJsonFileWithEmptyObjectWithErrors.ts @@ -0,0 +1,15 @@ +// @module: commonjs +// @outdir: out/ + +// @Filename: file1.ts +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +// @Filename: b.json +{ +} \ No newline at end of file diff --git a/tests/cases/compiler/requireOfJsonFileWithNoContent.ts b/tests/cases/compiler/requireOfJsonFileWithNoContent.ts new file mode 100644 index 0000000000000..c0d94bb269a21 --- /dev/null +++ b/tests/cases/compiler/requireOfJsonFileWithNoContent.ts @@ -0,0 +1,13 @@ +// @module: commonjs +// @outdir: out/ + +// @Filename: file1.ts +import b1 = require('./b'); +let x = b1.a; +import b2 = require('./b.json'); +if (x) { + let b = b2.b; + x = (b1.b === b); +} + +// @Filename: b.json From d243eb0107110d4fa172504978031063b99f85de Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 14 Sep 2017 14:28:37 -0700 Subject: [PATCH 6/6] Remove unnecessary function --- src/compiler/core.ts | 4 ---- src/compiler/moduleNameResolver.ts | 2 +- src/harness/harness.ts | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 5b0ee6ea01907..b6858772fb981 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -2245,10 +2245,6 @@ namespace ts { return deduplicate([...allSupportedExtensions, ...extraFileExtensions.map(e => e.extension)]); } - export function hasJsonFileExtension(fileName: string) { - return fileExtensionIs(fileName, Extension.Json); - } - export function hasJavaScriptFileExtension(fileName: string) { return forEach(supportedJavascriptExtensions, extension => fileExtensionIs(fileName, extension)); } diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 97c07e41ceac6..5796394d47e78 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -827,7 +827,7 @@ namespace ts { // If that didn't work, try stripping a ".js" or ".jsx" extension and replacing it with a TypeScript one; // e.g. "./foo.js" can be matched by "./foo.ts" or "./foo.d.ts" - if (hasJavaScriptFileExtension(candidate) || hasJsonFileExtension(candidate)) { + if (hasJavaScriptFileExtension(candidate) || fileExtensionIs(candidate, Extension.Json)) { const extensionless = removeFileExtension(candidate); if (state.traceEnabled) { const extension = candidate.substring(extensionless.length); diff --git a/src/harness/harness.ts b/src/harness/harness.ts index f768789d4755d..9cc74591d6f65 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1718,7 +1718,7 @@ namespace Harness { // .d.ts file, add to declFiles emit this.declFilesCode.push(emittedFile); } - else if (isJS(emittedFile.fileName) || isJSX(emittedFile.fileName) || ts.hasJsonFileExtension(emittedFile.fileName)) { + else if (isJS(emittedFile.fileName) || isJSX(emittedFile.fileName) || ts.fileExtensionIs(emittedFile.fileName, ts.Extension.Json)) { // .js file, add to files this.files.push(emittedFile); }