fix(37940): 'Move to new file' refactoring removes spaces between decorator and property modifiers

src/compiler/emitter.ts

@@ -4132,7 +4132,7 @@ namespace ts {
                 if (closingLineTerminatorCount) {
                     writeLine(closingLineTerminatorCount);
                 }
-                else if (format & ListFormat.SpaceBetweenBraces) {
+                else if (format & (ListFormat.SpaceAfterList | ListFormat.SpaceBetweenBraces)) {
                     writeSpace();
                 }
             }

src/compiler/types.ts

@@ -6545,6 +6545,7 @@ namespace ts {
 
         NoSpaceIfEmpty = 1 << 19,       // If the literal is empty, do not add spaces between braces.
         SingleElement = 1 << 20,
+        SpaceAfterList = 1 << 21,       // Add space after list
 
         // Precomputed Formats
         Modifiers = SingleLine | SpaceBetweenSiblings | NoInterveningComments,
@@ -6579,7 +6580,7 @@ namespace ts {
         CaseOrDefaultClauseStatements = Indented | MultiLine | NoTrailingNewLine | OptionalIfEmpty,
         HeritageClauseTypes = CommaDelimited | SpaceBetweenSiblings | SingleLine,
         SourceFileStatements = MultiLine | NoTrailingNewLine,
-        Decorators = MultiLine | Optional,
+        Decorators = MultiLine | Optional | SpaceAfterList,
         TypeArguments = CommaDelimited | SpaceBetweenSiblings | SingleLine | AngleBrackets | Optional,
         TypeParameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | AngleBrackets | Optional,
         Parameters = CommaDelimited | SpaceBetweenSiblings | SingleLine | Parenthesis,

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

@@ -3227,6 +3227,7 @@ declare namespace ts {
         NoInterveningComments = 262144,
         NoSpaceIfEmpty = 524288,
         SingleElement = 1048576,
+        SpaceAfterList = 2097152,
         Modifiers = 262656,
         HeritageClauses = 512,
         SingleLineTypeLiteralMembers = 768,
@@ -3258,7 +3259,7 @@ declare namespace ts {
         CaseOrDefaultClauseStatements = 163969,
         HeritageClauseTypes = 528,
         SourceFileStatements = 131073,
-        Decorators = 49153,
+        Decorators = 2146305,
         TypeArguments = 53776,
         TypeParameters = 53776,
         Parameters = 2576,

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

@@ -3227,6 +3227,7 @@ declare namespace ts {
         NoInterveningComments = 262144,
         NoSpaceIfEmpty = 524288,
         SingleElement = 1048576,
+        SpaceAfterList = 2097152,
         Modifiers = 262656,
         HeritageClauses = 512,
         SingleLineTypeLiteralMembers = 768,
@@ -3258,7 +3259,7 @@ declare namespace ts {
         CaseOrDefaultClauseStatements = 163969,
         HeritageClauseTypes = 528,
         SourceFileStatements = 131073,
-        Decorators = 49153,
+        Decorators = 2146305,
         TypeArguments = 53776,
         TypeParameters = 53776,
         Parameters = 2576,

tests/cases/fourslash/moveToNewFile_decorators.ts

@@ -0,0 +1,34 @@
+/// <reference path='fourslash.ts' />
+
+// @experimentalDecorators: true
+
+// @Filename: /a.ts
+////const decorator1: any = () => {};
+////const decorator2: any = () => {};
+////[|class Foo {
+////    constructor(@decorator1 private readonly x: number,
+////        @decorator1 @decorator2 private readonly y: number) { }
+////
+////    method1(@decorator1 x: number) { }
+////    method2(@decorator1 @decorator2 x: number) { }
+////}|]
+
+verify.noErrors();
+
+verify.moveToNewFile({
+    newFileContents: {
+        "/a.ts":
+`const decorator1: any = () => {};
+const decorator2: any = () => {};
+`,
+        "/Foo.ts":
+`class Foo {
+    constructor(@decorator1 private readonly x: number,
+        @decorator1 @decorator2 private readonly y: number) { }
+
+    method1(@decorator1 x: number) { }
+    method2(@decorator1 @decorator2 x: number) { }
+}
+`
+    }
+});

tests/cases/fourslash/moveToNewFile_decorators1.ts

@@ -0,0 +1,28 @@
+/// <reference path='fourslash.ts' />
+
+// @experimentalDecorators: true
+
+// @Filename: /a.ts
+////const decorator1: any = () => {};
+////const decorator2: any = () => {};
+////[|class Foo {
+////    @decorator1 method1() { }
+////    @decorator1 @decorator2 method2() { }
+////}|]
+
+verify.noErrors();
+
+verify.moveToNewFile({
+    newFileContents: {
+        "/a.ts":
+`const decorator1: any = () => {};
+const decorator2: any = () => {};
+`,
+        "/Foo.ts":
+`class Foo {
+    @decorator1 method1() { }
+    @decorator1 @decorator2 method2() { }
+}
+`
+    }
+});

tests/cases/fourslash/moveToNewFile_decorators2.ts

@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+// @experimentalDecorators: true
+
+// @Filename: /a.ts
+////const decorator1: any = () => {};
+////[|@decorator1 class Foo {
+////}|]
+
+verify.noErrors();
+
+verify.moveToNewFile({
+    newFileContents: {
+        "/a.ts":
+`const decorator1: any = () => {};
+`,
+        "/Foo.ts":
+`@decorator1 class Foo {
+}
+`
+    }
+});

tests/cases/fourslash/moveToNewFile_decorators3.ts

@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+
+// @experimentalDecorators: true
+
+// @Filename: /a.ts
+////const decorator1: any = () => {};
+////const decorator2: any = () => {};
+////[|@decorator1 @decorator2 class Foo {
+////}|]
+
+verify.noErrors();
+
+verify.moveToNewFile({
+    newFileContents: {
+        "/a.ts":
+`const decorator1: any = () => {};
+const decorator2: any = () => {};
+`,
+        "/Foo.ts":
+`@decorator1 @decorator2 class Foo {
+}
+`
+    }
+});