remove duplicate code

cmd/dev/headers/comments/files.go

@@ -20,7 +20,8 @@ func FileContentWithoutHeader(path, token string) (string, error) {
 	if !knowsFormat {
 		return text, nil
 	}
-	return format.remove(text, token), nil
+	_, content := format.SplitHeaderFromContent(text, token)
+	return content, nil
 }
 
 func FileContent(path string) (string, error) {

cmd/dev/headers/comments/formats.go

@@ -13,31 +13,6 @@ type Format struct {
 	endToken string
 }
 
-// removes the comment block in the given format containing the given token from the given text
-func (f Format) remove(text string, token string) string {
-	commentWithToken := f.renderLineStart(token)
-	inComment := false
-	result := []string{}
-	for _, line := range strings.Split(text, "\n") {
-		if strings.HasPrefix(line, commentWithToken) {
-			inComment = true
-		}
-		if inComment && line == "" {
-			// the type of comment blocks we remove here is separated by an empty line
-			// --> empty line marks the end of our comment block
-			inComment = false
-			continue
-		}
-		if inComment && !strings.HasPrefix(line, f.startToken) {
-			inComment = false
-		}
-		if !inComment {
-			result = append(result, line)
-		}
-	}
-	return strings.Join(result, "\n")
-}
-
 func (f Format) SplitHeaderFromContent(text string, token string) (header, content string) {
 	commentWithToken := f.renderLineStart(token)
 	inComment := false

cmd/dev/headers/comments/formats_test.go

@@ -31,7 +31,7 @@ func TestDoubleSlashCommentsRemove(t *testing.T) {
 	t.Parallel()
 	give := "// Copyright © 1997 Ory Corp Inc.\n// SPDX-License-Identifier: Apache-2.0\n\n// another comment\n\nname: test\nhello: world"
 	want := "// another comment\n\nname: test\nhello: world"
-	have := doubleSlashComments.remove(give, "Copyright ©")
+	_, have := doubleSlashComments.SplitHeaderFromContent(give, "Copyright ©")
 	assert.Equal(t, want, have)
 }
 
@@ -65,7 +65,7 @@ hello: world`, "\n")
 
 name: test
 hello: world`, "\n")
-	have := poundComments.remove(give, "Copyright ©")
+	_, have := poundComments.SplitHeaderFromContent(give, "Copyright ©")
 	assert.Equal(t, want, have)
 }
 
@@ -114,6 +114,6 @@ hello: world`, "\n")
 
 name: test
 hello: world`, "\n")
-	have := htmlComments.remove(give, "Copyright ©")
+	_, have := htmlComments.SplitHeaderFromContent(give, "Copyright ©")
 	assert.Equal(t, want, have)
 }