дзеркало
https://github.com/l0ng-ai/openidea.git
синхронізовано 2026-11-21 00:50:47 +02:00
Порівняти коміти
6
Коміти
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
4522b9a5e1 | ||
|
|
a9ad1f1bbb | ||
|
|
4c8caca6a5 | ||
|
|
2ec2e75d40 | ||
|
|
04d5d9bd58 | ||
|
|
9a415e6875 |
No files matched your search
@@ -1097,6 +1097,8 @@ impl AgentManager {
|
||||
title_renamed: s.title_renamed,
|
||||
}
|
||||
};
|
||||
// Copying may have started the source's agent: it stops again once idle.
|
||||
source.release_when_idle();
|
||||
let task = Task::restore(file, self.shared.clone());
|
||||
self.tasks.write().insert(task.id.clone(), task.clone());
|
||||
task.persist();
|
||||
@@ -1166,6 +1168,8 @@ impl AgentManager {
|
||||
task.persist();
|
||||
self.shared.emit(AgentEvent::Truncated { task: id.to_owned(), length: cut as u32 });
|
||||
task.emit_task();
|
||||
// Undoing may have started the agent: it stops again once idle.
|
||||
task.release_when_idle();
|
||||
Ok(first)
|
||||
}
|
||||
|
||||
|
||||
@@ -583,11 +583,12 @@ impl Shim {
|
||||
impl super::Shim for Shim {
|
||||
fn attach(&self, client: Peer) {
|
||||
let _ = self.client.set(client.clone());
|
||||
// The client went away: so do the processes.
|
||||
let weak = self.me.clone();
|
||||
// The client went away: so do the processes. Held until then: the connection drops
|
||||
// its handler (this shim) as it closes, and the sessions would go without stopping.
|
||||
let me = self.me.upgrade();
|
||||
tokio::spawn(async move {
|
||||
client.closed().await;
|
||||
if let Some(me) = weak.upgrade() {
|
||||
if let Some(me) = me {
|
||||
me.closed.store(true, Ordering::Release);
|
||||
let sessions: Vec<Arc<Session>> = me.sessions.lock().drain().map(|(_, s)| s).collect();
|
||||
for s in sessions {
|
||||
@@ -598,6 +599,15 @@ impl super::Shim for Shim {
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Session {
|
||||
/// A session dropped without being stopped (the shim went away) takes its process along.
|
||||
fn drop(&mut self) {
|
||||
if let Some(p) = self.st.get_mut().proc.take() {
|
||||
p.kill.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Session {
|
||||
fn shim(&self) -> Option<Arc<Shim>> {
|
||||
self.shim.upgrade()
|
||||
|
||||
@@ -311,6 +311,8 @@ struct Replay {
|
||||
sent: Arc<Mutex<Vec<Vec<Value>>>>,
|
||||
launched: Mutex<Vec<Vec<String>>>,
|
||||
errors: Arc<Mutex<Vec<String>>>,
|
||||
/// Each process's kill token.
|
||||
kills: Mutex<Vec<CancellationToken>>,
|
||||
}
|
||||
|
||||
impl Cli for Replay {
|
||||
@@ -331,6 +333,7 @@ impl Cli for Replay {
|
||||
let (shim_in, cli_in) = tokio::io::duplex(1 << 20);
|
||||
let (mut cli_out, shim_out) = tokio::io::duplex(1 << 20);
|
||||
let kill = CancellationToken::new();
|
||||
self.kills.lock().push(kill.clone());
|
||||
let (sent, errors, token) = (self.sent.clone(), self.errors.clone(), kill.clone());
|
||||
sent.lock().push(Vec::new());
|
||||
tokio::spawn(async move {
|
||||
@@ -428,6 +431,7 @@ async fn replay(name: &str) -> Replayed {
|
||||
sent: Arc::default(),
|
||||
launched: Mutex::default(),
|
||||
errors: Arc::default(),
|
||||
kills: Mutex::default(),
|
||||
});
|
||||
let (config, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
|
||||
let cwd_path = std::fs::canonicalize(cwd.path()).unwrap();
|
||||
@@ -461,6 +465,23 @@ async fn replay_simple() {
|
||||
assert_eq!(user["message"]["content"][0]["text"], "Reply with exactly: hello there");
|
||||
}
|
||||
|
||||
/// The app closing the connection (an idle task released, archived or deleted) stops the
|
||||
/// CLI processes of its sessions, idle ones included.
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn closing_the_connection_stops_the_processes() {
|
||||
let r = replay("simple").await;
|
||||
assert!(r.cli.kills.lock().iter().all(|k| !k.is_cancelled()));
|
||||
r.h.client.kill();
|
||||
let kills = r.cli.kills.lock().clone();
|
||||
tokio::time::timeout(Duration::from_secs(5), async {
|
||||
for k in kills {
|
||||
k.cancelled().await;
|
||||
}
|
||||
})
|
||||
.await
|
||||
.expect("every process was stopped");
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn replay_multi_turn() {
|
||||
let r = replay("multi_turn").await;
|
||||
@@ -727,6 +748,7 @@ async fn a_stop_ahead_of_its_prompt_cancels_it() {
|
||||
sent: Arc::default(),
|
||||
launched: Mutex::default(),
|
||||
errors: Arc::default(),
|
||||
kills: Mutex::default(),
|
||||
});
|
||||
let (dir, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
|
||||
let h = Harness::connect(cli.clone(), dir.path().into(), dir.path().join("p"), cwd.path().into(), Vec::new()).await;
|
||||
@@ -770,6 +792,7 @@ async fn a_failed_turn_reports_its_failure() {
|
||||
sent: Arc::default(),
|
||||
launched: Mutex::default(),
|
||||
errors: Arc::default(),
|
||||
kills: Mutex::default(),
|
||||
});
|
||||
let (dir, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
|
||||
let h =
|
||||
|
||||
@@ -2391,6 +2391,27 @@ async fn idle_agents_stop_and_resume_their_session_on_the_next_message() {
|
||||
assert!(live(&mgr, &task.id));
|
||||
mgr.shutdown();
|
||||
|
||||
// Undoing turns or copying the conversation starts a stopped agent: it stops again too.
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let agent = Arc::new(FakeAgent::default());
|
||||
let mgr = manager(tmp.path(), agent.clone());
|
||||
mgr.set_idle_release(Duration::from_millis(200));
|
||||
let task = mgr.create(new()).await.unwrap();
|
||||
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
|
||||
mgr.prompt(&task.id, text("again"), false).await.unwrap();
|
||||
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
|
||||
tokio::time::sleep(Duration::from_millis(600)).await;
|
||||
assert!(!live(&mgr, &task.id));
|
||||
mgr.rollback(&task.id, 1).await.unwrap();
|
||||
assert!(live(&mgr, &task.id));
|
||||
tokio::time::sleep(Duration::from_millis(600)).await;
|
||||
assert!(!live(&mgr, &task.id), "an agent started to undo turns stops too");
|
||||
mgr.fork(&task.id, None).await.unwrap();
|
||||
assert!(live(&mgr, &task.id));
|
||||
tokio::time::sleep(Duration::from_millis(600)).await;
|
||||
assert!(!live(&mgr, &task.id), "an agent started to copy the conversation stops too");
|
||||
mgr.shutdown();
|
||||
|
||||
// An agent that can't reload its session keeps running: stopping it would lose the conversation.
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let agent = Arc::new(FakeAgent { no_load: true, ..FakeAgent::default() });
|
||||
|
||||
@@ -122,6 +122,23 @@ test("Apply writes and stages unresolved text only after confirmation", async ({
|
||||
expect((await writes(page))[0]!.args[2]).toEqual({ changes: [{ from: 0, to: 13, insert: BASE }] });
|
||||
});
|
||||
|
||||
test("footer buttons work when a click doesn't focus them, as in WebKit", async ({ page }) => {
|
||||
await mountMerge(page);
|
||||
await result(page).locator(".cm-content").click();
|
||||
// WebKit focuses the clicked button's nearest focusable ancestor, not the button.
|
||||
await page
|
||||
.locator("#merge-host")
|
||||
.getByRole("button", { name: "Apply", exact: true })
|
||||
.evaluate((button) => {
|
||||
let target = button.parentElement;
|
||||
while (target && !target.hasAttribute("tabindex")) target = target.parentElement;
|
||||
if (target) target.focus();
|
||||
else (document.activeElement as HTMLElement | null)?.blur();
|
||||
(button as HTMLButtonElement).click();
|
||||
});
|
||||
await expect(page.getByRole("dialog")).toContainText("Save and mark the file as resolved anyway?");
|
||||
});
|
||||
|
||||
test("binary and unreadable versions show an error with no Apply controls", async ({ page }) => {
|
||||
await mountMerge(page, ["\0base", "\0ours", "\0theirs"]);
|
||||
await expect(page.locator("#merge-host")).toContainText("Binary files cannot be resolved in the merge editor.");
|
||||
|
||||
@@ -9,7 +9,7 @@ import { Channel } from "@tauri-apps/api/core";
|
||||
import { EditorSelection, MapMode, StateEffect, StateField, type Extension, type Text } from "@codemirror/state";
|
||||
import { EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view";
|
||||
import { codeLenses, shownAgain, type CodeLens } from "@/editor/api";
|
||||
import { executeAction } from "@/platform/actions";
|
||||
import { executeAction, getAction } from "@/platform/actions";
|
||||
import { commands, nextRequestId, type OutlineItem, type RequestId, type SymbolKind } from "@/platform/ipc";
|
||||
import { useProject } from "@/platform/project";
|
||||
import { debounce, docOf, isUnavailable, lspRequest } from "./lsp";
|
||||
@@ -106,6 +106,12 @@ const lensField = StateField.define<CodeLens[]>({
|
||||
const usagesEnabled = () => editorPrefs().inlay.codeVisionUsages;
|
||||
const authorEnabled = () => editorPrefs().inlay.codeVisionAuthor;
|
||||
|
||||
/** The author hint opens the file's blame annotations, and leaves them open when shown. */
|
||||
function showAnnotations(view: EditorView) {
|
||||
view.focus();
|
||||
if (!getAction("vcs.annotate")?.toggled?.()) void executeAction("vcs.annotate");
|
||||
}
|
||||
|
||||
function openUsages(view: EditorView, offset: number) {
|
||||
view.dispatch({ selection: EditorSelection.cursor(offset), userEvent: "select.lens" });
|
||||
view.focus();
|
||||
@@ -258,6 +264,7 @@ class UsagesLensPlugin {
|
||||
icon: "user",
|
||||
order: 20,
|
||||
kind: "author",
|
||||
run: showAnnotations,
|
||||
});
|
||||
const n = usages ? this.cache.get(key(t)) : undefined;
|
||||
if (n === undefined || (n === 0 && !editorPrefs().inlay.codeVisionNoUsages)) continue;
|
||||
|
||||
@@ -235,12 +235,16 @@ const lintTheme = EditorView.theme({
|
||||
".cm-lintRange-error": {
|
||||
textDecoration: "var(--editor-error-decoration, underline wavy var(--danger))",
|
||||
WebkitTextDecoration: "var(--editor-error-decoration, underline wavy var(--danger))",
|
||||
fontWeight: "var(--wave-error-bold, inherit)",
|
||||
fontStyle: "var(--wave-error-italic, inherit)",
|
||||
textDecorationSkipInk: "none",
|
||||
textUnderlineOffset: "3px",
|
||||
},
|
||||
".cm-lintRange-warning": {
|
||||
textDecoration: "var(--editor-warning-decoration, underline wavy var(--warning))",
|
||||
WebkitTextDecoration: "var(--editor-warning-decoration, underline wavy var(--warning))",
|
||||
fontWeight: "var(--wave-warning-bold, inherit)",
|
||||
fontStyle: "var(--wave-warning-italic, inherit)",
|
||||
backgroundColor: "var(--editor-warning-background, transparent)",
|
||||
textDecorationSkipInk: "none",
|
||||
textUnderlineOffset: "3px",
|
||||
@@ -254,8 +258,10 @@ const lintTheme = EditorView.theme({
|
||||
".cm-lintRange-hint": { textDecoration: "none" },
|
||||
// Typo level: IDEA's green wavy underline.
|
||||
".cm-lintRange.cm-lsp-typo": {
|
||||
textDecoration: "underline wavy color-mix(in srgb, var(--success) 85%, transparent)",
|
||||
WebkitTextDecoration: "underline wavy color-mix(in srgb, var(--success) 85%, transparent)",
|
||||
textDecoration: "var(--wave-typo-effect, underline wavy var(--wave-typo, var(--success)))",
|
||||
WebkitTextDecoration: "var(--wave-typo-effect, underline wavy var(--wave-typo, var(--success)))",
|
||||
fontWeight: "var(--wave-typo-bold, inherit)",
|
||||
fontStyle: "var(--wave-typo-italic, inherit)",
|
||||
textDecorationSkipInk: "none",
|
||||
textUnderlineOffset: "3px",
|
||||
},
|
||||
@@ -263,9 +269,16 @@ const lintTheme = EditorView.theme({
|
||||
textDecoration: "none",
|
||||
backgroundColor: "transparent",
|
||||
color: "var(--fg-unused, var(--fg-faint))",
|
||||
fontWeight: "var(--fg-unused-bold, inherit)",
|
||||
fontStyle: "var(--fg-unused-italic, inherit)",
|
||||
},
|
||||
".cm-lintRange.cm-lsp-unnecessary *": { color: "var(--fg-unused, var(--fg-faint))" },
|
||||
".cm-lintRange.cm-lsp-deprecated": { textDecoration: "line-through", textDecorationColor: "var(--fg-muted)" },
|
||||
".cm-lintRange.cm-lsp-deprecated": {
|
||||
textDecoration: "var(--fg-deprecated-effect, line-through var(--fg-deprecated, var(--fg-muted)))",
|
||||
WebkitTextDecoration: "var(--fg-deprecated-effect, line-through var(--fg-deprecated, var(--fg-muted)))",
|
||||
fontWeight: "var(--fg-deprecated-bold, inherit)",
|
||||
fontStyle: "var(--fg-deprecated-italic, inherit)",
|
||||
},
|
||||
// An error or warning on the same range (merged into one mark) keeps its underline.
|
||||
".cm-lintRange-error.cm-lsp-typo, .cm-lintRange-error.cm-lsp-unnecessary": {
|
||||
textDecoration: "var(--editor-error-decoration, underline wavy var(--danger))",
|
||||
|
||||
@@ -10,6 +10,7 @@ import { fontWeightVars, type CustomColorSchemes, type TextAttributesOverride }
|
||||
import {
|
||||
ATTRIBUTES,
|
||||
SCHEMES,
|
||||
EFFECT_CSS,
|
||||
overrideDeclarations,
|
||||
effectiveScheme,
|
||||
resolvedSchemeTokens,
|
||||
@@ -123,6 +124,8 @@ function previewVars(
|
||||
k.startsWith("--border-") ||
|
||||
k.startsWith("--ansi-") ||
|
||||
k.startsWith("--git-") ||
|
||||
k.startsWith("--wave-") ||
|
||||
k.startsWith("--editor-") ||
|
||||
k === "--caret"
|
||||
)
|
||||
vars[k] = v;
|
||||
@@ -137,20 +140,32 @@ function previewVars(
|
||||
|
||||
/** Text styled like an attribute in the preview. */
|
||||
function tokenStyle(attr: AttributeDef | undefined): CSSProperties {
|
||||
if (!attr?.token)
|
||||
return {
|
||||
const base = attr?.fg ?? attr?.effect;
|
||||
if (!attr?.token) {
|
||||
const colour: CSSProperties = {
|
||||
...(attr?.fg ? { color: `var(${attr.fg})` } : null),
|
||||
...(attr?.bg ? { backgroundColor: `var(${attr.bg})` } : null),
|
||||
// Token-less attributes with a font-style renderer carry it on `--<fg>-*`, the same
|
||||
// declarations `overrideDeclarations` emits for their overrides.
|
||||
...(attr?.fontStyle && (attr.fg ?? attr.effect)
|
||||
? {
|
||||
fontWeight: `var(${attr.fg ?? attr.effect}-bold, inherit)`,
|
||||
fontStyle: `var(${attr.fg ?? attr.effect}-italic, inherit)`,
|
||||
textDecoration: `var(${attr.effect ?? attr.fg}-effect, none)`,
|
||||
}
|
||||
};
|
||||
// Token-less attributes with a font-style renderer carry it on `--<fg|effect>-*`, the same
|
||||
// declarations `overrideDeclarations` emits for their overrides.
|
||||
if (!attr?.fontStyle || !base) return colour;
|
||||
const effectColor = `var(${attr.effect ?? attr.fg ?? "--fg-muted"})`;
|
||||
const effect: TextAttributesOverride["effect"] = attr.defaultEffect ?? (attr.effect ? "wave" : undefined);
|
||||
const decoration =
|
||||
effect && effect !== "none"
|
||||
? `var(${attr.effect ?? base}-effect, ${EFFECT_CSS[effect]?.(effectColor) ?? "none"})`
|
||||
: undefined;
|
||||
return {
|
||||
...colour,
|
||||
fontWeight: `var(${base}-bold, ${
|
||||
attr.defaultBold ? "var(--fw-code-bold, 700)" : "inherit"
|
||||
})` as CSSProperties["fontWeight"],
|
||||
fontStyle: `var(${base}-italic, ${attr.defaultItalic ? "italic" : "inherit"})`,
|
||||
...(decoration
|
||||
? { textDecoration: decoration, ...({ WebkitTextDecoration: decoration } as CSSProperties) }
|
||||
: null),
|
||||
};
|
||||
}
|
||||
if (attr.italicOnly)
|
||||
return { fontStyle: `var(--syn-${attr.token}-italic, ${attr.defaultItalic === false ? "normal" : "italic"})` };
|
||||
const t = attr.token;
|
||||
@@ -206,6 +221,11 @@ const SAMPLES: Record<string, CodeSample> = {
|
||||
[" ", "text"],
|
||||
["legacyCall", "unused"],
|
||||
],
|
||||
[
|
||||
["typo", "typo"],
|
||||
[" ", "text"],
|
||||
["deprecatedCall", "deprecated"],
|
||||
],
|
||||
[
|
||||
["bad\u203dchar", "invalid"],
|
||||
[" \u00b7 ", "whitespaces"],
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: var(--bg-app);
|
||||
outline: none;
|
||||
}
|
||||
.toolbar {
|
||||
flex: none;
|
||||
@@ -84,6 +85,7 @@
|
||||
}
|
||||
.message {
|
||||
flex: 1;
|
||||
outline: none;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
@@ -541,6 +541,10 @@ export function MergeEditor({ input }: { input: EditorInput }) {
|
||||
}, [actionHost]);
|
||||
|
||||
const focusProps = {
|
||||
// WebKit doesn't focus a clicked button: focus then moves to the nearest focusable
|
||||
// ancestor, which must be this editor for the footer and toolbar buttons to keep it the
|
||||
// focused merge editor their actions run in.
|
||||
tabIndex: -1,
|
||||
onFocusCapture: (e: React.FocusEvent<HTMLDivElement>) => {
|
||||
const target = e.target as Node;
|
||||
if (oursRef.current?.contains(target)) paneRef.current = "left";
|
||||
|
||||
@@ -49,6 +49,7 @@ import { allRepos, runRemote } from "./ops";
|
||||
import { showPushDialog, showUpdateDialog, type PushTarget, type UpdateTarget } from "./remoteUi";
|
||||
import { comparePathsWithRevision, showDirectoryWorkingDiff } from "./comparePaths";
|
||||
import { showCloneDialog } from "./clone";
|
||||
import { createRepository } from "./createRepository";
|
||||
import {
|
||||
showManageRemotes,
|
||||
showMergeDialog,
|
||||
@@ -246,6 +247,15 @@ export function registerVcsActions(): () => void {
|
||||
keyWhen: IN_COMMIT_WINDOW,
|
||||
run: () => useCommit.setState((s) => ({ historyTick: s.historyTick + 1 })),
|
||||
},
|
||||
{
|
||||
id: "vcs.createRepository",
|
||||
title: "Create Git Repository…",
|
||||
category: "Git",
|
||||
icon: "branch",
|
||||
when: "projectOpen && projectLocal",
|
||||
keywords: ["init", "git", "enable version control"],
|
||||
run: () => createRepository(),
|
||||
},
|
||||
{
|
||||
id: "vcs.clone",
|
||||
title: "Get from Version Control…",
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
/** VCS › Create Git Repository…: `git init` in a folder chosen under the project. */
|
||||
import { open } from "@/platform/dialog";
|
||||
import { tx } from "@/platform/i18n";
|
||||
import { call, commands } from "@/platform/ipc";
|
||||
import { useProject } from "@/platform/project";
|
||||
import { notifications } from "@/workbench/contributions";
|
||||
import { discoverRoots } from "./store";
|
||||
|
||||
export async function createRepository() {
|
||||
const root = useProject.getState().project?.root;
|
||||
const dir = await open({ title: tx("Select Directory for Git Init"), directory: true, defaultPath: root });
|
||||
if (typeof dir !== "string") return;
|
||||
try {
|
||||
await call(commands.vcsInit(dir));
|
||||
} catch (e) {
|
||||
notifications().notify({
|
||||
group: "vcs",
|
||||
level: "error",
|
||||
title: tx("Couldn't create Git repository"),
|
||||
body: String((e as Error)?.message ?? e),
|
||||
});
|
||||
return;
|
||||
}
|
||||
notifications().notify({ group: "vcs", level: "info", title: tx`Created Git repository in ${dir}` });
|
||||
await discoverRoots();
|
||||
}
|
||||
@@ -266,7 +266,7 @@ export function statusOf(path: string): FileStatus | undefined {
|
||||
}
|
||||
|
||||
/** Repositories found below a project that is not itself under git (scanned in the background). */
|
||||
async function discoverRoots() {
|
||||
export async function discoverRoots() {
|
||||
const root = useVcs.getState().root;
|
||||
if (!root || !isTauri()) return;
|
||||
const roots = await call(commands.vcsRoots()).catch(() => []);
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
ATTRIBUTES,
|
||||
CLEAR_COLOR,
|
||||
_setSchemeSource,
|
||||
overrideDeclarations,
|
||||
resolvedAttribute,
|
||||
schemeAfterThemeChange,
|
||||
schemeCss,
|
||||
@@ -341,4 +342,43 @@ describe("color schemes", () => {
|
||||
expect(v.codeStyle.languages.go).toEqual({ useTab: true });
|
||||
expect(v.general.softWrapFiles).toContain("*.md");
|
||||
});
|
||||
|
||||
it("styles Errors and Warnings attributes beyond colour", () => {
|
||||
const decls = overrideDeclarations({
|
||||
error: { bold: true, italic: true, effect: "strikeout", effectColor: "#ff0000" },
|
||||
unused: { italic: true },
|
||||
});
|
||||
const map = new Map(decls);
|
||||
expect(map.get("--wave-error-bold")).toBe("var(--fw-code-bold, 700)");
|
||||
expect(map.get("--wave-error-italic")).toBe("italic");
|
||||
expect(map.get("--wave-error-effect")).toBe("line-through #ff0000");
|
||||
expect(map.get("--editor-error-decoration")).toBe("line-through #ff0000");
|
||||
expect(map.get("--wave-error")).toBe("#ff0000");
|
||||
expect(map.get("--fg-unused-italic")).toBe("italic");
|
||||
const none = new Map(overrideDeclarations({ warning: { effect: "none" }, deprecated: { effect: "underline" } }));
|
||||
expect(none.get("--editor-warning-decoration")).toBe("none");
|
||||
expect(none.get("--fg-deprecated-effect")).toBe("underline var(--fg-deprecated)");
|
||||
});
|
||||
|
||||
it("keeps the font style of Errors and Warnings in custom schemes", () => {
|
||||
const customs = {
|
||||
"custom-x": {
|
||||
name: "X",
|
||||
parent: "dark" as const,
|
||||
attributes: { error: { bold: true }, deprecated: { effect: "underline" as const } },
|
||||
},
|
||||
};
|
||||
const css = schemeCss("custom-x", undefined, null, customs);
|
||||
expect(css).toContain("--wave-error-bold: var(--fw-code-bold, 700)");
|
||||
expect(css).toContain("--fg-deprecated-effect: underline var(--fg-deprecated)");
|
||||
});
|
||||
|
||||
it("lists typo and deprecated symbol under Errors and Warnings", () => {
|
||||
const ids = ATTRIBUTES.filter((a) => a.path.join("/") === "General/Errors and Warnings").map((a) => a.id);
|
||||
expect(ids).toEqual(["error", "warning", "weakWarning", "typo", "unused", "deprecated", "invalid"]);
|
||||
expect(resolvedAttribute("dark", "typo")).toMatchObject({ effect: "wave" });
|
||||
expect(resolvedAttribute("dark", "deprecated")).toMatchObject({ effect: "strikeout", effectColor: "#8c8f95" });
|
||||
expect(resolvedAttribute("dark", "deprecated").foreground).toBeUndefined();
|
||||
expect(resolvedAttribute("dark", "error")).toMatchObject({ effect: "wave", bold: false, italic: false });
|
||||
});
|
||||
});
|
||||
@@ -31,7 +31,8 @@ export interface AttributeDef {
|
||||
token?: string;
|
||||
/** A semantic modifier whose only configurable attribute is italic. */
|
||||
italicOnly?: boolean;
|
||||
/** The attribute's renderer applies font style and effects (tokens, the Git surfaces). */
|
||||
/** The attribute's renderer applies font style and effects (tokens, the Git surfaces,
|
||||
* Errors and Warnings): overrides land on `--<fg|effect>-*`. */
|
||||
fontStyle?: true;
|
||||
defaultBold?: boolean;
|
||||
defaultItalic?: boolean;
|
||||
@@ -139,10 +140,46 @@ const BASE_ATTRIBUTES: readonly AttributeDef[] = [
|
||||
path: ["General", "Search Results"],
|
||||
bg: "--bg-search-match-current",
|
||||
},
|
||||
{ id: "error", name: "Error", path: ["General", "Errors and Warnings"], effect: "--wave-error" },
|
||||
{ id: "warning", name: "Warning", path: ["General", "Errors and Warnings"], effect: "--wave-warning" },
|
||||
{
|
||||
id: "error",
|
||||
name: "Error",
|
||||
path: ["General", "Errors and Warnings"],
|
||||
effect: "--wave-error",
|
||||
defaultEffect: "wave",
|
||||
fontStyle: true,
|
||||
},
|
||||
{
|
||||
id: "warning",
|
||||
name: "Warning",
|
||||
path: ["General", "Errors and Warnings"],
|
||||
effect: "--wave-warning",
|
||||
defaultEffect: "wave",
|
||||
fontStyle: true,
|
||||
},
|
||||
{ id: "weakWarning", name: "Weak warning", path: ["General", "Errors and Warnings"], fg: "--fg-weak-warning" },
|
||||
{ id: "unused", name: "Unused symbol", path: ["General", "Errors and Warnings"], fg: "--fg-unused" },
|
||||
{
|
||||
id: "typo",
|
||||
name: "Typo",
|
||||
path: ["General", "Errors and Warnings"],
|
||||
effect: "--wave-typo",
|
||||
defaultEffect: "wave",
|
||||
fontStyle: true,
|
||||
},
|
||||
{
|
||||
id: "unused",
|
||||
name: "Unused symbol",
|
||||
path: ["General", "Errors and Warnings"],
|
||||
fg: "--fg-unused",
|
||||
fontStyle: true,
|
||||
},
|
||||
{
|
||||
id: "deprecated",
|
||||
name: "Deprecated symbol",
|
||||
path: ["General", "Errors and Warnings"],
|
||||
effect: "--fg-deprecated",
|
||||
defaultEffect: "strikeout",
|
||||
fontStyle: true,
|
||||
},
|
||||
syn("invalid", "Bad character", ["General", "Errors and Warnings"], "invalid"),
|
||||
syn("todo", "TODO defaults", ["General", "Code"], "todo"),
|
||||
{ id: "inlineValue", name: "Inline debugger values", path: ["Debugger"], fg: "--syn-inline-value" },
|
||||
@@ -339,6 +376,11 @@ export const ATTRIBUTES: readonly AttributeDef[] = [
|
||||
/** Variables a scheme sets: every attribute variable plus the editor tokens derived from them. */
|
||||
const SCHEME_VARS = new Set<string>([
|
||||
...ATTRIBUTES.flatMap((a) => [a.fg, a.bg, a.effect].filter((v): v is string => !!v)),
|
||||
// Font style of token-less attributes (`overrideDeclarations` writes them for custom schemes too).
|
||||
...ATTRIBUTES.flatMap((a) => {
|
||||
const base = a.fg ?? a.effect;
|
||||
return !a.token && a.fontStyle && base ? [`${base}-bold`, `${base}-italic`, `${a.effect ?? base}-effect`] : [];
|
||||
}),
|
||||
"--syn-comment-style",
|
||||
"--syn-doc-comment-tag-effect",
|
||||
"--editor-error-decoration",
|
||||
@@ -477,7 +519,7 @@ export function boldWeight(bold: boolean): string {
|
||||
return bold ? "var(--fw-code-bold, 700)" : "var(--fw-code, 400)";
|
||||
}
|
||||
|
||||
const EFFECT_CSS: Record<string, (c: string) => string> = {
|
||||
export const EFFECT_CSS: Record<string, (c: string) => string> = {
|
||||
underline: (c) => `underline ${c}`,
|
||||
wave: (c) => `underline wavy ${c}`,
|
||||
strikeout: (c) => `line-through ${c}`,
|
||||
@@ -507,9 +549,12 @@ export function overrideDeclarations(
|
||||
}
|
||||
if (setOrCleared(o.background) && attr.bg) out.push([attr.bg, o.background]);
|
||||
if (setOrCleared(o.effectColor) && attr.effect) out.push([attr.effect, o.effectColor]);
|
||||
if (attr.effect && setOrCleared(o.effectColor)) {
|
||||
if (attr.id === "error") out.push(["--editor-error-decoration", `underline wavy ${o.effectColor}`]);
|
||||
if (attr.id === "warning") out.push(["--editor-warning-decoration", `underline wavy ${o.effectColor}`]);
|
||||
if (attr.effect && (setOrCleared(o.effectColor) || o.effect)) {
|
||||
const style = o.effect ?? attr.defaultEffect ?? "wave";
|
||||
const color = setOrCleared(o.effectColor) ? o.effectColor! : `var(${attr.effect})`;
|
||||
const decoration = EFFECT_CSS[style]?.(color) ?? "none";
|
||||
if (attr.id === "error") out.push(["--editor-error-decoration", decoration]);
|
||||
if (attr.id === "warning") out.push(["--editor-warning-decoration", decoration]);
|
||||
}
|
||||
if (attr.token) {
|
||||
const t = attr.token;
|
||||
@@ -534,7 +579,9 @@ export function overrideDeclarations(
|
||||
if (o.effect)
|
||||
out.push([
|
||||
`${attr.effect ?? base}-effect`,
|
||||
EFFECT_CSS[o.effect]?.(setOrCleared(o.effectColor) ? o.effectColor! : "currentColor") ?? "none",
|
||||
EFFECT_CSS[o.effect]?.(
|
||||
setOrCleared(o.effectColor) ? o.effectColor! : attr.effect ? `var(${attr.effect})` : "currentColor",
|
||||
) ?? "none",
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -646,14 +693,20 @@ export function resolvedAttribute(
|
||||
const italicCss =
|
||||
vars.get(`--syn-${token}-italic`) ?? (token === "comment" ? vars.get("--syn-comment-style") : undefined);
|
||||
out.italic = own?.italic ?? italicFromCss(italicCss) ?? attr.defaultItalic ?? false;
|
||||
} else if (attr.fontStyle) {
|
||||
const base = attr.fg ?? attr.effect;
|
||||
const bold = base ? vars.get(`${base}-bold`) : undefined;
|
||||
const italic = base ? vars.get(`${base}-italic`) : undefined;
|
||||
if (bold !== undefined) out.bold = boldFromCss(bold) ?? false;
|
||||
if (italic !== undefined) out.italic = italicFromCss(italic) ?? false;
|
||||
} else if (effect) out.effect = effect;
|
||||
if (token && effect) out.effect = effect;
|
||||
if (effect) out.effect = effect;
|
||||
} else {
|
||||
// Token-less attributes whose renderer applies font style (the Git segments, Errors and
|
||||
// Warnings) carry their overrides on `--<fg|effect>-*`, the same declarations
|
||||
// `overrideDeclarations` emits.
|
||||
if (attr.fontStyle) {
|
||||
const base = attr.fg ?? attr.effect;
|
||||
const bold = base ? vars.get(`${base}-bold`) : undefined;
|
||||
const italic = base ? vars.get(`${base}-italic`) : undefined;
|
||||
out.bold = boldFromCss(bold) ?? attr.defaultBold ?? false;
|
||||
out.italic = italicFromCss(italic) ?? attr.defaultItalic ?? false;
|
||||
}
|
||||
if (effect) out.effect = effect;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
@@ -1510,5 +1510,9 @@
|
||||
"{name} (group)": "{name} (group)",
|
||||
"Servers in group": "Servers in group",
|
||||
"Upload to… on this group uploads the files to each of its servers in turn.": "Upload to… on this group uploads the files to each of its servers in turn.",
|
||||
"Server Group": "Server Group"
|
||||
"Server Group": "Server Group",
|
||||
"Create Git Repository…": "Create Git Repository…",
|
||||
"Select Directory for Git Init": "Select Directory for Git Init",
|
||||
"Couldn't create Git repository": "Couldn't create Git repository",
|
||||
"Created Git repository in {dir}": "Created Git repository in {dir}"
|
||||
}
|
||||
@@ -7911,5 +7911,9 @@
|
||||
"{name} (group)": "{name}(分组)",
|
||||
"Servers in group": "组内服务器",
|
||||
"Upload to… on this group uploads the files to each of its servers in turn.": "对此分组执行“上传到…”时,会依次上传到组内的每台服务器。",
|
||||
"Server Group": "服务器分组"
|
||||
"Server Group": "服务器分组",
|
||||
"Create Git Repository…": "创建 Git 仓库…",
|
||||
"Select Directory for Git Init": "选择要执行 Git Init 的目录",
|
||||
"Couldn't create Git repository": "无法创建 Git 仓库",
|
||||
"Created Git repository in {dir}": "已在 {dir} 创建 Git 仓库"
|
||||
}
|
||||
@@ -204,6 +204,8 @@ html {
|
||||
--fg-fold-marker: #6f737a;
|
||||
--fg-whitespace: #6f737a;
|
||||
--fg-unused: #6f737a;
|
||||
--wave-typo: #59a869;
|
||||
--fg-deprecated: #8c8f95;
|
||||
--bg-identifier-under-caret: #373b39;
|
||||
--bg-identifier-under-caret-write: #402f33;
|
||||
--fg-inlay: #868a91;
|
||||
@@ -643,6 +645,8 @@ html {
|
||||
--fg-fold-marker: #8b8e94;
|
||||
--fg-whitespace: #b5b7bd;
|
||||
--fg-unused: #8c8c8c;
|
||||
--wave-typo: #3d9950;
|
||||
--fg-deprecated: #6c707e;
|
||||
--bg-identifier-under-caret: #edebfc;
|
||||
--bg-identifier-under-caret-write: #fce8f4;
|
||||
--fg-inlay: #73767c;
|
||||
@@ -935,6 +939,8 @@ html {
|
||||
--fg-fold-marker: #9fa2a9;
|
||||
--fg-whitespace: #8b8e95;
|
||||
--fg-unused: #8b8e95;
|
||||
--wave-typo: #6cbb7d;
|
||||
--fg-deprecated: #b6b8be;
|
||||
--bg-identifier-under-caret: #3f4a44;
|
||||
--bg-identifier-under-caret-write: #553840;
|
||||
--fg-inlay: #ccced3;
|
||||
@@ -1147,6 +1153,8 @@ html {
|
||||
--fg-fold-marker: var(--palette-muted);
|
||||
--fg-whitespace: var(--palette-muted);
|
||||
--fg-unused: var(--palette-muted);
|
||||
--wave-typo: var(--palette-green);
|
||||
--fg-deprecated: var(--palette-muted);
|
||||
--fg-inlay: var(--palette-muted);
|
||||
--fg-weak-warning: var(--palette-muted);
|
||||
--syn-inline-value: var(--palette-muted);
|
||||
|
||||
@@ -95,7 +95,7 @@ function ProjectButton() {
|
||||
);
|
||||
}
|
||||
|
||||
const VCS_FALLBACK_ACTIONS = ["vcs.clone", "vcs.localHistory", "vcs.showLog"];
|
||||
const VCS_FALLBACK_ACTIONS = ["vcs.createRepository", "vcs.clone", "vcs.localHistory", "vcs.showLog"];
|
||||
|
||||
/** "Version Control ▾" shown while no VCS widget is contributed (project without a repository). */
|
||||
function VcsFallback() {
|
||||
|
||||
Reference in new issue
Заблокувати користувача