дзеркало
https://github.com/l0ng-ai/openidea.git
синхронізовано 2026-11-21 09:00:49 +02:00
Порівняти коміти
2
Коміти
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
3fb02a09d7 | ||
|
|
1091283b8e |
No files matched your search
@@ -0,0 +1,76 @@
|
||||
import type { Page } from "@playwright/test";
|
||||
import type { SignatureHelp } from "../src/bindings";
|
||||
import { expect, openFromTree, stubDesktop, test } from "./fixtures";
|
||||
|
||||
function signature(name: string, parameters: string[]) {
|
||||
let offset = name.length + 1;
|
||||
const ranges: [number, number][] = parameters.map((parameter) => {
|
||||
const range: [number, number] = [offset, offset + parameter.length];
|
||||
offset = range[1] + 2;
|
||||
return range;
|
||||
});
|
||||
return { label: `${name}(${parameters.join(", ")}): Invoice`, parameters: ranges, documentation: null };
|
||||
}
|
||||
|
||||
async function openParameterInfo(page: Page, help: SignatureHelp) {
|
||||
const editor = await openFromTree(page, "build.gradle.kts");
|
||||
await stubDesktop(page);
|
||||
await page.evaluate((help) => {
|
||||
window.__ipc.handlers.lsp_signature_help = () => help;
|
||||
}, help);
|
||||
await editor.locator(".cm-line", { hasText: "return order.toDto()" }).click();
|
||||
await page.keyboard.press("End");
|
||||
await page.keyboard.press("ArrowLeft");
|
||||
await page.keyboard.press("Meta+p");
|
||||
const popup = page.locator(".cm-lsp-signature");
|
||||
await expect(popup).toBeVisible();
|
||||
return { editor, popup };
|
||||
}
|
||||
|
||||
test("parameter info wraps long parameters and follows the editor width", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 1120, height: 700 });
|
||||
const parameter = "roundingPolicyForThirdPartyPaymentsWithMultipleSettlementCurrencies: RoundingPolicy";
|
||||
const { editor, popup } = await openParameterInfo(page, {
|
||||
signatures: [signature("formatInvoice", ["order: Cart", parameter, "currency: string"])],
|
||||
activeSignature: 0,
|
||||
activeParameter: 1,
|
||||
});
|
||||
await page.setViewportSize({ width: 560, height: 650 });
|
||||
await expect
|
||||
.poll(async () => {
|
||||
const [pane, hint] = await Promise.all([editor.boundingBox(), popup.boundingBox()]);
|
||||
return !!pane && !!hint && hint.x >= pane.x - 1 && hint.x + hint.width <= pane.x + pane.width + 1;
|
||||
})
|
||||
.toBe(true);
|
||||
await expect.poll(() => popup.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
await expect(popup.locator("b")).toHaveText(parameter);
|
||||
const fontSize = await editor.locator(".cm-content").evaluate((el) => getComputedStyle(el).fontSize);
|
||||
await expect(popup).toHaveCSS("font-size", fontSize);
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(popup).toBeHidden();
|
||||
});
|
||||
|
||||
test("parameter info keeps the active overload visible and scrolls to the others", async ({ workbench: page }) => {
|
||||
const signatures = Array.from({ length: 20 }, (_, i) =>
|
||||
signature("formatInvoice", [`order: Cart${i}`, "currency: string"]),
|
||||
);
|
||||
const { popup } = await openParameterInfo(page, { signatures, activeSignature: 16, activeParameter: 1 });
|
||||
await expect(popup.locator(".cm-lsp-signature-row")).toHaveCount(signatures.length);
|
||||
const active = popup.locator(".cm-lsp-signature-active b");
|
||||
await expect(active).toHaveText("currency: string");
|
||||
await expect
|
||||
.poll(async () => {
|
||||
const [frame, parameter] = await Promise.all([popup.boundingBox(), active.boundingBox()]);
|
||||
return (
|
||||
!!frame && !!parameter && parameter.y >= frame.y && parameter.y + parameter.height <= frame.y + frame.height
|
||||
);
|
||||
})
|
||||
.toBe(true);
|
||||
expect(await popup.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
|
||||
await popup.hover();
|
||||
await page.mouse.wheel(0, -1200);
|
||||
await expect.poll(() => popup.evaluate((el) => el.scrollTop)).toBe(0);
|
||||
await expect(
|
||||
popup.getByText("formatInvoice(order: Cart0, currency: string): Invoice", { exact: true }),
|
||||
).toBeInViewport();
|
||||
});
|
||||
@@ -6,8 +6,17 @@
|
||||
*/
|
||||
import { EditorSelection, Prec, StateEffect, StateField, type Extension } from "@codemirror/state";
|
||||
import { completionStatus, hasNextSnippetField, hasPrevSnippetField } from "@codemirror/autocomplete";
|
||||
import { EditorView, ViewPlugin, keymap, showTooltip, type Tooltip, type ViewUpdate } from "@codemirror/view";
|
||||
import {
|
||||
EditorView,
|
||||
ViewPlugin,
|
||||
keymap,
|
||||
repositionTooltips,
|
||||
showTooltip,
|
||||
type Tooltip,
|
||||
type ViewUpdate,
|
||||
} from "@codemirror/view";
|
||||
import { commands, type SignatureHelp } from "@/platform/ipc";
|
||||
import { tooltipBounds } from "@/editor/core/cm/setup";
|
||||
import { docOf, lspRequest, reportLspError, debounce } from "./lsp";
|
||||
import { offsetToPos } from "./positions";
|
||||
import { showHint } from "./hint";
|
||||
@@ -40,8 +49,6 @@ export function splitSignature(label: string, params: ReadonlyArray<[number, num
|
||||
return { before: label.slice(0, s), param: label.slice(s, e), after: label.slice(e) };
|
||||
}
|
||||
|
||||
const MAX_ROWS = 12;
|
||||
|
||||
/** Whether an overload can take an argument at `index` (varargs take any number). */
|
||||
export function acceptsParameter(sig: { label: string; parameters: ReadonlyArray<[number, number]> }, index: number) {
|
||||
if (index < sig.parameters.length) return true;
|
||||
@@ -54,23 +61,27 @@ function signatureTooltip(s: SigState): Tooltip {
|
||||
pos: s.pos,
|
||||
above: true,
|
||||
strictSide: false,
|
||||
create: () => {
|
||||
create: (view) => {
|
||||
const dom = document.createElement("div");
|
||||
dom.className = "cm-lsp-signature";
|
||||
dom.setAttribute("role", "tooltip");
|
||||
const { signatures, activeSignature, activeParameter } = s.help;
|
||||
const start = Math.max(0, Math.min(activeSignature - 6, signatures.length - MAX_ROWS));
|
||||
signatures.slice(start, start + MAX_ROWS).forEach((sig, j) => {
|
||||
const i = start + j;
|
||||
let active: HTMLElement | null = null;
|
||||
signatures.forEach((sig, i) => {
|
||||
const row = document.createElement("div");
|
||||
row.className = "cm-lsp-signature-row";
|
||||
if (i === activeSignature) row.classList.add("cm-lsp-signature-active");
|
||||
else if (!acceptsParameter(sig, activeParameter)) row.classList.add("cm-lsp-signature-disabled");
|
||||
if (i === activeSignature) {
|
||||
row.classList.add("cm-lsp-signature-active");
|
||||
row.setAttribute("aria-current", "true");
|
||||
active = row;
|
||||
} else if (!acceptsParameter(sig, activeParameter)) row.classList.add("cm-lsp-signature-disabled");
|
||||
const parts = splitSignature(sig.label, sig.parameters, activeParameter);
|
||||
row.append(parts.before);
|
||||
if (parts.param) {
|
||||
const b = document.createElement("b");
|
||||
b.textContent = parts.param;
|
||||
row.appendChild(b);
|
||||
if (i === activeSignature) active = b;
|
||||
}
|
||||
row.append(parts.after);
|
||||
dom.appendChild(row);
|
||||
@@ -81,7 +92,37 @@ function signatureTooltip(s: SigState): Tooltip {
|
||||
d.classList.add("cm-lsp-signature-doc");
|
||||
dom.appendChild(d);
|
||||
}
|
||||
return { dom };
|
||||
const fit = ({ left, right }: { left: number; right: number }) => {
|
||||
const width = `${Math.max(0, Math.floor(right - left))}px`;
|
||||
const fontSize = getComputedStyle(view.contentDOM).fontSize;
|
||||
const changed = dom.style.getPropertyValue("--cm-signature-width") !== width || dom.style.fontSize !== fontSize;
|
||||
if (changed) {
|
||||
dom.style.setProperty("--cm-signature-width", width);
|
||||
dom.style.fontSize = fontSize;
|
||||
}
|
||||
return changed;
|
||||
};
|
||||
// Reveal the current parameter after wrapping or a vertical clamp. Leave manual scrolling alone.
|
||||
let fittedWidth = 0;
|
||||
let fittedHeight = 0;
|
||||
return {
|
||||
dom,
|
||||
mount: () => void fit(tooltipBounds(view)),
|
||||
positioned: (space) => {
|
||||
if (fit(space)) {
|
||||
repositionTooltips(view);
|
||||
return;
|
||||
}
|
||||
if (!active || (fittedWidth === dom.clientWidth && fittedHeight === dom.clientHeight)) return;
|
||||
fittedWidth = dom.clientWidth;
|
||||
fittedHeight = dom.clientHeight;
|
||||
const top = dom.getBoundingClientRect().top + dom.clientTop;
|
||||
const parameter = active.getBoundingClientRect();
|
||||
const below = parameter.bottom - (top + fittedHeight);
|
||||
if (parameter.top < top || parameter.height >= fittedHeight) dom.scrollTop += parameter.top - top;
|
||||
else if (below > 0) dom.scrollTop += below;
|
||||
},
|
||||
};
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -270,28 +270,35 @@ export const lspTheme = EditorView.theme({
|
||||
cursor: "pointer",
|
||||
},
|
||||
".cm-lsp-link-button:hover": { color: "var(--link-hover)", textDecoration: "underline" },
|
||||
".cm-lsp-signature": {
|
||||
".cm-tooltip.cm-lsp-signature": {
|
||||
fontFamily: "var(--openidea-editor-font, var(--font-mono))",
|
||||
fontWeight: "var(--fw-code, 400)",
|
||||
fontSize: "var(--openidea-editor-font-size, var(--fs-code))",
|
||||
padding: "6px 10px",
|
||||
maxWidth: "640px",
|
||||
maxWidth: "min(640px, var(--cm-signature-width, 100%))",
|
||||
maxHeight: "min(380px, 65vh)",
|
||||
paddingBlock: "var(--space-0-5)",
|
||||
overflow: "auto",
|
||||
overscrollBehavior: "contain",
|
||||
},
|
||||
".cm-lsp-signature-row": {
|
||||
color: "var(--fg-secondary)",
|
||||
whiteSpace: "pre-wrap",
|
||||
overflowWrap: "anywhere",
|
||||
lineHeight: "1.5",
|
||||
padding: "var(--space-0-5) var(--space-2)",
|
||||
paddingInlineStart: "calc(var(--space-2) + 2ch)",
|
||||
textIndent: "-2ch",
|
||||
},
|
||||
".cm-lsp-signature-row": { color: "var(--fg-subtle)", whiteSpace: "pre-wrap", lineHeight: "max(20px, 1.5em)" },
|
||||
".cm-lsp-signature-active": {
|
||||
color: "var(--fg-strong)",
|
||||
backgroundColor: "var(--bg-identifier-under-caret, color-mix(in srgb, var(--accent) 14%, transparent))",
|
||||
margin: "0 -10px",
|
||||
padding: "0 10px",
|
||||
},
|
||||
".cm-lsp-signature-disabled": { opacity: "0.55" },
|
||||
".cm-lsp-signature b": { fontWeight: "var(--fw-code-bold, 700)", color: "var(--fg-strong)" },
|
||||
".cm-lsp-signature-doc": {
|
||||
borderTop: "1px solid var(--border-popup)",
|
||||
marginTop: "6px",
|
||||
paddingTop: "6px",
|
||||
maxHeight: "160px",
|
||||
overflow: "auto",
|
||||
marginTop: "var(--space-1)",
|
||||
padding: "var(--space-2)",
|
||||
},
|
||||
".cm-tooltip:has(> .cm-lsp-hint)": { background: "none", border: "none", boxShadow: "none" },
|
||||
".cm-lsp-hint": {
|
||||
|
||||
Reference in new issue
Заблокувати користувача