Merge pull request #31008 from andrewbranch/bug/29358

Support binding patterns in Promise -> async/await refactor
microsoft · Apr 24, 2019 · 6608349 · 6608349
2 parents e2310f2 + 95fb694
commit 6608349
Show file tree

Hide file tree

Showing 15 changed files with 403 additions and 60 deletions.
diff --git a/src/services/codefixes/convertToAsyncFunction.ts b/src/services/codefixes/convertToAsyncFunction.ts
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1717,7 +1717,19 @@ namespace ts {
 
     export function getSynthesizedDeepCloneWithRenames<T extends Node>(node: T, includeTrivia = true, renameMap?: Map<Identifier>, checker?: TypeChecker, callback?: (originalNode: Node, clone: Node) => any): T {
         let clone;
-        if (isIdentifier(node) && renameMap && checker) {
+        if (renameMap && checker && isBindingElement(node) && isIdentifier(node.name) && isObjectBindingPattern(node.parent)) {
+            const symbol = checker.getSymbolAtLocation(node.name);
+            const renameInfo = symbol && renameMap.get(String(getSymbolId(symbol)));
+
+            if (renameInfo && renameInfo.text !== (node.name || node.propertyName).getText()) {
+                clone = createBindingElement(
+                    node.dotDotDotToken,
+                    node.propertyName || node.name,
+                    renameInfo,
+                    node.initializer);
+            }
+        }
+        else if (renameMap && checker && isIdentifier(node)) {
             const symbol = checker.getSymbolAtLocation(node);
             const renameInfo = symbol && renameMap.get(String(getSymbolId(symbol)));
 

diff --git a/src/testRunner/unittests/services/convertToAsyncFunction.ts b/src/testRunner/unittests/services/convertToAsyncFunction.ts
@@ -347,6 +347,24 @@ interface Array<T> {}`
         _testConvertToAsyncFunction("convertToAsyncFunction_basic", `
 function [#|f|](): Promise<void>{
     return fetch('https://typescriptlang.org').then(result => { console.log(result) });
+}`);
+        _testConvertToAsyncFunction("convertToAsyncFunction_arrayBindingPattern", `
+function [#|f|](): Promise<void>{
+    return fetch('https://typescriptlang.org').then(([result]) => { console.log(result) });
+}`);
+        _testConvertToAsyncFunction("convertToAsyncFunction_objectBindingPattern", `
+function [#|f|](): Promise<void>{
+    return fetch('https://typescriptlang.org').then(({ result }) => { console.log(result) });
+}`);
+        _testConvertToAsyncFunction("convertToAsyncFunction_arrayBindingPatternRename", `
+function [#|f|](): Promise<void>{
+    const result = getResult();
+    return fetch('https://typescriptlang.org').then(([result]) => { console.log(result) });
+}`);
+        _testConvertToAsyncFunction("convertToAsyncFunction_objectBindingPatternRename", `
+function [#|f|](): Promise<void>{
+    const result = getResult();
+    return fetch('https://typescriptlang.org').then(({ result }) => { console.log(result) });
 }`);
     _testConvertToAsyncFunction("convertToAsyncFunction_basicNoReturnTypeAnnotation", `
 function [#|f|]() {
@@ -604,6 +622,50 @@ function [#|innerPromise|](): Promise<string> {
 `
         );
 
+        _testConvertToAsyncFunction("convertToAsyncFunction_InnerPromiseRetBinding1", `
+function [#|innerPromise|](): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(({ blob }) => blob.byteOffset).catch(({ message }) => 'Error ' + message);
+    }).then(blob => {
+        return blob.toString();
+    });
+}
+`
+        );
+
+        _testConvertToAsyncFunction("convertToAsyncFunction_InnerPromiseRetBinding2", `
+function [#|innerPromise|](): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(blob => blob.byteOffset).catch(err => 'Error');
+    }).then(({ x }) => {
+        return x.toString();
+    });
+}
+`
+        );
+
+        _testConvertToAsyncFunction("convertToAsyncFunction_InnerPromiseRetBinding3", `
+function [#|innerPromise|](): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(({ blob }) => blob.byteOffset).catch(({ message }) => 'Error ' + message);
+    }).then(([x, y]) => {
+        return (x || y).toString();
+    });
+}
+`
+        );
+
+        _testConvertToAsyncFunction("convertToAsyncFunction_InnerPromiseRetBinding4", `
+function [#|innerPromise|](): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(({ blob }: { blob: { byteOffset: number } }) => [0, blob.byteOffset]).catch(({ message }: Error) => ['Error ', message]);
+    }).then(([x, y]) => {
+        return (x || y).toString();
+    });
+}
+`
+        );
+
         _testConvertToAsyncFunctionFailed("convertToAsyncFunction_VarReturn01", `
 function [#|f|]() {
     let blob = fetch("https://typescriptlang.org").then(resp => console.log(resp));
@@ -1168,7 +1230,13 @@ const { length } = [#|function|] () {
 
     _testConvertToAsyncFunction("convertToAsyncFunction_catchBlockUniqueParams", `
 function [#|f|]() {
-	return Promise.resolve().then(x => 1).catch(x => "a").then(x => !!x);
+    return Promise.resolve().then(x => 1).catch(x => "a").then(x => !!x);
+}
+`);
+
+    _testConvertToAsyncFunction("convertToAsyncFunction_catchBlockUniqueParamsBindingPattern", `
+function [#|f|]() {
+    return Promise.resolve().then(() => ({ x: 3 })).catch(() => ({ x: "a" })).then(({ x }) => !!x);
 }
 `);
 

diff --git a/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding1.ts b/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding1.ts
@@ -0,0 +1,24 @@
+// ==ORIGINAL==
+
+function /*[#|*/innerPromise/*|]*/(): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(({ blob }) => blob.byteOffset).catch(({ message }) => 'Error ' + message);
+    }).then(blob => {
+        return blob.toString();
+    });
+}
+
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function innerPromise(): Promise<string> {
+    const resp = await fetch("https://typescriptlang.org");
+    let blob: any;
+    try {
+        const { blob } = await resp.blob();
+        blob = blob.byteOffset;
+    }
+    catch ({ message }) {
+        blob = 'Error ' + message;
+    }
+    return blob.toString();
+}
diff --git a/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding2.ts b/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding2.ts
@@ -0,0 +1,25 @@
+// ==ORIGINAL==
+
+function /*[#|*/innerPromise/*|]*/(): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(blob => blob.byteOffset).catch(err => 'Error');
+    }).then(({ x }) => {
+        return x.toString();
+    });
+}
+
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function innerPromise(): Promise<string> {
+    const resp = await fetch("https://typescriptlang.org");
+    let result: any;
+    try {
+        const blob = await resp.blob();
+        result = blob.byteOffset;
+    }
+    catch (err) {
+        result = 'Error';
+    }
+    const { x } = result;
+    return x.toString();
+}
diff --git a/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding3.ts b/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding3.ts
@@ -0,0 +1,25 @@
+// ==ORIGINAL==
+
+function /*[#|*/innerPromise/*|]*/(): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(({ blob }) => blob.byteOffset).catch(({ message }) => 'Error ' + message);
+    }).then(([x, y]) => {
+        return (x || y).toString();
+    });
+}
+
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function innerPromise(): Promise<string> {
+    const resp = await fetch("https://typescriptlang.org");
+    let result: any;
+    try {
+        const { blob } = await resp.blob();
+        result = blob.byteOffset;
+    }
+    catch ({ message }) {
+        result = 'Error ' + message;
+    }
+    const [x, y] = result;
+    return (x || y).toString();
+}
diff --git a/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding4.ts b/...elines/reference/convertToAsyncFunction/convertToAsyncFunction_InnerPromiseRetBinding4.ts
@@ -0,0 +1,25 @@
+// ==ORIGINAL==
+
+function /*[#|*/innerPromise/*|]*/(): Promise<string> {
+    return fetch("https://typescriptlang.org").then(resp => {
+        return resp.blob().then(({ blob }: { blob: { byteOffset: number } }) => [0, blob.byteOffset]).catch(({ message }: Error) => ['Error ', message]);
+    }).then(([x, y]) => {
+        return (x || y).toString();
+    });
+}
+
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function innerPromise(): Promise<string> {
+    const resp = await fetch("https://typescriptlang.org");
+    let result: any[];
+    try {
+        const { blob } = await resp.blob();
+        result = [0, blob.byteOffset];
+    }
+    catch ({ message }) {
+        result = ['Error ', message];
+    }
+    const [x, y] = result;
+    return (x || y).toString();
+}
diff --git a/.../baselines/reference/convertToAsyncFunction/convertToAsyncFunction_arrayBindingPattern.ts b/.../baselines/reference/convertToAsyncFunction/convertToAsyncFunction_arrayBindingPattern.ts
@@ -0,0 +1,11 @@
+// ==ORIGINAL==
+
+function /*[#|*/f/*|]*/(): Promise<void>{
+    return fetch('https://typescriptlang.org').then(([result]) => { console.log(result) });
+}
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function f(): Promise<void>{
+    const [result] = await fetch('https://typescriptlang.org');
+    console.log(result);
+}
diff --git a/...ines/reference/convertToAsyncFunction/convertToAsyncFunction_arrayBindingPatternRename.ts b/...ines/reference/convertToAsyncFunction/convertToAsyncFunction_arrayBindingPatternRename.ts
@@ -0,0 +1,13 @@
+// ==ORIGINAL==
+
+function /*[#|*/f/*|]*/(): Promise<void>{
+    const result = getResult();
+    return fetch('https://typescriptlang.org').then(([result]) => { console.log(result) });
+}
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function f(): Promise<void>{
+    const result = getResult();
+    const [result_1] = await fetch('https://typescriptlang.org');
+    console.log(result_1);
+}
diff --git a/...selines/reference/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParams.js b/...selines/reference/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParams.js
@@ -1,13 +1,13 @@
 // ==ORIGINAL==
 
 function /*[#|*/f/*|]*/() {
-	return Promise.resolve().then(x => 1).catch(x => "a").then(x => !!x);
+    return Promise.resolve().then(x => 1).catch(x => "a").then(x => !!x);
 }
 
 // ==ASYNC FUNCTION::Convert to async function==
 
 async function f() {
-	let x_2;
+    let x_2;
     try {
         const x = await Promise.resolve();
         x_2 = 1;

diff --git a/...selines/reference/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParams.ts b/...selines/reference/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParams.ts
@@ -1,13 +1,13 @@
 // ==ORIGINAL==
 
 function /*[#|*/f/*|]*/() {
-	return Promise.resolve().then(x => 1).catch(x => "a").then(x => !!x);
+    return Promise.resolve().then(x => 1).catch(x => "a").then(x => !!x);
 }
 
 // ==ASYNC FUNCTION::Convert to async function==
 
 async function f() {
-	let x_2: string | number;
+    let x_2: string | number;
     try {
         const x = await Promise.resolve();
         x_2 = 1;

diff --git a/...nce/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParamsBindingPattern.js b/...nce/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParamsBindingPattern.js
@@ -0,0 +1,20 @@
+// ==ORIGINAL==
+
+function /*[#|*/f/*|]*/() {
+    return Promise.resolve().then(() => ({ x: 3 })).catch(() => ({ x: "a" })).then(({ x }) => !!x);
+}
+
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function f() {
+    let result;
+    try {
+        await Promise.resolve();
+        result = ({ x: 3 });
+    }
+    catch (e) {
+        result = ({ x: "a" });
+    }
+    const { x } = result;
+    return !!x;
+}
diff --git a/...nce/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParamsBindingPattern.ts b/...nce/convertToAsyncFunction/convertToAsyncFunction_catchBlockUniqueParamsBindingPattern.ts
@@ -0,0 +1,20 @@
+// ==ORIGINAL==
+
+function /*[#|*/f/*|]*/() {
+    return Promise.resolve().then(() => ({ x: 3 })).catch(() => ({ x: "a" })).then(({ x }) => !!x);
+}
+
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function f() {
+    let result: { x: number; } | { x: string; };
+    try {
+        await Promise.resolve();
+        result = ({ x: 3 });
+    }
+    catch (e) {
+        result = ({ x: "a" });
+    }
+    const { x } = result;
+    return !!x;
+}
diff --git a/...baselines/reference/convertToAsyncFunction/convertToAsyncFunction_objectBindingPattern.ts b/...baselines/reference/convertToAsyncFunction/convertToAsyncFunction_objectBindingPattern.ts
@@ -0,0 +1,11 @@
+// ==ORIGINAL==
+
+function /*[#|*/f/*|]*/(): Promise<void>{
+    return fetch('https://typescriptlang.org').then(({ result }) => { console.log(result) });
+}
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function f(): Promise<void>{
+    const { result } = await fetch('https://typescriptlang.org');
+    console.log(result);
+}
diff --git a/...nes/reference/convertToAsyncFunction/convertToAsyncFunction_objectBindingPatternRename.ts b/...nes/reference/convertToAsyncFunction/convertToAsyncFunction_objectBindingPatternRename.ts
@@ -0,0 +1,13 @@
+// ==ORIGINAL==
+
+function /*[#|*/f/*|]*/(): Promise<void>{
+    const result = getResult();
+    return fetch('https://typescriptlang.org').then(({ result }) => { console.log(result) });
+}
+// ==ASYNC FUNCTION::Convert to async function==
+
+async function f(): Promise<void>{
+    const result = getResult();
+    const { result: result_1 } = await fetch('https://typescriptlang.org');
+    console.log(result_1);
+}