@b4n I'm done, phew! It's your turn :-)

The current state is this: if you delete geany/ctags/main, replace it with upstream-ctags/main and apply the 6-line patch (which I might eliminate in the future, it just requires some help on the uctags side and some more work on our side), you are done. This is the very last manual ctags/main sync so you'd better enjoy reviewing it - such an opportunity won't happen in the future ;-)

In any case, it doesn't make sense to review the patches as they are in this pull request - most of it is just how I tried to reduce the number of diffs against uctags and also originally I didn't even dream about having a full sync so there are some patches trying to simplify future manual syncs which are pointless now.

I think to review this it's best to first look at the corresponding upstream changes - it's these pull requests:

universal-ctags/ctags#2088
universal-ctags/ctags#2102

Then, the majority of Geany changes is inside src/tagmanager/tm_ctags.c and this file should be reviewed as a whole. It however resembles the mini-geany.c test mostly, it just does our specific things with the collected tags. To avoid extra callbacks, I moved tag creation functions from tm_source_file_c to this file in

266283c

Other patches from this pull request worth looking at are:

2413f2e
f6139d3
75c8c6c (and its bugfix 5c35fa7)
0182f7d
170b388

The rest is just intermediate garbage.

I'd suggest that you have a look at what I described above, play with the ActionScript and Cobol regex parsers to see they work and if everything is OK, I'll rebase this pull request this way:

  1. I remove the ActionScript and Cobol regex parsers and the related code
  2. I'll make the ctags changes a single commit - basically "sync to upstream ctags version" where I copy-over the ctags main and apply the patch
  3. I'll make a single commit containing all the Geany changes (something like "make Geany compile with the upstream ctags") so it will be easier to see what changes were made on the Geany side

Does it sound OK to you?

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.