From 11ff3401107d89594d7be96affd6f27ffadb7cbb Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Mon, 28 Sep 2026 18:44:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A2=98=E7=9B=AE):=20=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E6=B2=A1=E8=BF=87=E6=97=B6=E6=8A=8A=E4=BB=A3=E7=A0=81=E9=87=8C?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=80=E5=A4=84=E4=B8=AD=E6=96=87=E6=A0=87=E7=82=B9?=
 =?UTF-8?q?=E9=83=BD=E6=A0=87=E5=87=BA=E6=9D=A5=EF=BC=8C=E5=92=8C=E3=80=8C?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90=E8=8B=B1=E6=96=87=EF=BC=88N=20=E5=A4=84?=
 =?UTF-8?q?=EF=BC=89=E3=80=8D=E5=AF=B9=E5=BE=97=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 原来编辑器里只标报错点名的第一处，按钮却写着「4 处」，学生对不上、也不知道一键替换
  会改哪里。字符串和注释里的中文标点是合法的，不标（和一键替换同一套判断）
- 这种情况下没交上去：结果页签那一段叫「交之前检查」，标题写「还没有交上去」，
  不再叫「提交结果」

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../problem/components/PythonErrorExplain.vue | 11 ++++-
 .../src/oj/problem/components/ResultPane.vue  |  7 +++-
 apps/web/src/oj/problem/utils/errorMark.ts    | 42 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/oj/problem/components/PythonErrorExplain.vue b/apps/web/src/oj/problem/components/PythonErrorExplain.vue
index a646d07..8337ba0 100644
--- a/apps/web/src/oj/problem/components/PythonErrorExplain.vue
+++ b/apps/web/src/oj/problem/components/PythonErrorExplain.vue
@@ -1,7 +1,13 @@
 <script setup lang="ts">
 import { useCodeStore } from "oj/store/code"
 import { findChinesePunctuation } from "oj/problem/utils/chinesePunctuation"
-import { applyFixes, clearErrorMark, currentCode, showErrorMark } from "oj/problem/utils/errorMark"
+import {
+  applyFixes,
+  clearErrorMark,
+  currentCode,
+  showErrorMark,
+  showPunctuationMarks,
+} from "oj/problem/utils/errorMark"
 import { explainPythonCompileError } from "oj/problem/utils/pythonError"
 
 /**
@@ -55,6 +61,9 @@ watch(
     fixedCount.value = null
     if (ex?.line) showErrorMark(ex.line, ex.sourceLine, ex.caret)
     else clearErrorMark()
+    // 中文标点一处不漏地标出来，和按钮上的「N 处」对得上
+    const code = ex?.punctuation ? currentCode() : null
+    if (code !== null) showPunctuationMarks(findChinesePunctuation(code))
   },
   { immediate: true },
 )
diff --git a/apps/web/src/oj/problem/components/ResultPane.vue b/apps/web/src/oj/problem/components/ResultPane.vue
index b2e895e..16ddee3 100644
--- a/apps/web/src/oj/problem/components/ResultPane.vue
+++ b/apps/web/src/oj/problem/components/ResultPane.vue
@@ -45,7 +45,10 @@ const canTrial = computed(() => {
   <FlowchartResult v-if="drawing" />
   <div v-show="!drawing" class="result-pane">
     <n-radio-group v-if="canTrial" v-model:value="resultSegment" size="small" class="segments">
-      <n-radio-button value="submit">提交结果</n-radio-button>
+      <!-- 语法没过就没交上去：那一段不叫「提交结果」 -->
+      <n-radio-button value="submit">{{
+        syntaxErrorInfo ? "交之前检查" : "提交结果"
+      }}</n-radio-button>
       <n-radio-button value="samples">运行例子</n-radio-button>
       <n-radio-button value="custom">自己输入</n-radio-button>
     </n-radio-group>
@@ -53,7 +56,7 @@ const canTrial = computed(() => {
     <!-- 提交结果用 v-show：切去看运行例子时不卸载，挂着的错误说明在编辑器里标着红 -->
     <div v-show="resultSegment === 'submit' || !canTrial">
       <n-flex v-if="syntaxErrorInfo" vertical>
-        <n-alert type="warning" title="代码有语法错误，还没有提交" />
+        <n-alert type="warning" title="代码有语法错误，还没有交上去" />
         <PythonErrorExplain :err-info="syntaxErrorInfo" />
       </n-flex>
       <template v-else-if="submission">
diff --git a/apps/web/src/oj/problem/utils/errorMark.ts b/apps/web/src/oj/problem/utils/errorMark.ts
index 3447190..c489c3a 100644
--- a/apps/web/src/oj/problem/utils/errorMark.ts
+++ b/apps/web/src/oj/problem/utils/errorMark.ts
@@ -33,6 +33,36 @@ function build(state: EditorState, mark: Mark): DecorationSet {
   return Decoration.set(ranges)
 }
 
+/**
+ * 中文标点的标记：报错只点名第一处，但「把中文标点都换成英文（N 处）」说的是 N 处 ——
+ * 编辑器里只看得到一处的话，学生对不上那个 N，也不知道一键替换会改哪里。
+ * 字符串和注释里的不标（那是合法的，见 chinesePunctuation.ts）
+ */
+const setPunctuation = StateEffect.define<PunctuationFix[]>()
+const punctuationDeco = Decoration.mark({ class: "cm-punctuation-mark" })
+
+const punctuationField = StateField.define<DecorationSet>({
+  create: () => Decoration.none,
+  update(deco, tr) {
+    deco = deco.map(tr.changes)
+    for (const effect of tr.effects) {
+      if (effect.is(setPunctuation)) {
+        const max = tr.state.doc.length
+        deco = Decoration.set(
+          effect.value
+            .filter((fix) => fix.to <= max && fix.to > fix.from)
+            .map((fix) => punctuationDeco.range(fix.from, fix.to)),
+          true,
+        )
+      }
+      // 清错误标记的时候（下一次提交、一键替换）一起清
+      if (effect.is(setMark) && effect.value === null) deco = Decoration.none
+    }
+    return deco
+  },
+  provide: (field) => EditorView.decorations.from(field),
+})
+
 const markField = StateField.define<DecorationSet>({
   create: () => Decoration.none,
   update(deco, tr) {
@@ -68,9 +98,19 @@ const theme = EditorView.baseTheme({
     textUnderlineOffset: "3px",
     backgroundColor: "rgba(208, 48, 80, 0.18)",
   },
+  ".cm-punctuation-mark": {
+    backgroundColor: "rgba(240, 160, 32, 0.35)",
+    outline: "1px solid rgba(240, 160, 32, 0.8)",
+    borderRadius: "2px",
+  },
 })
 
-export const errorMarkExtensions = [markField, tracker, theme]
+export const errorMarkExtensions = [markField, punctuationField, tracker, theme]
+
+/** 标出这些中文标点（位置是整篇代码里的偏移，来自 findChinesePunctuation） */
+export function showPunctuationMarks(fixes: PunctuationFix[]) {
+  current?.dispatch({ effects: setPunctuation.of(fixes) })
+}
 
 /**
  * 标出第 `line` 行并滚过去。`sourceLine` 是报错里打出来的那一行（去了行首空格），