Sync ctags parsers with big changes with Geany

src/tagmanager/tm_ctags.c

@@ -49,7 +49,22 @@ static bool nonfatal_error_printer(const errorSelection selection,
 }
 
 
-static void enable_all_lang_kinds()
+static void enable_roles(const TMParserType lang, guint kind)
+{
+	unsigned int c = countLanguageRoles(lang, kind);
+	kindDefinition *def = getLanguageKind(lang, kind);
+	gchar kind_letter = def->letter;
+
+	for (unsigned int i = 0; i < c; i++)
+	{
+		roleDefinition* rdef = getLanguageRole(lang, kind, (int)i);
+		gboolean should_enable = tm_parser_enable_role(lang, kind_letter);
+		enableRole(rdef, should_enable);
+	}
+}
+
+
+static void enable_kinds_and_roles()
 {
 	TMParserType lang;
 
@@ -62,6 +77,7 @@ static void enable_all_lang_kinds()
 		{
 			kindDefinition *def = getLanguageKind(lang, kind);
 			enableKind(def, true);
+			enable_roles(lang, kind);
 		}
 	}
 }
@@ -226,7 +242,7 @@ void tm_ctags_init(void)
 	enableXtag(XTAG_REFERENCE_TAGS, true);
 
 	/* some kinds we are interested in are disabled by default */
-	enable_all_lang_kinds();
+	enable_kinds_and_roles();
 }
 
 

src/tagmanager/tm_parser.c

@@ -816,6 +816,21 @@ gchar *tm_parser_update_scope(TMParserType lang, gchar *scope)
 }
 
 
+/* whether or not to enable ctags roles for the given language and kind */
+gboolean tm_parser_enable_role(TMParserType lang, gchar kind)
+{
+	switch (lang)
+	{
+		case TM_PARSER_GO:
+			/* 'p' is used both for package definition tags and imported package
+			 * tags and we can't tell which is which just by kind. By disabling
+			 * roles for this kind, we only get package definition tags. */
+			return kind == 'p' ? FALSE : TRUE;
+	}
+	return TRUE;
+}
+
+
 const gchar *tm_parser_context_separator(TMParserType lang)
 {
 	switch (lang)
@@ -858,6 +873,7 @@ gboolean tm_parser_has_full_context(TMParserType lang)
 		case TM_PARSER_D:
 		case TM_PARSER_FERITE:
 		case TM_PARSER_GLSL:
+		case TM_PARSER_GO:
 		case TM_PARSER_JAVA:
 		case TM_PARSER_JAVASCRIPT:
 		case TM_PARSER_JSON:
@@ -879,7 +895,6 @@ gboolean tm_parser_has_full_context(TMParserType lang)
 		case TM_PARSER_ERLANG:
 		case TM_PARSER_F77:
 		case TM_PARSER_FORTRAN:
-		case TM_PARSER_GO:
 		case TM_PARSER_OBJC:
 		case TM_PARSER_REST:
 		/* Other parsers don't use scope at all (or should be somewhere above) */

src/tagmanager/tm_parser.h

@@ -125,6 +125,8 @@ TMTagType tm_parser_get_subparser_type(TMParserType lang, TMParserType sublang,
 
 gchar *tm_parser_update_scope(TMParserType lang, gchar *scope);
 
+gboolean tm_parser_enable_role(TMParserType lang, gchar kind);
+
 const gchar *tm_parser_context_separator(TMParserType lang);
 
 gboolean tm_parser_has_full_context(TMParserType lang);

tests/ctags/test.go.tags

@@ -33,7 +33,6 @@ f2
 f3�16�()�main.T1�0�(a, b int)
 f4�16�(a func () func ())�main.T7�0�(func (), int)
 f5�16�()�main�0
-fmt�256�0
 g�16384�main�0�int
 h�16384�main�0�int
 main�16�()�main�0