Hi Dodji Seketeli: Sorry to commit the patch so later, it costed me several days to solve a my careless when migrating cpp_token::file_offset to line/column, it seems new callbacks following from your advice work well in my patch, especially with in_macro_expansion_p. Please check them in attachment ChangeLog, libcpp.patch and plugin.patch. Sincerely Yunfeng