Tags: patch Given the following C++ code (where "|" represents the point): |Expected getFoo(); If you press C-M-d when c++-ts-mode is enabled, point moves to: Expected getFoo(|); In c++-mode, point moves (correctly) to: Expected<|int> getFoo(); Also, show-paren-mode does not highlight any <> pairs in c++-ts-mode. My proposed fix is to create a syntax table for c++-ts-mode and add "<" and ">" to it as open/close delimiters. The attached patch implements the proposed solution. Thanks.