Merge branch 'main' into fix45893

# Conflicts: # src/compiler/checker.ts # tests/cases/fourslash/findReferencesJSXTagName.ts # tests/cases/fourslash/tsxFindAllReferences10.ts
microsoft · ahejlsberg · Sep 23, 2021 · Sep 20, 2021 · Sep 20, 2021 · Sep 20, 2021
commit e949c855e8dfde81ff57b5a60e70a52085cd9d2c
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -31942,7 +31942,7 @@ namespace ts {
             }
 
             const operandType = checkExpression(node.expression);
-            const awaitedType = checkAwaitedType(operandType, node, Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+            const awaitedType = checkAwaitedType(operandType, /*withAlias*/ true, node, Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
             if (awaitedType === operandType && !isErrorType(awaitedType) && !(operandType.flags & TypeFlags.AnyOrUnknown)) {
                 addErrorOrSuggestion(/*isError*/ false, createDiagnosticForNode(node, Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
             }

diff --git a/tests/cases/fourslash/findReferencesJSXTagName.ts b/tests/cases/fourslash/findReferencesJSXTagName.ts
@@ -11,8 +11,4 @@
 //github.com//export const /*2*/SubmissionComp = (submission: SubmissionProps) =>
 //github.com//    <div style={{ fontFamily: "sans-serif" }}></div>;
 
-const [r0Def, r0, r1Def, r1, r2Def, r2] = test.ranges();
-const imports = { definition: "(alias) const SubmissionComp: (submission: SubmissionProps) => div\nimport SubmissionComp", ranges: [r0, r1] };
-const def = { definition: "const SubmissionComp: (submission: SubmissionProps) => div", ranges: [r2] };
-verify.referenceGroups([r0, r1], [imports, def]);
-verify.referenceGroups(r2, [def, imports]);
+verify.baselineFindAllReferences('1', '2')
diff --git a/tests/cases/fourslash/tsxFindAllReferences10.ts b/tests/cases/fourslash/tsxFindAllReferences10.ts
@@ -30,4 +30,4 @@
 //github.com// let opt = <MainButton goTo="goTo" />;
 //github.com// let opt = <MainButton wrong />;
 
-verify.singleReferenceGroup("(method) ButtonProps.onClick(event?: React.MouseEvent<HTMLButtonElement>): void", "onClick");
+verify.baselineFindAllReferences('1')