allow tools with same name and different vendor

Author: facchinm

src/arduino.cc/builder/tools_loader.go

@@ -111,9 +111,9 @@ func collectAllToolsFolders(from string) ([]string, error) {
 	return folders, i18n.WrapError(err)
 }
 
-func toolsSliceContains(tools *[]*types.Tool, name, version string) bool {
+func toolsSliceContains(tools *[]*types.Tool, name, version string, vendor string) bool {
 	for _, tool := range *tools {
-		if name == tool.Name && version == tool.Version {
+		if name == tool.Name && version == tool.Version && vendor == tool.Vendor {
 			return true
 		}
 	}
@@ -138,7 +138,7 @@ func loadToolsFrom(tools *[]*types.Tool, builtinToolsVersionsFilePath string) er
 			toolName := strings.Split(rowParts[0], ".")[1]
 			toolVendor := strings.Split(rowParts[0], ".")[0]
 			toolVersion := rowParts[1]
-			if !toolsSliceContains(tools, toolName, toolVersion) {
+			if !toolsSliceContains(tools, toolName, toolVersion, toolVendor) {
 				*tools = append(*tools, &types.Tool{Name: toolName, Vendor: toolVendor, Version: toolVersion, Folder: folder})
 			}
 		}
@@ -182,7 +182,7 @@ func loadToolsFromFolderStructure(tools *[]*types.Tool, folder string) error {
 				return i18n.WrapError(err)
 			}
 			toolVendor := filepath.Base(strings.Replace(folder, filepath.Base(folder), "", -1))
-			if !toolsSliceContains(tools, toolName.Name(), toolVersion.Name()) {
+			if !toolsSliceContains(tools, toolName.Name(), toolVersion.Name(), toolVendor) {
 				*tools = append(*tools, &types.Tool{Name: toolName.Name(), Vendor: toolVendor, Version: toolVersion.Name(), Folder: toolFolder})
 			}
 		}