Fix multiline templates prototype generation

Author: facchinm

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

@@ -110,31 +110,73 @@ func (p *CTagsParser) prototypeAndCodeDontMatch(tag *types.CTag) bool {
 		code = removeEverythingAfterClosingRoundBracket(code)
 		// Get how many characters are "missing"
 		n := strings.Index(prototype, code)
+		line := 0
 		// Add these characters to "code" string
-		code = getFunctionProtoWithNPreviousCharacters(tag, code, n)
+		code, line = getFunctionProtoWithNPreviousCharacters(tag, code, n)
 		// Check again for perfect matching
 		ret = strings.Index(code, prototype)
+		if ret != -1 {
+			tag.Line = line
+		}
 	}
 
 	return ret == -1
 }
 
+func findTemplateMultiline(tag *types.CTag) string {
+	code, _ := getFunctionProtoUntilTemplateToken(tag, tag.Code)
+	return removeEverythingAfterClosingRoundBracket(code)
+}
+
 func removeEverythingAfterClosingRoundBracket(s string) string {
 	n := strings.Index(s, ")")
 	return s[0 : n+1]
 }
 
-func getFunctionProtoWithNPreviousCharacters(tag *types.CTag, code string, n int) string {
+func getFunctionProtoUntilTemplateToken(tag *types.CTag, code string) (string, int) {
+
+	/* FIXME I'm ugly */
+	line := 0
+
+	file, err := os.Open(tag.Filename)
+	if err == nil {
+		defer file.Close()
+
+		scanner := bufio.NewScanner(file)
+		multilinecomment := false
+		var textBuffer []string
+
+		// buffer lines until we get to the start of this tag
+		for scanner.Scan() && line < (tag.Line-1) {
+			line++
+			text := scanner.Text()
+			textBuffer = append(textBuffer, text)
+		}
+
+		for line > 0 && !strings.Contains(code, TEMPLATE) {
+
+			line = line - 1
+			text := textBuffer[line]
+
+			text, multilinecomment = removeComments(text, multilinecomment)
+
+			code = text + code
+		}
+	}
+	return code, line
+}
+
+func getFunctionProtoWithNPreviousCharacters(tag *types.CTag, code string, n int) (string, int) {
 
 	/* FIXME I'm ugly */
 	expectedPrototypeLen := len(code) + n
+	line := 0
 
 	file, err := os.Open(tag.Filename)
 	if err == nil {
 		defer file.Close()
 
 		scanner := bufio.NewScanner(file)
-		line := 0
 		multilinecomment := false
 		var textBuffer []string
 
@@ -156,7 +198,7 @@ func getFunctionProtoWithNPreviousCharacters(tag *types.CTag, code string, n int
 			code = removeSpacesAndTabs(code)
 		}
 	}
-	return code
+	return code, line
 }
 
 func removeComments(text string, multilinecomment bool) (string, bool) {

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

@@ -81,14 +81,20 @@ func (p *CTagsParser) addPrototypes() {
 }
 
 func addPrototype(tag *types.CTag) {
-	if strings.Index(tag.Prototype, TEMPLATE) == 0 || strings.Index(tag.Code, TEMPLATE) == 0 {
-		code := tag.Code
-		if strings.Contains(code, "{") {
-			code = code[:strings.Index(code, "{")]
+	if strings.Index(tag.Prototype, TEMPLATE) == 0 {
+		if strings.Index(tag.Code, TEMPLATE) == 0 {
+			code := tag.Code
+			if strings.Contains(code, "{") {
+				code = code[:strings.Index(code, "{")]
+			} else {
+				code = code[:strings.LastIndex(code, ")")+1]
+			}
+			tag.Prototype = code + ";"
 		} else {
-			code = code[:strings.LastIndex(code, ")")+1]
+			//tag.Code is 99% multiline, recreate it
+			code := findTemplateMultiline(tag)
+			tag.Prototype = code + ";"
 		}
-		tag.Prototype = code + ";"
 		return
 	}