fix: 处理 Copilot 二轮 review 的 10 条评论
- BrowserView: 即使 host 在白名单,GUI 自身 origin 永不给 allow-same-origin(裸 host 条目覆盖所有端口时可提权) - intercept: revealInExplorer 相对路径经 resolveSidebarPath 解析后再 revealPaths(交付物路径是相对的) - intercept: ctx.betterSidebar 改为 ctx.get(#357 纤维链读取约定) - FileTree/EditorHost/TreePanel/tabs: 把 revealed 贯通到树行渲染 + 高亮类 + scrollIntoView(此前高亮永不渲染) - state.revealPaths: 重建祖先目录时保留前导分隔符(POSIX/UNC 此前目录永远折叠) - state.schedulePersist: 仅活动会话写入全局宽度(targeted open 不再用非活动会话的过期宽度覆盖拖拽值) - browser.probe: GET 回退显式取消 body(否则流式/大响应挂住 socket) - terminal-font: leading generic 前只放 symbols-only 字体;fully-patched 放 generic 后(避免 hijack 度量字体) - sidebar.module.css: 恢复拖拽反馈(#130 的 silent resize 与 PR 描述冲突,取 HEAD) - Sidebar: 剩余 4 处 ctx.betterSidebar 改 ctx.get - tests: 补 revealPaths/iframeSandboxFor/terminal-font 回归测试 + EditorHost/FileTree 测试补 revealed prop
This commit is contained in:
1 parent
9048dbe42d
commit
699ce448a1
19 files changed
+171
-27
No files matched your search
@@ -59,6 +59,10 @@ export const ICON_FONT_FALLBACKS: readonly string[] = [
|
||||
'"MesloLGS NF"',
|
||||
]
|
||||
|
||||
/** The symbols-only patch count at the head of {@link ICON_FONT_FALLBACKS}
|
||||
* (these carry no Latin glyphs, so they can never hijack ASCII metrics). */
|
||||
const SYMBOLS_ONLY_COUNT = 2
|
||||
|
||||
/**
|
||||
* CSS generic font families. A generic is a catch-all that always resolves,
|
||||
* so icon fonts must be spliced in *before* the first one to stay reachable.
|
||||
@@ -141,7 +145,11 @@ function splitFamilies(stack: string): string[] {
|
||||
* keeps their exact priority.
|
||||
* - The icon fonts are spliced in ahead of the *first* generic family
|
||||
* (`monospace` etc.), because a generic always resolves: anything after it
|
||||
* would never be consulted.
|
||||
* would never be consulted. A stack that OPENS with a generic is the one
|
||||
* exception: only the symbols-only patches (no Latin) may precede it — a
|
||||
* fully-patched Nerd Font there would become xterm's measuring base font
|
||||
* and override the user/theme family precedence, so it is placed after the
|
||||
* generic instead.
|
||||
* - Idempotent — re-applying to an already-topped-up stack is a no-op, which
|
||||
* matters because `TerminalView` diffs the resolved value against the live
|
||||
* `term.options.fontFamily` before reflowing.
|
||||
@@ -154,12 +162,22 @@ export function withIconFontFallbacks(stack: string): string {
|
||||
if (entries.length === 0) return ICON_FONT_FALLBACKS.join(', ')
|
||||
|
||||
const present = new Set(entries.map(normalizeFamily))
|
||||
const additions = ICON_FONT_FALLBACKS.filter(family => !present.has(normalizeFamily(family)))
|
||||
if (additions.length === 0) return entries.join(', ')
|
||||
const notPresent = (family: string): boolean => !present.has(normalizeFamily(family))
|
||||
const symbolsOnly = ICON_FONT_FALLBACKS.slice(0, SYMBOLS_ONLY_COUNT).filter(notPresent)
|
||||
const patched = ICON_FONT_FALLBACKS.slice(SYMBOLS_ONLY_COUNT).filter(notPresent)
|
||||
if (symbolsOnly.length === 0 && patched.length === 0) return entries.join(', ')
|
||||
|
||||
const firstGeneric = entries.findIndex(entry => GENERIC_FAMILIES.has(normalizeFamily(entry)))
|
||||
const cut = firstGeneric === -1 ? entries.length : firstGeneric
|
||||
return [...entries.slice(0, cut), ...additions, ...entries.slice(cut)].join(', ')
|
||||
// A fully-patched distribution ships Latin glyphs: placed ahead of a
|
||||
// LEADING generic (cut === 0) it would become xterm's measuring/base font
|
||||
// and override the user/theme family precedence. Only the symbols-only
|
||||
// patches — which carry no Latin — may precede it; the patched fonts go
|
||||
// after the generic (still reachable per character, never the base).
|
||||
if (cut === 0) {
|
||||
return [...symbolsOnly, entries[0]!, ...patched, ...entries.slice(1)].join(', ')
|
||||
}
|
||||
return [...entries.slice(0, cut), ...symbolsOnly, ...patched, ...entries.slice(cut)].join(', ')
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user