Unify expression position checks for template literals

IllusionMH · IllusionMH · commit 49a43524d951 · 2019-08-26T22:31:26.000+03:00
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1689,7 +1689,6 @@ namespace ts {
             case SyntaxKind.ConditionalExpression:
             case SyntaxKind.SpreadElement:
             case SyntaxKind.TemplateExpression:
-            case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.OmittedExpression:
             case SyntaxKind.JsxElement:
             case SyntaxKind.JsxSelfClosingElement:
@@ -1711,6 +1710,7 @@ namespace ts {
             case SyntaxKind.NumericLiteral:
             case SyntaxKind.BigIntLiteral:
             case SyntaxKind.StringLiteral:
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.ThisKeyword:
                 return isInExpressionContext(node);
             default:
diff --git a/tests/baselines/reference/noSubstitutionTemplateStringLiteralTypes.types b/tests/baselines/reference/noSubstitutionTemplateStringLiteralTypes.types
@@ -1,6 +1,5 @@
 === tests/cases/compiler/noSubstitutionTemplateStringLiteralTypes.ts ===
 const x: `foo` = "foo";
 >x : "foo"
->`foo` : "foo"
 >"foo" : "foo"
 
