Merge branch 'master' of https://github.com/Microsoft/TypeScript into feature/eslint

src/testRunner/tsconfig.json

@@ -73,7 +73,9 @@
         "unittests/config/tsconfigParsing.ts",
         "unittests/evaluation/asyncArrow.ts",
         "unittests/evaluation/asyncGenerator.ts",
+        "unittests/evaluation/awaiter.ts",
         "unittests/evaluation/forAwaitOf.ts",
+        "unittests/evaluation/objectRest.ts",
         "unittests/services/cancellableLanguageServiceOperations.ts",
         "unittests/services/colorization.ts",
         "unittests/services/convertToAsyncFunction.ts",

src/testRunner/unittests/evaluation/awaiter.ts

@@ -0,0 +1,24 @@
+describe("unittests:: evaluation:: awaiter", () => {
+    // NOTE: This could break if the ECMAScript spec ever changes the timing behavior for Promises (again)
+    it("await (es5)", async () => {
+        const result = evaluator.evaluateTypeScript(`
+        async function a(msg: string) {
+            await Promise.resolve();
+            output.push(msg);
+        }
+        function b(msg: string) {
+            return Promise.resolve().then(() => {
+                output.push(msg);
+            });
+        }
+        export const output: string[] = [];
+        export async function main() {
+            const p1 = a('1');
+            const p2 = b('2');
+            await Promise.all([p1, p2]);
+        }
+        `);
+        await result.main();
+        assert.deepEqual(result.output, ["1", "2"]);
+    });
+});

src/testRunner/unittests/evaluation/objectRest.ts

@@ -0,0 +1,28 @@
+describe("unittests:: evaluation:: objectRest", () => {
+    // https://github.com/microsoft/TypeScript/issues/31469
+    it("side effects in property assignment", async () => {
+        const result = evaluator.evaluateTypeScript(`
+            const k = { a: 1, b: 2 };
+            const o = { a: 3, ...k, b: k.a++ };
+            export const output = o;
+        `);
+        assert.deepEqual(result.output, { a: 1, b: 1 });
+    });
+    it("side effects in during spread", async () => {
+        const result = evaluator.evaluateTypeScript(`
+            const k = { a: 1, get b() { l = { c: 9 }; return 2; } };
+            let l = { c: 3 };
+            const o = { ...k, ...l };
+            export const output = o;
+        `);
+        assert.deepEqual(result.output, { a: 1, b: 2, c: 9 });
+    });
+    it("trailing literal-valued object-literal", async () => {
+        const result = evaluator.evaluateTypeScript(`
+            const k = { a: 1 }
+            const o = { ...k, ...{ b: 2 } };
+            export const output = o;
+        `);
+        assert.deepEqual(result.output, { a: 1, b: 2 });
+    });
+});