From fdc321ec6fb6c147262c3722f06019cfae7f4a24 Mon Sep 17 00:00:00 2001 From: Oleksandr T Date: Thu, 15 Jul 2021 23:25:37 +0300 Subject: [PATCH] fix(45049): fix diagnostic for missing property initializer --- src/compiler/diagnosticMessages.json | 2 +- src/compiler/parser.ts | 2 +- .../parserErrorRecovery_IncompleteMemberVariable2.errors.txt | 4 ++-- .../reference/privateInstanceMemberAccessibility.errors.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 06c5a54d18d9f..dfb655ddff359 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1400,7 +1400,7 @@ "category": "Error", "code": 1441 }, - "Missing '=' before default property value.": { + "Expected '=' for property initializer.": { "category": "Error", "code": 1442 }, diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index abfeadb48f970..0b508151064c4 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1664,7 +1664,7 @@ namespace ts { parseErrorAtCurrentToken(Diagnostics._0_expected, tokenToString(SyntaxKind.SemicolonToken)); } else { - parseErrorAtCurrentToken(Diagnostics.Missing_before_default_property_value); + parseErrorAtCurrentToken(Diagnostics.Expected_for_property_initializer); } return; } diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt index f5602fea178b1..5f74472e2ebf3 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts(12,20): error TS2304: Cannot find name 'C'. -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts(12,22): error TS1442: Missing '=' before default property value. +tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts(12,22): error TS1442: Expected '=' for property initializer. ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariables/parserErrorRecovery_IncompleteMemberVariable2.ts (2 errors) ==== @@ -18,7 +18,7 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IncompleteMemberVariabl ~ !!! error TS2304: Cannot find name 'C'. ~~~~~~~ -!!! error TS1442: Missing '=' before default property value. +!!! error TS1442: Expected '=' for property initializer. // Constructor constructor (public x: number, public y: number) { } diff --git a/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt b/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt index d91aa077fd6b1..ebc9bed1b7516 100644 --- a/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt +++ b/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt @@ -3,7 +3,7 @@ tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAcces tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts(6,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts(8,22): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword. tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts(10,15): error TS2304: Cannot find name 'super'. -tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts(12,12): error TS1442: Missing '=' before default property value. +tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts(12,12): error TS1442: Expected '=' for property initializer. ==== tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAccessibility.ts (5 errors) ==== @@ -29,5 +29,5 @@ tests/cases/conformance/classes/members/accessibility/privateInstanceMemberAcces a: this.foo; // error ~ -!!! error TS1442: Missing '=' before default property value. +!!! error TS1442: Expected '=' for property initializer. } \ No newline at end of file