Move prototypeAndCodeDontMatch to ctags_has_issues

Author: facchinm

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

@@ -58,6 +58,47 @@ func sliceContainsInt(s []int, e int) bool {
 	return false
 }
 
+func (p *CTagsParser) prototypeAndCodeDontMatch(tag *types.CTag) bool {
+	if tag.SkipMe {
+		return true
+	}
+
+	code := removeSpacesAndTabs(tag.Code)
+
+	// original code is multi-line, which tags doesn't have - could we find this code in the
+	// original source file, for purposes of checking here?
+	if strings.Index(code, ")") == -1 {
+		file, err := os.Open(tag.Filename)
+		if err == nil {
+			defer file.Close()
+
+			scanner := bufio.NewScanner(file)
+			line := 1
+
+			// skip lines until we get to the start of this tag
+			for scanner.Scan() && line < tag.Line {
+				line++
+			}
+
+			// read up to 10 lines in search of a closing paren
+			newcode := scanner.Text()
+			for scanner.Scan() && line < (tag.Line+10) && strings.Index(newcode, ")") == -1 {
+				newcode += scanner.Text()
+			}
+
+			// don't bother replacing the code text if we haven't found a closing paren
+			if strings.Index(newcode, ")") != -1 {
+				code = removeSpacesAndTabs(newcode)
+			}
+		}
+	}
+
+	prototype := removeSpacesAndTabs(tag.Prototype)
+	prototype = removeTralingSemicolon(prototype)
+
+	return strings.Index(code, prototype) == -1
+}
+
 /* This function scans the source files searching for "extern C" context
  * It save the line numbers in a map filename -> {lines...}
  */

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

@@ -30,8 +30,6 @@
 package ctags
 
 import (
-	"bufio"
-	"os"
 	"strconv"
 	"strings"
 
@@ -69,7 +67,7 @@ func (p *CTagsParser) Parse(ctagsOutput string) []*types.CTag {
 	p.addPrototypes()
 	p.removeDefinedProtypes()
 	p.skipDuplicates()
-	p.skipTagsWhere(prototypeAndCodeDontMatch)
+	p.skipTagsWhere(p.prototypeAndCodeDontMatch)
 
 	return p.tags
 }
@@ -148,47 +146,6 @@ func (p *CTagsParser) skipTagsWhere(skipFunc skipFuncType) {
 	}
 }
 
-func prototypeAndCodeDontMatch(tag *types.CTag) bool {
-	if tag.SkipMe {
-		return true
-	}
-
-	code := removeSpacesAndTabs(tag.Code)
-
-	// original code is multi-line, which tags doesn't have - could we find this code in the
-	// original source file, for purposes of checking here?
-	if strings.Index(code, ")") == -1 {
-		file, err := os.Open(tag.Filename)
-		if err == nil {
-			defer file.Close()
-
-			scanner := bufio.NewScanner(file)
-			line := 1
-
-			// skip lines until we get to the start of this tag
-			for scanner.Scan() && line < tag.Line {
-				line++
-			}
-
-			// read up to 10 lines in search of a closing paren
-			newcode := scanner.Text()
-			for scanner.Scan() && line < (tag.Line+10) && strings.Index(newcode, ")") == -1 {
-				newcode += scanner.Text()
-			}
-
-			// don't bother replacing the code text if we haven't found a closing paren
-			if strings.Index(newcode, ")") != -1 {
-				code = removeSpacesAndTabs(newcode)
-			}
-		}
-	}
-
-	prototype := removeSpacesAndTabs(tag.Prototype)
-	prototype = removeTralingSemicolon(prototype)
-
-	return strings.Index(code, prototype) == -1
-}
-
 func removeTralingSemicolon(s string) string {
 	return s[0 : len(s)-1]
 }