cmd/joj3/stage/main.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/joint-online-judge/JOJ3/cmd/joj3/conf"
-	executors "github.com/joint-online-judge/JOJ3/internal/executor"
+	"github.com/joint-online-judge/JOJ3/internal/executors"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers"
 	"github.com/joint-online-judge/JOJ3/internal/stage"
 
 	"github.com/jinzhu/copier"

internal/executors/all.go

@@ -1,8 +1,8 @@
 package executors
 
 import (
-	_ "github.com/joint-online-judge/JOJ3/internal/executor/dummy"
+	_ "github.com/joint-online-judge/JOJ3/internal/executors/dummy"
-	"github.com/joint-online-judge/JOJ3/internal/executor/sandbox"
+	"github.com/joint-online-judge/JOJ3/internal/executors/sandbox"
 )
 
 // this file does nothing but imports to ensure all the init() functions

internal/parser/all.go

@@ -1,16 +0,0 @@
-package parsers
-
-import (
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/clangtidy"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/cppcheck"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/cpplint"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/diff"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/dummy"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/healthcheck"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/keyword"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/resultstatus"
-	_ "github.com/joint-online-judge/JOJ3/internal/parser/sample"
-)
-
-// this file does nothing but imports to ensure all the init() functions
-// in the subpackages are called

internal/parsers/all.go

@@ -0,0 +1,16 @@
+package parsers
+
+import (
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/clangtidy"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/cppcheck"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/cpplint"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/diff"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/dummy"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/healthcheck"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/keyword"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/resultstatus"
+	_ "github.com/joint-online-judge/JOJ3/internal/parsers/sample"
+)
+
+// this file does nothing but imports to ensure all the init() functions
+// in the subpackages are called

internal/parsers/diff/parser.go

@@ -87,9 +87,8 @@ func (*Diff) Run(results []stage.ExecutorResult, confAny any) (
 						// Generate diff block with surrounding context
 						diffOutput := generateDiffWithContext(
 							stdoutLines, resultLines, diffOps)
-						diffOutput = strings.TrimSuffix(diffOutput, "\n  \n")
 						comment += fmt.Sprintf(
-							"```diff\n%s\n```\n",
+							"```diff\n%s```\n",
 							diffOutput,
 						)
 					}