@techee can #2990 and #2991 be merged, or have you more fiddling to do?
I think #2990 is OK to be merged (just added a comment there regarding what I did).
I would still wait with this one. First, I guess merging #2990 will cause some merge conflicts here so these will have to be resolved first.
Second, there is the problem with the go parser I mentioned in https://github.com/geany/geany/pull/3032#issuecomment-983476305 and subsequent comment and I'd like to know the opinion of @masatake.
Also, someone might want to have a look at the patch I added yesterday here to rewrite PHP scope information if I didn't do something stupid there.