Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 30 insertions, 0 deletions

diff --git a/workhorse/internal/lsif_transformer/parser/errors.go b/workhorse/internal/lsif_transformer/parser/errors.go
new file mode 100644
index 00000000000..1040a789413
--- /dev/null
+++ b/workhorse/internal/lsif_transformer/parser/errors.go
@@ -0,0 +1,30 @@
+package parser
+
+import (
+	"errors"
+	"strings"
+)
+
+func combineErrors(errsOrNil ...error) error {
+	var errs []error
+	for _, err := range errsOrNil {
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	if len(errs) == 0 {
+		return nil
+	}
+
+	if len(errs) == 1 {
+		return errs[0]
+	}
+
+	var msgs []string
+	for _, err := range errs {
+		msgs = append(msgs, err.Error())
+	}
+
+	return errors.New(strings.Join(msgs, "\n"))
+}