feat(parser/diff): option to force quit on diff

internal/parser/diff/parser.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/criyle/go-judge/envexec"
 	"github.com/joint-online-judge/JOJ3/internal/stage"
 )
 
@@ -24,13 +23,13 @@ type Conf struct {
 	PassComment string `default:"🥳Passed!\n"`
 	FailComment string `default:"🧐Failed...\n"`
 	Cases       []struct {
-		IgnoreResultStatus bool
+		Outputs []struct {
-		Outputs            []struct {
+			Score           int
-			Score        int
+			FileName        string
-			FileName     string
+			AnswerPath      string
-			AnswerPath   string
+			CompareSpace    bool
-			CompareSpace bool
+			AlwaysHide      bool
-			AlwaysHide   bool
+			ForceQuitOnDiff bool
 		}
 	}
 }
@@ -54,51 +53,46 @@ func (*Diff) Run(results []stage.ExecutorResult, confAny any) (
 		result := results[i]
 		score := 0
 		comment := ""
-		if !caseConf.IgnoreResultStatus &&
+		for _, output := range caseConf.Outputs {
-			result.Status != stage.Status(envexec.StatusAccepted) {
+			answer, err := os.ReadFile(output.AnswerPath)
-			forceQuit = true
+			if err != nil {
-			comment += fmt.Sprintf(
+				return nil, true, err
-				"Unexpected executor status: %s.", result.Status,
+			}
-			)
+			slog.Debug("compare", "filename", output.FileName,
-		} else {
+				"answer path", output.AnswerPath,
-			for _, output := range caseConf.Outputs {
+				"actual", result.Files[output.FileName],
-				answer, err := os.ReadFile(output.AnswerPath)
+				"answer", string(answer))
-				if err != nil {
+			// If no difference, assign score
-					return nil, true, err
+			if compareChars(string(answer), result.Files[output.FileName],
+				output.CompareSpace) {
+				score += output.Score
+				comment += conf.PassComment
+			} else {
+				if output.ForceQuitOnDiff {
+					forceQuit = true
 				}
-				slog.Debug("compare", "filename", output.FileName,
+				comment += conf.FailComment
-					"answer path", output.AnswerPath,
+				comment += fmt.Sprintf("Difference found in `%s`.\n",
-					"actual", result.Files[output.FileName],
+					output.FileName)
-					"answer", string(answer))
+				if !output.AlwaysHide {
-				// If no difference, assign score
+					// Convert answer to string and split by lines
-				if compareChars(string(answer), result.Files[output.FileName],
+					stdoutLines := strings.Split(string(answer), "\n")
-					output.CompareSpace) {
+					resultLines := strings.Split(
-					score += output.Score
+						result.Files[output.FileName], "\n")
-					comment += conf.PassComment
+
+					// Generate Myers diff
+					diffOps := myersDiff(stdoutLines, resultLines)
+
+					// 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",
+						diffOutput,
+					)
 				} else {
-					comment += conf.FailComment
+					comment += "(Content hidden.)\n"
-					comment += fmt.Sprintf("Difference found in `%s`.\n",
-						output.FileName)
-					if !output.AlwaysHide {
-						// Convert answer to string and split by lines
-						stdoutLines := strings.Split(string(answer), "\n")
-						resultLines := strings.Split(
-							result.Files[output.FileName], "\n")
-
-						// Generate Myers diff
-						diffOps := myersDiff(stdoutLines, resultLines)
-
-						// 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",
-							diffOutput,
-						)
-					} else {
-						comment += "(Content hidden.)\n"
-					}
 				}
 			}
 		}