Merged #3049 into master.
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#event-10674470211
You are receiving this because you are subscribed to this thread.
Message ID:
Great, so I've just re-pushed the squashed version in case someone wants to
have a look at it. I'll merge it tomorrow (well, actually later today) but feel
free to merge it earlier if you want.
--
Reply to this email directly or view it on GitHub:
@elextr approved this pull request.
LGBI, docs ok, I won't be home to be able to test anything until after release
unfortunately
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#pullrequestreview-1681070153
You are receiving this because you are
> Apart the small doc changes, LGTM.
Committed now.
Alright, I'll wait for @elextr if he has some more comments to the
documentation, then squash the commits a bit and merge the result afterwards.
--
Reply to this email directly or view it on GitHub:
@b4n approved this pull request.
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#pullrequestreview-1681065041
You are receiving this because you are subscribed to this thread.
Message ID:
@techee pushed 1 commit.
69ad323270615947ae6249c9eab2396c7301cf43 Add a remark about tag file naming
when 'l' field is used
--
View it on GitHub:
https://github.com/geany/geany/pull/3049/files/bc49cd2750dacf0bb5f82b7f30d328df79f23e9e..69ad323270615947ae6249c9eab2396c7301cf43
You are receiving
@kugel- approved this pull request.
LGBI but I only understand a fraction of it anyway
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#pullrequestreview-1680935257
You are receiving this because you are subscribed to this thread.
Message ID:
@b4n commented on this pull request.
> {
- if ((NULL == fgets(buf, BUFSIZ, fp)) || ('\0' == *buf))
- return FALSE;
- }
- while (strncmp(buf, "!_TAG_", 6) == 0); /* skip !_TAG_ lines */
+ TMTagType type;
+ TMTag
@b4n approved this pull request.
Apart the small doc changes, LGTM. Limited testing shows it works nicely,
including mixed languages in a tags file. Older tags files I had laying around
using either Pipe or Tagmanager format still seemed to work as usual. I didn't
have any older ctags tags
@techee pushed 1 commit.
bc49cd2750dacf0bb5f82b7f30d328df79f23e9e Document the recommended way of
generating tags files
--
View it on GitHub:
https://github.com/geany/geany/pull/3049/files/43ee190b8ff0886a4b55313a7f75ba0da4c6083d..bc49cd2750dacf0bb5f82b7f30d328df79f23e9e
You are receiving
@elextr commented on this pull request.
> }
- else if (0 == strcmp(key, "file")) /* static (local)
tag */
- tag->local = TRUE;
- else if (0 == strcmp(key, "signature")) /* arglist */
+
@techee commented on this pull request.
> }
- else if (0 == strcmp(key, "file")) /* static (local)
tag */
- tag->local = TRUE;
- else if (0 == strcmp(key, "signature")) /* arglist */
+
@techee pushed 1 commit.
43ee190b8ff0886a4b55313a7f75ba0da4c6083d Fix compiler warnings related to loop
index variables
--
View it on GitHub:
https://github.com/geany/geany/pull/3049/files/a088e452fbbef8bc08d0bc350265d98e45f048f0..43ee190b8ff0886a4b55313a7f75ba0da4c6083d
You are receiving
@elextr commented on this pull request.
> {
- if ((NULL == fgets(buf, BUFSIZ, fp)) || ('\0' == *buf))
- return FALSE;
- }
- while (strncmp(buf, "!_TAG_", 6) == 0); /* skip !_TAG_ lines */
+ TMTagType type;
+ TMTag
@techee pushed 1 commit.
a088e452fbbef8bc08d0bc350265d98e45f048f0 Fix some compiler warnings
--
View it on GitHub:
https://github.com/geany/geany/pull/3049/files/4ca132618802e4114c5ee08cbd8a7e55c8609e4c..a088e452fbbef8bc08d0bc350265d98e45f048f0
You are receiving this because you are subscribed
@b4n requested changes on this pull request.
First pass only based on *code* review, no actual testing yet.
> + TMParserType lang =
> tm_ctags_get_named_lang(value);
+ if (lang >= 0)
+ tag->lang =
@techee commented on this pull request.
> +Generating tags files using ctags
+*
+Geany supports loading tag files generated using the ``ctags`` command-line
+tool from the universal-ctags project
(https://github.com/universal-ctags/ctags).
+Even though Geany
@techee pushed 1 commit.
4ca132618802e4114c5ee08cbd8a7e55c8609e4c Improve wording of geany.txt
--
View it on GitHub:
https://github.com/geany/geany/pull/3049/files/bb64384a6af2631ff6f4168118ff27e0dff1c4b5..4ca132618802e4114c5ee08cbd8a7e55c8609e4c
You are receiving this because you are
@elextr commented on this pull request.
> +Generating tags files using ctags
+*
+Geany supports loading tag files generated using the ``ctags`` command-line
+tool from the universal-ctags project
(https://github.com/universal-ctags/ctags).
+Even though Geany
@techee commented on this pull request.
> +Generating tags files using ctags
+*
+Geany supports loading tag files generated using the ``ctags`` command-line
+tool from the universal-ctags project
(https://github.com/universal-ctags/ctags).
+Even though Geany
@elextr commented on this pull request.
> @@ -1785,6 +1786,25 @@ This works basically the same as on other platforms::
"c:\program files\geany\bin\geany" -g c:\mytags.php.tags
c:\code\somefile.php
+Generating tags files using ctags
+*
+Geany supports
@techee commented on this pull request.
> case-sensitive. This helps Geany to read the file properly. If this
line is missing, Geany tries to auto-detect the used format but this
-might fail.
+might fail. Tag files using the CTags format should be left unmodified in the
OK.
--
Reply to
@techee commented on this pull request.
> @@ -1689,12 +1689,13 @@ Global tags files can have three different formats:
* Pipe-separated format
* CTags format
-The first line of global tags files should be a comment, introduced
-by ``#`` followed by a space and a string like ``format=pipe``,
@techee commented on this pull request.
> @@ -1785,6 +1786,25 @@ This works basically the same as on other platforms::
"c:\program files\geany\bin\geany" -g c:\mytags.php.tags
c:\code\somefile.php
+Generating tags files using ctags
+*
+Geany supports
@elextr requested changes on this pull request.
A couple of changes.
> @@ -1785,6 +1786,25 @@ This works basically the same as on other platforms::
"c:\program files\geany\bin\geany" -g c:\mytags.php.tags
c:\code\somefile.php
+Generating tags files using ctags
@techee pushed 1 commit.
bb64384a6af2631ff6f4168118ff27e0dff1c4b5 Update geany.txt with ctags usage for
generating tag files
--
View it on GitHub:
https://github.com/geany/geany/pull/3049/files/d945009828e3c36b366a42448b009ea66f784090..bb64384a6af2631ff6f4168118ff27e0dff1c4b5
You are
> At least we can easily change the PHP tags generation script when needed.
But we still need to support user's tag files possibly generated by older ctags
versions so it should stay there for some time even if we update the php parser.
--
Reply to this email directly or view it on GitHub:
@techee pushed 3 commits.
e1ae976a7284d59f24b387825e967a2e6794a330 Add ctags 'readtags' library to allow
us parse ctags files
d364c30e7973ceaf387f8c64211d3980a462f90b Fix compilation when TM_DEBUG is
defined
d945009828e3c36b366a42448b009ea66f784090 Use the readtags library to parse
ctags
> > We'll still need the "unknown" check to support older ctags binaries
> > unfortunately.
At least we can easily change the PHP tags generation script when needed.
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#issuecomment-1760373686
You are
> We'll still need the "unknown" check to support older ctags binaries
> unfortunately.
Sure, but it'll still make it more coherent. Unless we fear it'd break
compatibility at some level…
> OK to rebase this branch on top of master so it can be more easily tested
> with the php and py tag
> Good catch. Maybe it'd be worth submitting an update to that parser to be
> more in line with the convention as well.
We'll still need the "unknown" check to support older ctags binaries
unfortunately.
OK to rebase this branch on top of master so it can be more easily tested with
the php
> > I wrote most of it, it ought to be perfect
>
> Oh, I'm syncing it in the wrong direction - I should have updated ctags with
> your code :-).
Meh, I also wrote some of that one, so either way works :grinning:
> I discovered one more problem - all parsers use `typeref:typename` but I just
Maybe should I also grab the latest version of the libreadtags library for this
PR? I noticed you also submitted some patch to it in the spring.
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#issuecomment-1758610973
You are receiving this because
> I wrote most of it, it ought to be perfect
Oh, I'm syncing it in the wrong direction - I should have updated ctags with
your code :-).
I discovered one more problem - all parsers use `typeref:typename` but I just
discovered after looking at Enrico's php tags file and at the php parser
@techee commented on this pull request.
> {
- gchar buf[BUFSIZ];
- gchar *p, *tab;
+ tagEntry entry;
+ tagFile *f = tagsOpen(tags_file, NULL);
+ const gchar *lang_kinds = tm_ctags_get_lang_kinds(lang);
+ GPtrArray *unknown_fields = g_ptr_array_new_full(10,
@techee commented on this pull request.
> + fclose(fp); /* the readtags library opens the file by itself */
+ read_ctags_file(tags_file, mode, file_tags);
> doesn't this happen?
You are absolutely right. When `format=ctags` is found in the file, I added
```
@techee commented on this pull request.
> @@ -436,7 +443,6 @@ static TMTag *new_tag_from_tags_file(TMSourceFile *file,
> FILE *fp, TMParserType
result = init_tag_from_file_alt(tag, file, fp);
break;
case TM_FILE_FORMAT_CTAGS:
-
@techee pushed 4 commits.
49386fb8c70a80019ef5cd75ba21ec86305759b2 Warn about using legacy #
format=ctags and update documentation
a2cf693790c238faf7ba32aa18b478b6eaa77dc6 Add a debug warning
a4a7941d7a0a82a1ebc6edb1b90566e2d3851c05 Replace GPtrArray with GArray
> I'm not sure how robust our parser is against invalid input
I wrote most of it, it ought to be perfect :grin:
> or updated ctags file format
In theory the format is perfectly well defined and stable (just adding new
extension fields), so it should be fine™. But in practice uctags added
@b4n commented on this pull request.
> @@ -436,7 +443,6 @@ static TMTag *new_tag_from_tags_file(TMSourceFile *file,
> FILE *fp, TMParserType
result = init_tag_from_file_alt(tag, file, fp);
break;
case TM_FILE_FORMAT_CTAGS:
-
@techee commented on this pull request.
>
- /* tag name */
- if (! (tab = strchr(p, '\t')) || p == tab)
- return FALSE;
- tag->name = g_strndup(p, (gsize)(tab - p));
- p = tab + 1;
+ if (entry.kind[0] && entry.kind[1])
+
@techee pushed 2 commits.
14c3b8081c79da98f053eda3a2f61925eafa5933 Use C-style comments
5635539d55f069a06211854bc67f1db5d1679c69 End both loops when scope found
--
View it on GitHub:
@techee commented on this pull request.
> @@ -154,7 +154,7 @@ gboolean tm_tag_is_anon(const TMTag *tag);
const char *tm_tag_type_name(const TMTag *tag);
-TMTagType tm_tag_name_type(const char* tag_name);
+TMTagType tm_tag_name_type(const char* tag_name, TMParserType lang);
Yes.
This
@elextr commented on this pull request.
> @@ -154,7 +154,7 @@ gboolean tm_tag_is_anon(const TMTag *tag);
const char *tm_tag_type_name(const TMTag *tag);
-TMTagType tm_tag_name_type(const char* tag_name);
+TMTagType tm_tag_name_type(const char* tag_name, TMParserType lang);
Reference
@elextr commented on this pull request.
> @@ -154,7 +154,7 @@ gboolean tm_tag_is_anon(const TMTag *tag);
const char *tm_tag_type_name(const TMTag *tag);
-TMTagType tm_tag_name_type(const char* tag_name);
+TMTagType tm_tag_name_type(const char* tag_name, TMParserType lang);
No change, its
@kugel- requested changes on this pull request.
>
- /* tag name */
- if (! (tab = strchr(p, '\t')) || p == tab)
- return FALSE;
- tag->name = g_strndup(p, (gsize)(tab - p));
- p = tab + 1;
+ if (entry.kind[0] && entry.kind[1])
+
I wonder why PRs like this are open or so long and then rushed into the
release. Not enough pinging?
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#issuecomment-1752640119
You are receiving this because you are subscribed to this thread.
Message
By the way, I really think this PR should go to 2.0. @eht16 converted various
tag-generating scripts to use the ctags file format and some things aren't
parsed correctly now without this patch, see the end of
https://github.com/geany/geany/pull/3512#issue-1740467282.
--
Reply to this email
> Now conflicts are fixed will try to test in the next few days.
IIRC it seemed to work with limited testing way back then, but seems I didn't
post that, sorry. Didn't have anything complicated to test with.
--
Reply to this email directly or view it on GitHub:
Should I rebase this PR on top of master and squash some of the commits?
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3049#issuecomment-1750772060
You are receiving this because you are subscribed to this thread.
Message ID:
50 matches
Mail list logo
