diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 5ba78c1ad98ab..432b63dca1e05 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -2514,11 +2514,12 @@ namespace ts { return true; } const node = symbol.valueDeclaration; - const init = !node ? undefined : + let init = !node ? undefined : isVariableDeclaration(node) ? node.initializer : isBinaryExpression(node) ? node.right : isPropertyAccessExpression(node) && isBinaryExpression(node.parent) ? node.parent.right : undefined; + init = init && getRightMostAssignedExpression(init); if (init) { const isPrototypeAssignment = isPrototypeAccess(isVariableDeclaration(node) ? node.name : isBinaryExpression(node) ? node.left : node); return !!getJavascriptInitializer(isBinaryExpression(init) && init.operatorToken.kind === SyntaxKind.BarBarToken ? init.right : init, isPrototypeAssignment); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ae21da9c9d0e5..4344409e69748 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4868,7 +4868,10 @@ namespace ts { // binding pattern [x, s = ""]. Because the contextual type is a tuple type, the resulting type of [1, "one"] is the // tuple type [number, string]. Thus, the type inferred for 'x' is number and the type inferred for 's' is string. function getWidenedTypeForVariableLikeDeclaration(declaration: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement, reportErrors?: boolean): Type { - let type = getTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true); + return widenTypeForVariableLikeDeclaration(getTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true), declaration, reportErrors); + } + + function widenTypeForVariableLikeDeclaration(type: Type | undefined, declaration: any, reportErrors?: boolean) { if (type) { if (reportErrors) { reportErrorsFromWidening(declaration, type); @@ -4931,59 +4934,48 @@ namespace ts { if (declaration.kind === SyntaxKind.ExportAssignment) { return links.type = checkExpression((declaration).expression); } - if (isInJavaScriptFile(declaration) && isJSDocPropertyLikeTag(declaration) && declaration.typeExpression) { - return links.type = getTypeFromTypeNode(declaration.typeExpression.type); - } // Handle variable, parameter or property if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) { return errorType; } - let type: Type; - // Handle certain special assignment kinds, which happen to union across multiple declarations: - // * module.exports = expr - // * exports.p = expr - // * this.p = expr - // * className.prototype.method = expr - if (declaration.kind === SyntaxKind.BinaryExpression || - declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) { - type = getWidenedTypeFromJSSpecialPropertyDeclarations(symbol); - } - else if (isJSDocPropertyLikeTag(declaration) - || isPropertyAccessExpression(declaration) - || isIdentifier(declaration) - || isClassDeclaration(declaration) - || isFunctionDeclaration(declaration) - || (isMethodDeclaration(declaration) && !isObjectLiteralMethod(declaration)) - || isMethodSignature(declaration)) { - - // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty` - if (symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.Enum | SymbolFlags.ValueModule)) { - return getTypeOfFuncClassEnumModule(symbol); - } - type = tryGetTypeFromEffectiveTypeNode(declaration) || anyType; - } - else if (isPropertyAssignment(declaration)) { - type = tryGetTypeFromEffectiveTypeNode(declaration) || checkPropertyAssignment(declaration); - } - else if (isJsxAttribute(declaration)) { - type = tryGetTypeFromEffectiveTypeNode(declaration) || checkJsxAttribute(declaration); - } - else if (isShorthandPropertyAssignment(declaration)) { - type = tryGetTypeFromEffectiveTypeNode(declaration) || checkExpressionForMutableLocation(declaration.name, CheckMode.Normal); - } - else if (isObjectLiteralMethod(declaration)) { - type = tryGetTypeFromEffectiveTypeNode(declaration) || checkObjectLiteralMethod(declaration, CheckMode.Normal); - } - else if (isParameter(declaration) - || isPropertyDeclaration(declaration) - || isPropertySignature(declaration) - || isVariableDeclaration(declaration) - || isBindingElement(declaration)) { - type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true); - } - else { - return Debug.fail("Unhandled declaration kind! " + Debug.showSyntaxKind(declaration) + " for " + Debug.showSymbol(symbol)); + let type = getJSSpecialType(symbol, declaration); + if (!type) { + if (isJSDocPropertyLikeTag(declaration) + || isPropertyAccessExpression(declaration) + || isIdentifier(declaration) + || isClassDeclaration(declaration) + || isFunctionDeclaration(declaration) + || (isMethodDeclaration(declaration) && !isObjectLiteralMethod(declaration)) + || isMethodSignature(declaration)) { + // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty` + if (symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.Enum | SymbolFlags.ValueModule)) { + return getTypeOfFuncClassEnumModule(symbol); + } + type = tryGetTypeFromEffectiveTypeNode(declaration) || anyType; + } + else if (isPropertyAssignment(declaration)) { + type = tryGetTypeFromEffectiveTypeNode(declaration) || checkPropertyAssignment(declaration); + } + else if (isJsxAttribute(declaration)) { + type = tryGetTypeFromEffectiveTypeNode(declaration) || checkJsxAttribute(declaration); + } + else if (isShorthandPropertyAssignment(declaration)) { + type = tryGetTypeFromEffectiveTypeNode(declaration) || checkExpressionForMutableLocation(declaration.name, CheckMode.Normal); + } + else if (isObjectLiteralMethod(declaration)) { + type = tryGetTypeFromEffectiveTypeNode(declaration) || checkObjectLiteralMethod(declaration, CheckMode.Normal); + } + else if (isParameter(declaration) + || isPropertyDeclaration(declaration) + || isPropertySignature(declaration) + || isVariableDeclaration(declaration) + || isBindingElement(declaration)) { + type = getWidenedTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true); + } + else { + return Debug.fail("Unhandled declaration kind! " + Debug.showSyntaxKind(declaration) + " for " + Debug.showSymbol(symbol)); + } } if (!popTypeResolution()) { @@ -4994,6 +4986,56 @@ namespace ts { return links.type; } + function getJSSpecialType(symbol: Symbol, decl: Declaration): Type | undefined { + if (!isInJavaScriptFile(decl)) { + return undefined; + } + else if (isJSDocPropertyLikeTag(decl) && decl.typeExpression) { + return getTypeFromTypeNode(decl.typeExpression.type); + } + // Handle certain special assignment kinds, which happen to union across multiple declarations: + // * module.exports = expr + // * exports.p = expr + // * this.p = expr + // * className.prototype.method = expr + else if (isBinaryExpression(decl) || + isPropertyAccessExpression(decl) && isBinaryExpression(decl.parent)) { + return getJSInitializerType(decl, symbol, getAssignedJavascriptInitializer(isBinaryExpression(decl) ? decl.left : decl)) || + getWidenedTypeFromJSSpecialPropertyDeclarations(symbol); + } + else if (isParameter(decl) + || isPropertyDeclaration(decl) + || isPropertySignature(decl) + || isVariableDeclaration(decl) + || isBindingElement(decl)) { + // Use type from type annotation if one is present + const isOptional = isParameter(decl) && isJSDocOptionalParameter(decl) || + !isBindingElement(decl) && !isVariableDeclaration(decl) && !!decl.questionToken; + const declaredType = tryGetTypeFromEffectiveTypeNode(decl); + return declaredType && addOptionality(declaredType, isOptional) || + getJSInitializerType(decl, symbol, getDeclaredJavascriptInitializer(decl)) || + getWidenedTypeForVariableLikeDeclaration(decl, /*includeOptionality*/ true); + } + } + + function getJSInitializerType(decl: Node, symbol: Symbol, init: Expression | undefined): Type | undefined { + if (init && isInJavaScriptFile(init) && isObjectLiteralExpression(init)) { + const exports = createSymbolTable(); + while (isBinaryExpression(decl) || isPropertyAccessExpression(decl)) { + const s = getSymbolOfNode(decl); + if (s && hasEntries(s.exports)) { + mergeSymbolTable(exports, s.exports); + } + decl = isBinaryExpression(decl) ? decl.parent : decl.parent.parent; + } + const s = getSymbolOfNode(decl); + if (s && hasEntries(s.exports)) { + mergeSymbolTable(exports, s.exports); + } + return createAnonymousType(symbol, exports, emptyArray, emptyArray, jsObjectLiteralIndexInfo, undefined); + } + } + function getAnnotatedAccessorType(accessor: AccessorDeclaration | undefined): Type | undefined { if (accessor) { if (accessor.kind === SyntaxKind.GetAccessor) { @@ -12181,14 +12223,6 @@ namespace ts { // widen accessor based properties here. return prop; } - if (prop.flags & SymbolFlags.JSContainer) { - const node = prop.declarations && first(prop.declarations); - const init = getAssignedJavascriptInitializer(node); - if (init && init.kind !== SyntaxKind.ObjectLiteralExpression) { - // for JS special declarations, the only kind of initializer that will widen is object literals - return prop; - } - } const original = getTypeOfSymbol(prop); const propContext = context && createWideningContext(context, prop.escapedName, /*siblings*/ undefined); const widened = getWidenedTypeWithContext(original, propContext); @@ -15996,19 +16030,6 @@ namespace ts { let patternWithComputedProperties = false; let hasComputedStringProperty = false; let hasComputedNumberProperty = false; - - if (isInJSFile) { - const decl = getDeclarationOfJSInitializer(node); - if (decl) { - // a JS object literal whose declaration's symbol has exports is a JS namespace - const symbol = getSymbolOfNode(decl); - if (symbol && hasEntries(symbol.exports)) { - propertiesTable = symbol.exports; - symbol.exports.forEach(s => propertiesArray.push(getMergedSymbol(s))); - return createObjectLiteralType(); - } - } - } propertiesTable = createSymbolTable(); let offset = 0; @@ -20440,9 +20461,15 @@ namespace ts { getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], UnionReduction.Subtype) : leftType; case SyntaxKind.EqualsToken: - checkSpecialAssignment(left, right); - checkAssignmentOperator(rightType); - return getRegularTypeOfObjectLiteral(rightType); + const special = getSpecialPropertyAssignmentKind(left.parent as BinaryExpression); + checkSpecialAssignment(special, right); + if (isJSSpecialPropertyAssignment(special)) { + return leftType; + } + else { + checkAssignmentOperator(rightType); + return getRegularTypeOfObjectLiteral(rightType); + } case SyntaxKind.CommaToken: if (!compilerOptions.allowUnreachableCode && isSideEffectFree(left) && !isEvalNode(right)) { error(left, Diagnostics.Left_side_of_comma_operator_is_unused_and_has_no_side_effects); @@ -20453,8 +20480,7 @@ namespace ts { return Debug.fail(); } - function checkSpecialAssignment(left: Node, right: Expression) { - const special = getSpecialPropertyAssignmentKind(left.parent as BinaryExpression); + function checkSpecialAssignment(special: SpecialPropertyAssignmentKind, right: Expression) { if (special === SpecialPropertyAssignmentKind.ModuleExports) { const rightType = checkExpression(right, checkMode); for (const prop of getPropertiesOfObjectType(rightType)) { @@ -20513,6 +20539,7 @@ namespace ts { // requires VarExpr to be classified as a reference // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1) // and the type of the non-compound operation to be assignable to the type of VarExpr. + if (checkReferenceExpression(left, Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access) && (!isIdentifier(left) || unescapeLeadingUnderscores(left.escapedText) !== "exports")) { // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported @@ -20521,6 +20548,23 @@ namespace ts { } } + function isJSSpecialPropertyAssignment(special: SpecialPropertyAssignmentKind) { + switch (special) { + case SpecialPropertyAssignmentKind.ExportsProperty: + case SpecialPropertyAssignmentKind.ModuleExports: + case SpecialPropertyAssignmentKind.Property: + case SpecialPropertyAssignmentKind.Prototype: + case SpecialPropertyAssignmentKind.PrototypeProperty: + case SpecialPropertyAssignmentKind.ThisProperty: + const symbol = getSymbolOfNode(left); + const init = getAssignedJavascriptInitializer(right); + return init && isObjectLiteralExpression(init) && + symbol && hasEntries(symbol.exports); + default: + return false; + } + } + function reportOperatorError() { error(errorNode || operatorToken, Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, tokenToString(operatorToken.kind), typeToString(leftType), typeToString(rightType)); } @@ -23297,9 +23341,15 @@ namespace ts { // Node is the primary declaration of the symbol, just validate the initializer // Don't validate for-in initializer as it is already an error const initializer = getEffectiveInitializer(node); - if (initializer && node.parent.parent.kind !== SyntaxKind.ForInStatement) { - checkTypeAssignableTo(checkExpressionCached(initializer), type, node, /*headMessage*/ undefined); - checkParameterInitializer(node); + if (initializer) { + const isJSObjectLiteralInitializer = isInJavaScriptFile(node) && + isObjectLiteralExpression(initializer) && + (initializer.properties.length === 0 || isPrototypeAccess(node.name)) && + hasEntries(symbol.exports); + if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== SyntaxKind.ForInStatement) { + checkTypeAssignableTo(checkExpressionCached(initializer), type, node, /*headMessage*/ undefined); + checkParameterInitializer(node); + } } } else { diff --git a/src/parser/utilities.ts b/src/parser/utilities.ts index f04f5f01bd706..e67ea3e743f39 100644 --- a/src/parser/utilities.ts +++ b/src/parser/utilities.ts @@ -1761,6 +1761,12 @@ namespace ts { return node.initializer; } + /** Get the declaration initializer when it is container-like (See getJavascriptInitializer). */ + export function getDeclaredJavascriptInitializer(node: HasExpressionInitializer) { + const init = getEffectiveInitializer(node); + return init && getJavascriptInitializer(init, isPrototypeAccess(node.name)); + } + /** * Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getJavascriptInitializer). * We treat the right hand side of assignments with container-like initalizers as declarations. diff --git a/tests/baselines/reference/APISample_Watch.errors.txt b/tests/baselines/reference/APISample_Watch.errors.txt index bb02ed2b9a2dc..2acf3736320f8 100644 --- a/tests/baselines/reference/APISample_Watch.errors.txt +++ b/tests/baselines/reference/APISample_Watch.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_Watch.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt b/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt index 8f1d89b484575..f3ab873050859 100644 --- a/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt +++ b/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_WatchWithDefaults.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt b/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt index ee60b5c0d9ff7..98c64db5f8ac2 100644 --- a/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt +++ b/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_WatchWithOwnWatchHost.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_compile.errors.txt b/tests/baselines/reference/APISample_compile.errors.txt index 2b730ac576f3b..a84f736a3dc93 100644 --- a/tests/baselines/reference/APISample_compile.errors.txt +++ b/tests/baselines/reference/APISample_compile.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_compile.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_jsdoc.errors.txt b/tests/baselines/reference/APISample_jsdoc.errors.txt index 02ac0d0fbf57a..46b14bb2ea1e5 100644 --- a/tests/baselines/reference/APISample_jsdoc.errors.txt +++ b/tests/baselines/reference/APISample_jsdoc.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_jsdoc.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_linter.errors.txt b/tests/baselines/reference/APISample_linter.errors.txt index 01bab05567aab..150c5f0a0c117 100644 --- a/tests/baselines/reference/APISample_linter.errors.txt +++ b/tests/baselines/reference/APISample_linter.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_linter.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_parseConfig.errors.txt b/tests/baselines/reference/APISample_parseConfig.errors.txt index 87f2415221006..24bb4ed962cff 100644 --- a/tests/baselines/reference/APISample_parseConfig.errors.txt +++ b/tests/baselines/reference/APISample_parseConfig.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_parseConfig.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_transform.errors.txt b/tests/baselines/reference/APISample_transform.errors.txt index 3f8facbb0714c..7f5c20db32d6c 100644 --- a/tests/baselines/reference/APISample_transform.errors.txt +++ b/tests/baselines/reference/APISample_transform.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_transform.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_watcher.errors.txt b/tests/baselines/reference/APISample_watcher.errors.txt index 61fffd2cec854..0de54243e2636 100644 --- a/tests/baselines/reference/APISample_watcher.errors.txt +++ b/tests/baselines/reference/APISample_watcher.errors.txt @@ -1,67 +1,65 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10796,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10807,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10817,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10892,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10949,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11003,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11023,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11033,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11067,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11074,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11092,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11118,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11133,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11163,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11197,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11232,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11240,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11244,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11274,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11317,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11504,37): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8912,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9172,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9522,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9546,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9633,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10798,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10809,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10819,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10894,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10951,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11005,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11025,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11035,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11069,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11072,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11076,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11094,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11120,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11123,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11135,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11165,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11199,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11210,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11234,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11242,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11246,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11276,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11319,41): error TS1005: ';' expected. typescript_standalone.d.ts(11506,28): error TS1005: ';' expected. typescript_standalone.d.ts(11506,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11510,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11508,37): error TS1005: ';' expected. typescript_standalone.d.ts(11512,28): error TS1005: ';' expected. typescript_standalone.d.ts(11512,37): error TS1005: ';' expected. typescript_standalone.d.ts(11514,28): error TS1005: ';' expected. @@ -70,8 +68,8 @@ typescript_standalone.d.ts(11516,28): error TS1005: ';' expected. typescript_standalone.d.ts(11516,37): error TS1005: ';' expected. typescript_standalone.d.ts(11518,28): error TS1005: ';' expected. typescript_standalone.d.ts(11518,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11520,37): error TS1005: ';' expected. typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11531,28): error TS1005: ';' expected. @@ -100,8 +98,8 @@ typescript_standalone.d.ts(11553,28): error TS1005: ';' expected. typescript_standalone.d.ts(11553,37): error TS1005: ';' expected. typescript_standalone.d.ts(11555,28): error TS1005: ';' expected. typescript_standalone.d.ts(11555,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11565,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11557,37): error TS1005: ';' expected. typescript_standalone.d.ts(11567,28): error TS1005: ';' expected. typescript_standalone.d.ts(11567,37): error TS1005: ';' expected. typescript_standalone.d.ts(11569,28): error TS1005: ';' expected. @@ -115,19 +113,21 @@ typescript_standalone.d.ts(11575,37): error TS1005: ';' expected. typescript_standalone.d.ts(11577,28): error TS1005: ';' expected. typescript_standalone.d.ts(11577,37): error TS1005: ';' expected. typescript_standalone.d.ts(11579,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11579,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11579,37): error TS1005: ';' expected. typescript_standalone.d.ts(11581,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11581,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11653,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11581,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11583,52): error TS1005: ';' expected. typescript_standalone.d.ts(11655,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11655,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11655,72): error TS1005: ';' expected. typescript_standalone.d.ts(11657,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11657,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11657,38): error TS1005: ';' expected. typescript_standalone.d.ts(11659,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11659,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11735,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11659,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11661,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11737,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_watcher.ts (0 errors) ==== diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 2a633035bf2e8..84764068c53a7 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -6222,6 +6222,8 @@ declare namespace ts { function getDeclarationOfJSInitializer(node: Node): Node | undefined; /** Get the initializer, taking into account defaulted Javascript initializers */ function getEffectiveInitializer(node: HasExpressionInitializer): Expression | undefined; + /** Get the declaration initializer when it is container-like (See getJavascriptInitializer). */ + function getDeclaredJavascriptInitializer(node: HasExpressionInitializer): Expression | undefined; /** * Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getJavascriptInitializer). * We treat the right hand side of assignments with container-like initalizers as declarations. diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 48a310301b320..de921984acce5 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -6222,6 +6222,8 @@ declare namespace ts { function getDeclarationOfJSInitializer(node: Node): Node | undefined; /** Get the initializer, taking into account defaulted Javascript initializers */ function getEffectiveInitializer(node: HasExpressionInitializer): Expression | undefined; + /** Get the declaration initializer when it is container-like (See getJavascriptInitializer). */ + function getDeclaredJavascriptInitializer(node: HasExpressionInitializer): Expression | undefined; /** * Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getJavascriptInitializer). * We treat the right hand side of assignments with container-like initalizers as declarations. diff --git a/tests/baselines/reference/chainedPrototypeAssignment.types b/tests/baselines/reference/chainedPrototypeAssignment.types index a893ae63022c6..f0d9cc972ef0f 100644 --- a/tests/baselines/reference/chainedPrototypeAssignment.types +++ b/tests/baselines/reference/chainedPrototypeAssignment.types @@ -86,9 +86,9 @@ A.prototype = B.prototype = { >A : typeof A >prototype : { [x: string]: any; m(n: number): number; } >B.prototype = { /** @param {number} n */ m(n) { return n + 1 }} : { [x: string]: any; m(n: number): number; } ->B.prototype : { [x: string]: any; m(n: number): number; } +>B.prototype : { [x: string]: any; } >B : typeof B ->prototype : { [x: string]: any; m(n: number): number; } +>prototype : { [x: string]: any; } >{ /** @param {number} n */ m(n) { return n + 1 }} : { [x: string]: any; m(n: number): number; } /** @param {number} n */ diff --git a/tests/baselines/reference/exportNestedNamespaces.symbols b/tests/baselines/reference/exportNestedNamespaces.symbols index e5fc5db16d9e9..10f1600a2df7b 100644 --- a/tests/baselines/reference/exportNestedNamespaces.symbols +++ b/tests/baselines/reference/exportNestedNamespaces.symbols @@ -12,7 +12,7 @@ exports.n.K = function () { >K : Symbol(n.K, Decl(mod.js, 0, 15)) this.x = 10; ->this : Symbol(__object, Decl(mod.js, 0, 11)) +>this : Symbol(n, Decl(mod.js, 0, 0), Decl(mod.js, 1, 8)) >x : Symbol(K.x, Decl(mod.js, 1, 27)) } exports.Classic = class { diff --git a/tests/baselines/reference/exportNestedNamespaces.types b/tests/baselines/reference/exportNestedNamespaces.types index b6b701bc05f37..664429d802ca8 100644 --- a/tests/baselines/reference/exportNestedNamespaces.types +++ b/tests/baselines/reference/exportNestedNamespaces.types @@ -1,24 +1,24 @@ === tests/cases/conformance/salsa/mod.js === exports.n = {}; ->exports.n = {} : { [x: string]: any; K: typeof K; } ->exports.n : { [x: string]: any; K: typeof K; } +>exports.n = {} : typeof n +>exports.n : typeof n >exports : typeof import("tests/cases/conformance/salsa/mod") ->n : { [x: string]: any; K: typeof K; } ->{} : { [x: string]: any; K: typeof K; } +>n : typeof n +>{} : { [x: string]: any; } exports.n.K = function () { >exports.n.K = function () { this.x = 10;} : typeof K >exports.n.K : typeof K ->exports.n : { [x: string]: any; K: typeof K; } +>exports.n : typeof n >exports : typeof import("tests/cases/conformance/salsa/mod") ->n : { [x: string]: any; K: typeof K; } +>n : typeof n >K : typeof K >function () { this.x = 10;} : typeof K this.x = 10; >this.x = 10 : 10 >this.x : any ->this : { [x: string]: any; K: typeof K; } +>this : typeof n >x : any >10 : 10 } @@ -47,9 +47,9 @@ var k = new s.n.K() >k : K >new s.n.K() : K >s.n.K : typeof K ->s.n : { [x: string]: any; K: typeof K; } +>s.n : typeof s.n >s : typeof s ->n : { [x: string]: any; K: typeof K; } +>n : typeof s.n >K : typeof K k.x diff --git a/tests/baselines/reference/jsContainerMergeJsContainer.types b/tests/baselines/reference/jsContainerMergeJsContainer.types index 6d25fb4608a65..5759b08561324 100644 --- a/tests/baselines/reference/jsContainerMergeJsContainer.types +++ b/tests/baselines/reference/jsContainerMergeJsContainer.types @@ -1,13 +1,13 @@ === tests/cases/conformance/salsa/a.js === // #24131 const a = {}; ->a : { [x: string]: any; d: { (): void; prototype: { [x: string]: any; }; }; } ->{} : { [x: string]: any; d: { (): void; prototype: { [x: string]: any; }; }; } +>a : typeof a +>{} : { [x: string]: any; } a.d = function() {}; >a.d = function() {} : { (): void; prototype: { [x: string]: any; }; } >a.d : { (): void; prototype: { [x: string]: any; }; } ->a : { [x: string]: any; d: { (): void; prototype: { [x: string]: any; }; }; } +>a : typeof a >d : { (): void; prototype: { [x: string]: any; }; } >function() {} : { (): void; prototype: { [x: string]: any; }; } @@ -16,7 +16,7 @@ a.d.prototype = {}; >a.d.prototype = {} : { [x: string]: any; } >a.d.prototype : { [x: string]: any; } >a.d : { (): void; prototype: { [x: string]: any; }; } ->a : { [x: string]: any; d: { (): void; prototype: { [x: string]: any; }; }; } +>a : typeof a >d : { (): void; prototype: { [x: string]: any; }; } >prototype : { [x: string]: any; } >{} : { [x: string]: any; } diff --git a/tests/baselines/reference/jsContainerMergeTsDeclaration3.types b/tests/baselines/reference/jsContainerMergeTsDeclaration3.types index 1a29cab253872..d03c13764e657 100644 --- a/tests/baselines/reference/jsContainerMergeTsDeclaration3.types +++ b/tests/baselines/reference/jsContainerMergeTsDeclaration3.types @@ -5,7 +5,7 @@ declare class A {} === tests/cases/conformance/salsa/b.js === const A = { }; >A : typeof A ->{ } : { [x: string]: any; prototype: A; d: { [x: string]: any; }; } +>{ } : { [x: string]: any; } A.d = { }; >A.d = { } : { [x: string]: any; } diff --git a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types index 69d00b6aa79ae..7c17e7c22bbf6 100644 --- a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types +++ b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types @@ -1,7 +1,7 @@ === tests/cases/conformance/salsa/a.js === var variable = {}; >variable : { [x: string]: any; a: number; } ->{} : { [x: string]: any; a: number; } +>{} : { [x: string]: any; } variable.a = 0; >variable.a = 0 : 0 diff --git a/tests/baselines/reference/moduleExportNestedNamespaces.types b/tests/baselines/reference/moduleExportNestedNamespaces.types index 92dd4f14e6917..def26bac423c7 100644 --- a/tests/baselines/reference/moduleExportNestedNamespaces.types +++ b/tests/baselines/reference/moduleExportNestedNamespaces.types @@ -1,12 +1,12 @@ === tests/cases/conformance/salsa/mod.js === module.exports.n = {}; ->module.exports.n = {} : { [x: string]: any; K: typeof C; } +>module.exports.n = {} : any >module.exports.n : any >module.exports : any >module : any >exports : any >n : any ->{} : { [x: string]: any; K: typeof C; } +>{} : { [x: string]: any; } module.exports.n.K = function C() { >module.exports.n.K = function C() { this.x = 10;} : typeof C @@ -54,9 +54,9 @@ var k = new s.n.K() >k : C >new s.n.K() : C >s.n.K : typeof C ->s.n : { [x: string]: any; K: typeof C; } +>s.n : typeof s.n >s : typeof s ->n : { [x: string]: any; K: typeof C; } +>n : typeof s.n >K : typeof C k.x diff --git a/tests/baselines/reference/nestedPrototypeAssignment.types b/tests/baselines/reference/nestedPrototypeAssignment.types index 620ca215f6d6a..1ac8ea1ad0328 100644 --- a/tests/baselines/reference/nestedPrototypeAssignment.types +++ b/tests/baselines/reference/nestedPrototypeAssignment.types @@ -1,19 +1,19 @@ === tests/cases/conformance/salsa/mod.js === // #24111 -- shouldn't assert C.prototype = {} ->C.prototype = {} : { [x: string]: any; bar: typeof C.prototype.bar; } ->C.prototype : { [x: string]: any; bar: typeof C.prototype.bar; } +>C.prototype = {} : typeof C.prototype +>C.prototype : typeof C.prototype >C : typeof C ->prototype : { [x: string]: any; bar: typeof C.prototype.bar; } ->{} : { [x: string]: any; bar: typeof C.prototype.bar; } +>prototype : typeof C.prototype +>{} : { [x: string]: any; } C.prototype.bar.foo = {}; >C.prototype.bar.foo = {} : { [x: string]: any; } >C.prototype.bar.foo : { [x: string]: any; } >C.prototype.bar : typeof C.prototype.bar ->C.prototype : { [x: string]: any; bar: typeof C.prototype.bar; } +>C.prototype : typeof C.prototype >C : typeof C ->prototype : { [x: string]: any; bar: typeof C.prototype.bar; } +>prototype : typeof C.prototype >bar : typeof C.prototype.bar >foo : { [x: string]: any; } >{} : { [x: string]: any; } diff --git a/tests/baselines/reference/typeFromPropertyAssignment10.types b/tests/baselines/reference/typeFromPropertyAssignment10.types index a880498f047c7..86c525ac96174 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment10.types +++ b/tests/baselines/reference/typeFromPropertyAssignment10.types @@ -1,28 +1,28 @@ === tests/cases/conformance/salsa/module.js === var Outer = Outer || {}; ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->Outer || {} : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->{} : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } +>Outer : typeof Outer +>Outer || {} : typeof Outer | { [x: string]: any; } +>Outer : typeof Outer +>{} : { [x: string]: any; } Outer.app = Outer.app || {}; ->Outer.app = Outer.app || {} : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer.app || {} : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->{} : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app = Outer.app || {} : typeof Outer.app +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app +>Outer.app || {} : { [x: string]: any; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app +>{} : { [x: string]: any; } === tests/cases/conformance/salsa/someview.js === Outer.app.SomeView = (function () { >Outer.app.SomeView = (function () { var SomeView = function() { var me = this; } return SomeView;})() : () => void >Outer.app.SomeView : () => void ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >SomeView : () => void >(function () { var SomeView = function() { var me = this; } return SomeView;})() : () => void >(function () { var SomeView = function() { var me = this; } return SomeView;}) : () => () => void @@ -43,9 +43,9 @@ Outer.app.SomeView = (function () { Outer.app.Inner = class { >Outer.app.Inner = class { constructor() { /** @type {number} */ this.y = 12; }} : typeof Inner >Outer.app.Inner : typeof Inner ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >Inner : typeof Inner >class { constructor() { /** @type {number} */ this.y = 12; }} : typeof Inner @@ -63,9 +63,9 @@ var example = new Outer.app.Inner(); >example : Inner >new Outer.app.Inner() : Inner >Outer.app.Inner : typeof Inner ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >Inner : typeof Inner example.y; @@ -77,9 +77,9 @@ example.y; Outer.app.statische = function (k) { >Outer.app.statische = function (k) { return k ** k;} : (k: number) => number >Outer.app.statische : (k: number) => number ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >statische : (k: number) => number >function (k) { return k ** k;} : (k: number) => number >k : number @@ -93,9 +93,9 @@ Outer.app.statische = function (k) { Outer.app.Application = (function () { >Outer.app.Application = (function () { /** * Application main class. * Will be instantiated & initialized by HTML page */ var Application = function () { var me = this; me.view = new Outer.app.SomeView(); }; return Application;})() : () => void >Outer.app.Application : () => void ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >Application : () => void >(function () { /** * Application main class. * Will be instantiated & initialized by HTML page */ var Application = function () { var me = this; me.view = new Outer.app.SomeView(); }; return Application;})() : () => void >(function () { /** * Application main class. * Will be instantiated & initialized by HTML page */ var Application = function () { var me = this; me.view = new Outer.app.SomeView(); }; return Application;}) : () => () => void @@ -120,9 +120,9 @@ Outer.app.Application = (function () { >view : any >new Outer.app.SomeView() : any >Outer.app.SomeView : () => void ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >SomeView : () => void }; @@ -135,18 +135,18 @@ var app = new Outer.app.Application(); >app : any >new Outer.app.Application() : any >Outer.app.Application : () => void ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >Application : () => void var inner = new Outer.app.Inner(); >inner : Inner >new Outer.app.Inner() : Inner >Outer.app.Inner : typeof Inner ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >Inner : typeof Inner inner.y; @@ -166,9 +166,9 @@ x.y; Outer.app.statische(101); // Infinity, duh >Outer.app.statische(101) : number >Outer.app.statische : (k: number) => number ->Outer.app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } ->Outer : { [x: string]: any; app: { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; }; } ->app : { [x: string]: any; SomeView: () => void; Inner: typeof Inner; statische(k: number): number; Application: () => void; } +>Outer.app : typeof Outer.app +>Outer : typeof Outer +>app : typeof Outer.app >statische : (k: number) => number >101 : 101 diff --git a/tests/baselines/reference/typeFromPropertyAssignment11.types b/tests/baselines/reference/typeFromPropertyAssignment11.types index 8c90e824f23c5..87a709d7cf3a4 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment11.types +++ b/tests/baselines/reference/typeFromPropertyAssignment11.types @@ -5,9 +5,9 @@ var Inner = function() {} Inner.prototype = { >Inner.prototype = { m() { }, i: 1} : { [x: string]: any; m(): void; i: number; } ->Inner.prototype : { [x: string]: any; m(): void; i: number; } +>Inner.prototype : { [x: string]: any; } >Inner : typeof Inner ->prototype : { [x: string]: any; m(): void; i: number; } +>prototype : { [x: string]: any; } >{ m() { }, i: 1} : { [x: string]: any; m(): void; i: number; } m() { }, @@ -21,18 +21,18 @@ Inner.prototype = { Inner.prototype.j = 2 >Inner.prototype.j = 2 : 2 >Inner.prototype.j : any ->Inner.prototype : { [x: string]: any; m(): void; i: number; } +>Inner.prototype : { [x: string]: any; } >Inner : typeof Inner ->prototype : { [x: string]: any; m(): void; i: number; } +>prototype : { [x: string]: any; } >j : any >2 : 2 /** @type {string} */ Inner.prototype.k; >Inner.prototype.k : any ->Inner.prototype : { [x: string]: any; m(): void; i: number; } +>Inner.prototype : { [x: string]: any; } >Inner : typeof Inner ->prototype : { [x: string]: any; m(): void; i: number; } +>prototype : { [x: string]: any; } >k : any var inner = new Inner() diff --git a/tests/baselines/reference/typeFromPropertyAssignment13.types b/tests/baselines/reference/typeFromPropertyAssignment13.types index c5370aebc5659..5b97d2986f57c 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment13.types +++ b/tests/baselines/reference/typeFromPropertyAssignment13.types @@ -1,22 +1,22 @@ === tests/cases/conformance/salsa/module.js === var Outer = {} ->Outer : { [x: string]: any; Inner: typeof Inner; } ->{} : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer +>{} : { [x: string]: any; } Outer.Inner = function() {} >Outer.Inner = function() {} : typeof Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner >function() {} : typeof Inner Outer.Inner.prototype = { >Outer.Inner.prototype = { m() { }, i: 1} : { [x: string]: any; m(): void; i: number; } ->Outer.Inner.prototype : { [x: string]: any; m(): void; i: number; } +>Outer.Inner.prototype : { [x: string]: any; } >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner ->prototype : { [x: string]: any; m(): void; i: number; } +>prototype : { [x: string]: any; } >{ m() { }, i: 1} : { [x: string]: any; m(): void; i: number; } m() { }, @@ -30,29 +30,29 @@ Outer.Inner.prototype = { Outer.Inner.prototype.j = 2 >Outer.Inner.prototype.j = 2 : 2 >Outer.Inner.prototype.j : any ->Outer.Inner.prototype : { [x: string]: any; m(): void; i: number; } +>Outer.Inner.prototype : { [x: string]: any; } >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner ->prototype : { [x: string]: any; m(): void; i: number; } +>prototype : { [x: string]: any; } >j : any >2 : 2 /** @type {string} */ Outer.Inner.prototype.k; >Outer.Inner.prototype.k : any ->Outer.Inner.prototype : { [x: string]: any; m(): void; i: number; } +>Outer.Inner.prototype : { [x: string]: any; } >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner ->prototype : { [x: string]: any; m(): void; i: number; } +>prototype : { [x: string]: any; } >k : any var inner = new Outer.Inner() >inner : Inner & { [x: string]: any; m(): void; i: number; } >new Outer.Inner() : Inner & { [x: string]: any; m(): void; i: number; } >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner inner.m() diff --git a/tests/baselines/reference/typeFromPropertyAssignment14.types b/tests/baselines/reference/typeFromPropertyAssignment14.types index 65838ccacc18f..60d63c489d6b3 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment14.types +++ b/tests/baselines/reference/typeFromPropertyAssignment14.types @@ -1,23 +1,23 @@ === tests/cases/conformance/salsa/def.js === var Outer = {}; ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->{} : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } +>Outer : typeof Outer +>{} : { [x: string]: any; } === tests/cases/conformance/salsa/work.js === Outer.Inner = function () {} ->Outer.Inner = function () {} : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer.Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->function () {} : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } +>Outer.Inner = function () {} : { (): void; prototype: { [x: string]: any; }; } +>Outer.Inner : { (): void; prototype: { [x: string]: any; }; } +>Outer : typeof Outer +>Inner : { (): void; prototype: { [x: string]: any; }; } +>function () {} : { (): void; prototype: { [x: string]: any; }; } Outer.Inner.prototype = { >Outer.Inner.prototype = { x: 1, m() { }} : { [x: string]: any; x: number; m(): void; } ->Outer.Inner.prototype : { [x: string]: any; x: number; m(): void; } ->Outer.Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->prototype : { [x: string]: any; x: number; m(): void; } +>Outer.Inner.prototype : { [x: string]: any; } +>Outer.Inner : { (): void; prototype: { [x: string]: any; }; } +>Outer : typeof Outer +>Inner : { (): void; prototype: { [x: string]: any; }; } +>prototype : { [x: string]: any; } >{ x: 1, m() { }} : { [x: string]: any; x: number; m(): void; } x: 1, @@ -47,9 +47,9 @@ inner.m() var inno = new Outer.Inner() >inno : { [x: string]: any; x: number; m(): void; } >new Outer.Inner() : { [x: string]: any; x: number; m(): void; } ->Outer.Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } +>Outer.Inner : { (): void; prototype: { [x: string]: any; }; } +>Outer : typeof Outer +>Inner : { (): void; prototype: { [x: string]: any; }; } inno.x >inno.x : number diff --git a/tests/baselines/reference/typeFromPropertyAssignment15.types b/tests/baselines/reference/typeFromPropertyAssignment15.types index afb1ea779f0eb..8731d8dee4e19 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment15.types +++ b/tests/baselines/reference/typeFromPropertyAssignment15.types @@ -1,12 +1,12 @@ === tests/cases/conformance/salsa/a.js === var Outer = {}; ->Outer : { [x: string]: any; Inner: typeof Inner; } ->{} : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer +>{} : { [x: string]: any; } Outer.Inner = class { >Outer.Inner = class { constructor() { this.x = 1 } m() { }} : typeof Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner >class { constructor() { this.x = 1 } m() { }} : typeof Inner @@ -41,7 +41,7 @@ var inno = new Outer.Inner() >inno : Inner >new Outer.Inner() : Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner inno.x diff --git a/tests/baselines/reference/typeFromPropertyAssignment16.types b/tests/baselines/reference/typeFromPropertyAssignment16.types index 76076e74d9333..d67d6ccca3763 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment16.types +++ b/tests/baselines/reference/typeFromPropertyAssignment16.types @@ -1,22 +1,22 @@ === tests/cases/conformance/salsa/a.js === var Outer = {}; ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->{} : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } +>Outer : typeof Outer +>{} : { [x: string]: any; } Outer.Inner = function () {} ->Outer.Inner = function () {} : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer.Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->function () {} : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } +>Outer.Inner = function () {} : { (): void; prototype: { [x: string]: any; }; } +>Outer.Inner : { (): void; prototype: { [x: string]: any; }; } +>Outer : typeof Outer +>Inner : { (): void; prototype: { [x: string]: any; }; } +>function () {} : { (): void; prototype: { [x: string]: any; }; } Outer.Inner.prototype = { >Outer.Inner.prototype = { x: 1, m() { }} : { [x: string]: any; x: number; m(): void; } ->Outer.Inner.prototype : { [x: string]: any; x: number; m(): void; } ->Outer.Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->prototype : { [x: string]: any; x: number; m(): void; } +>Outer.Inner.prototype : { [x: string]: any; } +>Outer.Inner : { (): void; prototype: { [x: string]: any; }; } +>Outer : typeof Outer +>Inner : { (): void; prototype: { [x: string]: any; }; } +>prototype : { [x: string]: any; } >{ x: 1, m() { }} : { [x: string]: any; x: number; m(): void; } x: 1, @@ -45,9 +45,9 @@ inner.m() var inno = new Outer.Inner() >inno : { [x: string]: any; x: number; m(): void; } >new Outer.Inner() : { [x: string]: any; x: number; m(): void; } ->Outer.Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } ->Outer : { [x: string]: any; Inner: { (): void; prototype: { [x: string]: any; x: number; m(): void; }; }; } ->Inner : { (): void; prototype: { [x: string]: any; x: number; m(): void; }; } +>Outer.Inner : { (): void; prototype: { [x: string]: any; }; } +>Outer : typeof Outer +>Inner : { (): void; prototype: { [x: string]: any; }; } inno.x >inno.x : number diff --git a/tests/baselines/reference/typeFromPropertyAssignment18.symbols b/tests/baselines/reference/typeFromPropertyAssignment18.symbols index 19fc0068c9189..cb74bd66d3965 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment18.symbols +++ b/tests/baselines/reference/typeFromPropertyAssignment18.symbols @@ -9,7 +9,9 @@ function m() { >m : Symbol(m, Decl(a.js, 0, 30)) } GLOBSTAR.p = 1 +>GLOBSTAR.p : Symbol(GLOBSTAR.p, Decl(a.js, 2, 1)) >GLOBSTAR : Symbol(GLOBSTAR, Decl(a.js, 0, 3)) +>p : Symbol(GLOBSTAR.p, Decl(a.js, 2, 1)) m.GLOBSTAR.q = 2 >m.GLOBSTAR.q : Symbol(m.GLOBSTAR.q, Decl(a.js, 3, 14)) @@ -18,13 +20,27 @@ m.GLOBSTAR.q = 2 >GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14)) >q : Symbol(m.GLOBSTAR.q, Decl(a.js, 3, 14)) +GLOBSTAR.p +>GLOBSTAR.p : Symbol(GLOBSTAR.p, Decl(a.js, 2, 1)) +>GLOBSTAR : Symbol(GLOBSTAR, Decl(a.js, 0, 3)) +>p : Symbol(GLOBSTAR.p, Decl(a.js, 2, 1)) + GLOBSTAR.q >GLOBSTAR.q : Symbol(m.GLOBSTAR.q, Decl(a.js, 3, 14)) >GLOBSTAR : Symbol(GLOBSTAR, Decl(a.js, 0, 3)) >q : Symbol(m.GLOBSTAR.q, Decl(a.js, 3, 14)) m.GLOBSTAR.p +>m.GLOBSTAR.p : Symbol(GLOBSTAR.p, Decl(a.js, 2, 1)) +>m.GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14)) +>m : Symbol(m, Decl(a.js, 0, 30)) +>GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14)) +>p : Symbol(GLOBSTAR.p, Decl(a.js, 2, 1)) + +m.GLOBSTAR.q +>m.GLOBSTAR.q : Symbol(m.GLOBSTAR.q, Decl(a.js, 3, 14)) >m.GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14)) >m : Symbol(m, Decl(a.js, 0, 30)) >GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14)) +>q : Symbol(m.GLOBSTAR.q, Decl(a.js, 3, 14)) diff --git a/tests/baselines/reference/typeFromPropertyAssignment18.types b/tests/baselines/reference/typeFromPropertyAssignment18.types index 9f594379d0baf..94f859426022e 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment18.types +++ b/tests/baselines/reference/typeFromPropertyAssignment18.types @@ -1,40 +1,52 @@ === tests/cases/conformance/salsa/a.js === var GLOBSTAR = m.GLOBSTAR = {} ->GLOBSTAR : { [x: string]: any; q: number; } ->m.GLOBSTAR = {} : { [x: string]: any; q: number; } ->m.GLOBSTAR : { [x: string]: any; q: number; } ->m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; } ->GLOBSTAR : { [x: string]: any; q: number; } ->{} : { [x: string]: any; q: number; } +>GLOBSTAR : { [x: string]: any; q: number; p: number; } +>m.GLOBSTAR = {} : { [x: string]: any; q: number; p: number; } +>m.GLOBSTAR : { [x: string]: any; q: number; p: number; } +>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; p: number; }; } +>GLOBSTAR : { [x: string]: any; q: number; p: number; } +>{} : { [x: string]: any; } function m() { ->m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; } +>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; p: number; }; } } GLOBSTAR.p = 1 >GLOBSTAR.p = 1 : 1 ->GLOBSTAR.p : any ->GLOBSTAR : { [x: string]: any; q: number; } ->p : any +>GLOBSTAR.p : number +>GLOBSTAR : { [x: string]: any; q: number; p: number; } +>p : number >1 : 1 m.GLOBSTAR.q = 2 >m.GLOBSTAR.q = 2 : 2 >m.GLOBSTAR.q : number ->m.GLOBSTAR : { [x: string]: any; q: number; } ->m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; } ->GLOBSTAR : { [x: string]: any; q: number; } +>m.GLOBSTAR : { [x: string]: any; q: number; p: number; } +>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; p: number; }; } +>GLOBSTAR : { [x: string]: any; q: number; p: number; } >q : number >2 : 2 +GLOBSTAR.p +>GLOBSTAR.p : number +>GLOBSTAR : { [x: string]: any; q: number; p: number; } +>p : number + GLOBSTAR.q >GLOBSTAR.q : number ->GLOBSTAR : { [x: string]: any; q: number; } +>GLOBSTAR : { [x: string]: any; q: number; p: number; } >q : number m.GLOBSTAR.p ->m.GLOBSTAR.p : any ->m.GLOBSTAR : { [x: string]: any; q: number; } ->m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; } ->GLOBSTAR : { [x: string]: any; q: number; } ->p : any +>m.GLOBSTAR.p : number +>m.GLOBSTAR : { [x: string]: any; q: number; p: number; } +>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; p: number; }; } +>GLOBSTAR : { [x: string]: any; q: number; p: number; } +>p : number + +m.GLOBSTAR.q +>m.GLOBSTAR.q : number +>m.GLOBSTAR : { [x: string]: any; q: number; p: number; } +>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; p: number; }; } +>GLOBSTAR : { [x: string]: any; q: number; p: number; } +>q : number diff --git a/tests/baselines/reference/typeFromPropertyAssignment24.types b/tests/baselines/reference/typeFromPropertyAssignment24.types index 5acd55568cb84..a8d1760c5ea1f 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment24.types +++ b/tests/baselines/reference/typeFromPropertyAssignment24.types @@ -4,7 +4,7 @@ Outer.Inner.Message = function() { >Outer.Inner.Message = function() {} : () => void >Outer.Inner.Message : () => void >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner >Message : () => void >function() {} : () => void @@ -15,7 +15,7 @@ var y = new Outer.Inner() >y : Inner >new Outer.Inner() : Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner y.name @@ -34,13 +34,13 @@ x.name === tests/cases/conformance/salsa/def.js === var Outer = {} ->Outer : { [x: string]: any; Inner: typeof Inner; } ->{} : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer +>{} : { [x: string]: any; } Outer.Inner = class { >Outer.Inner = class { name() { return 'hi' }} : typeof Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner >class { name() { return 'hi' }} : typeof Inner diff --git a/tests/baselines/reference/typeFromPropertyAssignment25.types b/tests/baselines/reference/typeFromPropertyAssignment25.types index e5c4a2066e7ac..13fae2c861f07 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment25.types +++ b/tests/baselines/reference/typeFromPropertyAssignment25.types @@ -1,12 +1,12 @@ === tests/cases/conformance/salsa/bug24703.js === var Common = {}; ->Common : { [x: string]: any; I: typeof I; O: typeof O; } ->{} : { [x: string]: any; I: typeof I; O: typeof O; } +>Common : typeof Common +>{} : { [x: string]: any; } Common.I = class { >Common.I = class { constructor() { this.i = 1 }} : typeof I >Common.I : typeof I ->Common : { [x: string]: any; I: typeof I; O: typeof O; } +>Common : typeof Common >I : typeof I >class { constructor() { this.i = 1 }} : typeof I @@ -22,11 +22,11 @@ Common.I = class { Common.O = class extends Common.I { >Common.O = class extends Common.I { constructor() { super() this.o = 2 }} : typeof O >Common.O : typeof O ->Common : { [x: string]: any; I: typeof I; O: typeof O; } +>Common : typeof Common >O : typeof O >class extends Common.I { constructor() { super() this.o = 2 }} : typeof O >Common.I : I ->Common : { [x: string]: any; I: typeof I; O: typeof O; } +>Common : typeof Common >I : typeof I constructor() { @@ -46,14 +46,14 @@ var o = new Common.O() >o : O >new Common.O() : O >Common.O : typeof O ->Common : { [x: string]: any; I: typeof I; O: typeof O; } +>Common : typeof Common >O : typeof O var i = new Common.I() >i : I >new Common.I() : I >Common.I : typeof I ->Common : { [x: string]: any; I: typeof I; O: typeof O; } +>Common : typeof Common >I : typeof I o.i diff --git a/tests/baselines/reference/typeFromPropertyAssignment26.errors.txt b/tests/baselines/reference/typeFromPropertyAssignment26.errors.txt new file mode 100644 index 0000000000000..0cc5213515253 --- /dev/null +++ b/tests/baselines/reference/typeFromPropertyAssignment26.errors.txt @@ -0,0 +1,24 @@ +tests/cases/conformance/salsa/bug24730.js(11,14): error TS2339: Property 'doesNotExist' does not exist on type 'C'. +tests/cases/conformance/salsa/bug24730.js(12,26): error TS2339: Property 'doesntExistEither' does not exist on type 'number'. + + +==== tests/cases/conformance/salsa/bug24730.js (2 errors) ==== + var UI = {} + UI.TreeElement = class { + constructor() { + this.treeOutline = 12 + } + }; + UI.context = new UI.TreeElement() + + class C extends UI.TreeElement { + onpopulate() { + this.doesNotExist + ~~~~~~~~~~~~ +!!! error TS2339: Property 'doesNotExist' does not exist on type 'C'. + this.treeOutline.doesntExistEither() + ~~~~~~~~~~~~~~~~~ +!!! error TS2339: Property 'doesntExistEither' does not exist on type 'number'. + } + }; + \ No newline at end of file diff --git a/tests/baselines/reference/typeFromPropertyAssignment26.symbols b/tests/baselines/reference/typeFromPropertyAssignment26.symbols new file mode 100644 index 0000000000000..f70413c819f28 --- /dev/null +++ b/tests/baselines/reference/typeFromPropertyAssignment26.symbols @@ -0,0 +1,43 @@ +=== tests/cases/conformance/salsa/bug24730.js === +var UI = {} +>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11)) + +UI.TreeElement = class { +>UI.TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11)) +>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11)) +>TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11)) + + constructor() { + this.treeOutline = 12 +>this.treeOutline : Symbol(TreeElement.treeOutline, Decl(bug24730.js, 2, 19)) +>this : Symbol(TreeElement, Decl(bug24730.js, 1, 16)) +>treeOutline : Symbol(TreeElement.treeOutline, Decl(bug24730.js, 2, 19)) + } +}; +UI.context = new UI.TreeElement() +>UI.context : Symbol(UI.context, Decl(bug24730.js, 5, 2)) +>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11)) +>context : Symbol(UI.context, Decl(bug24730.js, 5, 2)) +>UI.TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11)) +>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11)) +>TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11)) + +class C extends UI.TreeElement { +>C : Symbol(C, Decl(bug24730.js, 6, 33)) +>UI.TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11)) +>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11)) +>TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11)) + + onpopulate() { +>onpopulate : Symbol(C.onpopulate, Decl(bug24730.js, 8, 32)) + + this.doesNotExist +>this : Symbol(C, Decl(bug24730.js, 6, 33)) + + this.treeOutline.doesntExistEither() +>this.treeOutline : Symbol(TreeElement.treeOutline, Decl(bug24730.js, 2, 19)) +>this : Symbol(C, Decl(bug24730.js, 6, 33)) +>treeOutline : Symbol(TreeElement.treeOutline, Decl(bug24730.js, 2, 19)) + } +}; + diff --git a/tests/baselines/reference/typeFromPropertyAssignment26.types b/tests/baselines/reference/typeFromPropertyAssignment26.types new file mode 100644 index 0000000000000..d40ca74137287 --- /dev/null +++ b/tests/baselines/reference/typeFromPropertyAssignment26.types @@ -0,0 +1,55 @@ +=== tests/cases/conformance/salsa/bug24730.js === +var UI = {} +>UI : typeof UI +>{} : { [x: string]: any; } + +UI.TreeElement = class { +>UI.TreeElement = class { constructor() { this.treeOutline = 12 }} : typeof TreeElement +>UI.TreeElement : typeof TreeElement +>UI : typeof UI +>TreeElement : typeof TreeElement +>class { constructor() { this.treeOutline = 12 }} : typeof TreeElement + + constructor() { + this.treeOutline = 12 +>this.treeOutline = 12 : 12 +>this.treeOutline : number +>this : this +>treeOutline : number +>12 : 12 + } +}; +UI.context = new UI.TreeElement() +>UI.context = new UI.TreeElement() : TreeElement +>UI.context : TreeElement +>UI : typeof UI +>context : TreeElement +>new UI.TreeElement() : TreeElement +>UI.TreeElement : typeof TreeElement +>UI : typeof UI +>TreeElement : typeof TreeElement + +class C extends UI.TreeElement { +>C : C +>UI.TreeElement : TreeElement +>UI : typeof UI +>TreeElement : typeof TreeElement + + onpopulate() { +>onpopulate : () => void + + this.doesNotExist +>this.doesNotExist : any +>this : this +>doesNotExist : any + + this.treeOutline.doesntExistEither() +>this.treeOutline.doesntExistEither() : any +>this.treeOutline.doesntExistEither : any +>this.treeOutline : number +>this : this +>treeOutline : number +>doesntExistEither : any + } +}; + diff --git a/tests/baselines/reference/typeFromPropertyAssignment4.types b/tests/baselines/reference/typeFromPropertyAssignment4.types index 90b97d91d0c32..612a0f696e103 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment4.types +++ b/tests/baselines/reference/typeFromPropertyAssignment4.types @@ -1,13 +1,13 @@ === tests/cases/conformance/salsa/def.js === var Outer = {}; ->Outer : { [x: string]: any; Inner: typeof Inner; } ->{} : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer +>{} : { [x: string]: any; } === tests/cases/conformance/salsa/a.js === Outer.Inner = class { >Outer.Inner = class { constructor() { /** @type {number} */ this.y = 12 }} : typeof Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner >class { constructor() { /** @type {number} */ this.y = 12 }} : typeof Inner @@ -35,7 +35,7 @@ var inner = new Outer.Inner() >inner : Inner >new Outer.Inner() : Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner inner.y @@ -57,7 +57,7 @@ var z = new Outer.Inner() >z : Inner >new Outer.Inner() : Inner >Outer.Inner : typeof Inner ->Outer : { [x: string]: any; Inner: typeof Inner; } +>Outer : typeof Outer >Inner : typeof Inner z.y diff --git a/tests/baselines/reference/typeFromPropertyAssignment7.types b/tests/baselines/reference/typeFromPropertyAssignment7.types index c17abf3216398..395dbee2c418d 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment7.types +++ b/tests/baselines/reference/typeFromPropertyAssignment7.types @@ -1,12 +1,12 @@ === tests/cases/conformance/salsa/a.js === var obj = {}; ->obj : { [x: string]: any; method(hunch: any): boolean; } ->{} : { [x: string]: any; method(hunch: any): boolean; } +>obj : typeof obj +>{} : { [x: string]: any; } obj.method = function (hunch) { >obj.method = function (hunch) { return true;} : (hunch: any) => boolean >obj.method : (hunch: any) => boolean ->obj : { [x: string]: any; method(hunch: any): boolean; } +>obj : typeof obj >method : (hunch: any) => boolean >function (hunch) { return true;} : (hunch: any) => boolean >hunch : any @@ -18,6 +18,6 @@ var b = obj.method(); >b : boolean >obj.method() : boolean >obj.method : (hunch: any) => boolean ->obj : { [x: string]: any; method(hunch: any): boolean; } +>obj : typeof obj >method : (hunch: any) => boolean diff --git a/tests/baselines/reference/typeFromPropertyAssignment8.types b/tests/baselines/reference/typeFromPropertyAssignment8.types index 71ebad0624c4a..8aa93afb463c9 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment8.types +++ b/tests/baselines/reference/typeFromPropertyAssignment8.types @@ -1,27 +1,27 @@ === tests/cases/conformance/salsa/a.js === var my = my || {}; ->my : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->my || {} : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->my : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->{} : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } +>my : typeof my +>my || {} : typeof my | { [x: string]: any; } +>my : typeof my +>{} : { [x: string]: any; } my.app = my.app || {}; ->my.app = my.app || {} : { [x: string]: any; Application: () => void; } ->my.app : { [x: string]: any; Application: () => void; } ->my : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } ->my.app || {} : { [x: string]: any; Application: () => void; } ->my.app : { [x: string]: any; Application: () => void; } ->my : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } ->{} : { [x: string]: any; Application: () => void; } +>my.app = my.app || {} : typeof my.app +>my.app : typeof my.app +>my : typeof my +>app : typeof my.app +>my.app || {} : { [x: string]: any; } +>my.app : typeof my.app +>my : typeof my +>app : typeof my.app +>{} : { [x: string]: any; } my.app.Application = (function () { >my.app.Application = (function () {var Application = function () { //...};return Application;})() : () => void >my.app.Application : () => void ->my.app : { [x: string]: any; Application: () => void; } ->my : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } +>my.app : typeof my.app +>my : typeof my +>app : typeof my.app >Application : () => void >(function () {var Application = function () { //...};return Application;})() : () => void >(function () {var Application = function () { //...};return Application;}) : () => () => void @@ -40,37 +40,37 @@ return Application; my.app.Application() >my.app.Application() : void >my.app.Application : () => void ->my.app : { [x: string]: any; Application: () => void; } ->my : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } +>my.app : typeof my.app +>my : typeof my +>app : typeof my.app >Application : () => void === tests/cases/conformance/salsa/b.js === var min = window.min || {}; ->min : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } +>min : typeof min >window.min || {} : any >window.min : any >window : Window >min : any ->{} : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } +>{} : { [x: string]: any; } min.app = min.app || {}; ->min.app = min.app || {} : { [x: string]: any; Application: () => void; } ->min.app : { [x: string]: any; Application: () => void; } ->min : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } ->min.app || {} : { [x: string]: any; Application: () => void; } ->min.app : { [x: string]: any; Application: () => void; } ->min : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } ->{} : { [x: string]: any; Application: () => void; } +>min.app = min.app || {} : typeof min.app +>min.app : typeof min.app +>min : typeof min +>app : typeof min.app +>min.app || {} : { [x: string]: any; } +>min.app : typeof min.app +>min : typeof min +>app : typeof min.app +>{} : { [x: string]: any; } min.app.Application = (function () { >min.app.Application = (function () {var Application = function () { //...};return Application;})() : () => void >min.app.Application : () => void ->min.app : { [x: string]: any; Application: () => void; } ->min : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } +>min.app : typeof min.app +>min : typeof min +>app : typeof min.app >Application : () => void >(function () {var Application = function () { //...};return Application;})() : () => void >(function () {var Application = function () { //...};return Application;}) : () => () => void @@ -89,8 +89,8 @@ return Application; min.app.Application() >min.app.Application() : void >min.app.Application : () => void ->min.app : { [x: string]: any; Application: () => void; } ->min : { [x: string]: any; app: { [x: string]: any; Application: () => void; }; } ->app : { [x: string]: any; Application: () => void; } +>min.app : typeof min.app +>min : typeof min +>app : typeof min.app >Application : () => void diff --git a/tests/baselines/reference/typeFromPropertyAssignment9.symbols b/tests/baselines/reference/typeFromPropertyAssignment9.symbols index 72dd84e4d64cf..27188c71b32db 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment9.symbols +++ b/tests/baselines/reference/typeFromPropertyAssignment9.symbols @@ -40,7 +40,7 @@ my.predicate.query = function () { var me = this; >me : Symbol(me, Decl(a.js, 9, 7)) ->this : Symbol(__object, Decl(a.js, 7, 30)) +>this : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3)) me.property = false; >me : Symbol(me, Decl(a.js, 9, 7)) diff --git a/tests/baselines/reference/typeFromPropertyAssignment9.types b/tests/baselines/reference/typeFromPropertyAssignment9.types index 61d4cb06b7101..e9212f950678d 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment9.types +++ b/tests/baselines/reference/typeFromPropertyAssignment9.types @@ -1,15 +1,15 @@ === tests/cases/conformance/salsa/a.js === var my = my || {}; ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->my || {} : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->{} : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } +>my : typeof my +>my || {} : typeof my | { [x: string]: any; } +>my : typeof my +>{} : { [x: string]: any; } /** @param {number} n */ my.method = function(n) { >my.method = function(n) { return n + 1;} : (n: number) => number >my.method : (n: number) => number ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } +>my : typeof my >method : (n: number) => number >function(n) { return n + 1;} : (n: number) => number >n : number @@ -22,45 +22,45 @@ my.method = function(n) { my.number = 1; >my.number = 1 : 1 >my.number : number ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } +>my : typeof my >number : number >1 : 1 my.object = {}; >my.object = {} : { [x: string]: any; } >my.object : { [x: string]: any; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } +>my : typeof my >object : { [x: string]: any; } >{} : { [x: string]: any; } my.predicate = my.predicate || {}; ->my.predicate = my.predicate || {} : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my.predicate || {} : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->{} : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate = my.predicate || {} : typeof my.predicate +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate +>my.predicate || {} : { [x: string]: any; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate +>{} : { [x: string]: any; } my.predicate.query = function () { >my.predicate.query = function () { var me = this; me.property = false;} : { (): void; another(): number; result: string; } >my.predicate.query : { (): void; another(): number; result: string; } ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate >query : { (): void; another(): number; result: string; } >function () { var me = this; me.property = false;} : { (): void; another(): number; result: string; } var me = this; ->me : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->this : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>me : typeof my.predicate +>this : typeof my.predicate me.property = false; >me.property = false : false >me.property : any ->me : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>me : typeof my.predicate >property : any >false : false @@ -69,18 +69,18 @@ var q = new my.predicate.query(); >q : any >new my.predicate.query() : any >my.predicate.query : { (): void; another(): number; result: string; } ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate >query : { (): void; another(): number; result: string; } my.predicate.query.another = function () { >my.predicate.query.another = function () { return 1;} : () => number >my.predicate.query.another : () => number >my.predicate.query : { (): void; another(): number; result: string; } ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate >query : { (): void; another(): number; result: string; } >another : () => number >function () { return 1;} : () => number @@ -92,9 +92,9 @@ my.predicate.query.result = 'none' >my.predicate.query.result = 'none' : "none" >my.predicate.query.result : string >my.predicate.query : { (): void; another(): number; result: string; } ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate >query : { (): void; another(): number; result: string; } >result : string >'none' : "none" @@ -105,15 +105,15 @@ my.predicate.query.result = 'none' my.predicate.sort = my.predicate.sort || function (first, second) { >my.predicate.sort = my.predicate.sort || function (first, second) { return first > second ? first : second;} : (first: number, second: number) => number >my.predicate.sort : (first: number, second: number) => number ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate >sort : (first: number, second: number) => number >my.predicate.sort || function (first, second) { return first > second ? first : second;} : (first: number, second: number) => number >my.predicate.sort : (first: number, second: number) => number ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate >sort : (first: number, second: number) => number >function (first, second) { return first > second ? first : second;} : (first: number, second: number) => number >first : number @@ -130,9 +130,9 @@ my.predicate.sort = my.predicate.sort || function (first, second) { my.predicate.type = class { >my.predicate.type = class { m() { return 101; }} : typeof type >my.predicate.type : typeof type ->my.predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } ->my : { [x: string]: any; method(n: number): number; number: number; object: { [x: string]: any; }; predicate: { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; }; } ->predicate : { [x: string]: any; query: { (): void; another(): number; result: string; }; sort(first: number, second: number): number; type: typeof type; } +>my.predicate : typeof my.predicate +>my : typeof my +>predicate : typeof my.predicate >type : typeof type >class { m() { return 101; }} : typeof type @@ -144,17 +144,17 @@ my.predicate.type = class { // global-ish prefixes var min = window.min || {}; ->min : { [x: string]: any; nest: { (): void; other: typeof other; }; property: { [x: string]: any; }; } +>min : typeof min >window.min || {} : any >window.min : any >window : Window >min : any ->{} : { [x: string]: any; nest: { (): void; other: typeof other; }; property: { [x: string]: any; }; } +>{} : { [x: string]: any; } min.nest = this.min.nest || function () { }; >min.nest = this.min.nest || function () { } : { (): void; other: typeof other; } >min.nest : { (): void; other: typeof other; } ->min : { [x: string]: any; nest: { (): void; other: typeof other; }; property: { [x: string]: any; }; } +>min : typeof min >nest : { (): void; other: typeof other; } >this.min.nest || function () { } : { (): void; other: typeof other; } >this.min.nest : any @@ -168,7 +168,7 @@ min.nest.other = self.min.nest.other || class { }; >min.nest.other = self.min.nest.other || class { } : typeof other >min.nest.other : typeof other >min.nest : { (): void; other: typeof other; } ->min : { [x: string]: any; nest: { (): void; other: typeof other; }; property: { [x: string]: any; }; } +>min : typeof min >nest : { (): void; other: typeof other; } >other : typeof other >self.min.nest.other || class { } : typeof other @@ -184,7 +184,7 @@ min.nest.other = self.min.nest.other || class { }; min.property = global.min.property || {}; >min.property = global.min.property || {} : { [x: string]: any; } >min.property : { [x: string]: any; } ->min : { [x: string]: any; nest: { (): void; other: typeof other; }; property: { [x: string]: any; }; } +>min : typeof min >property : { [x: string]: any; } >global.min.property || {} : { [x: string]: any; } >global.min.property : any diff --git a/tests/baselines/reference/typeFromPropertyAssignmentOutOfOrder.types b/tests/baselines/reference/typeFromPropertyAssignmentOutOfOrder.types index 191f45e3cb1ae..947028db3852d 100644 --- a/tests/baselines/reference/typeFromPropertyAssignmentOutOfOrder.types +++ b/tests/baselines/reference/typeFromPropertyAssignmentOutOfOrder.types @@ -2,7 +2,7 @@ First.Item = class I {} >First.Item = class I {} : typeof I >First.Item : typeof I ->First : { [x: string]: any; Item: typeof I; } +>First : typeof First >Item : typeof I >class I {} : typeof I >I : typeof I @@ -10,21 +10,21 @@ First.Item = class I {} Common.Object = class extends First.Item {} >Common.Object = class extends First.Item {} : typeof Object >Common.Object : typeof Object ->Common : { [x: string]: any; Object: typeof Object; } +>Common : typeof Common >Object : typeof Object >class extends First.Item {} : typeof Object >First.Item : I ->First : { [x: string]: any; Item: typeof I; } +>First : typeof First >Item : typeof I Workspace.Object = class extends Common.Object {} >Workspace.Object = class extends Common.Object {} : typeof Object >Workspace.Object : typeof Object ->Workspace : { [x: string]: any; Object: typeof Object; } +>Workspace : typeof Workspace >Object : typeof Object >class extends Common.Object {} : typeof Object >Common.Object : Object ->Common : { [x: string]: any; Object: typeof Object; } +>Common : typeof Common >Object : typeof Object /** @type {Workspace.Object} */ @@ -33,14 +33,14 @@ var am; === tests/cases/conformance/salsa/roots.js === var First = {}; ->First : { [x: string]: any; Item: typeof I; } ->{} : { [x: string]: any; Item: typeof I; } +>First : typeof First +>{} : { [x: string]: any; } var Common = {}; ->Common : { [x: string]: any; Object: typeof Object; } ->{} : { [x: string]: any; Object: typeof Object; } +>Common : typeof Common +>{} : { [x: string]: any; } var Workspace = {}; ->Workspace : { [x: string]: any; Object: typeof Object; } ->{} : { [x: string]: any; Object: typeof Object; } +>Workspace : typeof Workspace +>{} : { [x: string]: any; } diff --git a/tests/baselines/reference/typeFromPropertyAssignmentWithExport.types b/tests/baselines/reference/typeFromPropertyAssignmentWithExport.types index 5329632527436..cd7823d00b22a 100644 --- a/tests/baselines/reference/typeFromPropertyAssignmentWithExport.types +++ b/tests/baselines/reference/typeFromPropertyAssignmentWithExport.types @@ -2,13 +2,13 @@ // this is a javascript file... export const Adapter = {}; ->Adapter : { [x: string]: any; prop: { [x: string]: any; }; asyncMethod(): void; } ->{} : { [x: string]: any; prop: { [x: string]: any; }; asyncMethod(): void; } +>Adapter : typeof Adapter +>{} : { [x: string]: any; } Adapter.prop = {}; >Adapter.prop = {} : { [x: string]: any; } >Adapter.prop : { [x: string]: any; } ->Adapter : { [x: string]: any; prop: { [x: string]: any; }; asyncMethod(): void; } +>Adapter : typeof Adapter >prop : { [x: string]: any; } >{} : { [x: string]: any; } @@ -16,7 +16,7 @@ Adapter.prop = {}; Adapter.asyncMethod = function() {} >Adapter.asyncMethod = function() {} : () => void >Adapter.asyncMethod : () => void ->Adapter : { [x: string]: any; prop: { [x: string]: any; }; asyncMethod(): void; } +>Adapter : typeof Adapter >asyncMethod : () => void >function() {} : () => void diff --git a/tests/baselines/reference/typedefCrossModule3.types b/tests/baselines/reference/typedefCrossModule3.types index 9d3767dcbbaba..b9722719895d4 100644 --- a/tests/baselines/reference/typedefCrossModule3.types +++ b/tests/baselines/reference/typedefCrossModule3.types @@ -1,21 +1,21 @@ === tests/cases/conformance/jsdoc/mod2.js === /** @typedef {number} Foo */ const ns = {}; ->ns : { [x: string]: any; Foo: typeof Foo; } ->{} : { [x: string]: any; Foo: typeof Foo; } +>ns : typeof ns +>{} : { [x: string]: any; } ns.Foo = class {} >ns.Foo = class {} : typeof Foo >ns.Foo : typeof Foo ->ns : { [x: string]: any; Foo: typeof Foo; } +>ns : typeof ns >Foo : typeof Foo >class {} : typeof Foo module.exports = ns; ->module.exports = ns : { [x: string]: any; Foo: typeof Foo; } +>module.exports = ns : typeof ns >module.exports : any >module : any >exports : any ->ns : { [x: string]: any; Foo: typeof Foo; } +>ns : typeof ns diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts index 3940cd7a13e39..40525ef019179 100644 --- a/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts +++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts @@ -8,5 +8,7 @@ function m() { GLOBSTAR.p = 1 m.GLOBSTAR.q = 2 +GLOBSTAR.p GLOBSTAR.q m.GLOBSTAR.p +m.GLOBSTAR.q diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment26.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment26.ts new file mode 100644 index 0000000000000..600f46805b442 --- /dev/null +++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment26.ts @@ -0,0 +1,19 @@ +// @noEmit: true +// @noImplicitAny: true +// @checkJs: true +// @allowJs: true +// @Filename: bug24730.js +var UI = {} +UI.TreeElement = class { + constructor() { + this.treeOutline = 12 + } +}; +UI.context = new UI.TreeElement() + +class C extends UI.TreeElement { + onpopulate() { + this.doesNotExist + this.treeOutline.doesntExistEither() + } +};