Fixed all lint warnings

cmaglie · cmaglie · commit d03e4f84da81 · 2022-02-02T15:50:47.000+01:00
diff --git a/legacy/builder/builder_utils/utils.go b/legacy/builder/builder_utils/utils.go
@@ -371,10 +371,7 @@ func unescapeDep(s string) string {
 }
 
 func removeEndingBackSlash(s string) string {
-	if strings.HasSuffix(s, "\\") {
-		s = s[:len(s)-1]
-	}
-	return s
+	return strings.TrimSuffix(s, "\\")
 }
 
 func nonEmptyString(s string) bool {
diff --git a/legacy/builder/create_cmake_rule.go b/legacy/builder/create_cmake_rule.go
@@ -40,6 +40,8 @@ type ExportProjectCMake struct {
 	SketchError bool
 }
 
+var lineMatcher = regexp.MustCompile(`^#line\s\d+\s"`)
+
 func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 	if s.SketchError || !canExportCmakeProject(ctx) {
 		return nil
@@ -139,7 +141,7 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 		lines := strings.Split(string(input), "\n")
 
 		for i, line := range lines {
-			if lineToRemove, _ := regexp.MatchString(`^#line\s\d+\s"`, line); lineToRemove == true {
+			if lineMatcher.MatchString(line) {
 				lines[i] = ""
 			}
 		}
diff --git a/legacy/builder/ctags/ctags_has_issues.go b/legacy/builder/ctags/ctags_has_issues.go
@@ -26,7 +26,7 @@ import (
 func (p *CTagsParser) FixCLinkageTagsDeclarations(tags []*types.CTag) {
 
 	linesMap := p.FindCLinkageLines(tags)
-	for i, _ := range tags {
+	for i := range tags {
 
 		if sliceContainsInt(linesMap[tags[i].Filename], tags[i].Line) &&
 			!strings.Contains(tags[i].PrototypeModifiers, EXTERN) {
@@ -51,7 +51,7 @@ func (p *CTagsParser) prototypeAndCodeDontMatch(tag *types.CTag) bool {
 
 	code := removeSpacesAndTabs(tag.Code)
 
-	if strings.Index(code, ")") == -1 {
+	if !strings.Contains(code, ")") {
 		// Add to code non-whitespace non-comments tokens until we find a closing round bracket
 		file, err := os.Open(tag.Filename)
 		if err == nil {
@@ -70,7 +70,7 @@ func (p *CTagsParser) prototypeAndCodeDontMatch(tag *types.CTag) bool {
 			temp := ""
 
 			code, multilinecomment = removeComments(scanner.Text(), multilinecomment)
-			for scanner.Scan() && line < (tag.Line+10) && strings.Index(temp, ")") == -1 {
+			for scanner.Scan() && line < (tag.Line+10) && !strings.Contains(temp, ")") {
 				temp, multilinecomment = removeComments(scanner.Text(), multilinecomment)
 				code += temp
 			}
@@ -189,13 +189,13 @@ func getFunctionProtoWithNPreviousCharacters(tag *types.CTag, code string, n int
 
 func removeComments(text string, multilinecomment bool) (string, bool) {
 	// Remove C++ style comments
-	if strings.Index(text, "//") != -1 {
+	if strings.Contains(text, "//") {
 		text = text[0:strings.Index(text, "//")]
 	}
 
 	// Remove C style comments
-	if strings.Index(text, "*/") != -1 {
-		if strings.Index(text, "/*") != -1 {
+	if strings.Contains(text, "*/") {
+		if strings.Contains(text, "/*") {
 			// C style comments on the same line
 			text = text[0:strings.Index(text, "/*")] + text[strings.Index(text, "*/")+1:len(text)-1]
 		} else {
@@ -205,7 +205,7 @@ func removeComments(text string, multilinecomment bool) (string, bool) {
 	}
 
 	if multilinecomment {
-		if strings.Index(text, "/*") != -1 {
+		if strings.Contains(text, "/*") {
 			text = text[0:strings.Index(text, "/*")]
 			multilinecomment = false
 		} else {
@@ -267,7 +267,7 @@ func (p *CTagsParser) FindCLinkageLines(tags []*types.CTag) map[string][]int {
 				}
 
 				// check if we are on the first non empty line after externCDecl in case 3
-				if enteringScope == true {
+				if enteringScope {
 					enteringScope = false
 				}
 
@@ -279,13 +279,13 @@ func (p *CTagsParser) FindCLinkageLines(tags []*types.CTag) map[string][]int {
 						enteringScope = true
 					}
 				}
-				if inScope == true {
+				if inScope {
 					lines[tag.Filename] = append(lines[tag.Filename], line)
 				}
 				indentLevels += strings.Count(str, "{") - strings.Count(str, "}")
 
 				// Bail out if indentLevel is zero and we are not in case 3
-				if indentLevels == 0 && enteringScope == false {
+				if indentLevels == 0 && !enteringScope {
 					inScope = false
 				}
 			}
diff --git a/legacy/builder/ctags/ctags_parser.go b/legacy/builder/ctags/ctags_parser.go
@@ -90,7 +90,7 @@ func addPrototype(tag *types.CTag) {
 	}
 
 	tag.PrototypeModifiers = ""
-	if strings.Index(tag.Code, STATIC+" ") != -1 {
+	if strings.Contains(tag.Code, STATIC+" ") {
 		tag.PrototypeModifiers = tag.PrototypeModifiers + " " + STATIC
 	}
 
@@ -121,7 +121,7 @@ func (p *CTagsParser) skipDuplicates() {
 	definedPrototypes := make(map[string]bool)
 
 	for _, tag := range p.tags {
-		if !definedPrototypes[tag.Prototype] && tag.SkipMe == false {
+		if !definedPrototypes[tag.Prototype] && !tag.SkipMe {
 			definedPrototypes[tag.Prototype] = true
 		} else {
 			tag.SkipMe = true
diff --git a/legacy/builder/ctags/ctags_to_prototypes.go b/legacy/builder/ctags/ctags_to_prototypes.go
@@ -55,10 +55,10 @@ func (p *CTagsParser) firstFunctionPointerUsedAsArgument() int {
 
 func functionNameUsedAsFunctionPointerIn(tag *types.CTag, functionTags []*types.CTag) bool {
 	for _, functionTag := range functionTags {
-		if tag.Line != functionTag.Line && strings.Index(tag.Code, "&"+functionTag.FunctionName) != -1 {
+		if tag.Line != functionTag.Line && strings.Contains(tag.Code, "&"+functionTag.FunctionName) {
 			return true
 		}
-		if tag.Line != functionTag.Line && strings.Index(strings.TrimSpace(tag.Code), "("+functionTag.FunctionName+")") != -1 {
+		if tag.Line != functionTag.Line && strings.Contains(tag.Code, "("+functionTag.FunctionName+")") {
 			return true
 		}
 	}
diff --git a/legacy/builder/filter_sketch_source.go b/legacy/builder/filter_sketch_source.go
@@ -34,9 +34,7 @@ type FilterSketchSource struct {
 func (s *FilterSketchSource) Run(ctx *types.Context) error {
 	fileNames := paths.NewPathList()
 	fileNames.Add(ctx.Sketch.MainFile)
-	for _, file := range ctx.Sketch.OtherSketchFiles {
-		fileNames = append(fileNames, file)
-	}
+	fileNames.AddAll(ctx.Sketch.OtherSketchFiles)
 
 	inSketch := false
 	filtered := ""
diff --git a/legacy/builder/includes_finder_with_regexp.go b/legacy/builder/includes_finder_with_regexp.go
@@ -34,7 +34,7 @@ func findIncludeForOldCompilers(source string) string {
 	lines := strings.Split(source, "\n")
 	for _, line := range lines {
 		splittedLine := strings.Split(line, ":")
-		for i, _ := range splittedLine {
+		for i := range splittedLine {
 			if strings.Contains(splittedLine[i], "fatal error") {
 				return strings.TrimSpace(splittedLine[i+1])
 			}
diff --git a/legacy/builder/test/helper_tools_downloader.go b/legacy/builder/test/helper_tools_downloader.go
@@ -70,66 +70,66 @@ type Core struct {
 
 func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 	cores := []Core{
-		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
-		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
+		{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
+		{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
 	}
 
 	boardsManagerCores := []Core{
-		Core{Maintainer: "arduino", Arch: "samd", Version: "1.6.5"},
+		{Maintainer: "arduino", Arch: "samd", Version: "1.6.5"},
 	}
 
 	boardsManagerRedBearCores := []Core{
-		Core{Maintainer: "RedBearLab", Arch: "avr", Version: "1.0.0", Url: "https://redbearlab.github.io/arduino/Blend/blend_boards.zip"},
+		{Maintainer: "RedBearLab", Arch: "avr", Version: "1.0.0", Url: "https://redbearlab.github.io/arduino/Blend/blend_boards.zip"},
 	}
 
 	toolsMultipleVersions := []Tool{
-		Tool{Name: "bossac", Version: "1.6.1-arduino"},
-		Tool{Name: "bossac", Version: "1.5-arduino"},
+		{Name: "bossac", Version: "1.6.1-arduino"},
+		{Name: "bossac", Version: "1.5-arduino"},
 	}
 
 	tools := []Tool{
-		Tool{Name: "avrdude", Version: "6.0.1-arduino5"},
-		Tool{Name: "avr-gcc", Version: "4.8.1-arduino5"},
-		Tool{Name: "arm-none-eabi-gcc", Version: "4.8.3-2014q1"},
-		Tool{Name: "ctags", Version: "5.8-arduino11",
+		{Name: "avrdude", Version: "6.0.1-arduino5"},
+		{Name: "avr-gcc", Version: "4.8.1-arduino5"},
+		{Name: "arm-none-eabi-gcc", Version: "4.8.3-2014q1"},
+		{Name: "ctags", Version: "5.8-arduino11",
 			OsUrls: []OsUrl{
-				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-mingw32.zip"},
-				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-apple-darwin.zip"},
-				OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-armv6-linux-gnueabihf.tar.bz2"},
-				OsUrl{Os: "aarch64-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-aarch64-linux-gnu.tar.bz2"},
+				{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-pc-linux-gnu.tar.bz2"},
+				{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-pc-linux-gnu.tar.bz2"},
+				{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-mingw32.zip"},
+				{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-apple-darwin.zip"},
+				{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-armv6-linux-gnueabihf.tar.bz2"},
+				{Os: "aarch64-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-aarch64-linux-gnu.tar.bz2"},
 			},
 		},
-		Tool{Name: "arduino-preprocessor", Version: "0.1.5",
+		{Name: "arduino-preprocessor", Version: "0.1.5",
 			OsUrls: []OsUrl{
-				OsUrl{Os: "i686-pc-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-i686-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-x86_64-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "i686-mingw32", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-i686-w64-mingw32.tar.bz2"},
-				OsUrl{Os: "x86_64-apple-darwin", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-x86_64-apple-darwin11.tar.bz2"},
-				OsUrl{Os: "arm-linux-gnueabihf", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-arm-linux-gnueabihf.tar.bz2"},
-				OsUrl{Os: "aarch64-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-aarch64-linux-gnu.tar.bz2"},
+				{Os: "i686-pc-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-i686-pc-linux-gnu.tar.bz2"},
+				{Os: "x86_64-pc-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-x86_64-pc-linux-gnu.tar.bz2"},
+				{Os: "i686-mingw32", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-i686-w64-mingw32.tar.bz2"},
+				{Os: "x86_64-apple-darwin", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-x86_64-apple-darwin11.tar.bz2"},
+				{Os: "arm-linux-gnueabihf", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-arm-linux-gnueabihf.tar.bz2"},
+				{Os: "aarch64-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-aarch64-linux-gnu.tar.bz2"},
 			},
 		},
 	}
 
 	boardsManagerTools := []Tool{
-		Tool{Name: "openocd", Version: "0.9.0-arduino", Package: "arduino"},
-		Tool{Name: "CMSIS", Version: "4.0.0-atmel", Package: "arduino"},
+		{Name: "openocd", Version: "0.9.0-arduino", Package: "arduino"},
+		{Name: "CMSIS", Version: "4.0.0-atmel", Package: "arduino"},
 	}
 
 	boardsManagerRFduinoTools := []Tool{
-		Tool{Name: "arm-none-eabi-gcc", Version: "4.8.3-2014q1", Package: "RFduino"},
+		{Name: "arm-none-eabi-gcc", Version: "4.8.3-2014q1", Package: "RFduino"},
 	}
 
 	libraries := []Library{
-		Library{Name: "Audio", Version: "1.0.4"},
-		Library{Name: "Adafruit PN532", Version: "1.0.0"},
-		Library{Name: "Bridge", Version: "1.6.1"},
-		Library{Name: "CapacitiveSensor", Version: "0.5.0", VersionInLibProperties: "0.5"},
-		Library{Name: "Ethernet", Version: "1.1.1"},
-		Library{Name: "Robot IR Remote", Version: "2.0.0"},
-		Library{Name: "FastLED", Version: "3.1.0"},
+		{Name: "Audio", Version: "1.0.4"},
+		{Name: "Adafruit PN532", Version: "1.0.0"},
+		{Name: "Bridge", Version: "1.6.1"},
+		{Name: "CapacitiveSensor", Version: "0.5.0", VersionInLibProperties: "0.5"},
+		{Name: "Ethernet", Version: "1.1.1"},
+		{Name: "Robot IR Remote", Version: "2.0.0"},
+		{Name: "FastLED", Version: "3.1.0"},
 	}
 
 	download(t, cores, boardsManagerCores, boardsManagerRedBearCores, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools, libraries)
diff --git a/legacy/builder/test/unused_compiled_libraries_remover_test.go b/legacy/builder/test/unused_compiled_libraries_remover_test.go
@@ -36,7 +36,7 @@ func TestUnusedCompiledLibrariesRemover(t *testing.T) {
 
 	ctx := &types.Context{}
 	ctx.LibrariesBuildPath = temp
-	ctx.ImportedLibraries = []*libraries.Library{&libraries.Library{Name: "Bridge"}}
+	ctx.ImportedLibraries = []*libraries.Library{{Name: "Bridge"}}
 
 	cmd := builder.UnusedCompiledLibrariesRemover{}
 	err = cmd.Run(ctx)
@@ -56,7 +56,7 @@ func TestUnusedCompiledLibrariesRemover(t *testing.T) {
 func TestUnusedCompiledLibrariesRemoverLibDoesNotExist(t *testing.T) {
 	ctx := &types.Context{}
 	ctx.LibrariesBuildPath = paths.TempDir().Join("test")
-	ctx.ImportedLibraries = []*libraries.Library{&libraries.Library{Name: "Bridge"}}
+	ctx.ImportedLibraries = []*libraries.Library{{Name: "Bridge"}}
 
 	cmd := builder.UnusedCompiledLibrariesRemover{}
 	err := cmd.Run(ctx)
diff --git a/legacy/builder/test/utils_test.go b/legacy/builder/test/utils_test.go
@@ -67,13 +67,13 @@ func TestQuoteCppString(t *testing.T) {
 }
 
 func TestParseCppString(t *testing.T) {
-	str, rest, ok := utils.ParseCppString(`foo`)
+	_, _, ok := utils.ParseCppString(`foo`)
 	require.Equal(t, false, ok)
 
-	str, rest, ok = utils.ParseCppString(`"foo`)
+	_, _, ok = utils.ParseCppString(`"foo`)
 	require.Equal(t, false, ok)
 
-	str, rest, ok = utils.ParseCppString(`"foo"`)
+	str, rest, ok := utils.ParseCppString(`"foo"`)
 	require.Equal(t, true, ok)
 	require.Equal(t, `foo`, str)
 	require.Equal(t, ``, rest)
diff --git a/legacy/builder/utils/utils.go b/legacy/builder/utils/utils.go
@@ -34,6 +34,7 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/pkg/errors"
+	"golang.org/x/text/runes"
 	"golang.org/x/text/transform"
 	"golang.org/x/text/unicode/norm"
 )
@@ -92,22 +93,12 @@ func IsSCCSOrHiddenFile(file os.FileInfo) bool {
 
 func IsHiddenFile(file os.FileInfo) bool {
 	name := filepath.Base(file.Name())
-
-	if name[0] == '.' {
-		return true
-	}
-
-	return false
+	return name[0] == '.'
 }
 
 func IsSCCSFile(file os.FileInfo) bool {
 	name := filepath.Base(file.Name())
-
-	if SOURCE_CONTROL_FOLDERS[name] {
-		return true
-	}
-
-	return false
+	return SOURCE_CONTROL_FOLDERS[name]
 }
 
 func SliceContains(slice []string, target string) bool {
@@ -375,34 +366,28 @@ func ParseCppString(line string) (string, string, bool) {
 		c, width := utf8.DecodeRuneInString(line[i:])
 
 		switch c {
-		// Backslash, next character is used unmodified
 		case '\\':
+			// Backslash, next character is used unmodified
 			i += width
 			if i >= len(line) {
 				return "", line, false
 			}
 			res += string(line[i])
-			break
-		// Quote, end of string
 		case '"':
+			// Quote, end of string
 			return res, line[i+width:], true
 		default:
 			res += string(c)
-			break
 		}
 
 		i += width
 	}
 }
 
-func isMn(r rune) bool {
-	return unicode.Is(unicode.Mn, r) // Mn: nonspacing marks
-}
-
 // Normalizes an UTF8 byte slice
 // TODO: use it more often troughout all the project (maybe on logger interface?)
 func NormalizeUTF8(buf []byte) []byte {
-	t := transform.Chain(norm.NFD, transform.RemoveFunc(isMn), norm.NFC)
+	t := transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
 	result, _, _ := transform.Bytes(t, buf)
 	return result
 }

Original file line number	Diff line number	Diff line change
`@@ -371,10 +371,7 @@ func unescapeDep(s string) string {`
`371`	`371`	`}`
`372`	`372`
`373`	`373`	`func removeEndingBackSlash(s string) string {`
`374`		`- if strings.HasSuffix(s, "\\") {`
`375`		`- s = s[:len(s)-1]`
`376`		`- }`
`377`		`- return s`
	`374`	`+ return strings.TrimSuffix(s, "\\")`
`378`	`375`	`}`
`379`	`376`
`380`	`377`	`func nonEmptyString(s string) bool {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ type ExportProjectCMake struct {`
`40`	`40`	`SketchError bool`
`41`	`41`	`}`
`42`	`42`
	`43`	+var lineMatcher = regexp.MustCompile(`^#line\s\d+\s"`)
	`44`	`+`
`43`	`45`	`func (s ExportProjectCMake) Run(ctx types.Context) error {`
`44`	`46`	`if s.SketchError \|\| !canExportCmakeProject(ctx) {`
`45`	`47`	`return nil`
`@@ -139,7 +141,7 @@ func (s ExportProjectCMake) Run(ctx types.Context) error {`
`139`	`141`	`lines := strings.Split(string(input), "\n")`
`140`	`142`
`141`	`143`	`for i, line := range lines {`
`142`		- if lineToRemove, _ := regexp.MatchString(`^#line\s\d+\s"`, line); lineToRemove == true {
	`144`	`+ if lineMatcher.MatchString(line) {`
`143`	`145`	`lines[i] = ""`
`144`	`146`	`}`
`145`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func addPrototype(tag *types.CTag) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`tag.PrototypeModifiers = ""`
`93`		`- if strings.Index(tag.Code, STATIC+" ") != -1 {`
	`93`	`+ if strings.Contains(tag.Code, STATIC+" ") {`
`94`	`94`	`tag.PrototypeModifiers = tag.PrototypeModifiers + " " + STATIC`
`95`	`95`	`}`
`96`	`96`
`@@ -121,7 +121,7 @@ func (p *CTagsParser) skipDuplicates() {`
`121`	`121`	`definedPrototypes := make(map[string]bool)`
`122`	`122`
`123`	`123`	`for _, tag := range p.tags {`
`124`		`- if !definedPrototypes[tag.Prototype] && tag.SkipMe == false {`
	`124`	`+ if !definedPrototypes[tag.Prototype] && !tag.SkipMe {`
`125`	`125`	`definedPrototypes[tag.Prototype] = true`
`126`	`126`	`} else {`
`127`	`127`	`tag.SkipMe = true`
Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,10 @@ func (p *CTagsParser) firstFunctionPointerUsedAsArgument() int {`
`55`	`55`
`56`	`56`	`func functionNameUsedAsFunctionPointerIn(tag types.CTag, functionTags []types.CTag) bool {`
`57`	`57`	`for _, functionTag := range functionTags {`
`58`		`- if tag.Line != functionTag.Line && strings.Index(tag.Code, "&"+functionTag.FunctionName) != -1 {`
	`58`	`+ if tag.Line != functionTag.Line && strings.Contains(tag.Code, "&"+functionTag.FunctionName) {`
`59`	`59`	`return true`
`60`	`60`	`}`
`61`		`- if tag.Line != functionTag.Line && strings.Index(strings.TrimSpace(tag.Code), "("+functionTag.FunctionName+")") != -1 {`
	`61`	`+ if tag.Line != functionTag.Line && strings.Contains(tag.Code, "("+functionTag.FunctionName+")") {`
`62`	`62`	`return true`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func findIncludeForOldCompilers(source string) string {`
`34`	`34`	`lines := strings.Split(source, "\n")`
`35`	`35`	`for _, line := range lines {`
`36`	`36`	`splittedLine := strings.Split(line, ":")`
`37`		`- for i, _ := range splittedLine {`
	`37`	`+ for i := range splittedLine {`
`38`	`38`	`if strings.Contains(splittedLine[i], "fatal error") {`
`39`	`39`	`return strings.TrimSpace(splittedLine[i+1])`
`40`	`40`	`}`