Commit 6a3b384fc35525c66f67ae6ad501abae7ddd1e16

Authored by haohao
2 parents eddd21f4 78d798bb

merge: sync master-jdk17, keep stripTrailing and trailing comma fix

Co-authored-by: Cursor <cursoragent@cursor.com>