feat(view): preserve bracket-marked calls without modifiers

Track CallExpr.bracket_marked from `[callee]` parse so Structure display keeps `[fn] …` instead of falling back to `> fn …` when there are no pre-modifiers.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
cflmyandCursor committed 2026-09-14 13:39:12 +08:00
1 parent d5a9301c7f
commit 551f4ff322
5 files changed
+50 -3

No files matched your search

+2 -1
View File
@@ -18,7 +18,7 @@
|------------|---------------|------|
| `Expr::Index` | `[键](基)` | 嵌套 `[k2]([k1](base))` |
| `InterpPart::Index` | 同上嵌套链接形 | 不再默认 `` `base`[^k] `` |
| `CallExpr` + `pre_modifiers` | `修饰 [callee] 实参…` | 无修饰时仍可显示 `> callee …` |
| `CallExpr` + `bracket_marked` / `pre_modifiers` | `修饰 [callee] 实参…` 或 `[callee] 实参…` | 仅经典 `>` 解析时仍显示 `> callee …` |
| 赋值 / 返回 | 粗体 / 斜体语义即可 | 不强制还原整句叙述 |
| foreach | `- [项](集合)` | 不变 |
@@ -32,3 +32,4 @@
| 日期 | 说明 |
|------|------|
| 2026-09-14 | 初稿;Index 链接形 + 括号调用修饰表面 |
| 2026-09-14 | `bracket_marked`:无修饰的 `[callee]` 也保真显示 |
+2
View File
@@ -32,6 +32,7 @@
| **M8** | 教程第 9 章 + Skill examples → 链接取元 / v0.3 标记 | **done** |
| **M9** | 教程其余章节(1–8、10–12、14)全面对齐 v0.3 + 链接取元 | **done** |
| **M10** | public/stdlib 剩余演示统一括号调用;public import 返回面修到 v0.3 | **done** |
| **M11** | View:`bracket_marked` 使无修饰 `[callee]` 也显示括号形 | **done** |
## 2. 验收(出门)
@@ -55,3 +56,4 @@
| 2026-09-14 | M8 教程 + Skill examples 同步 |
| 2026-09-14 | M9 教程全书对齐 v0.3 标记与链接取元 |
| 2026-09-14 | M10 public/stdlib 括号调用扫尾 + import 返回面 |
| 2026-09-14 | M11 View `bracket_marked` 无修饰括号调用表面 |
+3
View File
@@ -121,6 +121,9 @@ pub struct CallExpr {
/// Pre-bracket modifiers: `礼貌 [问候] x` → `["礼貌"]`, expanded to `礼貌=True` at eval.
/// See [bracket-call-modifiers.md](../../doc/design/bracket-call-modifiers.md).
pub pre_modifiers: Vec<String>,
/// True when the call was authored with `[callee]` (even with no modifiers).
/// View prefers `修饰 [callee] …` / `[callee] …` over `> callee …` when set.
pub bracket_marked: bool,
}
impl CallExpr {
+5
View File
@@ -949,6 +949,7 @@ pub fn parse_call_tail(s: &str, prefer_var: bool) -> Result<(CallExpr, usize)> {
receiver,
args,
pre_modifiers: Vec::new(),
bracket_marked: false,
},
after_callee_offset + ws + args_consumed,
))
@@ -1040,6 +1041,7 @@ fn try_bracket_marked_call(s: &str, prefer_var: bool) -> Result<Option<(CallExpr
receiver,
args,
pre_modifiers,
bracket_marked: true,
},
consumed,
)));
@@ -1687,6 +1689,7 @@ mod bracket_call_tests {
let (c, _) = parse_call_tail(r#"礼貌 [问候] "Marqdo""#, true).unwrap();
assert_eq!(c.callee, "问候");
assert_eq!(c.pre_modifiers, vec!["礼貌".to_string()]);
assert!(c.bracket_marked);
assert_eq!(c.args.len(), 1);
}
@@ -1694,9 +1697,11 @@ mod bracket_call_tests {
fn nested_paren_arg() {
let (c, _) = parse_call_tail(r#"[问候] ([格式化] "x")"#, true).unwrap();
assert_eq!(c.callee, "问候");
assert!(c.bracket_marked);
match &c.args[0] {
Arg::Positional(Expr::Call(inner)) => {
assert_eq!(inner.callee, "格式化");
assert!(inner.bracket_marked);
}
other => panic!("expected nested call, got {:?}", other),
}
+38 -2
View File
@@ -1249,7 +1249,8 @@ fn stmt_shell(line: u32, inner: &str, mode: StructureMode) -> String {
fn call_display(call: &CallExpr) -> String {
let mut s = String::new();
if !call.pre_modifiers.is_empty() {
let bracket = call.bracket_marked || !call.pre_modifiers.is_empty();
if bracket {
for m in &call.pre_modifiers {
s.push_str(m);
s.push(' ');
@@ -1468,7 +1469,7 @@ fn lit_display(lit: &Literal) -> String {
#[cfg(test)]
mod tests {
use super::*;
use crate::ast::{BinaryOp, Expr, Literal};
use crate::ast::{Arg, BinaryOp, CallExpr, Expr, Literal};
#[test]
fn expr_gt_is_surface() {
@@ -1632,4 +1633,39 @@ mod tests {
let llm = crate::parse::parse_source(include_str!("../../tests/ext/llm-import.mq.md")).unwrap();
assert!(uses_stream_panel(&llm));
}
#[test]
fn call_display_bracket_without_modifiers() {
let call = CallExpr {
callee: "parse".into(),
path: Some(vec!["json".into(), "parse".into()]),
receiver: None,
args: vec![Arg::Named {
name: "text".into(),
value: Expr::Literal(Literal::Text("{}".into())),
}],
pre_modifiers: vec![],
bracket_marked: true,
};
let d = call_display(&call);
assert!(d.starts_with("[json.parse]"), "{d}");
assert!(!d.starts_with("> "), "{d}");
}
#[test]
fn call_display_gt_when_not_bracket() {
let call = CallExpr {
callee: "print".into(),
path: None,
receiver: None,
args: vec![Arg::Named {
name: "text".into(),
value: Expr::Literal(Literal::Text("hi".into())),
}],
pre_modifiers: vec![],
bracket_marked: false,
};
let d = call_display(&call);
assert!(d.starts_with("> print"), "{d}");
}
}