Merge branch 'master' into cli-inception

Author: cmaglie

arduino-builder/main.go

@@ -96,19 +96,8 @@ func (h *foldersFlag) String() string {
 	return fmt.Sprint(*h)
 }
 
-func (h *foldersFlag) Set(csv string) error {
-	var values []string
-	if strings.Contains(csv, string(os.PathListSeparator)) {
-		values = strings.Split(csv, string(os.PathListSeparator))
-	} else {
-		values = strings.Split(csv, ",")
-	}
-
-	for _, value := range values {
-		value = strings.TrimSpace(value)
-		*h = append(*h, value)
-	}
-
+func (h *foldersFlag) Set(folder string) error {
+	*h = append(*h, folder)
 	return nil
 }
 

create_cmake_rule.go

@@ -109,10 +109,10 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 
 	// Use old ctags method to generate export file
 	commands := []types.Command{
-		&ContainerMergeCopySketchFiles{},
+		//&ContainerMergeCopySketchFiles{},
 		&ContainerAddPrototypes{},
-		&FilterSketchSource{Source: &ctx.Source, RemoveLineMarkers: true},
-		&SketchSaver{},
+		//&FilterSketchSource{Source: &ctx.Source, RemoveLineMarkers: true},
+		//&SketchSaver{},
 	}
 
 	for _, command := range commands {

ctags/ctags_to_prototypes.go

@@ -72,8 +72,7 @@ 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 == "()") {
+		if tag.Line != functionTag.Line && strings.Index(strings.TrimSpace(tag.Code), "("+functionTag.FunctionName+")") != -1 {
 			return true
 		}
 	}

test/prototypes_adder_test.go

@@ -907,3 +907,44 @@ func TestPrototypesAdderSketchWithDosEol(t *testing.T) {
 	}
 	// only requires no error as result
 }
+
+func TestPrototypesAdderSketchWithSubstringFunctionMember(t *testing.T) {
+	DownloadCoresAndToolsAndLibraries(t)
+	sketchLocation := paths.New("sketch_with_class_and_method_substring", "sketch_with_class_and_method_substring.ino")
+	quotedSketchLocation := utils.QuoteCppString(Abs(t, sketchLocation).String())
+
+	ctx := &types.Context{
+		HardwareDirs:         paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
+		BuiltInToolsDirs:     paths.NewPathList("downloaded_tools"),
+		BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
+		OtherLibrariesDirs:   paths.NewPathList("libraries"),
+		SketchLocation:       sketchLocation,
+		FQBN:                 parseFQBN(t, "arduino:avr:uno"),
+		ArduinoAPIVersion:    "10600",
+		Verbose:              true,
+	}
+
+	buildPath := SetupBuildPath(t, ctx)
+	defer buildPath.RemoveAll()
+
+	commands := []types.Command{
+
+		&builder.ContainerSetupHardwareToolsLibsSketchAndProps{},
+
+		&builder.ContainerMergeCopySketchFiles{},
+
+		&builder.ContainerFindIncludes{},
+
+		&builder.PrintUsedLibrariesIfVerbose{},
+		&builder.WarnAboutArchIncompatibleLibraries{},
+
+		&builder.ContainerAddPrototypes{},
+	}
+
+	for _, command := range commands {
+		err := command.Run(ctx)
+		NoError(t, err)
+	}
+
+	require.Contains(t, ctx.Source, "class Foo {\nint blooper(int x) { return x+1; }\n};\n\nFoo foo;\n\n#line 7 "+quotedSketchLocation+"\nvoid setup();")
+}

test/sketch_with_class_and_method_substring/sketch_with_class_and_method_substring.ino

@@ -0,0 +1,13 @@
+class Foo {
+int blooper(int x) { return x+1; }
+};
+
+Foo foo;
+
+void setup() {
+  foo.setup();
+}
+
+void loop() {
+  foo.loop();
+}

utils/utils.go

@@ -153,7 +153,7 @@ func FilterFiles() filterFiles {
 	}
 }
 
-var SOURCE_CONTROL_FOLDERS = map[string]bool{"CVS": true, "RCS": true, ".git": true, ".github": true, ".svn": true, ".hg": true, ".bzr": true, ".vscode": true}
+var SOURCE_CONTROL_FOLDERS = map[string]bool{"CVS": true, "RCS": true, ".git": true, ".github": true, ".svn": true, ".hg": true, ".bzr": true, ".vscode": true, ".settings": true}
 
 func IsSCCSOrHiddenFile(file os.FileInfo) bool {
 	return IsSCCSFile(file) || IsHiddenFile(file)