feat: multiline code snippet

gnoverse · Oct 30, 2024 · 24bd678 · 24bd678
1 parent 535f5b5
commit 24bd678
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/formatter/builder.go b/formatter/builder.go
@@ -156,7 +156,7 @@ func header(rule string, severity string, maxLineNumWidth int, filename string,
 
 	padding := strings.Repeat(" ", maxLineNumWidth)
 	endString += lineStyle.Sprintf("%s--> ", padding)
-	endString += fileStyle.Sprintf("%s:%d:%d", filename, startLine, startColumn)
+	endString += fileStyle.Sprintf("%s:%d:%d\n", filename, startLine, startColumn)
 
 	return endString
 }
@@ -174,7 +174,7 @@ func codeSnippet(snippetLines []string, startLine int, endLine int, maxLineNumWi
 		line = strings.TrimPrefix(line, commonIndent)
 		lineNum := fmt.Sprintf("%*d", maxLineNumWidth, i)
 
-		endString += lineStyle.Sprintf("%s | %s", lineNum, line)
+		endString += lineStyle.Sprintf("%s | %s\n", lineNum, line)
 	}
 
 	return endString

diff --git a/formatter/cyclomatic_complexity.go b/formatter/cyclomatic_complexity.go
@@ -8,8 +8,8 @@ import (
 type CyclomaticComplexityFormatter struct{}
 
 func (f *CyclomaticComplexityFormatter) IssueTemplate() string {
-	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn}}
-{{snippet .SnippetLines .StartLine .EndLine .MaxLineNumWidth .CommonIndent .Padding}}
+	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn -}}
+{{snippet .SnippetLines .StartLine .EndLine .MaxLineNumWidth .CommonIndent .Padding -}}
 {{underlineAndMessage .Message .Padding .StartLine .EndLine .StartColumn .EndColumn .SnippetLines .CommonIndent}}
 {{complexityInfo .Padding .Message }}
 

diff --git a/formatter/general.go b/formatter/general.go
@@ -3,8 +3,8 @@ package formatter
 type GeneralIssueFormatter struct{}
 
 func (f *GeneralIssueFormatter) IssueTemplate() string {
-	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn}}
-{{snippet .SnippetLines .StartLine .EndLine .MaxLineNumWidth .CommonIndent .Padding}}
+	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn -}}
+{{snippet .SnippetLines .StartLine .EndLine .MaxLineNumWidth .CommonIndent .Padding -}}
 {{underlineAndMessage .Message .Padding .StartLine .EndLine .StartColumn .EndColumn .SnippetLines .CommonIndent}}
 
 {{- if .Suggestion }}

diff --git a/formatter/missing_mod_package.go b/formatter/missing_mod_package.go
@@ -3,7 +3,7 @@ package formatter
 type MissingModPackageFormatter struct{}
 
 func (f *MissingModPackageFormatter) IssueTemplate() string {
-	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn}}
+	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn -}}
 {{message .Message}}
 `
 }

diff --git a/formatter/slice_bound.go b/formatter/slice_bound.go
@@ -3,10 +3,10 @@ package formatter
 type SliceBoundsCheckFormatter struct{}
 
 func (f *SliceBoundsCheckFormatter) IssueTemplate() string {
-	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn}}
-{{snippet .SnippetLines .StartLine .EndLine .MaxLineNumWidth .CommonIndent .Padding}}
+	return `{{header .Rule .Severity .MaxLineNumWidth .Filename .StartLine .StartColumn -}}
+{{snippet .SnippetLines .StartLine .EndLine .MaxLineNumWidth .CommonIndent .Padding -}}
 {{underlineAndMessage .Message .Padding .StartLine .EndLine .StartColumn .EndColumn .SnippetLines .CommonIndent}}
-{{warning .Category}}
+{{warning .Category -}}
 `
 }