Handle more cases when searching for callback reference

the tag will be searched only if its signature is void and it's not being skipped for other reasons

Author: facchinm

src/arduino.cc/builder/ctags/ctags_parser.go

@@ -236,7 +236,6 @@ func parseTag(row string) *types.CTag {
 
 	parts = parts[2:]
 
-	signature := ""
 	returntype := ""
 	for _, part := range parts {
 		if strings.Contains(part, ":") {
@@ -253,7 +252,7 @@ func parseTag(row string) *types.CTag {
 			case "typeref":
 				tag.Typeref = value
 			case "signature":
-				signature = value
+				tag.Signature = value
 			case "returntype":
 				returntype = value
 			case "class":
@@ -265,7 +264,7 @@ func parseTag(row string) *types.CTag {
 			}
 		}
 	}
-	tag.Prototype = returntype + " " + tag.FunctionName + signature + ";"
+	tag.Prototype = returntype + " " + tag.FunctionName + tag.Signature + ";"
 
 	if strings.Contains(row, "/^") && strings.Contains(row, "$/;") {
 		tag.Code = row[strings.Index(row, "/^")+2 : strings.Index(row, "$/;")]

src/arduino.cc/builder/ctags/ctags_to_prototypes.go

@@ -70,14 +70,18 @@ func functionNameUsedAsFunctionPointerIn(tag *types.CTag, functionTags []*types.
 		if tag.Line != functionTag.Line && strings.Index(tag.Code, "&"+functionTag.FunctionName) != -1 {
 			return true
 		}
+		if tag.Line != functionTag.Line && strings.Index(tag.Code, functionTag.FunctionName) != -1 &&
+			(functionTag.Signature == "(void)" || functionTag.Signature == "()") {
+			return true
+		}
 	}
 	return false
 }
 
 func (p *CTagsParser) collectFunctions() []*types.CTag {
 	functionTags := []*types.CTag{}
 	for _, tag := range p.tags {
-		if tag.Kind == KIND_FUNCTION {
+		if tag.Kind == KIND_FUNCTION && !tag.SkipMe {
 			functionTags = append(functionTags, tag)
 		}
 	}

src/arduino.cc/builder/types/types.go

@@ -252,6 +252,7 @@ type CTag struct {
 	Filename     string
 	Typeref      string
 	SkipMe       bool
+	Signature    string
 
 	Prototype          string
 	Function           string