[CLEANUP + COMMENT] fix more exoteric multiline issues

Author: facchinm

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

@@ -99,19 +99,26 @@ func findLinesWithExternCScope(tag *types.CTag, ctx *types.Context) {
 		scanner := bufio.NewScanner(file)
 
 		inExternCNamespaceScope := false
+		decidingExternScope := false
 		indentLevels := 0
 		line := 0
 		for scanner.Scan() {
 			line++
 			str := scanner.Text()
-			if strings.Contains(str, EXTERN) {
+			if decidingExternScope == true && len(removeSpacesAndTabs(str)) > 0 {
+				decidingExternScope = false
+			}
+			if strings.Contains(removeSpacesAndTabs(str), removeSpacesAndTabs(EXTERN)) {
 				inExternCNamespaceScope = true
+				if len(removeSpacesAndTabs(str)) == len(removeSpacesAndTabs(EXTERN)) {
+					decidingExternScope = true
+				}
 			}
 			if inExternCNamespaceScope == true {
 				ctx.LinesInExternCContext[tag.Filename] = append(ctx.LinesInExternCContext[tag.Filename], line)
 			}
 			indentLevels += strings.Count(str, "{") - strings.Count(str, "}")
-			if indentLevels == 0 {
+			if indentLevels == 0 && decidingExternScope == false {
 				inExternCNamespaceScope = false
 			}
 		}
@@ -247,7 +254,7 @@ func prototypeAndCodeDontMatch(tag *types.CTag) bool {
 		// what could possibly go wrong?
 		// definition is multiline
 
-		// Phase 1: add to code n non-whitespace tokens before the code line
+		// Phase 1: add to code n non-whitespace non-comments tokens before the code line
 		code = removeEverythingAfterClosingPerentheses(code)
 
 		// is the code contained in the prototype?
@@ -269,22 +276,46 @@ func getFunctionPrototypWithNPreviousCharacter(tag *types.CTag, code string, n i
 		defer file.Close()
 
 		scanner := bufio.NewScanner(file)
-		line := 1
-		iteration := 1
+		line := 0
+		multilinecomment := false
+		var textBuffer []string
 
-		for len(code) < expectedPrototypeLen {
+		// skip 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)
+		}
 
-			// skip lines until we get to the start of this tag
-			for scanner.Scan() && line < (tag.Line-iteration) {
-				line++
+		for line > 0 && len(code) < expectedPrototypeLen {
+
+			line = line - 1
+			text := textBuffer[line]
+
+			if strings.Index(text, "//") != -1 {
+				text = text[0:strings.Index(text, "//")]
+			}
+
+			if strings.Index(text, "*/") != -1 {
+				if strings.Index(text, "/*") != -1 {
+					text = text[0:strings.Index(text, "/*")] + text[strings.Index(text, "*/")+1:len(text)-1]
+				} else {
+					text = text[strings.Index(text, "*/")+1 : len(text)-1]
+					multilinecomment = true
+				}
+			}
+
+			if multilinecomment {
+				if strings.Index(text, "/*") != -1 {
+					text = text[0:strings.Index(text, "/*")]
+					multilinecomment = false
+				} else {
+					text = ""
+				}
 			}
 
-			code = scanner.Text() + code
+			code = text + code
 			code = removeSpacesAndTabs(code)
-			iteration++
-			// rewind the file
-			file.Seek(0, 0)
-			line = 0
 		}
 	}
 	return code