Skip to content

Commit 47f48d3

Browse files
Apply same single-line style to copied nodes as manufactured ones (microsoft#57890)
Co-authored-by: TypeScript Bot <[email protected]>
1 parent 32a1370 commit 47f48d3

File tree

503 files changed

+1411
-1406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

503 files changed

+1411
-1406
lines changed

src/compiler/checker.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ import {
272272
getEffectiveTypeParameterDeclarations,
273273
getElementOrPropertyAccessName,
274274
getEmitDeclarations,
275+
getEmitFlags,
275276
getEmitModuleKind,
276277
getEmitModuleResolutionKind,
277278
getEmitScriptTarget,
@@ -632,6 +633,7 @@ import {
632633
isLiteralTypeNode,
633634
isLogicalOrCoalescingBinaryExpression,
634635
isLogicalOrCoalescingBinaryOperator,
636+
isMappedTypeNode,
635637
isMetaProperty,
636638
isMethodDeclaration,
637639
isMethodSignature,
@@ -8620,7 +8622,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
86208622
cancellationToken.throwIfCancellationRequested();
86218623
}
86228624
let hadError = false;
8623-
const file = getSourceFileOfNode(existing);
86248625
const transformed = visitNode(existing, visitExistingNodeTreeSymbols, isTypeNode);
86258626
if (hadError) {
86268627
return undefined;
@@ -8756,8 +8757,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
87568757
}
87578758
}
87588759

8759-
if (file && isTupleTypeNode(node) && !nodeIsSynthesized(node) && (getLineAndCharacterOfPosition(file, node.pos).line === getLineAndCharacterOfPosition(file, node.end).line)) {
8760-
setEmitFlags(node, EmitFlags.SingleLine);
8760+
if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {
8761+
const visited = visitEachChild(node, visitExistingNodeTreeSymbols, /*context*/ undefined);
8762+
const clone = setTextRange(visited === node ? factory.cloneNode(node) : visited, node);
8763+
const flags = getEmitFlags(clone);
8764+
setEmitFlags(clone, flags | (context.flags & NodeBuilderFlags.MultilineObjectLiterals && isTypeLiteralNode(node) ? 0 : EmitFlags.SingleLine));
8765+
return clone;
87618766
}
87628767

87638768
return visitEachChild(node, visitExistingNodeTreeSymbols, /*context*/ undefined);

tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module A {
1313
}
1414

1515
export var UnitSquare : {
16-
>UnitSquare : { top: { left: Point; right: Point;}; bottom: { left: Point; right: Point;}; }
16+
>UnitSquare : { top: { left: Point; right: Point; }; bottom: { left: Point; right: Point; }; }
1717

1818
top: { left: Point, right: Point },
1919
>top : { left: Point; right: Point; }

tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module A {
3535

3636
=== test.ts ===
3737
var fn: () => { x: number; y: number };
38-
>fn : () => { x: number; y: number;}
38+
>fn : () => { x: number; y: number; }
3939
>x : number
4040
>y : number
4141

tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module B {
3535

3636
=== test.ts ===
3737
var fn: () => { x: number; y: number };
38-
>fn : () => { x: number; y: number;}
38+
>fn : () => { x: number; y: number; }
3939
>x : number
4040
>y : number
4141

tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ var p = Geometry.Origin;
8484
>Origin : A.Point
8585

8686
var line: { start: { x: number; y: number }; end: { x: number; y: number; } };
87-
>line : { start: { x: number; y: number;}; end: { x: number; y: number;}; }
87+
>line : { start: { x: number; y: number; }; end: { x: number; y: number; }; }
8888
>start : { x: number; y: number; }
8989
>x : number
9090
>y : number

tests/baselines/reference/accessorsOverrideProperty8.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type AnyCtor<P extends object> = new (...a: any[]) => P
1616
>a : any[]
1717

1818
declare function classWithProperties<T extends { [key: string]: Types }, P extends object>(properties: T, klass: AnyCtor<P>): {
19-
>classWithProperties : <T extends { [key: string]: Types; }, P extends object>(properties: T, klass: AnyCtor<P>) => { new (): P & Properties<T>; prototype: P & Properties<T>;}
19+
>classWithProperties : <T extends { [key: string]: Types; }, P extends object>(properties: T, klass: AnyCtor<P>) => { new (): P & Properties<T>; prototype: P & Properties<T>; }
2020
>key : string
2121
>properties : T
2222
>klass : AnyCtor<P>

tests/baselines/reference/aliasUsageInObjectLiteral.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var b: { x: IHasVisualizationModel } = { x: moduleA };
3030
>moduleA : typeof moduleA
3131

3232
var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
33-
>c : { y: { z: IHasVisualizationModel;}; }
33+
>c : { y: { z: IHasVisualizationModel; }; }
3434
>y : { z: IHasVisualizationModel; }
3535
>z : IHasVisualizationModel
3636
>{ y: { z: moduleA } } : { y: { z: typeof moduleA; }; }

tests/baselines/reference/annotatedThisPropertyInitializerDoesntNarrow.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// from webpack/lib/Compilation.js and filed at #26427
55
/** @param {{ [s: string]: number }} map */
66
function mappy(map) {}
7-
>mappy : (map: { [s: string]: number;}) => void
7+
>mappy : (map: { [s: string]: number; }) => void
88
>map : { [s: string]: number; }
99

1010
export class C {

tests/baselines/reference/anonterface.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module M {
88
>C : C
99

1010
m(fn:{ (n:number):string; },n2:number):string {
11-
>m : (fn: { (n: number): string;}, n2: number) => string
11+
>m : (fn: { (n: number): string; }, n2: number) => string
1212
>fn : (n: number) => string
1313
>n : number
1414
>n2 : number

tests/baselines/reference/anyAssignabilityInInheritance.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ var r3 = foo3(a); // any
8585
>a : any
8686

8787
declare function foo7(x: { bar: number }): { bar: number };
88-
>foo7 : { (x: { bar: number;}): { bar: number;}; (x: any): any; }
88+
>foo7 : { (x: { bar: number; }): { bar: number; }; (x: any): any; }
8989
>x : { bar: number; }
9090
>bar : number
9191
>bar : number

0 commit comments

Comments
 (0)