From 1490536054dde741f5c54233d7778b4ca260f2ae Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Sat, 2 Nov 2019 11:40:41 +0200
Subject: [PATCH] merge similar entries in CHANGELOG.unreleased.md (#6782)

---
 CHANGELOG.unreleased.md | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 2683766f..c772b439 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -123,25 +123,28 @@ class C extends B {
 }
 ```
 
-#### TypeScript: Prettier removed `?` from optional computed class fields ([#6657] by [@cryrivers])
+#### TypeScript: Fix optional computed class fields and methods ([#6657] by [@cryrivers], [#6673] by [@thorn0])
 
-Still happens if the field key is a complex expression, but has been fixed in this case:
+Still broken if the key is a complex expression, but has been fixed in these cases:
 
 <!-- prettier-ignore -->
 ```ts
 // Input
 class Foo {
   [bar]?: number;
+  protected [s]?() {}
 }
 
 // Output (Prettier stable)
 class Foo {
   [bar]: number;
+  protected [s?]() {};
 }
 
 // Output (Prettier master)
 class Foo {
   [bar]?: number;
+  protected [s]?() {}
 }
 ```
 
@@ -1097,26 +1100,6 @@ class A {
 }
 ```
 
-#### TypeScript: Fix optional computed methods ([#6673] by [@thorn0])
-
-<!-- prettier-ignore -->
-```ts
-// Input
-class A {
-  protected [s]?() {}
-}
-
-// Output (Prettier stable)
-class A {
-  protected [s?]() {}
-}
-
-// Output (Prettier master)
-class A {
-  protected [s]?() {}
-}
-```
-
 #### Angular: Put a closing parenthesis onto a new line after ternaries passed to pipes ([#5682] by [@selvazhagan])
 
 <!-- prettier-ignore -->