[geany/geany] 81fb12: Fix language check in tm_workspace_find()

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Wed, 06 May 2015 16:37:46 UTC
Commit:      81fb120f508be4b8f472a818b708039c3942b642
             https://github.com/geany/geany/commit/81fb120f508be4b8f472a818b708039c3942b642

Log Message:
-----------
Fix language check in tm_workspace_find()

The tags_lang variable is set from the first tag in the found array but
the array may actually contain tags from several languages. This may
lead to two things:

1. Goto tag definition goes to a tag from a different filetype
2. Worse, the first tag is from a different language than the current file
and we get a message that no tag was found

Get lang for every tag in the array and rename tags_lang to tag_lang.


Modified Paths:
--------------
    tagmanager/src/tm_workspace.c

Modified: tagmanager/src/tm_workspace.c
30 lines changed, 15 insertions(+), 15 deletions(-)
===================================================================
@@ -686,7 +686,6 @@ const GPtrArray *tm_workspace_find(const char *name, TMTagType type, TMTagAttrTy
 	TMTag **matches[2];
 	size_t len;
 	guint tagCount[2]={0,0}, tagIter;
-	gint tags_lang;
 
 	if (!name)
 		return NULL;
@@ -705,11 +704,11 @@ const GPtrArray *tm_workspace_find(const char *name, TMTagType type, TMTagAttrTy
 	/* file tags */
 	if (matches[0] && *matches[0])
 	{
-		tags_lang = (*matches[0])->lang;
-
 		for (tagIter=0;tagIter<tagCount[0];++tagIter)
 		{
-			if ((type & (*matches[0])->type) && (lang == -1 || tags_lang == lang))
+			gint tag_lang = (*matches[0])->lang;
+
+			if ((type & (*matches[0])->type) && (lang == -1 || tag_lang == lang))
 				g_ptr_array_add(tags, *matches[0]);
 			if (partial)
 			{
@@ -728,20 +727,21 @@ const GPtrArray *tm_workspace_find(const char *name, TMTagType type, TMTagAttrTy
 	/* global tags */
 	if (matches[1] && *matches[1])
 	{
-		int tags_lang_alt = 0;
-		tags_lang = (*matches[1])->lang;
-		/* tags_lang_alt is used to load C global tags only once for C and C++
-		 * lang = 1 is C++, lang = 0 is C
-		 * if we have lang 0, than accept also lang 1 for C++ */
-		if (tags_lang == 0)	/* C or C++ */
-			tags_lang_alt = 1;
-		else
-			tags_lang_alt = tags_lang; /* otherwise just ignore it */
-
 		for (tagIter=0;tagIter<tagCount[1];++tagIter)
 		{
+			gint tag_lang = (*matches[1])->lang;
+			gint tag_lang_alt = 0;
+
+			/* tag_lang_alt is used to load C global tags only once for C and C++
+			 * lang = 1 is C++, lang = 0 is C
+			 * if we have lang 0, than accept also lang 1 for C++ */
+			if (tag_lang == 0)	/* C or C++ */
+				tag_lang_alt = 1;
+			else
+				tag_lang_alt = tag_lang; /* otherwise just ignore it */
+
 			if ((type & (*matches[1])->type) && (lang == -1 ||
-				tags_lang == lang || tags_lang_alt == lang))
+				tag_lang == lang || tag_lang_alt == lang))
 				g_ptr_array_add(tags, *matches[1]);
 
 			if (partial)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).