Don't use tag identifier F

It's used for file tags upstram and might interfere with it.
geany · Nov 19, 2020 · ab68168 · ab68168
1 parent 0347e74
commit ab68168
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/ctags/parsers/geany_objc.c b/ctags/parsers/geany_objc.c
@@ -46,7 +46,7 @@ static kindDefinition ObjcKinds[] = {
 	{true, 'm', "method", "Object's method"},
 	{true, 'c', "class", "Class' method"},
 	{true, 'v', "var", "Global variable"},
-	{true, 'F', "field", "Object field"},
+	{true, 'E', "field", "Object field"},
 	{true, 'f', "function", "A function"},
 	{true, 'p', "property", "A property"},
 	{true, 't', "typedef", "A type alias"},

diff --git a/ctags/parsers/geany_ruby.c b/ctags/parsers/geany_ruby.c
@@ -39,7 +39,7 @@ static kindDefinition RubyKinds [] = {
 	{ true, 'c', "class",  "classes" },
 	{ true, 'f', "method", "methods" },
 	{ true, 'm', "module", "modules" },
-	{ true, 'F', "singletonMethod", "singleton methods" },
+	{ true, 'S', "singletonMethod", "singleton methods" },
 #if 0
 	/* Following two kinds are reserved. */
 	{ true, 'd', "describe", "describes and contexts for Rspec" },

diff --git a/ctags/parsers/geany_rust.c b/ctags/parsers/geany_rust.c
@@ -58,7 +58,7 @@ static kindDefinition rustKinds[] = {
 	{true, 'M', "macro", "Macro Definition"},
 	{true, 'm', "field", "A struct field"},
 	{true, 'e', "enumerator", "An enum variant"},
-	{true, 'F', "method", "A method"},
+	{true, 'P', "method", "A method"},
 };
 
 typedef enum {

diff --git a/ctags/parsers/geany_sql.c b/ctags/parsers/geany_sql.c
@@ -204,7 +204,7 @@ static kindDefinition SqlKinds [] = {
 	{ true,  'c', "cursor",		  "cursors"				   },
 	{ false, 'd', "prototype",	  "prototypes"			   },
 	{ true,  'f', "function",	  "functions"			   },
-	{ true,  'F', "field",		  "record fields"		   },
+	{ true,  'E', "field",		  "record fields"		   },
 	{ false, 'l', "local",		  "local variables"		   },
 	{ true,  'L', "label",		  "block label"			   },
 	{ true,  'P', "package",	  "packages"			   },

diff --git a/src/tagmanager/tm_parser.c b/src/tagmanager/tm_parser.c
@@ -159,7 +159,7 @@ static TMParserMapEntry map_SQL[] = {
 	{'c', tm_tag_undef_t},
 	{'d', tm_tag_prototype_t},
 	{'f', tm_tag_function_t},
-	{'F', tm_tag_field_t},
+	{'E', tm_tag_field_t},
 	{'l', tm_tag_undef_t},
 	{'L', tm_tag_undef_t},
 	{'P', tm_tag_package_t},
@@ -209,7 +209,7 @@ static TMParserMapEntry map_RUBY[] = {
 	{'c', tm_tag_class_t},
 	{'f', tm_tag_method_t},
 	{'m', tm_tag_namespace_t},
-	{'F', tm_tag_member_t},
+	{'S', tm_tag_member_t},
 };
 
 static TMParserMapEntry map_TCL[] = {
@@ -458,7 +458,7 @@ static TMParserMapEntry map_OBJC[] = {
 	{'m', tm_tag_method_t},
 	{'c', tm_tag_class_t},
 	{'v', tm_tag_variable_t},
-	{'F', tm_tag_field_t},
+	{'E', tm_tag_field_t},
 	{'f', tm_tag_function_t},
 	{'p', tm_tag_undef_t},
 	{'t', tm_tag_typedef_t},
@@ -496,7 +496,7 @@ static TMParserMapEntry map_RUST[] = {
 	{'M', tm_tag_macro_t},
 	{'m', tm_tag_field_t},
 	{'e', tm_tag_enumerator_t},
-	{'F', tm_tag_method_t},
+	{'P', tm_tag_method_t},
 };
 
 static TMParserMapEntry map_GO[] = {