HerrCai0907 wrote: > Try getting rid of findNextTokenSkippingComments, and maybe just jump to begin() + token width Do you think it is a good idea to use `ECD->getLocation().getLocWithOffset(ECD->getName().size())`? https://github.com/llvm/llvm-project/pull/86129