Порівняти коміти

...
Автор SHA1 Повідомлення Дата
l0ng-ai 5ce76a970c fix(debugger): group line breakpoint actions 2026-11-22 12:22:45 +08:00
l0ng-ai ff80b4351a fix(editor): pair Kotlin template braces and generic factory calls (#5108)
Two pairing gaps in Kotlin:

- **`"${`** stayed `"${|"`: `closeBrackets()` pairs `{` only before whitespace or a closer, and here the auto-inserted closing quote follows. `templateBrace` pairs a `{` typed right after `$` inside an open string into `${|}`, in Kotlin, Groovy, Dart, Scala, JavaScript and TypeScript (template literals). Outside a string nothing changes.
- **`mutableListOf<`** got no `>`: the Kotlin rule only treats capitalized names as types. A generic factory call written directly against its `<` — `…Of` (`listOf`, `mutableMapOf`, `setOf`…), `empty…`, `arrayOfNulls`, `enumValues`, `enumValueOf`, `typeOf` — now pairs. Other lowercase names, and any name followed by a space, stay comparisons.
2026-11-22 11:55:51 +08:00
l0ng-ai af2be518ec fix(editor): move selected text by dragging it (#5137)
The desktop window keeps native drag and drop on for files dropped onto it, so HTML5 drop events never reach the page and CodeMirror's built-in text drag never landed: dragged text stayed where it was.

Text drag now runs on mouse events. Dragging the selection shows a drop caret, scrolls the editor near its edges, and drops the text at the caret on release, into the same or another editor. Option (macOS) or Ctrl held at release copies instead of moving; Escape cancels; a click on the selection without dragging places the caret. "Enable drag-and-drop functionality in editor" still turns it off.

Closes #5117
2026-11-22 11:53:25 +08:00
l0ng-ai 9f60e9b209 fix(search): integrate the Search Everywhere query field (#5116)
The Search Everywhere query field now sits directly on the popup surface. A single inset divider shows focus for the query and its history button. The shorter query row gives results more room in short windows.
2026-11-22 11:45:46 +08:00
Deng Liuтаdengliu 1838919f47 fix(agents): close Phase 1 skills hub discovery, staging, and override gaps (#5129)
Fixes the remaining Phase 1 gaps of the Agent Skills hub:

- `/` completion drops skills that are off or `user-invocable: false`, de-duplicates Codex's prefixed names, keeps `argument-hint`, defaults `disable-model-invocation: true` skills to slash-only, and refreshes when session or draft overrides change.
- Discovery scans workspace member folders, monorepo packages up to two levels down, `<category>/<skill>/SKILL.md` folders and Copilot CLI's two-level `installed-plugins` layout (skipping disabled plugins). Codex disable rules point at `<skill>/SKILL.md`, and roots each CLI already scans are treated as native so skills aren't staged twice.
- A skill that is off globally or for the workspace can be turned on for one session; untrusted workspace skills stay locked. Settings › Agents › Skills shows the other folders a symlinked skill is linked from.

Closes #3897

Co-authored-by: dengliu <[email protected]>
2026-11-22 11:45:20 +08:00
l0ng-ai 256d77c3f6 fix(editor): move Go switch cases and Kotlin when branches as a whole (#5112)
Move Statement (⌘⇧↓/↑) on a branch header:

- **Go** `case 1:`: `structural_ranges` climbed past the branch to the whole `switch` (a `case` keyword's ancestors are not direct children of a block until the switch). With no sibling, the line-based fallback ran and moved `println("one")` above every label, breaking the switch.
- **Kotlin** `1 -> …` in a `when`: the statement was the whole `when`, so nothing moved.

`LangKinds` gains `clauses` (Go `expression_case`, `default_case`, `type_case`, `communication_case`; Kotlin `when_entry`). In `structural_ranges`, a branch reached from its header is the statement, and its neighbours are only other branches (never the switch subject `x`). Statements inside a branch are unchanged. On the frontend, `planMoveStatement` trims the line breaks a node may end with: Go branch ranges run to the next line's start, which made `ownsLines` reject them and fall back again.
2026-11-22 11:31:54 +08:00
Ernstjan FreriksтаEjaYF 7ec2b18b63 fix(tools): name the .NET SDK a dotnet tool needs instead of dotnet's generic error (#5076)
Installing a .NET tool (csharp-ls, FsAutoComplete) on a machine whose newest SDK is older than the one the tool targets failed with dotnet's generic "NuGet feed cannot be accessed" hint.

Before installing, the IDE reads the newest SDK from `dotnet --list-sdks` and the target framework of the package's releases from the nuget.org catalog. If the latest release needs a newer SDK, it installs the newest stable release that runs on the installed one and logs why; if none of the 20 newest does, it fails naming the SDK version required. When nuget.org can't be reached it installs as before, and a failed install now quotes dotnet's `error NUxxxx` lines.

Co-authored-by: EjaYF <[email protected]>
2026-11-22 11:30:34 +08:00
l0ng-ai f8ec222a0d fix(run): integrate the Run Anything command field into the popup (#5111)
The Run Anything command field now sits directly on the popup surface. A single inset divider shows keyboard focus. The command row is 14 px shorter, giving the scrollable results the extra space in short windows.
2026-11-22 11:29:49 +08:00
l0ng-ai aad0573fb9 fix(refactor): introduce a Go variable where gopls offers only a constant (#5110)
⌥⌘V on `1 + 2` in `println(1 + 2)` (Go) answered "Selected block should represent an expression". gopls 0.24 offers only **Extract constant** (`refactor.extract.constant`) for a constant expression — checked with a small LSP script against the installed gopls: both `only: ["refactor"]` and `["refactor.extract"]` return just that action. No action mapped to Introduce Variable, and the syntax-based fallback deliberately stands back when a running server answers nothing (`reason: "empty"`).

When the server's answer contains another introduce-kind extraction for the selection, the server evidently takes it for an expression, so `runRefactoring` now calls the fallback with a new reason `otherKind`, which builds the variable from the syntax tree (`value := 1 + 2`, as GoLand does). An empty answer otherwise still means no fallback.
2026-11-22 11:28:17 +08:00
l0ng-ai 8ea0052a7f fix(editor): continuation indent after a Kotlin when arrow or assignment (#5109)
In Kotlin, Enter after `1 ->` in a `when` (with the body still to come) or after `val answer =` kept the line's indentation (8 and 4 spaces) instead of continuing one level deeper (12 and 8), as IDEA does. Kotlin uses CodeMirror's legacy C-like mode, whose indentation does not know either construct.

An indent service for the Kotlin mode (`EXTRA_SUPPORT` in `languages.ts`) adds one level after a line ending in `->` or in an assignment `=` (not `==`, `!=`, `<=`, `>=`), with nothing after the caret and no bracket left open.
2026-11-22 11:25:27 +08:00
l0ng-ai b20e0b0902 fix(editor): continue Rust /// documentation comments on Enter (#5107)
Enter after `/// Summary` above a Rust function gave a blank line: `enterInLineComment` only splits a comment when text follows the caret, so at the end of the line nothing continued the documentation. RustRover (and Rider for C#) continue documentation line comments.

`enterAfterDocLineComment` handles Enter at the end of a `///` line (Rust, C#, Dart, Swift, F#) or a Rust `//!` line: the next line gets the same indentation and prefix, caret after `/// `. Plain `//` comments and `////` banners are unchanged, as is Enter in the middle of a comment (still split by `enterInLineComment`).
2026-11-22 11:21:28 +08:00
l0ng-ai e3fca1bb6f fix(editor): keep the caret where the comment commands put it (#5106)
Two caret problems with the comment commands, seen in Go, Rust and Kotlin:

- **⌘/, Undo, Redo**: the comment came back but the caret went to the line above (L2 instead of L3). As with Delete Line and Move Statement, CodeMirror's history maps the pre-command caret through the change on Redo unless a selection was recorded after it; `commentLine` now records its resulting caret (and keeps its repeated-⌘/ detection on the state after that).
- **⌥⌘/ on a blank line without a selection** inserted `/*  */` with the caret before it. It now inserts the language's empty block comment with the caret between the delimiters (`/* | */`); lines with code keep the existing behaviour.
2026-11-22 11:18:58 +08:00
l0ng-ai bfea07a30e fix(editor): keep a Rust lifetime's apostrophe single (#5105)
With quote pairing on, typing `'a` between `<>` in `fn borrow<>() {}` gave `fn borrow<'a'>() {}`, and `&'a` got a stray quote too: `closeBrackets()` pairs `'` wherever no word character precedes it, and Rust's apostrophe also starts lifetimes.

`rustLifetimeQuote` (an input handler for Rust, under the Insert pair quote option) inserts a single `'` where a lifetime goes: after `<`, `&` or `+`, and after `,` or `:` inside angle brackets (`<'a, 'b>`, `<T: 'static>`). Lifetimes earlier on the line are ignored when counting brackets. A char literal (`let c = '`, `f('a', '`) still pairs.
2026-11-22 11:17:13 +08:00
l0ng-ai 4d5648c38d fix(editor): add the parameter list when completing a bare function header (#5104)
Complete Current Statement (⌘⇧↵) after `func f` (Go), `fn f` (Rust) or `fun f` (Kotlin) produced `func f {` / `|` / `}`: a body without a parameter list, which does not compile. A header that names a function (after any modifiers such as `pub async`, `private suspend`, and optional type parameters) but has no `(` yet now gets `()` before the body; the caret goes into the body as before. `pub async fn …` is now recognised as a block head too.
2026-11-22 11:15:17 +08:00
l0ng-ai fbcbfb648c fix(vcs): align Git Log commit message typography (#5103)
Git Log now uses the editor's configured font, size, and weights for commit subjects and descriptions. Authors, dates, branches, and signatures use smaller UI text and tighter spacing. Long metadata can wrap inside the details pane.
2026-11-22 11:14:45 +08:00
Charlie.Weiтаcharli117 bf2478934e feat(plugins): deliver caret-moved events (API 1.15) (#5119)
Plugin API 1.15 adds a caret-moved event through the existing events.other channel (no WIT interface or signature change): {path, line, col, settled} with 0-based UTF-16 positions for the focused editor. The frontend batches caret moves after 120 ms (only the latest position per file) and sends one settled event 600 ms after the caret rests; queued and delayed events are dropped when the editor, document, path or project changes. editor-focused now carries the focused editor (path, language, selections) through an optional argument on plugin_set_active_file, which the remote adapter forwards. Requires the events capability; components and fixtures are rebuilt for 1.15.

Co-authored-by: charli117 <[email protected]>
2026-11-22 10:43:27 +08:00
l0ng-ai 8f252398fe fix(debugger): adapt frames and variables to side docks (#5102)
The Debug tool window puts the call stack above Variables when docked on either side, giving both panes the full dock width; in the bottom dock the panes sit side by side. Each orientation remembers its divider position.
2026-11-22 10:35:18 +08:00
l0ng-ai 54c7cbc3b0 fix(problems): adapt the preview to the dock position (#5099)
In a side dock, Problems puts the severity and navigation toolbar above the list and the source preview below it, both at the full dock width; in the bottom dock the list and preview sit side by side. Each orientation remembers its divider position.
2026-11-22 10:08:12 +08:00
l0ng-ai 1fd9246ccc fix(structure): put tree controls in the tool window header (#5097)
The docked Structure tree starts directly below the tool window header, gaining 32 px of vertical space. The header's View Options menu groups sorting and member filters, and the existing Options menu holds Expand All, Collapse All and the two source-following commands.
2026-11-22 09:45:38 +08:00
l0ng-ai 7b6ac0d5a8 fix(run): keep session tab controls visible in narrow panels (#5096)
Run session tabs fit the available space in the tool window header. Long names shorten to keep the close or pin button visible, and hovering shows the full name and, for completed runs, the duration and exit code.
2026-11-22 09:24:47 +08:00
l0ng-ai d764f9cae1 fix(search): keep distinguishing folders visible in search results (#5095)
Search Everywhere shortens long directory paths before the last folder in Files and Classes, so same-named results stay distinguishable; hovering shows the full directory. File names keep their extensions visible when the name fits on the row.
2026-11-22 08:59:37 +08:00
Muuтаmuutot 3908b70b61 fix(ui): match JetBrains compact Tree.border insets (#5100)
Compact Mode reduced tree row height and the island gap, but the tree's horizontal inset stayed at 6px, leaving compact trees 2px wider on each side than JetBrains' compact Tree.border (2,8,2,8). The --tree-inset token now steps 6px → 4px in Compact Mode, so island gap plus inset is 12px normally and 8px compact.

Co-authored-by: muutot <[email protected]>
2026-11-22 08:50:19 +08:00
l0ng-ai c1f0a85718 fix(diff): keep status and viewer tools together (#5094)
The single-file diff toolbar keeps the comparison status beside Settings and the other viewer tools, in a group that can wrap to a second row so longer comparison messages stay readable. At toolbar widths of 520 px and below, the viewer layout, collapse and synchronized scrolling commands are available from Settings.
2026-11-22 08:37:37 +08:00
l0ng-ai acdd88f0f7 fix(debugger): group variable and watch context menu actions (#5093)
The debugger variable menu groups Set Value with Copy Value and Copy Name, and watch creation and field watchpoints get their own group when available. The watch menu puts Remove Watch and Remove All Watches first, above value and source commands.
2026-11-22 08:15:54 +08:00
l0ng-ai 1f8c869293 fix(vcs): group Commit changes menu actions by workflow (#5092)
The Commit changes menu leads with Commit, Rollback and Move to Another Changelist in the change-list workflow, and with Stage and Unstage in staging mode. Diff, source and path-copy commands are grouped together, and the two patch commands sit next to each other.
2026-11-22 07:53:31 +08:00
l0ng-ai f3928b3553 fix(terminal): organize the output context menu (#5091)
The terminal output menu puts Find and session commands first, then groups Copy, Paste and Select All above Clear Buffer and the split commands. Find opens the search bar with the selected text as the query.
2026-11-22 07:31:15 +08:00
l0ng-ai 5161d266ab fix(console): give the search field more room in narrow panes (#5088)
The console search field no longer shares a row with its matching options in a narrow dock: below 224 px the clear and matching controls move below the query. The match count uses the small UI font with tabular digits and sits beside the previous and next buttons.
2026-11-22 07:11:38 +08:00
l0ng-ai b30b30311f fix(workbench): keep toolbar controls readable in narrow windows (#5087)
The main toolbar shares the available text width between labels, so long project and run configuration names give up space before short branch names. At the minimum window width, dropdowns with leading icons show just those icons with their tooltips, while Run, Debug and the window buttons keep their hit targets.
2026-11-22 06:47:40 +08:00
l0ng-ai c9c6d87a14 fix(vcs): group Git Log commit context menu actions (#5086)
The Git Log commit menu puts revision copying and patch creation at the top, then separates comparison from operations that change the repository. Cherry-pick sits with the other commit operations, parent and child navigation sit together, and both bookmark actions share a group.
2026-11-22 06:17:56 +08:00
l0ng-ai 97ffd9aae9 fix(project): group Project view context menu actions (#5084)
The Project view puts Rename beside Refactor and Delete, with a separate group for Reformat Code and Optimize Imports. Jump to Source follows the clipboard actions; Local History, Git and Reload from Disk share a group, and comparison is separated from directory roles and file colors.
2026-11-22 05:58:37 +08:00
l0ng-ai 5e39650886 fix(editor): organize the editor tab context menu (#5081)
The editor tab context menu puts Close All Tabs beside Close Other Tabs, followed by the more specific close commands. Copy Path/Reference gets its own group above the splits, each split sits beside its split-and-move action, and pinning, opening a new window and configuring tabs share a group.
2026-11-22 05:42:00 +08:00
l0ng-ai 444c315d57 fix(platform): paste the primary selection only over editable content on Linux (#5089)
WebKitGTK pastes the primary selection on a middle-button release into the focused editable, wherever the release lands, so closing a tab with a middle click pasted into the active editor (and a middle click on a tree, tool window or the terminal did the same). Middle-button releases outside editable content now cancel that paste; a middle click in the editor or a text field still pastes.

Fixes #5079
2026-11-22 05:23:22 +08:00
l0ng-ai a4bea25ae3 fix(editor): group clipboard, search and open actions in the context menu (#5080)
The editor context menu keeps Cut, Copy, Paste and Copy / Paste Special together, with clipboard shortcut labels that follow the host platform. With a selection, Find in Files sits with the other search and navigation actions, and Split Right sits next to Open In, above Local History and Git.
2026-11-22 05:23:10 +08:00
Emir 84b1770da4 feat(i18n): detect the system language on first launch (#5082)
When the global settings.toml is missing, OpenIDEA now saves the OS's preferred UI language (NSLocale on macOS, GetUserPreferredUILanguages on Windows, LC_ALL/LC_MESSAGES/LANG elsewhere) as appearance.locale, mapped to one of the shipped UI languages with English as the fallback, and loads that catalog before the workbench renders. An existing settings file keeps its saved language. The mapping lives in ide-workspace next to the settings store, and a test keeps its locale list in step with the frontend's.

Co-authored-by: laot7490 <[email protected]>
2026-11-22 05:23:06 +08:00
arookieofc-ai 88295ecca8 fix(e2e): track tightened status bar height in compactMode sizes (#5083)
#5037 tightened the standard status bar to 30 px; the Compact Mode e2e still expected 34 px for the normal density.
2026-11-22 05:17:47 +08:00
l0ng-ai e87aee5969 fix(editor): make the Expressions chooser compact and readable (#5077)
The Expressions chooser uses one compact column for both the refactoring action and the syntax fallback. Multiline candidates show their first source line followed by an ellipsis, while selecting a row still highlights and uses the full expression; the highlight clears when filtering leaves no active row.
2026-11-22 05:02:33 +08:00
l0ng-ai 84d8be1181 fix(window): show minimize and maximize on Linux without a desktop session (#5085)
With no desktop session (WSLg, a bare compositor) GTK reports its built-in decoration layout, close only, so the frameless title bar had no way to minimize or maximize the window. The desktop's gtk-decoration-layout is now used only when a desktop session is running (XDG_CURRENT_DESKTOP, XDG_SESSION_DESKTOP or DESKTOP_SESSION); otherwise the title bar shows minimize, maximize and close.

Fixes #4421
2026-11-22 04:42:35 +08:00
l0ng-ai 27cbdb1ba6 fix(editor): preview changes in the Unwrap or Remove chooser (#5075)
The Unwrap/Remove chooser uses a compact list of action names. The selected action previews the kept and removed code in the editor; switching rows leaves the caret and scroll position in place, and Escape dismisses the chooser and clears the preview.
2026-11-22 04:42:22 +08:00
l0ng-ai 1005dc1363 fix(editor): lay out inline refactoring names as a lookup list (#5072)
Inline refactoring name suggestions align with the identifier being edited. Rows follow the editor font and zoom, with a separate footer for the shortcut; the list fits inside the editor and scrolls to keep the active suggestion visible.
2026-11-22 04:25:59 +08:00
l0ng-ai 3f3cdeba0d fix(editor): make the Generate chooser compact and scannable (#5069)
Generate now uses the compact, caret-anchored action chooser. Constructors, accessors, overrides and tests get distinct icons at the standard action-list size, and the chooser keeps its width while typing to filter.
2026-11-22 04:03:48 +08:00
l0ng-ai 9b8c88e1ee fix(editor): show the opening line of offscreen scopes (#5068)
When the caret reaches a closing delimiter whose opener is above the viewport, the opening line of that scope (with the declaration above a brace on its own line) is shown at the top of the editor after a short pause, in the editor's font, line numbers and colours. Caret and scroll stay put; it follows the brace highlighting setting, closes on Escape, and stays hidden when Sticky Lines already shows the opener.
2026-11-22 03:42:22 +08:00
l0ng-ai 392574fe2a fix(ui): don't show a scrollbar over content that fits after a resize (#5016)
A scroll range of one pixel or less is WebKit rounding after a resize (a splitter drag leaves scrollHeight 319 over clientHeight 318), not content: the overlay scrollbar and the editor scrollbar thumb no longer show for it.
2026-11-22 03:40:25 +08:00
l0ng-ai 41829e74db fix(editor): keep inline hints aligned with source text (#5066)
Inline hints use a size one pixel under the editor font, sit on the text baseline with even padding, and stay a single label when lines wrap, so they no longer shift or split around the source text.
2026-11-22 03:16:31 +08:00
l0ng-ai aee21233fb test(lsp): pass a lazy action's resolve data as a string (#5078)
CodeAction.data is serialized JSON on the IPC boundary; the test added in #5074 gave it an object, which pnpm typecheck rejects.
2026-11-22 03:04:29 +08:00
l0ng-ai 17f5889037 fix(diff): make collapsed unchanged lines easier to find and expand (#5065)
Collapsed unchanged lines in the diff viewer are now a full-width button: a chevron, the line count in UI type and a hatched rule in the separator colour, with hover and focus states. Clicking it or pressing Enter expands the range in both panes and returns focus to the editor.
2026-11-22 02:57:36 +08:00
l0ng-ai ff6c6eb13f fix(editor): restore the caret of Move Statement on Redo (#5063)
Redo of Move Statement Up / Down left the caret where the move started: CodeMirror's history maps the selection from before the edit through it unless the command records the selection after. Both the structural and the line-based move now record the caret they set, so Undo / Redo put it back.
2026-11-22 02:50:09 +08:00
l0ng-ai ac015847a3 fix(editor): remove unused imports in Optimize Imports for TypeScript (#5062)
Optimize Imports in JavaScript / TypeScript now removes unused imports first: typescript-language-server's organize imports only sorts and merges them, and removing the unused ones is its own source.removeUnusedImports action. Optimize-imports-on-save does the same.
2026-11-22 02:46:43 +08:00
l0ng-ai 4c774d2e8e fix(refactor): find TypeScript extractions for Introduce Variable and Extract Method (#5061)
typescript-language-server answers code actions with refactorings only when `only` contains a kind that contains `refactor`; asked for `refactor.extract` it returned nothing, so Introduce Variable and Extract Method refused the selection. JavaScript / TypeScript now ask for `refactor`; the actions are still mapped by their own kind, and other servers keep the narrow kind.
2026-11-22 02:43:04 +08:00
l0ng-ai 8adbbd1b05 fix(lsp): apply refactorings that resolve their edit lazily (#5074)
TypeScript Introduce Variable, Extract Constant and Extract Method did nothing with vtsls: its refactoring actions carry resolve data and a follow-up command but no edit, and an action was only resolved when it had no command either. The resolved edit then failed on a create of the edited file marked ignoreIfExists, which the conversion dropped.

- Resolve an action without an edit whenever it carries resolve data (interactive path and lsp_apply_code_action).
- Leave out create / rename operations their ignoreIfExists makes no-ops, and deletes their ignoreIfNotExists does.
2026-11-22 02:41:50 +08:00
l0ng-ai c207e57686 fix(editor): preview folded code on hover (#5060)
Hovering a folded region's placeholder shows the folded lines in a tooltip: highlighted as in the editor, with line numbers when the gutter shows them, up to 80 lines, aligned to the pane edge. It closes on Escape, scroll or a fold change. The sticky-lines renderer shares the line rendering.
2026-11-22 02:36:02 +08:00
l0ng-ai ac0a56d1ec fix(editor): show font size feedback when zooming (#5059)
Wheel or keyboard zoom now shows the current font size at the bottom of the editor pane that changed, with Reset Font Size and a link to Editor > General. It stays while hovered or focused and dismisses after five seconds; LightEdit gets the same reset.
2026-11-22 02:32:38 +08:00
l0ng-ai 07cbb560df fix(agents): give agents every root of a multi-project workspace (#5071)
A task's agent only learned its own directory, so in a workspace with attached projects it missed the other projects and left their part of a change undone.

- Sessions pass the workspace's other roots (the project and the trusted attached projects, minus the task's own directory and project) as ACP additionalDirectories to agents that advertise the capability.
- The Codex shim turns them into runtimeWorkspaceRoots on thread start, resume and fork, so workspace-write covers them and the model is told about them; the Claude Code shim passes each as --add-dir.
- New read-only MCP tool get_workspace_roots lists the roots, and the server instructions point to it for workspace questions and changes that span projects.

Fixes #5058
2026-11-22 02:17:09 +08:00
l0ng-ai 88936106ab feat(editor): documentation stub tags for TypeScript and Python docstrings (#5057)
Insert documentation comment stub filled tags in for PHP only.

- **JavaScript / TypeScript**: `/**` + Enter above a function declaration, method, constructor or arrow function assigned to a `const` now lists `@param name` for each parameter (parameter properties, rest and defaulted parameters included) and `@returns` when a non-void result type is declared. Calls and statements get no tags.
- **Python**: Enter between the quotes of a `"""` (or `'''`) opened on the first line under a `def` expands it into a docstring, as PyCharm does with its default reStructuredText format: the summary line, `:param name:` per parameter (`self` / `cls` skipped, `*args` / `**kw` by name) and `:return:` (not for `__init__` or `-> None`), then the closing quotes.

Both follow the existing Smart Keys › Insert documentation comment stub option.
2026-11-22 01:56:46 +08:00
l0ng-ai 78041f3745 fix(editor): complete arrow functions, open brackets and Python headers (#5056)
Complete Current Statement (⌘⇧↵) in TypeScript and Python (both use the text rules in `completeStatementSpec`):

- `const f = (x: number) =>` became `=>;`. An arrow function now gets a block body, followed by the brackets still open and a `;` where the statement needs one: `=> {` / `|` / `};`, `items.map((x) => {` / `|` / `});`.
- `const obj = { name: "Ada"` became `{ name: "Ada";`. Brackets the line opened and left open are now closed before the `;` (`{ name: "Ada" };`, `foo(a, bar(2));`); a line ending in `,` or `{` is left to continue.
- Python `async def …`, `with …`, `except …`, `case …`, `match …`, `async for …` got no `:`. Every compound statement header now gets one; `match = 5` and `case.x` stay statements.
2026-11-22 01:56:40 +08:00
l0ng-ai d0eeb5e8c3 fix(editor): type over a closing bracket that already closes a pair (#5054)
`closeBrackets()` steps over a closer only when it inserted that closer itself during the session. So with `value = (1 + 2|)` in a reopened file (or code pasted / written earlier), typing `)` gave `(1 + 2)|)`; same for `]` and `}`. IDEA types over a closing bracket that already closes a pair.

`skipClosingBracket` (an input handler next to `skipClosingQuote`, under the Insert pair bracket option) steps over the bracket at the caret when the syntax tree matches it to an opener and the line has no more openers than closers of that kind outside strings; otherwise the bracket is inserted (`f(g(x|)` still gets its missing `)`). Multi-line pairs (`foo(` … `)` on a later line) are stepped over too.
2026-11-22 01:52:21 +08:00
l0ng-ai 5a9783dbf0 fix(workbench): keep tool window header actions in view (#5053)
Tool window titles and tabs give up width before the header actions, so Options and Hide stay at the right edge of a narrow pane. A shortened title keeps its full text on hover. When the contributed controls need more room, their strip scrolls independently while Options and Hide stay in place.
2026-11-22 01:51:01 +08:00
l0ng-ai 74c2757a7a fix(editor): dedent after return and realign bare except: in Python (#5052)
Two Python indentation gaps against PyCharm:

- Enter after `return 1`, `pass`, `raise …`, `break` or `continue` kept the block's indentation. The dedent rule existed only in `fallbackIndent`, which steps aside when a language mode is loaded (Python has `@codemirror/lang-python`). An indent service for Python now applies it: one level out, unless a bracket is still open (`return foo(`) or text follows the caret.
- Typing a bare `except:` inside a `try` body left it indented: the stock `indentOnInput` pattern and `Body` rule only know `except ` with a space. `except:` now triggers reindentation and aligns with its `try:` (or a previous `except`).

Both are added through `EXTRA_SUPPORT` for the Python mode (`src/editor/core/cm/languages.ts`).
2026-11-22 01:50:44 +08:00
l0ng-ai ff6187ebf9 fix(editor): pair backticks, Python prefixed strings and triple quotes (#5051)
`prefsExtension` gives `closeBrackets()` its own pairing list (to honour the Insert pair bracket / quote options), and that list replaced the language's: only `( [ { ' "`. So:

- TypeScript / JavaScript: typing `\`` left the template literal open;
- Python: `f"`, `r'`, `b"`… left the string open (the language's `stringPrefixes` were dropped), and `"""` did not close.

The list now adds the backtick for JavaScript, TypeScript, Vue, Svelte, Astro and Go, and Python's `'''` / `"""` with its string prefixes; the two options still switch brackets and quotes off.
2026-11-22 01:48:28 +08:00
l0ng-ai 708ceac09a fix(editor): keep editor banner messages and actions readable (#5050)
Editor notification bars group their action links and let the message wrap at the width of the editor pane. Links stay on the same row when there is room and wrap below the message in narrower splits. The banner uses the UI text size and has smaller vertical insets in Compact Mode.
2026-11-22 01:47:53 +08:00
l0ng-ai 5ba43e93e5 fix(services): load container logs in batches and keep their colours (#5067)
Docker logs reached the webview one IPC message per line; WebView2 delivers each message on its own, so a 1000-line tail took 10-40 s on Windows. ide_docker::logs now collects lines for 30 ms and sends them together from a second thread, so a quiet log still flushes, and docker_logs streams Vec<DockerLogLine>. The log pane (container and plugin service logs) renders ANSI colours instead of stripping them, takes the Console log level colours like the Run console, and has Scroll to End.

Fixes #5049
2026-11-22 01:36:39 +08:00
l0ng-ai c552183924 fix(editor): restore the caret of Delete Line on Redo (#5047)
Delete Line (⌘⌫), Undo, Redo: the line was deleted again, but the caret ended at the end of the line above instead of where the deletion had put it (the next line, same column). CodeMirror's history restores, on Redo, the first selection recorded after the change, and otherwise maps the pre-change caret through it; Delete Line set its caret in the same transaction, so nothing was recorded and the old caret (inside the deleted line) mapped to the previous line end. `deleteLine` now dispatches its resulting selection once more, which the history records as the selection after the edit.
2026-11-22 01:16:55 +08:00
l0ng-ai f2adcccf2a feat(editor): fill the Java documentation stub with its tags (#5045) 2026-11-22 01:16:49 +08:00
l0ng-ai 158d11bd7f (#5044)
Copy Path/Reference opens at 500 px when space permits. Each row places the action and shortcut before the right-aligned path preview. Long paths keep the filename in view, and dragging the popup edge gives them more room.
2026-11-22 01:16:32 +08:00
l0ng-ai c6de070cba fix(editor): split a string literal on Enter instead of breaking it (#5043)
Enter inside a Java string (`String t = "hello|world";`) inserted a raw line break into the literal, leaving code that does not compile. A new Enter handler (`enterInStringLiteral`) splits a one-line string literal into two joined with `+`, the second on a continuation-indented line with the caret after its opening quote:

```java
String t = "hello" +
        "|world";
```

It applies in Java, C#, Kotlin, Groovy, JavaScript and TypeScript (the literal's own quote in JS/TS), with IDEA's default continuation indent (two levels for the JVM languages and C#, one for JS/TS). Text blocks, template literals, a caret inside an escape (`\\|n`), char literals, multi-line literals and other languages keep the plain newline.
2026-11-22 01:16:04 +08:00
l0ng-ai 42b9106ade fix(editor): undo Introduce Variable in one step (#5040)
After Introduce Variable (⌥⌘V) and Enter on a suggested name, one Undo only put the server's placeholder name back (`value` → `extracted`); the reformatting and the extraction each needed another Undo. The refactoring is made of several transactions (the server's workspace edit, `reformatGenerated`, the in-place rename) and each was its own history event.

A small history group (`src/editor/lsp/historyGroup.ts`) keeps the transactions in between out of the undo history and, when it closes, records the net change once. `applyIntroduceAction` opens it before applying the server action and closes it when the in-place rename ends (new `onEnd` on the session), or right away if no rename starts. One Undo now restores the original expression, and Redo brings the whole refactoring back.

Escape during the rename keeps the introduced variable with its current name, as the hint says and as IDEA does; that part of the report is not changed.
2026-11-22 01:04:48 +08:00
l0ng-ai 92a49f19af fix(editor): keep the keyboard in the editor after closing the focused tab (#5039)
Closing the focused editor tab with ⌘W (or its close button) showed the next tab, but `document.activeElement` became `<body>`: arrow keys and typing did nothing until the editor was clicked. `closeTab` removed the tab without giving the focus to the editor that took its place. It now does so when the closed editor had the focus (a tab closed while focus is elsewhere leaves focus alone).
2026-11-22 01:04:18 +08:00
l0ng-ai f58e6d1259 fix(editor): complete Java block heads and open strings with Complete Current Statement (#5038)
Complete Current Statement (⌘⇧↵) in Java added a `;` where a block was meant, because tree-sitter's error recovery reports a missing `;` after an unfinished head and the structural pass inserted it:

- `if (true)` → `if (true);` (the next statement then runs unconditionally)
- `public class App` / `public void run()` → `…;`
- `String m = "hello` → `"hello;` (the `;` inside the open string)
- `for` → `for { }` (the text rules only knew keyword-led heads)

Now a finished block head (balanced brackets, not followed by an Allman `{` line) and an open string skip the parser's `;` and go to the text rules, which:

- recognise type declarations behind modifiers/annotations and Java / C# method and constructor headers (`abstract` / `native` methods keep the `;`; `return` / `throw` / `new` lines and plain calls are statements);
- give a bare `if` / `for` / `while` / `switch` / `catch` its parentheses with the caret inside (`for (|) {` / `}`) in languages with parenthesised conditions;
- close an open string or char literal before the `;` (Rust's `'a` is a lifetime, not a quote).
2026-11-22 01:04:12 +08:00
l0ng-ai 13a2356fa1 fix(workbench): tighten status bar height and widget spacing (#5037)
The status bar uses one 30 px row in the standard density and a 24 px row in Compact Mode. Adjacent widgets use their existing insets for spacing, which gives the editor and its status controls a little more room.
2026-11-22 00:58:32 +08:00
Mr0Bread 002751e524 refactor(agents): remove CSS rules nothing reads (#5055)
Three CSS rules in the agents feature can never apply, so they only add to the files:

- `ReferenceChip.module.css` `.selected`: no `styles.selected` (or `chipStyles.selected`) anywhere in `src/`.
- `SkillsPage.module.css` `.link` and `.link:hover`: `SkillsPage.tsx` never reads `styles.link`.
- `Session.module.css`: the first `.questionChoices` block (`display`, `flex-direction`, `gap`) is overridden property-for-property by the second `.questionChoices` block later in the file (same selector, same specificity, no media query), so the computed style is unchanged.

22 lines removed, no behaviour change.

Co-authored-by: Mr0Bread <[email protected]>
2026-11-22 00:52:31 +08:00
l0ng-ai ac87278ddd fix(welcome): separate project names, locations and branches in the switcher (#5035)
Project names now have a line of their own in the title bar project switcher, so a long Git branch can no longer crowd out the name. The path and branch use the smaller metadata type size. Remote projects show their host and folder on separate lines, with keyboard search highlighting each match in its corresponding line.
2026-11-22 00:52:24 +08:00
l0ng-ai a62d4d11c3 fix(editor): indent the line after Complete Current Statement like the statement (#5028)
Complete Current Statement (⌘⇧↵) on `String a = "123"` added the `;` but put the caret on a new line one continuation indent deeper (12 spaces instead of 8). `completeStatementSpec` asked for the new line's indentation before inserting the `;`, when the parser still saw an unfinished statement. The indentation is now computed on the line with the `;` in place.
2026-11-22 00:52:18 +08:00
l0ng-ai 0164e82e32 fix(run): group test navigation and display options (#5027)
The test results toolbar groups its filters together and moves Previous and Next Failed Test into More Actions, where the shortcuts are shown next to their labels. Test Runner Options can hide row durations to give long test names more room. The choice is remembered across sessions and the test summary and selected output remain visible.
2026-11-22 00:52:11 +08:00
l0ng-ai edb8f69024 fix(editor): finish Introduce Variable on a double-clicked name suggestion (#5026)
During Introduce Variable, the name suggestions listed under the new variable reacted only to a single press: a double click put the name in but left the refactoring open, so it looked like double click did nothing. A double click now puts the name in and finishes, as Enter does (a single click still only puts it in). The list and its hint used the hand cursor; they now show the arrow, as other editor popups do.
2026-11-22 00:52:05 +08:00
l0ng-ai ccfa4a1f22 fix(run): show why Profile or Run with Coverage did not start (#5025)
With the Run notification group set to not show balloons (Settings › Notifications, or Don't Show Again on a Run notification), clicking Profile '…' / Allocations / Live Objects or Run with Coverage looked like it did nothing: the reason the run could not start (async-profiler or the coverage tool is not installed, the configuration is not supported, preparing it failed) went only to the Notifications list. These notifications answer a command the user just ran, so they are now `userInitiated` and always show as a balloon, like a manual update check.
2026-11-22 00:51:58 +08:00
l0ng-ai 8eb332aba7 fix(new-project): flag a taken folder and remember the location (#5024)
New Project accepted the name of a folder that already exists and has files, and only reported "already exists and is not empty" in the progress view after Create. It now checks as the name or location changes: the name field and its hint turn red and Create is disabled. Until the user types a name, it follows the first free `untitled`, `untitled1`, … in the location.

The location always started at the home folder (unless Default Project Directory was set). It now starts where the last project was created; the Default Project Directory setting still comes first.

The check is the one `scaffold_create` already did, moved into `ide_scaffold::target_taken` and exposed with `free_name` as `scaffold_target_taken` / `scaffold_free_name`.
2026-11-22 00:51:52 +08:00
l0ng-ai 0798582173 feat(markdown): add a stacked editor and preview layout (#5023)
Markdown can display the editor above its live preview so both use the full width of a narrow editor group. Choose Side by side or Stacked under Preview layout in Markdown settings. Each layout remembers its own divider position, and existing side-by-side sizes are restored when switching back.
2026-11-22 00:51:45 +08:00
l0ng-ai 46883c413c feat(welcome): show Remote Development as a header button (#5021)
Remote Development was hidden in the welcome page's More Actions menu, with the same folder icon as Open; New File used the same plus as New Project. Remote Development is now a header button next to Clone Repository with a new server icon, and New File has a new page-with-plus icon (both icons apply wherever these actions appear). Header buttons no longer cap their width, which cut "Remote Development" to "Remote Develo…"; they collapse to icons below 740px.

The Remote Development dialog's rows ended at different edges because Configure… is wider than Browse. The form is now a two-column grid: fields share the first column and side buttons the second, and its horizontal padding matches the dialog footer, so fields, side buttons and Cancel / Open line up.
2026-11-22 00:51:38 +08:00
l0ng-ai 840dddb897 fix(editor): fit long single-row tabs inside narrow splits (#5020)
A long file name in a single-row editor split could push the selected tab's close button outside the visible strip. Single-row tabs now constrain the label to the available width and keep the close button beside the shortened name. The hidden tabs picker still opens tabs outside the visible strip.
2026-11-22 00:51:33 +08:00
l0ng-ai ae51e195a5 fix(vcs): reorder the annotation gutter context menu (#5019)
Right-clicking the annotation gutter showed Show Commit in Git Log first and Close Annotations last, below Options. The menu now starts with Close Annotations, then Show Diff and Copy Revision Number; after a separator come the revision actions (Annotate at Revision…, Annotate Previous Revision, Show Commit in Git Log, Ignore This Commit), and Options is last. On an uncommitted line the menu is Close Annotations, Options.
2026-11-22 00:51:26 +08:00
l0ng-ai 205be89d4e fix(terminal): keep the selected session tab visible in narrow panes (#5017)
A long terminal session name could take more space than its tab strip and push the close button out of view. Each tab now fits the available width, with an ellipsis for long labels and the full name on hover. New Tab and the terminal options sit next to the strip, and the tab picker handles sessions that overflow.
2026-11-22 00:51:20 +08:00
l0ng-ai ece9c7ef73 fix(project): keep file refactoring changes visible in the preview (#5013)
File refactoring previews give each file a distinct header with its directory and occurrence count. Each code excerpt starts near the changed text and can wrap in a narrow window. The reference count and confirmation buttons stay visible as the list scrolls, and excluded files have a struck-through file name.
2026-11-22 00:51:13 +08:00
Emir fe55a73e97 style(app): redesign welcome and plugins page (#4999)
The plugin details page groups version, downloads, author, categories and the ID / homepage / mail / signer fields so they are easier to scan, with translated labels. The Welcome sidebar uses a larger logo and full-width navigation rows; danger menu items tint their icons.

Co-authored-by: laot7490 <[email protected]>
2026-11-22 00:39:07 +08:00
Vladislav Kuzmin 65b0cc45f0 feat(database): choose tree visibility from row counts (#4824)
The count on a Database tree row opens a searchable chooser for what that row shows, without opening Data Source Properties: PostgreSQL source rows choose databases and database rows choose schemas (each database inherits the source rules until overridden, stored as schemasByDatabase); ClickHouse keeps a flat database list. A visibility-only save updates the rules against the latest saved file and keeps the connection and loaded metadata, while wildcard rules and names the server did not return are preserved.

Closes #4781

Co-authored-by: principalwater <[email protected]>
2026-11-22 00:38:27 +08:00
Vladislav Kuzmin aaab9a5dc6 feat(database): select a JDBC driver from a database preset (#4607)
The General tab of a named database preset lists its built-in driver and the local JDBC profiles associated with that preset, so a local driver no longer requires switching the type to Custom JDBC; the type and tree icon stay. Manage Drivers and Go to Driver open the profile manager scoped to that type. A connection refuses a profile associated with another preset, and a JDBC password is kept apart from a Snowflake key-pair passphrase when switching transports.

Closes #4564

Co-authored-by: principalwater <[email protected]>
2026-11-22 00:37:23 +08:00
Muuтаmuutot 4bc68d27cc feat(settings): Color Scheme › Diff & Merge support (#4994)
Adds a Diff & Merge page to Color Scheme with the four change types (Changed, Conflict, Deleted, Inserted: line background and error stripe mark) and the folded unchanged fragments wave. Each attribute edits the --diff-* tokens the diff viewer paints, with a live preview, and IntelliJ scheme import maps DIFF_* keys and DIFF_SEPARATOR_WAVE onto them. The theme template and token reference list the new wave token.

Co-authored-by: muutot <[email protected]>
2026-11-22 00:37:11 +08:00
Mr0Bread 50f0363669 refactor(agents): share the session MCP and skills picker chrome (#5029)
The MCP and Skills pickers in the composer share one SessionPicker for the trigger, popup header, filter, footer and row parts, and one CSS module; each picker supplies only its data and labels. The trigger's product name is passed as `brand` and shown as written, as before.

Co-authored-by: Mr0Bread <[email protected]>
2026-11-22 00:37:06 +08:00
Mr0Bread 0ff51fdae4 refactor(agents): share the settings-page CSS between MCP servers and skills (#5030)
The rules the MCP Servers and Skills settings pages had in common move into SettingsPage.module.css; each page keeps only its own rules. No visual change.

Co-authored-by: Mr0Bread <[email protected]>
2026-11-22 00:36:54 +08:00
Mr0Bread 7df0880dcc refactor(agents): table-drive classifyUrl and share tool-output ingestion (#5031)
GitHub and GitLab item URLs are matched through one route table, and tool output (JSON metadata and links) is ingested by one helper for both the gh-create and plain tool paths. Classification results are unchanged.

Co-authored-by: Mr0Bread <[email protected]>
2026-11-22 00:36:50 +08:00
Mr0Bread 312559e121 refactor(editor): expose navigation providers, related providers and position helpers through editor/api (#4989)
Features import navigation/related provider registration and the offset/position helpers from `@/editor/api` instead of reaching into editor internals. No behaviour change.

Co-authored-by: Mr0Bread <[email protected]>
2026-11-22 00:36:46 +08:00
LU XIANGRUIтаwildcatDownstairs db8f9a72b0 feat(vcs): edit the compared folders in Compare Directories (#4975)
The left and right paths of Compare Directories are editable fields with a folder chooser beside each, as in IDEA. Enter, leaving the field or picking a folder compares the new pair, opened as its own tab in place of the current one; a path that isn't a folder, or the same folder on both sides, is refused with a message. The layout e2e test follows the editable fields and per-row synchronisation.

Closes #3925

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:17:22 +08:00
LU XIANGRUIтаwildcatDownstairs 0a7a292d82 feat(vcs): synchronize compared directories with per-row operations (#4974)
Each Compare Directories row carries IDEA's synchronisation operation in the marker column: copy to the right, copy to the left, delete (one-sided entries) or do nothing; Space or a click cycles it. Synchronize Selected and Synchronize All run the operations as one batch after a single confirmation counting deletions and overwrites. The new fs_synchronize_directories command validates every path, runs the operations on the blocking pool through the existing copy/merge and delete paths (Local History, VCS delete hooks), continues past failures and returns them; cancelling stops before the next entry. The per-row operations replace the single-entry Copy to Left / Copy to Right / Delete buttons.

Refs #3925

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:16:19 +08:00
LU XIANGRUIтаwildcatDownstairs a78d1fdc27 feat(project-view): mark folders of attached projects as excluded (#4962)
A folder inside an attached project now has Mark Directory as › Excluded (and Cancel Exclusion), written to that project's own .openidea settings so it also applies when the project is opened alone. New commands project_workspace_members and project_workspace_member_set (projectStructure.* keys of attached projects only); the existing markFolder logic computes the change. Other roles stay out of the menu for attached projects until their source and test roots are applied.

Closes #4712

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:13:04 +08:00
LU XIANGRUIтаwildcatDownstairs 8681bfab0d feat(vcs): compare directories by content, text, size or timestamp (#4973)
Compare Directories gets IDEA's Compare by selector: Binary content (default), Text, Size, and Size and timestamp. Text decodes both files with the editor's encoding detection and ignores line separators (files over 5 MiB or binary ones fall back to bytes); Size and timestamp allows 2 s of skew. The choice is remembered.

Refs #3925

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:09:12 +08:00
LU XIANGRUIтаwildcatDownstairs 2e7aab9ec6 feat(run): build configurations started together in one Maven run (#4963)
With Delegate IDE build/run actions to Maven, starting several Java configurations together (a Compound, or several Services rows) ran one mvn -pl <module> -am compile plus one classpath probe per configuration, one after another, rebuilding shared upstream modules each time. A launch's Maven run now also builds the modules of the launches still waiting for theirs (same reactor, scope, incremental policy and delegation) as one -pl a,b,c -am run with one classpath probe; the waiting launches reuse the recorded snapshots and classpaths. A member with JDT errors makes it a clean compile; if the shared build fails, none start and each console shows the failure. A lone launch builds as before.

Refs #3971

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:09:07 +08:00
LU XIANGRUIтаwildcatDownstairs c08b9b8d4d feat(project): give attached projects their own excluded folders (#4960)
In a workspace with attached projects, the primary project's excluded folders were applied relative to every root (excluding gen in the primary also hid gen in each attached project), while an attached project's own exclusions were ignored. Each workspace project now keeps its own excluded folders, read from its Project Structure settings and build files, and one per-root lookup (exclude_globs_in / search_excludes_in / root_of) gives the index, file watchers, Find in Files, the Project view, the Cucumber/Spring scans and the MCP file tools that root's set. A workspace folder (container) still applies its excluded folders in every member.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:09:02 +08:00
LU XIANGRUIтаwildcatDownstairs 81b357cdce feat(color-scheme): add Kotlin extension call, package-level call and enum entry entries (#4979)
The Kotlin page gets Identifiers › Extension function call, Package-level function call and Classes › Enum entry, as IntelliJ's Kotlin page has. Calls on an explicit receiver to top-level functions are extension calls, without one package-level calls; enum entries no longer take Constant. Each falls back to its parent until set; .icls KOTLIN_* keys fill them.

Closes #4059

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:08:46 +08:00
LU XIANGRUIтаwildcatDownstairs 9eaa44e004 feat(color-scheme): split predefined types and functions and separate literal keywords (#4978)
Language Defaults and each language page get Identifiers › Predefined type and Predefined function next to Predefined symbol, and Literal keyword next to Keyword. The new entries show their parent until set, so existing overrides keep applying. true / false / null in the clike modes (Kotlin, Scala, Dart, Groovy, C#) are bool / null tokens taking Literal keyword instead of Constant.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:07:39 +08:00
LU XIANGRUIтаwildcatDownstairs a3dc3c99a6 feat(color-scheme): add a JavaScript and TypeScript page with decorator and global entries (#4977)
Settings › Editor › Color Scheme gets a JavaScript and TypeScript page as in WebStorm, with Decorator and Identifiers › Global variable / Global function. A decorator's whole name takes the Decorator colour (tsserver reports it as a class), from the syntax tree before the server answers; non-local variables and functions take the global entries, library symbols stay Predefined symbol. .icls TS.* / JS.* keys land on the new page.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-22 00:06:29 +08:00
SunZhiQiang 4c19b7d5b0 fix(agents): answer AskUserQuestion in the conversation (#5034)
The open AskUserQuestion card was pinned above the composer: with several options it covered the conversation (max 50vh, its own scroll), and in a short conversation it floated away from its messages. The card now renders in the conversation at the asking entry and scrolls with it; picking an option on a single-select question moves on to the next one. Permission forms and questions that outlive their turn still wait above the composer at the composer's width.

Closes #5033

Co-authored-by: panda-student <[email protected]>
2026-11-22 00:06:25 +08:00
faysouтаfaysou 85edcf0660 fix(markdown): hide code breadcrumbs in Preview Only (#5032)
Markdown Preview Only still showed the code breadcrumbs (the heading at the caret) under the rendered preview. A text editor wrapper can now report that it hides the source editor (useSourceHidden); the editor pane then drops that tab's code breadcrumbs. Markdown does so in Preview Only and keeps its heading breadcrumbs while the source is shown.

Co-authored-by: faysou <[email protected]>
2026-11-21 23:51:24 +08:00
faysouтаfaysou 49dd1bbef3 perf(markdown): cut layout reads while scrolling previews (#5036)
Each preview scroll frame read offsetTop of every block to find the line at the top. The preview now indexes its blocks when the HTML changes and binary-searches them, reading offsets lazily from the live layout so reflows (zoom, images, diagrams) still count.

Co-authored-by: faysou <[email protected]>
2026-11-21 23:51:17 +08:00
faysouтаfaysou aa73f4c2b9 feat(markdown): render linked footnotes in the preview (#4996)
The Markdown preview showed footnote references as raw text. A marked extension renders references as bracketed superscript links and collects (multi-line) definitions after the document body in citation order, each with return links to its citations; unresolved references and code spans stay literal.

Co-authored-by: faysou <[email protected]>
2026-11-21 23:51:12 +08:00
LU XIANGRUIтаwildcatDownstairs 5375099042 feat(editor): move a ; typed before ) to the end of the statement (#4943)
Typing ; while only closing parentheses follow the caret puts it after the last ), as IntelliJ IDEA's editor.move.semicolon.after.paren does (on by default). It applies in languages that end statements with ;, and not in strings, comments, control statement heads (for, if, try-with-resources, …), declarations, annotations, or when the statement continues on the next line. Settings › Editor › General › Smart Keys has an option to turn it off.

Closes #4936

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-21 23:51:07 +08:00
faysouтаfaysou 2c47bd58bb fix(vcs): group branches across linked worktrees (#5018)
Linked worktrees share one repository's branches, but the branch popup and the Git Log Branches pane listed each checkout as its own repository. vcs_roots now reports each root's branch_root (the main worktree of its common Git directory), and both views group checkouts by it while the Paths filter still scopes the log to the selected checkout. The branch menus also offer New Worktree from '<branch>'…, which preselects the branch, requires a new branch when it is already checked out, and opens the worktree in a new window.

Co-authored-by: faysou <[email protected]>
2026-11-21 23:51:03 +08:00
l0ng-ai d80aeb6e9e docs: describe ESLint, browser debugging, Bun debugging and Open In › GitHub (#5046)
The JavaScript page still said there was no ESLint integration, no browser debugging and no Bun debugging, and the GitHub page said files couldn't be opened on GitHub or linked. Document the ESLint server, the JavaScript Debug configuration, bun-dap, Open In / Copy Path/Reference… for GitHub, GitLab and Bitbucket remotes, and the TypeScript inlay hints, in English and Chinese.
2026-11-21 23:13:08 +08:00
l0ng-ai 55a5e79c9f fix(json): validate JSON files and map SchemaStore schemas for common config files (#5042)
vscode-json-language-server validates nothing unless json.validate.enable is set, so even a file's own $schema was ignored. JSON and JSONC now enable validation and map package.json, tsconfig/jsconfig, ESLint, Prettier, Babel, Lerna, Turborepo, SWC and Composer configs to their published schemas.
2026-11-21 23:09:01 +08:00
l0ng-ai df4210f529 fix(typescript): show inlay hints from vtsls and typescript-language-server (#5041)
Both servers produce no inlay hints unless their inlayHints settings ask for them, and no language config set any. TS, TSX, JS, JSX and Vue's vtsls now enable parameter names at literal arguments, inferred variable types and enum member values; Editor › Inlay Hints still decides which kinds are shown.
2026-11-21 23:08:56 +08:00
Deng Liuтаdengliu 09d8e92e2c chore(dev): add an optional mise contributor toolchain (#4948)
Add mise.toml pinning Rust (with rustfmt and clippy), Node.js and pnpm, plus six tasks (setup, dev, dev:app, build, test, check) that call the existing pnpm scripts and Cargo commands, so the worktree-aware launcher is unchanged and contributors can still work without mise. Document the optional workflow in both setup guides and AGENTS.md, and raise the documented Node minimum to 22.22.2, which the locked jsdom requires on the 22.x line.

Closes #4941

Co-authored-by: dengliu <[email protected]>
2026-11-21 22:22:19 +08:00
Mr0Bread 221b6c3098 fix(ci): validate language smoke dependency triggers (#4847)
Language smoke's path filters missed inputs the smoke actually loads (src/workbench, src/ui, src/bindings.ts, editor LSP modules, vite/tsconfig, pnpm-workspace, patches, build-tools) and the crates ide-host pulls in directly (ide-search, ide-streams), so changes there skipped the smoke. Add them to the workflow paths and the Changes step patterns, and add scripts/smoke-paths.ts with a test that derives the smoke's inputs from the frontend import closure and cargo metadata and fails when the workflow misses one. CI's frontend filter now also runs on crate manifest changes, which the test reads.

Co-authored-by: Mr0Bread <[email protected]>
2026-11-21 22:21:17 +08:00
ntbang0901 d154dce4f7 fix(app): restrict base and form targets in the workbench CSP (#4874)
The workbench CSP had no base-uri or form-action, so injected markup could add a <base> element to retarget relative URLs or post a form to any origin. Add base-uri 'self' and form-action 'none'; the workbench never uses <base> and every form handles submit in script. The plugin view CSP already sets form-action 'none'.

Co-authored-by: ntbang0901 <[email protected]>
2026-11-21 22:19:42 +08:00
l0ng-ai 83364c5423 chore: v0.1.50 2026-11-21 21:03:57 +08:00
l0ng-ai fa33819afb fix(agents): keep the model name readable in a narrow chat composer (#5015)
In a narrow composer the toolbar's first item was capped at 110px, meant for the New Task agent picker. A chat's composer has no agent picker, so the cap fell on the model control and squeezed the model name to "G…" next to its settings chip while the row had room to spare. The agent picker already shows only its icon and doesn't grow, so the cap is removed.
2026-11-21 20:59:22 +08:00
l0ng-ai 5e6a59eae8 fix(agents): pick the model from the list and set its options from one chip (#5012)
The composer's model controls had three ways into the same settings: a "High" detail next to the model chip with a half divider and no chevron, a "Low ›" entry on model list rows leading to a settings page with a back arrow, and inside it a dropdown for Codex's six effort levels — two steps to change effort. While a model's settings loaded, a "Loading model settings…" text broke the row's alignment.

Now the model chip only picks (and pins) models, and the chip next to it opens every option of the current model — effort, context size, fast mode — in one popup, each a click away: on/off as a switch, up to five values as a segmented control, more listed. A model with a single option closes the popup on a choice. The chip has a chevron like the other composer chips, and a spinner takes its place while settings load. Configuring a model other than the current one from its list row is gone.
2026-11-21 20:46:14 +08:00
l0ng-ai a9971905dc fix(navigation): prioritize existing tests in the test chooser (#5011)
The Test and Test Subject choosers give file names their own space and align directories to the right, keeping the end of long directories visible. When there are several tests, the first match is selected and Create New Test appears below the results, with a divider before it.
2026-11-21 20:38:21 +08:00
l0ng-ai 7e6296f0c6 fix(navigation): separate target names from file locations (#5010)
Navigation target rows show the container next to the symbol at the same text size. File locations align to the right and keep the file name and line visible when a long path has to be shortened. The list scrolls inside the popup when space is limited.
2026-11-21 20:18:55 +08:00
l0ng-ai 31c169c889 fix(editor): give the indentation chooser a code style heading (#5008)
The indentation popup uses a Code Style heading for the active file's language. The current indentation stays checked even when the file uses a custom number of spaces. The heading and choices use the standard menu text size.
2026-11-21 20:05:32 +08:00
l0ng-ai 13103fd5af fix(plugins): update wasmtime to 49.0.7 for the WASI sandbox advisory (#5009)
RUSTSEC-2026-0587: on Windows a drive-prefixed path component let a WASI guest escape its preopened directory. 49.0.7 carries the fix; the rest of the wasmtime crates move with it. Lockfile-only.
2026-11-21 20:03:31 +08:00
l0ng-ai 50340219ac fix(editor): show usages on a declaration a server finds no definition for
Go to Declaration on a declaration's own name shows its usages only when the language server answers the declaration itself. kotlin-language-server answers nothing there, so ⌘B / ⌘-click on `fun lend` reported "Cannot find declaration to go to" while Find Usages listed four. When the server has no definition and the syntax tree puts the caret on a declaration's name, the usages show now, for every language.
2026-11-21 19:58:02 +08:00
l0ng-ai 71000e15f2 fix(editor): open library sources reached by navigation read-only
Go to Declaration into a library could open its source editable: only files under the External Libraries roots were read-only, and many language servers answer with sources they keep elsewhere (java-analyzer's source cache, the TypeScript lib files of the server's own typescript, Intelephense's stubs, the temporary copies kotlin-language-server writes). A file outside the project that code navigation opens (declarations, implementations, usages, hierarchy, documentation and inlay links) now opens read-only with the Library source notice. Files opened outside the project in other ways stay editable.
2026-11-21 19:58:02 +08:00
l0ng-ai 042008f681 fix(run): don't launch Java with a server JDK older than the module's release
Without jdtls, a Java run or debug used the JDK the Java language server reports (java-analyzer's own runtime) before matching the module's Java version, so a module compiled for release 21 started on JDK 17 and failed with UnsupportedClassVersionError. The server's JDK is now used only when it can run the module's release; otherwise the installed JDK matching it is picked.
2026-11-21 19:58:02 +08:00
l0ng-ai 942e6cb237 fix(windows): stop WebView2 browser shortcuts from taking unhandled IDE keys (#5007)
A key the keymap leaves alone reached WebView2's browser accelerators: Ctrl+F in a view without its own find opened the page's Find bar over the whole window, and F3, F12 or Alt+Left ran browser features. Turn the accelerators off for every webview; the page still gets every key.
2026-11-21 19:57:55 +08:00
l0ng-ai 674cdd3925 fix(diff): align headers in the combined changes view (#5006)
The combined changes view gives each file its own inset section, with a bold file name and a muted path. File actions sit before the name so they stay visible when a narrow editor pane truncates the text. Compact Mode reduces the space around file sections and headers.
2026-11-21 19:44:35 +08:00
l0ng-ai 04666f5980 fix(app): open middle-clicked links in the browser (#5005)
A middle click on a link (an agent reply, any rendered content) navigated the IDE window to it: link handlers listen to click, and the middle button fires auxclick, whose default action the webview carried out. A window-wide auxclick handler now cancels it for every link and opens a web link in the default browser, as a left click does; a link into the app itself does nothing.

Fixes #4992
2026-11-21 19:33:15 +08:00
l0ng-ai d335ba5fdd fix(project): align the New file type picker (#5004)
The keyboard New popup aligns the search icon and text with the options below it. The search divider has side margins, and the search field keeps its height in short windows while the list scrolls. The wider list and smaller shortcut text let the full Scratch File label fit alongside its Windows shortcut.
2026-11-21 19:23:09 +08:00
l0ng-ai 33d2f34e58 fix(vcs): list a nested repository's files once (#5003)
A folder the enclosing repository still tracks can become a repository of its own; both then reported its files, so the same path appeared twice in the Commit tool window's change tree and its rows went stale when a repository group was collapsed. Each file now belongs to its innermost repository: the enclosing repository's entries inside a nested one are dropped, in the full status and the scoped refresh.

Fixes #4990
2026-11-21 19:07:29 +08:00
l0ng-ai 7646bc4746 fix(workbench): align the empty editor shortcuts (#5001)
The empty editor presents its actions and shortcuts in a left-aligned block centered across the editor. The text uses a 16 px default size with more space between rows, and shortcuts use the foreground color. The Project action appears when the Project tool window is hidden. LightEdit uses the same layout for its file actions.
2026-11-21 19:04:42 +08:00
Emir 2c161812a0 fix(plugins): refresh marketplace after uninstall (#5000)
After uninstalling a plugin, the marketplace kept showing it as installed until it was refreshed, so it couldn't be installed again right away. Uninstall now refreshes the marketplace (from its cached index), as install already does.

Co-authored-by: laot7490 <[email protected]>
2026-11-21 18:51:06 +08:00
l0ng-ai 1778bf1ef3 fix(editor): keep inspection counts readable in split panes (#4998)
The editor inspection widget uses smaller tabular counts and groups the two diagnostic navigation buttons. A narrow pane shows the total beside the Problems icon, leaving more of the code visible. The summary tooltip and accessible label provide the count for each severity.
2026-11-21 18:39:36 +08:00
l0ng-ai 1e7fe7605b fix(editor): align Sticky Lines with the editor viewport (#4997)
Sticky Lines now shares the editor's typography, tab width, and line-number mode. Pinned text and line numbers align with their columns in the document. The panel follows the editor viewport and paints behind the overview lane, with header text clipped at the lane's edge.
2026-11-21 18:19:08 +08:00
l0ng-ai 67dcf5c978 fix(workbench): make background task details easier to read (#4995)
The Background Tasks popup has a fixed title bar and a scrollable task list. Long titles and progress details wrap, and the progress bars, percentages, and cancel buttons line up across rows. The popup remembers its size after it is resized.
2026-11-21 18:00:33 +08:00
l0ng-ai 20404d2f44 fix(workbench): give Notifications a readable timeline (#4993)
Notifications now has a Timeline heading and a Clear All button that stays visible while the history scrolls. Entries use the workbench UI text size and align their titles, timestamps, and actions. In a narrow pane the timestamp and dismiss button move below the title so longer titles can wrap at normal word boundaries. Multiline messages scroll with the history.
2026-11-21 17:38:38 +08:00
l0ng-ai b44e552628 fix(navigation): make the Bookmarks popup resizable (#4991)
The Bookmarks popup opens in the center and remembers its window size and the split between the bookmark list and source preview. The panes sit side by side in a wide window and stack in a narrow one so the preview has room for source lines. Bookmark rows use the workbench list density and align their line numbers on the right.
2026-11-21 17:18:32 +08:00
l0ng-ai bc4e8e9655 fix(editor): align Parameter Info typography and overload rows (#4988)
Parameter Info uses the workbench font and UI size for its signatures. A single signature emphasizes the current argument in bold. Overload lists use inset separators and a rounded highlight for the active signature, while keeping the current argument visible as the list wraps.
2026-11-21 16:55:56 +08:00
faysouтаfaysou c12799c973 test(debugger): select stack threads by their labels (#4987)
The narrow debug dock test timed out after the thread selector started including each thread's state in its option name (Order worker Running). It now finds the option by its visible thread label within the Thread listbox.

Co-authored-by: faysou <[email protected]>
2026-11-21 16:43:04 +08:00
l0ng-ai 0d4bd4a69a fix(editor): group Quick Documentation popup actions (#4986)
Quick Documentation now keeps Edit Source and More Actions in its lower-right corner. More Actions groups the commands for opening the Documentation tool window and moving back or forward through the current document history. The corner stays visible while the documentation scrolls.
2026-11-21 16:42:03 +08:00
l0ng-ai bf2f44d523 fix(debugger): align evaluation history with the expression editor (#4985)
Evaluate uses the configured editor font, size and line height for the expression field. Its history dropdown lines up with the full field and uses the same code typography. The Result label also names the results area for assistive technology.
2026-11-21 16:23:40 +08:00
LU XIANGRUIтаwildcatDownstairs 2b6fab3c1c fix(semantic): colour typescript-language-server's member tokens as methods (#4984)
typescript-language-server passes tsserver's own token type for methods, member (vtsls renames it method). The semantic token mapping only knew method and dropped member tokens, so with typescript-language-server method declarations took the field colour and calls none. member now maps like method.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-21 16:20:04 +08:00
LU XIANGRUIтаwildcatDownstairs 37df909358 fix(color-scheme): let derived tokens follow a scheme's overrides (#4983)
Under an imported or explicitly chosen non-default scheme, tokens that tokens.css derives with var() kept the parent scheme's colour: resolvedSchemeTokens resolved the parent's var() chains to hex first and applied the overrides afterwards. Overrides now take part in resolving, so a derived token follows its source unless it is overridden itself, in the editor stylesheet, the Settings preview and resolvedAttribute. The theme's own scheme is unchanged.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-21 16:15:03 +08:00
l0ng-ai b51054daca fix(navigation): group File Structure filters above the tree (#4980)
File Structure puts the member filters in a compact toolbar above the search field and symbol tree. The toolbar wraps complete labels on narrow windows, while the tree scrolls independently. Sorting and narrowing on typing are available from the View Options menu on the right.
2026-11-21 16:05:46 +08:00
l0ng-ai 57856f2d54 fix(search): keep filter controls visible while scrolling (#4976)
Search Everywhere now aligns the checkbox, type icon and label in each filter row. All, None and Invert sit below the scrolling list so they stay visible when the list is long or the window is short.
2026-11-21 15:50:40 +08:00
LU XIANGRUIтаwildcatDownstairs e06c16f547 fix(color-scheme): let Python method calls follow a Python function call colour (#4971)
A Python override of Function call coloured plain calls but not method calls: tokens.css declares --syn-python-method-call: var(--syn-function-call) on :root, so the fallback was resolved there and never saw the Python block's override. The Python block now re-declares the Python tokens whose default is a var() of a token it overrides (unless they have their own override), so Method call follows Function call and Nested function definition follows Function definition, as in PyCharm. The Settings page shows the same inherited colour.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-21 15:49:34 +08:00
Vladislav Kuzmin 7b893d2982 fix(database): show SQL batch progress as statements finish (#4799)
The SQL console got one response at the end of a batch, so progress, timings and results only appeared once every statement had finished. A new db_execute_stream command reports each statement's start and completion over a channel; the console shows the spinner and timer on the running statement and publishes each result grid as it completes. The batch still runs once, stops at the first error or on cancel, and an older remote server falls back to db_execute after rejecting the new command before execution.

Closes #4782

Co-authored-by: principalwater <[email protected]>
2026-11-21 15:45:35 +08:00
l0ng-ai 1cc8a361b8 fix(project-view): move speed search above the file rows (#4969)
- Place the Project tree's speed search above the file rows so the first item stays readable while typing.
- Use the standard field height, a 16 px search icon, and a visible caret. Long queries truncate within the sidebar. Keyboard focus stays in the tree.
2026-11-21 15:26:36 +08:00
l0ng-ai a28f6ce331 fix(editor): preview regex replacements at the match (#4967)
- Show the expanded replacement beneath the current match in file-level regex Replace when the result differs from the template. The preview uses the same replacement calculation as Replace Next.
- Use a compact monospace balloon that preserves line breaks and stays within the editor width. It follows the selected match and leaves focus in the toolbar.
2026-11-21 15:18:13 +08:00
l0ng-ai 5d27b4254b fix(editor): align the hidden tabs popup (#4966)
- List only the editor tabs clipped by the strip. A separator marks the split between tabs clipped before and after the visible stretch.
- Use compact rows with file icons, the tab label, and its close control. Keep the popup open while closing hidden tabs and bring the chosen tab into view when it is opened.
2026-11-21 14:52:59 +08:00
LU XIANGRUIтаwildcatDownstairs 45d85f5721 fix(plugins): keep web view panels transparent under a dark theme on Windows (#4964)
WebView2 paints an opaque backdrop behind an iframe whose color-scheme differs from the embedding page's. Plugin web view pages (web = "...") got data-theme from the frame bridge but no color-scheme (only html views get BASE_STYLE), so under a dark theme they turned white on Windows. The bridge now sets the frame root's color-scheme along with data-theme, as html views already have.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-21 14:48:21 +08:00
LU XIANGRUIтаwildcatDownstairs fa7fcd0d90 fix(color-scheme): import PyCharm's function call, class and f-string colours (#4965)
Importing a PyCharm color scheme skipped eight PyCharm Python keys (PY.FUNCTION_CALL, PY.CLASS_DEFINITION, PY.PARAMETER, PY.LOCAL_VARIABLE, PY.TYPE_PARAMETER, PY.INVALID_STRING_ESCAPE, PY.FSTRING_FRAGMENT_BRACES, PY.FSTRING_FORMAT_SPEC_NUMBER), so Python calls took the shared call colour. They now map to the existing Python attributes and export under PyCharm's keys; files exported earlier under OPENIDEA_ names still import.

Co-authored-by: wildcatDownstairs <[email protected]>
2026-11-21 14:48:07 +08:00
l0ng-ai 6b2b4a96e7 fix(debugger): align the thread selector with the frames pane (#4961)
- Give the thread selector the width of the call stack header, with the standard workbench font and a fixed chevron at the trailing edge.
- Show a leading icon for running, suspended, and breakpoint threads in both the header and the menu. Keep the status text in the menu and make the selected thread's full name and status available in the header tooltip and accessible description.
2026-11-21 14:33:37 +08:00
l0ng-ai d507e67123 fix(debugger): anchor Smart Step Into to the paused line (#4959)
- Open the Smart Step Into target list by the paused source line. Center it when the paused source is outside the visible editor.
- Keep the list compact for short target lists. Scroll longer lists and show clipped method names in a tooltip.
2026-11-21 14:13:46 +08:00
l0ng-ai 5563345a8f fix(debugger): fit the full value viewer to its popup (#4958)
Size the debugger's full-value popup to the workbench and let the text fill the available space as the popup grows. Render the value with the configured editor font, line height and tab width. Keep the resized popup visible if the workbench shrinks.
2026-11-21 13:52:34 +08:00
Mollo-i bff0761c48 fix(vcs): honour the diff window setting in Show Diff (#4957)
Show Diff called openDiff directly and always opened an editor tab, ignoring Settings > Version Control > Confirmation > Open diff as editor tab. It now goes through openVcsDiff like the other change entry points, so with the option off the diff opens in the separate Diff window.

Co-authored-by: Greenker <[email protected]>
2026-11-21 13:42:14 +08:00
l0ng-ai 2811a438a0 fix(editor): skip project-wide background requests in library sources (#4933)
Go to Declaration in a library file could wait 10-20 s behind usage lenses, server code lenses and inheritor markers, which asked references / implementation for every visible library declaration and made the server analyse the whole project.

Usage lenses and server code lenses now skip library sources (library roots, node_modules, excluded folders, virtual documents, files outside the project). Gutter markers stay: in library files ↓ is asked for classes and interfaces only, and in-flight marker requests are cancelled while a navigation gesture runs and asked again afterwards.
2026-11-21 13:38:13 +08:00
Mollo-i d34252c80a fix(editor): keep Java annotations on their line's indentation after Enter (#4956)
Enter after a Java annotation added an indentation level, so stacked annotations above a class drifted right: the stock Java grammar parses an annotation (or an unfinished annotation type) as a Statement, which continues one level deeper. A Java-only indent service keeps the annotation line's indentation when the break follows the whole annotation; an open @Ann( and code blocks still indent.

Co-authored-by: Greenker <[email protected]>
2026-11-21 13:22:19 +08:00
l0ng-ai a60a36f052 fix(settings): align the Download JDK dialog (#4955)
Put Version first in Download JDK, followed by Vendor and Location. Use one aligned control column in the desktop dialog and put labels above their controls in narrow windows. The location field uses the regular UI font, and long help, progress, and error text can wrap within the dialog.
2026-11-21 13:20:21 +08:00
ntbang0901 939222cdfb feat(debugger): Java exception breakpoints for a chosen class (#4954)
The Breakpoints dialog gains Java Exception Breakpoints on a chosen class (subclasses included): Caught and/or Uncaught, optionally limited by class filters on the throwing code. java-debug's Caught/Uncaught filters stay as the Any exception row. java-debug has no per-class exception requests, so the jvm-inspect bundle (1.2.0) makes the JDI exception requests itself; ide-dap arms them before configurationDone (a throw on main's first line stops) and again after each setExceptionBreakpoints, which drops them. Condition and catch-class filters show disabled with the reason. The bundle jar was rebuilt from source and matches the checked-in one byte for byte.

Co-authored-by: ntbang0901 <[email protected]>
2026-11-21 13:19:21 +08:00
l0ng-ai ec0370ec23 fix(settings): fit Module Sources to the available width (#4953)
Put the folder tree and marked roots in a resizable split in Project Structure › Modules › Sources. The panels stack when the available width is too small for a side-by-side layout. The summary shows populated root groups and uses the 13 px workbench font for folder paths.
2026-11-21 12:58:16 +08:00
l0ng-ai 9243ff2eac feat(services): jump to the source of a run configuration (#4952)
Run configuration nodes in Services gain Jump to Source (F4, ⌘↓, context menu): JVM applications and Spring Boot open their main class at the declaration (the configuration's module first), npm/Bun the script in package.json, Python/Ruby/shell/pytest their file, Gradle/Maven the build file, Go the target or main.go, .NET the project file. Kinds without a file show it disabled. F4 on a run configuration no longer starts it; providers without Jump to Source keep activating.
2026-11-21 12:44:18 +08:00
l0ng-ai 143281d67e fix(settings): group Project Libraries attachments in a tree (#4951)
Project Libraries now shows class and source attachments in one expandable tree with a shared add and remove toolbar. Attachment rows use the 13 px workbench font. In narrow windows, the library list and details adapt to the available width, and long paths scroll inside the tree.
2026-11-21 12:35:29 +08:00
Zou e1f25d2747 feat(i18n): add Traditional Chinese (zh-TW) UI language (#4950)
Adds 繁體中文 to the UI languages. The catalogs are converted from the Simplified ones with OpenCC (s2twp) plus a Taiwan IT terminology pass keyed on the English source (column → 欄, undo → 復原). zh-TW, zh-HK, zh-MO and zh-Hant* resolve to it; other zh tags stay Simplified. The update source picks CNB for every zh* locale, matching the backend.

Co-authored-by: g4cj8498741 <[email protected]>
2026-11-21 12:25:12 +08:00
l0ng-ai 26fce11f94 fix(run): align the stack trace dialog (#4949)
Give the stack trace editor a 600 × 400 preferred area and use the configured editor typography, including tab width. Resizing the dialog grows the editor. At short window heights, the editor shrinks so the trace scrolls within the field and the footer stays visible.
2026-11-21 12:14:11 +08:00
Gabriel Gondim c5c2fb7c98 fix(ssh): use the agent from IdentityAgent or the login shell's SSH_AUTH_SOCK (#4939)
OpenSSH authentication asked the agent client for SSH_AUTH_SOCK from the process environment only. On macOS an app started from the Dock has launchd's socket there, so an agent exported in ~/.zshrc (Bitwarden's, in #4934) was never used. The default agent is now SSH_AUTH_SOCK as the login shell sets it (the app already reads that environment at startup), and IdentityAgent in ~/.ssh/config is honoured per host, jump hosts included (none, SSH_AUTH_SOCK, $VAR or a path with ~ and % tokens). On Windows a SSH_AUTH_SOCK that is not a pipe falls back to the OpenSSH pipe.

Co-authored-by: GGVidal <[email protected]>
2026-11-21 12:03:04 +08:00
l0ng-ai 31ca9daa61 fix(vcs): align the target changelist dialog (#4947)
Put existing and new target changelists in one editable **Name** field. Open the list to pick an existing target or enter a name to make a new one. The comment and active status sit in the same place for both choices. Undo Commit offers the commit subject as a suggested name.
2026-11-21 11:57:07 +08:00
l0ng-ai d89991168e fix(vcs): align the history commit message dialog (#4945)
Show the commit hash and author above the message editor when editing a commit. Use the same layout for the message of a squashed commit. The dialog resizes in both directions, and the text area follows the configured editor font, weight and line height.
2026-11-21 11:39:42 +08:00
l0ng-ai 16496f8001 fix(vcs): don't report the index a worktree diff refreshes as a repository change (#4946)
git diff against the working tree rewrites .git/index when it meets files with stale stat data, even with --no-optional-locks. The watcher reported that as a repository change, so the agent changes view, which re-reads on every repository change, re-ran its diffs and triggered itself again; on Windows, where git and gix disagree on stat data, it never settled and kept several git processes a second running (#4792). Every git diff that reads the working tree now records an index it rewrote as our own write, like status's write-back; this covers agent changes, compare with the working tree and the other worktree diffs.
2026-11-21 11:38:31 +08:00
l0ng-ai ce58c873da test: update two fixtures left stale by recent changes (#4944)
The commit settings default shape gained includeChangesByDefault (#4864), and New Task options now come from the project's saved catalog (#4901), so the approvals test seeds projectCatalogs instead of the removed provider-wide config. Fixes Rust checks on main for every platform.
2026-11-21 11:31:46 +08:00
l0ng-ai d069c3daff fix(vcs): align the revision comparison toolbar (#4942)
Move **Show Diff** from the desktop revision comparison footer to a compact toolbar above the changed files. The action is available when a file is selected. **Close** sits by itself at the bottom right.
2026-11-21 11:22:15 +08:00
l0ng-ai 95b71e1ffc fix(vcs): align the rebase dialog (#4940)
- Group the repository, command and target branch in one row. The row wraps when space is limited.
- Put the branch being rebased in the title. With `--onto` enabled, place the new base beside the command and label the old base on its own row.
- Move flags to **Modify options** and show active flags below the fields. Clear branch selections when switching repositories and wait for the new repository's branches.
2026-11-21 11:05:51 +08:00
l0ng-ai 732cfd6002 fix(vcs): align the unstash dialog (#4935)
- Align the repository, current branch, stash list, and branch input in two columns using the workbench form font. Put Show Changes and Drop Stash beside the list and group the restore options beneath it.
- Add a repository picker for multi-repository projects. Each repository loads its own stash list before the actions become available. After a drop, the list stays visible while the actions wait for the refreshed selection. The fields stack on narrow windows.
2026-11-21 10:48:32 +08:00
Akbar Husain 189879f0fa perf(vfs): coalesce the pre-debounce watcher queue per path (#4032)
Raw notify events were queued one by one until the debounce window closed, so an event storm grew the queue without bound. Events are now classified in the notify callback and coalesced per path, keeping each path's distinct transitions in order, so the batch sees the same result while memory is bounded by paths touched (100,000 writes over 1,000 paths: 100,000 entries before, 1,000 after). Coalesced VCS changes replay as creates so directory changes under .git are not dropped as lock-file touches.

Co-authored-by: akbar1214 <[email protected]>
2026-11-21 10:47:34 +08:00
l0ng-ai f0a412f3e2 fix(vcs): align the worktrees panel (#4937)
- Place the actions on the left of the Worktrees tree in both the dialog and the Git tool window.
- Show the checkout name above its branch and path, with the same UI font size for the checkout name and branch. Current, locked, and prunable worktrees have status icons. The tree supports searching by either checkout name or branch.
2026-11-21 10:40:52 +08:00
Gabriel Gondim 1a470e2a23 fix(window): host system buttons in the macOS fullscreen title bar (#4923)
In native full screen on macOS, the window buttons lived in the title bar strip AppKit slides down with the menu bar, which showed up as a dark band over the IDE's own title bar. Full screen now hosts system window buttons made by standardWindowButton:forStyleMask: in the slot the page keeps for them, and hides that strip. The strip is re-hidden from its own window notifications (no polling), matched by its exact class, and only for the window in full screen.

Fixes #4746

Co-authored-by: GGVidal <[email protected]>
2026-11-21 10:28:43 +08:00
l0ng-ai 793c720f7f fix(vcs): align the reset dialog (#4932)
- Align the Reset HEAD fields in two columns and use the workbench form font throughout. Show the current branch and the selected reset mode's effect, and stack the fields on narrow windows.
- Let the user choose the repository in a multi-repository project. A repository change resets the typed revision to HEAD.
- In Reset to Here, put the repository, branch, and fixed commit above the mode choices.
2026-11-21 09:53:24 +08:00
l0ng-ai 93c7f8b7fd fix(vcs): align the merge dialog (#4930)
- Put the repository and searchable branch picker on the same line as the Git command. The row wraps on narrow windows.
- Move the merge flags into the Modify options menu and show the selected flags below the command row. Choosing a custom commit message opens a multiline field.
2026-11-21 09:40:19 +08:00
l0ng-ai 3e37b60505 refactor(settings): remove the unused RadioRow control (#4931)
The settings pages that used RadioRow now lay out their radio groups themselves, so it had no callers left and knip failed on main. Removes it with its RadioChoice type.
2026-11-21 09:33:05 +08:00
weigramтаweigram a5c8fe17fd feat(services): drag a run type's group to reorder it (#4929)
The Services tree persists the order of its run type groups per project, but only configurations inside a group could be moved. Groups now reorder among each other by drag or with Move Up / Move Down, using the project's type list as their order, so the new position survives reopening.

Co-authored-by: weigram <[email protected]>
2026-11-21 09:32:07 +08:00
l0ng-ai 0684795334 fix(vcs): align the new branch dialog (#4924)
New Branch used a stacked prompt with a small label above the name field and the creation options at the left edge. The dialog now puts the label beside the field, uses the workbench UI font for both, and aligns validation and options with the field. On narrow windows the label stacks above the field and the checkboxes can wrap.
2026-11-21 09:31:00 +08:00
l0ng-ai 30cbb80f22 fix(history): align the recent changes chooser (#4917)
fix(history): align the recent changes chooser
2026-11-21 09:30:49 +08:00
weigramтаweigram 5cfb0d3311 feat(settings): reopen Settings on the page it was closed on (#4927)
Settings now records the page it shows (when it opens and on each navigation) and reopens there, in the separate Settings window and across restarts. The page is UI state and stays in localStorage; Settings for New Projects keeps its own pages out of it, and an id that no longer exists falls back to the first page.

Co-authored-by: weigram <[email protected]>
2026-11-21 09:22:16 +08:00
l0ng-ai bccf1bd7d6 fix(vcs): align the tag dialog (#4926)
- Align the Tag dialog's labels and controls in two columns, use the workbench font throughout, and stack the fields on narrow windows.
- Show the selected repository and its current branch above the tag fields. Keep the duplicate-name message and Force checkbox under the tag name.
2026-11-21 09:18:46 +08:00
l0ng-ai 3d79454be8 fix(vcs): align the changelist form (#4925)
The changelist form stacked small labels above each field and left room for only three lines of comments. The Name and Comment labels now sit beside a shared field column at the workbench UI size. The comment field starts at four lines, and the fields stack on narrow windows. The same form is available when creating, editing or moving changes to a new list.
2026-11-21 08:59:25 +08:00
l0ng-ai 46e4af2b32 fix(vfs): ignore Git metadata directory touches (#4922)
Git for Windows reports a parent directory modification when Git creates or removes a lock. The watcher treated these notifications as repository changes and refreshed Git status even when the index was identical. Refresh Git status on metadata file changes and directory creation or removal. Skip directory modifications caused by the changed entries.
2026-11-21 08:43:26 +08:00
l0ng-ai 067edb7d60 fix(vcs): align the Git annotation gutter (#4921)
Git annotations displayed only the first part of each author's name, and variable-width dates pushed the author column out of alignment. The gutter now uses the workbench UI font and sizes the columns from the file's annotations. Authors are shown by full name, with a width cap for long labels. When enabled, the revision column leads the row.
2026-11-21 08:25:00 +08:00
l0ng-ai 0a4abf1705 fix(vcs): align the file history layout (#4920)
File History inherited the repository log's sidebars, which left little room for the revision list or commit message. It now uses a full-width toolbar and revision list, with author and date before the subject by default. A resizable pane below puts the selected commit message beside the changed files and remembers its size independently. The repository log and directory history keep their current layout.
2026-11-21 08:06:50 +08:00
l0ng-ai d31699c86a fix(vcs): align the file revision chooser (#4919)
fix(vcs): align the file revision chooser
2026-11-21 07:59:59 +08:00
Gabriel Gondim 9467c4ea1b fix(plugins): install-dir reads and default editors over associated apps (#4918)
A plugin's fs.read-*, editor.open and views.open-location rejected absolute paths under its own install (package) directory, so a linked plugin could not open files bundled next to its component. The install directory is now readable like fs.plugin-dir() (writes still need an fs.write grant). Custom editors with priority "default" now open in the IDE ahead of the Files opened in associated applications list, so a PDF editor plugin is not bypassed by the built-in *.pdf association. The SDK carries the updated WIT docs and the plugin components are rebuilt.

Fixes #4167

Co-authored-by: GGVidal <[email protected]>
2026-11-21 07:58:50 +08:00
l0ng-ai 7c12c58874 fix(vcs): align the operations chooser (#4915)
fix(vcs): align the operations chooser
2026-11-21 07:29:12 +08:00
l0ng-ai 9f47ef0991 style(settings): format the Git settings imports (#4916)
Formats an import line that came out of a merge too long for oxfmt. No behaviour change.
2026-11-21 07:26:17 +08:00
l0ng-ai 3b614dda7a fix(diff): clarify clipboard comparison labels (#4911)
fix(diff): clarify clipboard comparison labels
2026-11-21 07:25:45 +08:00
l0ng-ai 5acd778340 fix(navigation): align the Select In chooser (#4909)
fix(navigation): align the Select In chooser
2026-11-21 07:25:17 +08:00
l0ng-ai 7c682a580f fix(editor): group the Refactor This actions (#4906)
Refactor This uses a compact action list with an Extract/Introduce section and dividers for the related action groups. Filtering keeps captions only for groups with matching actions. The number beside each action still selects that action directly.
2026-11-21 07:25:05 +08:00
l0ng-ai dc07691279 fix(run): align the run configuration chooser (#4904)
The run configuration chooser adapts its width to configuration names and leaves room for the row actions. At large zoom or in a short viewport, the configuration list scrolls while the search field and keyboard shortcuts stay visible.
2026-11-21 07:24:47 +08:00
l0ng-ai 2d04a3d9bc fix(editor): align the Quick Definition preview (#4903)
Quick Definition opens with a toolbar above a resizable code preview. The header shows the symbol and its source location, with previous and next controls when several results are available. The preview uses the source editor's font size, line height, and zoom.
2026-11-21 07:24:36 +08:00
l0ng-ai 8f9b9b1016 fix(workbench): group commands in the tool window layouts menu (#4902)
Window → Tool Window Layouts groups commands under each saved layout and marks the active layout. The default layout is at the top, with commands for the current arrangement below the saved layouts. Rename opens the name field for the selected layout directly.
2026-11-21 07:24:18 +08:00
l0ng-ai 096964c798 fix(workbench): align the toolbar customization dialog (#4898)
Move the add, remove, reorder, transfer, and restore controls into a compact toolbar above the lists. Keep the left and right groups side by side when there is room, and stack them in narrow windows so the labels have more space. The add picker opens directly below its command.
2026-11-21 07:24:08 +08:00
l0ng-ai f1bfd5db52 fix(workbench): center and label Quick Switch Scheme (#4897)
Quick Switch Scheme now opens in the center of the window and stays there when the window is resized. A title identifies the popup, and a numeric column shows shortcuts 1–4 for opening its categories. Theme previews and editor focus still restore when the popup closes.
2026-11-21 07:23:50 +08:00
l0ng-ai a17af582f3 fix(settings): align the Date Formats layout (#4894)
Place the date pattern help beside the input when there is room and let it wrap under the input in narrow windows. Put the live examples just below the time format control in smaller, secondary text. Pretty formatting remains a separate setting and still updates both examples.
2026-11-21 07:23:32 +08:00
l0ng-ai 47f018d8b5 fix(settings): align the External Tools form (#4893)
Pair Name and Group when the form has room and put Description on its own row. Tool Settings contains the command fields, while the execution checkboxes sit in a collapsible Advanced options section that opens for matching settings searches. The fields and macro buttons adapt to the available width.
2026-11-21 07:23:22 +08:00
l0ng-ai 94aa62430c fix(settings): align the System Settings layout (#4890)
Put exit confirmation before Project, then place file saving and synchronization in a Files section before Caches. In narrow windows, the project-opening choices use less vertical space, the directory field keeps its browse button beside it, and the idle timeout keeps its unit. The existing Autosave search term still finds the page.
2026-11-21 07:23:03 +08:00
l0ng-ai 4242c94bfc fix(settings): align the Updates settings layout (#4889)
Put Check Now and Last checked on the same row, below automatic checks and the update source. The last-checked timestamp uses secondary text and follows the button as the window narrows. The release notes preference sits below the manual check.
2026-11-21 07:22:44 +08:00
l0ng-ai 8864ff595d fix(settings): align the Maven settings layout (#4886)
Put the snapshot option and a compact thread count at the top. Group Maven home, user settings, the local repository, and toolchains under Environment. Put source downloads under Importing, with build delegation, JRE, and profiles together under Runner.

Environment and Runner put labels above their fields in narrow windows. Browse buttons stay beside their paths, and Maven Daemon controls are available below Runner.
2026-11-21 07:22:34 +08:00
l0ng-ai 0a08d9f4ce fix(settings): align the Gradle settings layout (#4885)
Place Gradle user home at the top of the page, with separate sections for Build and Run and the Gradle runtime. Keep the local installation path and Browse button beside Distribution when there is room. In narrow windows the path field moves below the selector and stays next to Browse. The Gradle JVM picker sits below the distribution controls.
2026-11-21 07:22:23 +08:00
l0ng-ai 7dbfe8852e fix(settings): align the Spelling settings layout (#4884)
Place custom dictionary files above the accepted words. Give both lists the available pane width, with monospaced paths and standard UI text for words. A tab selects the project or application dictionary within the accepted words section. Settings for New Projects shows the application dictionary directly.
2026-11-21 07:22:13 +08:00
l0ng-ai ae97d5f1c2 fix(settings): group the debugger Data Views controls (#4883)
Group inline values and value tooltips under Editor. Keep the hover delay beside its checkbox in wide windows and below it in narrow windows. Turning off hover dims the delay field and keeps its value for when hover is enabled again. Sort order and live watches sit at the top of the page.
2026-11-21 07:21:54 +08:00
l0ng-ai 4340a96c59 fix(settings): align the Terminal settings layout (#4882)
Group the primary font, fallback font, and sizing controls above Application Settings. Let the start directory and default tab name use the available width. Keep the shell path, installed-shell menu, and Browse button together. Narrow windows place text fields below their labels and show the application checkboxes in one column.
2026-11-21 07:21:17 +08:00
l0ng-ai 0af7bcc7cf fix(settings): align the VCS confirmation settings (#4878)
The file creation and deletion policies use aligned selectors in Version Control settings. They fit on separate rows at narrow widths. The patch creation and history controls follow the Changes group as separate settings.
2026-11-21 07:21:07 +08:00
l0ng-ai 4f52f5ebfa fix(vcs): align the directory comparison layout (#4875)
fix(vcs): align the directory comparison layout
2026-11-21 07:20:29 +08:00
l0ng-ai f284633162 fix(settings): align the Appearance controls (#4867)
fix(settings): align the Appearance controls
2026-11-21 07:20:18 +08:00
l0ng-ai 0ceda2c385 fix(settings): align the Git settings controls (#4865)
fix(settings): align the Git settings controls
2026-11-21 07:20:07 +08:00
l0ng-ai 8b3f55dfb4 fix(settings): align the HTTP Proxy form (#4863)
fix(settings): align the HTTP Proxy form
2026-11-21 07:19:48 +08:00
l0ng-ai c0e888dd2f fix(settings): align the Console settings layout (#4861)
fix(settings): align the Console settings layout
2026-11-21 07:19:37 +08:00
l0ng-ai 04bed01942 fix(vcs): align the Apply Patch preview (#4860)
fix(vcs): align the Apply Patch preview
2026-11-21 07:19:24 +08:00
weigramтаweigram dfafe6c767 fix(app): bring the window forward before the quit prompts ask (#4913)
Confirm Exit and the Terminate / Unsaved Changes prompts of a quit are drawn inside the window, but a quit can start outside it (the Dock, a logout, another window). A minimized or covered window asked with nothing on screen and the app looked hung. The window is now unminimized, shown and focused right before a quit prompt; a window with nothing to ask is left where it is.

Fixes #4912

Co-authored-by: weigram <[email protected]>

Co-authored-by: weigram <[email protected]>
2026-11-21 07:06:44 +08:00
Vladislav Kuzmin 461c71a50b test(settings): measure notification labels in the group list (#4892)
#4810 replaced the notification group table with a listbox, and the compact settings test still waited for a table cell, so it timed out before measuring anything. It now measures the group labels inside the listbox.

Fixes #4891

Co-authored-by: principalwater <[email protected]>

Co-authored-by: principalwater <[email protected]>
2026-11-21 06:55:23 +08:00
l0ng-ai 82085a227e fix(agents): record a task's turns across nested repositories (#4910)
A local task in a project with nested git repositories recorded no turns, so the Changes pane's last-turn scope stayed empty there and the whole-task list no longer kept to the files the task touched. A turn now records each repository's HEAD as it starts; the files a turn changed, their text when it began and its rollback come from the repository holding each file, including commits made in a nested one.
2026-11-21 06:38:07 +08:00
Paweł SzymańskiтаPawelSzymanski89 c3f420374c fix(agents): list task changes per repository, including nested repos (#4543)
A local agent task in a project that holds nested git repositories (an own .git below the project root, not a submodule) only saw the changes of the repository at its root. Its changes are now read from every repository under the root, each against its own HEAD; the Changes pane groups them under a row per repository when there are several, and a rollback reads each file from its own repository.

Co-authored-by: PawelSzymanski89 <[email protected]>

Co-authored-by: PawelSzymanski89 <[email protected]>
2026-11-21 06:32:34 +08:00
faysouтаfaysou 6bf7bc8c2b fix(vcs): apply Directory Mappings changes to all selected roots (#4908)
Directory Mappings now supports multi-row selection with Cmd/Ctrl and Shift. Minus moves the selected Git roots to an Unregistered roots section instead of only removing manually added ones, and plus registers the selected unregistered roots again in one step. Applying a removal refreshes Git status and branches: removing the selected repository switches to the remaining one, and removing the last repository clears the previous Git state and decorations.

Co-authored-by: faysou <[email protected]>

Co-authored-by: faysou <[email protected]>
2026-11-21 06:18:36 +08:00
faysouтаfaysou 34dfc166db fix(vcs): keep Git Log paths and branches in sync (#4907)
The Paths filter of the Git Log now holds the repository checkboxes, path entry, the file and folder tree and recent paths. Selecting paths replaces the repository selection, so a path in another repository no longer leaves the log empty, and the commit log and the Branches panel are scoped to the repositories the paths belong to.

Co-authored-by: faysou <[email protected]>

Co-authored-by: faysou <[email protected]>
2026-11-21 06:15:44 +08:00
Chris Schofield 64632dc4d7 feat(editor): JSX/TSX tag editing — linked tag rename, prop values, Emmet (#4905)
JSX/TSX editing like the HTML modes: editing an opening or closing tag's name renames its partner (Simultaneous <tag></tag> editing), Enter between a tag pair puts the caret on an indented line with the closing tag below, and JSX tag pairs are matched. Typing = after a value-less prop inserts "" for string-typed props and {} otherwise (type from the server's hover, {} after 500 ms), following Pair quotes / Pair brackets. Emmet expands with Tab among an element's children and after return / => (className, self-closing void elements). Under TypeScript 7 the native server is asked for jsxAttributeCompletionStyle auto, so prop completion inserts the value delimiters as vtsls does.

Co-authored-by: ChildishForces <[email protected]>

Co-authored-by: ChildishForces <[email protected]>
2026-11-21 05:45:10 +08:00
Mr0Bread f484fd6802 fix(agents): let chats select any model their agent's catalog lists (#4901)
An existing agent chat listed models from the agent's catalog but refused to switch to them unless the catalog was under 15 minutes old and matched the launch fingerprint. A model the picker lists is now always selectable. The chat's picker offers the agent's current catalog plus the model the chat runs, and falls back to the session's own list when there is no catalog. The per-task copy of models and effort levels is removed, so the project catalog is the only source of available models and efforts.

Co-authored-by: Mr0Bread <[email protected]>

Co-authored-by: Mr0Bread <[email protected]>
2026-11-21 04:50:52 +08:00
l0ng-ai 8121dc87f1 test(e2e): wait for the Run window to take focus before toggling it (#4900)
The tool-window shortcut hides a window only once it is active, and activation focuses it on the next frame; under load the test pressed Cmd+4 or Shift+Escape before that, so the window stayed open. The test now waits for focus inside the Run window first.
2026-11-21 04:27:03 +08:00
l0ng-ai 97f78908a1 fix(terminal): don't take focus that moved elsewhere while the view loaded (#4899)
A focus request made before xterm opened was applied whenever it opened, so a terminal still loading took the caret back from a view the user had clicked meanwhile. The deferred focus now applies only while focus is where it was when requested, on the page, or inside the terminal's own tool window.
2026-11-21 04:23:06 +08:00
faysouтаfaysou e7aec17d46 Match backtick runs in protected inline Markdown math (#4895)
Protected inline math ($`...`$) now matches the opening backtick run to the first closing run of the same length, as Markdown code spans do: ($``x` + y``$) renders as math, while ($`x` `y`$) keeps two code spans and literal dollars.

Co-authored-by: faysou <[email protected]>

Co-authored-by: faysou <[email protected]>
2026-11-21 03:56:06 +08:00
l0ng-ai cb24f252c5 fix(vcs): keep focus on the commit message when the Commit window opens (#4896)
Activating a tool window focuses its first field or tree on the next frame unless its content marks a data-autofocus target. The Commit window's message wasn't marked, so after Cmd+K focused the message, activation could move focus to the Changes tree depending on timing. The message is now the window's preferred focus, also when the window is activated from its stripe button.
2026-11-21 03:55:28 +08:00
faysouтаfaysou 8557b8d21e feat(vcs): make default Commit inclusion configurable (#4864)
Settings > Version Control > Commit gets Include changes in the commit by default. It is on by default, which keeps the current behaviour (the active changelist's changes start checked). Turned off, the Commit view starts with every file unchecked, partially staged files included. Explicit selections still apply, and staging-area mode still follows the Git index.

Co-authored-by: faysou <[email protected]>

Co-authored-by: faysou <[email protected]>
2026-11-21 03:32:16 +08:00
l0ng-ai 99a8f8feaa fix(completion): put the caret inside a Kotlin call that takes arguments (#4888)
Refs #3447

kotlin-lsp inserts a picked item itself, parentheses included, and the caret was moved after the whole edit (read()| for read(name: String)), so typed arguments went after the call. When the item's signature lists parameters and the server's edit ends with (), the caret now goes between the parentheses, as it does for items inserted on the client.
2026-11-21 02:50:55 +08:00
l0ng-ai 4b76566af4 fix(editor): write failed saves to the log with their stack (#4887)
Refs #3447

A failed save only showed its message in the Could not save notification, and a failed autosave of a closed tab went to the console. Both are now written to the log file with their stack, so a report's log shows where the save failed.
2026-11-21 02:49:14 +08:00
943 змінених файлів з 47726 додано та 8572 видалено

No files matched your search

+3 -2
Переглянути файл
@@ -65,8 +65,9 @@ jobs:
plugin_web='^plugins/official/[^/]+/web-src/'
# Paths the frontend checks never read...
backend='^(crates/|src-tauri/|sdk/|wit/|java/|fixtures/|Cargo\.(toml|lock)$|deny\.toml$|rustfmt\.toml$|rust-toolchain(\.toml)?$|\.cargo/)'
# ...except these, which frontend tests and e2e fixtures load.
read_by_web='^(fixtures/(folding|django-app)/|crates/ide-plugin/tests/fixtures/|crates/ide-db/(src|tests/fixtures)/snowflake/|src-tauri/(icons|capabilities)/|src-tauri/tauri\.conf\.json$)'
# ...except these, which frontend tests and e2e fixtures load (the crate manifests:
# scripts/smoke-paths.test.ts, through cargo metadata).
read_by_web='^(fixtures/(folding|django-app)/|(crates/[^/]+/)?Cargo\.toml$|crates/ide-plugin/tests/fixtures/|crates/ide-db/(src|tests/fixtures)/snowflake/|src-tauri/(icons|capabilities)/|src-tauri/tauri\.conf\.json$)'
# What the browser app and its e2e tests are built from.
app='^(src/|e2e/|public/|index\.html$|vite\.config\.ts$|tsconfig\.json$|playwright\.config\.ts$|package\.json$|pnpm-(lock|workspace)\.yaml$|crates/ide-plugin/tests/fixtures/|src-tauri/(icons|capabilities)/|src-tauri/tauri\.conf\.json$)'
# The plugin workspaces: the SDK, the plugins, their interface and the host's fixture plugins.
+28 -3
Переглянути файл
@@ -8,6 +8,9 @@ name: Language smoke
# (Run, Run tests, the test tree, Rerun Failed Tests): smoke/run.test.ts; and debugging its
# entry point with the debugger the IDE installs (breakpoint, frames, variables, evaluate,
# Step Over, Resume): smoke/debug.test.ts.
# The paths below and the Changes step's patterns must cover every file the smoke loads and
# every crate it runs: scripts/smoke-paths.test.ts checks them (`node scripts/smoke-paths.ts
# [file…]` lists what they miss, or the languages a change runs).
on:
push:
branches: [main]
@@ -20,10 +23,30 @@ on:
- "Cargo.lock"
- "src/features/run/**"
- "src/features/debugger/**"
- "src/features/build-tools/**"
- "src/platform/**"
- "src/workbench/**"
- "src/ui/**"
- "src/editor/api.ts"
- "src/editor/core/cm/cornerInset.ts"
- "src/editor/core/cm/iconArea.ts"
- "src/editor/lsp/availability.ts"
- "src/editor/lsp/diagnostics.ts"
- "src/editor/lsp/files.ts"
- "src/editor/lsp/hint.ts"
- "src/editor/lsp/lsp.ts"
- "src/editor/lsp/positions.ts"
- "src/bindings.ts"
- "src/styles/tokens.css"
- "src/test/setup.ts"
- "src-tauri/icons/128x128.png"
- "smoke/**"
- "vite.config.ts"
- "tsconfig.json"
- "package.json"
- "pnpm-lock.yaml"
- "pnpm-workspace.yaml"
- "patches/**"
- ".github/workflows/language-smoke.yml"
- ".github/tool-versions.env"
pull_request:
@@ -70,10 +93,12 @@ jobs:
--jq '.[] | .filename, (.previous_filename // empty)' > files.txt
cat files.txt
# Crates outside what the smoke runs (language servers, debuggers, run configurations,
# SDKs, build tools and the project model): cargo metadata, deps of ide-lsp/dap/run/sdk/tools.
unused='^crates/(ide-agent|ide-analysis|ide-android|ide-cli|ide-clipboard|ide-coverage|ide-db|ide-docker|ide-fonts|ide-github|ide-http|ide-mcp|ide-notebook|ide-profiler|ide-scaffold|ide-search|ide-spell|ide-ssh|ide-streams|ide-vcs|ide-web)/'
# SDKs, build tools, the project model, Find Usages candidates, debug stream traces):
# cargo metadata, ide-host's direct deps ide-search/ide-streams and the deps of
# ide-lsp/dap/run/sdk/tools.
unused='^crates/(ide-agent|ide-analysis|ide-android|ide-cli|ide-clipboard|ide-coverage|ide-db|ide-docker|ide-fonts|ide-github|ide-http|ide-mcp|ide-notebook|ide-profiler|ide-scaffold|ide-spell|ide-ssh|ide-vcs|ide-web)/'
# The workflow's paths, less those handled per language below.
smoke='^(crates/|Cargo\.(toml|lock)$|src/features/(run|debugger)/|src/platform/|smoke/|package\.json$|pnpm-lock\.yaml$|\.github/workflows/language-smoke\.yml$|\.github/tool-versions\.env$)'
smoke='^(crates/|Cargo\.(toml|lock)$|src/features/(run|debugger|build-tools)/|src/platform/|src/workbench/|src/ui/|src/editor/(api|core/cm/(cornerInset|iconArea)|lsp/(availability|diagnostics|files|hint|lsp|positions))\.ts$|src/bindings\.ts$|src/styles/tokens\.css$|src/test/setup\.ts$|src-tauri/icons/128x128\.png$|smoke/|vite\.config\.ts$|tsconfig\.json$|package\.json$|pnpm-(lock|workspace)\.yaml$|patches/|\.github/workflows/language-smoke\.yml$|\.github/tool-versions\.env$)'
langs=""
while read -r f; do
case "$f" in
+3 -1
Переглянути файл
@@ -73,7 +73,9 @@ Shared agent skills live in `.agents/skills/` (`.claude/skills/` links to them):
## Commands
- `pnpm tauri dev` — run the app with worktree isolation (Node 22.18+).
- Optional: `mise install` provisions the contributor toolchain; `mise tasks` lists the task aliases.
See [Development setup](docs/en/contribute/setup.mdx). The direct commands below still work without mise.
- `pnpm tauri dev` — run the app with worktree isolation. Use Node 22.22.2 or later on the 22.x line.
`pnpm dev:app` also enables the global Tauri API. `pnpm dev:status` reports
this worktree's running MCP bridges and actual ports.
- `pnpm build` — typecheck + bundle frontend.
Створено
+115 -124
Переглянути файл
@@ -1203,27 +1203,27 @@ dependencies = [
[[package]]
name = "cranelift-assembler-x64"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aecefa88696b62f833cc0c997d19c93246b0268e2aaf23e0e8692e527f6de088"
checksum = "c19fba13ee427c4dd29488ea51127e945bf07fd9d79093f14c9cc57f74acf757"
dependencies = [
"cranelift-assembler-x64-meta",
]
[[package]]
name = "cranelift-assembler-x64-meta"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1391a2546f5edf06a0ff5e9430d73c2713fd536aefec53200dc21846d1467f53"
checksum = "dd88c766346fcc14bbadbd68cb11e9bc1e555e99f7e8f6b1f4c27a73ca659bec"
dependencies = [
"cranelift-srcgen",
]
[[package]]
name = "cranelift-bforest"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9528915fbc2c950702329e08c6d72aaff8ece9b7ecdbd225742825c09a445227"
checksum = "f19d43d75dd963d6b1a653f2e03d4eed4365ca2e598ec57e52c15afdad6c3276"
dependencies = [
"cranelift-entity",
"wasmtime-internal-core",
@@ -1231,9 +1231,9 @@ dependencies = [
[[package]]
name = "cranelift-bitset"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dd69a6db85c1bcff989809e0e0b3b06506425f32b545c46aeafda5fe7775d6a"
checksum = "45d0b93e50856858c89c61cbe3f6d4b07596da22eb5a03a95b19420e1d08a275"
dependencies = [
"serde",
"serde_derive",
@@ -1242,9 +1242,9 @@ dependencies = [
[[package]]
name = "cranelift-codegen"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24c2db6c26cd96393cf785c4b51b900738963cc7422aa0045416a7641ae2f6cd"
checksum = "efbdff32d3b6b4f33f1ba8a4ac747b97ce569b1d6834c3089c1c0933b94e618c"
dependencies = [
"bumpalo",
"cranelift-assembler-x64",
@@ -1273,9 +1273,9 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e284270142e7f1dcb73a992a62a8b3716b4062a65a52d8f2732c6ebf6f7f342f"
checksum = "67fd11ff24916a2c1ff852ce4bb664fcf2c2970ed551de44dd5b573321123703"
dependencies = [
"cranelift-assembler-x64-meta",
"cranelift-codegen-shared",
@@ -1286,24 +1286,24 @@ dependencies = [
[[package]]
name = "cranelift-codegen-shared"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6595667b7d505cf85d5bdd014e6f57ad6128183238f8e372319d9384782472f5"
checksum = "ba5d321229c3e00a17d7bb3633529ffdf97a13bcf4962fd2e92f1e0fd39360aa"
[[package]]
name = "cranelift-control"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26ffdbfcd24c3833d730849e6d132af34a400a2b89b44446015c01eecbea21d"
checksum = "71cd63450256d0f80f7a0527e133452f84fa6e1ca73c7db6ca2a9e8cc89d1c18"
dependencies = [
"arbitrary",
]
[[package]]
name = "cranelift-entity"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ffb08ccd8a77fb31cdbbda2afa2333d8f85299b1bc0d1c194259ba66d160d74"
checksum = "18d2f259130db1bbb89500d26944971a9beeb410de91ff14039203f055d7f9f0"
dependencies = [
"cranelift-bitset",
"serde",
@@ -1313,9 +1313,9 @@ dependencies = [
[[package]]
name = "cranelift-frontend"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b447e4f2bb44b1188185a77f478e5a91b7723a40b3b58c3e2d5b26df2ed5a665"
checksum = "cf37a38d982d45fe2c065d55e4de76e596b443b6acceb3ca726c2072c8ba6d7b"
dependencies = [
"cranelift-codegen",
"hashbrown 0.17.1",
@@ -1326,15 +1326,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f0989e943f3a9d41989595826bba544df9fda64bcddd4df0c06fb2e26af3cb3"
checksum = "8ce8f84e2d44326879e18016d763457a2cb5d775e4a5822cd7473fc171fca063"
[[package]]
name = "cranelift-native"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fa10df59e776c42dae5b6ba5216ba5321707a2136abd2219e615c54b234fc1b"
checksum = "df64a0392edac7b38fb2965ce8e205e7c5e219e4c531ed3cd1929c782f21853d"
dependencies = [
"cranelift-codegen",
"libc",
@@ -1343,9 +1343,9 @@ dependencies = [
[[package]]
name = "cranelift-srcgen"
version = "0.136.6"
version = "0.136.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36508559c8839a8b6ee091f9deaa9cfe620a82f1abb5e358a0a0c65290583622"
checksum = "3748e3c77c0717359cd4c089e1dc057221eb8598a9c18b0b5afccb5685975abb"
[[package]]
name = "crc"
@@ -2154,7 +2154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -2386,7 +2386,7 @@ checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a"
dependencies = [
"io-lifetimes 2.0.4",
"rustix",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
@@ -4144,7 +4144,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
[[package]]
name = "ide-agent"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"blake3",
"dunce",
@@ -4171,7 +4171,7 @@ dependencies = [
[[package]]
name = "ide-analysis"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ast-grep-core",
"ide-core",
@@ -4185,7 +4185,7 @@ dependencies = [
[[package]]
name = "ide-android"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"serde",
@@ -4196,7 +4196,7 @@ dependencies = [
[[package]]
name = "ide-build"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"blake3",
"chardetng",
@@ -4214,7 +4214,7 @@ dependencies = [
[[package]]
name = "ide-cli"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"dirs 6.0.0",
"serde",
@@ -4228,7 +4228,7 @@ dependencies = [
[[package]]
name = "ide-clipboard"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"gtk",
"objc2 0.6.5",
@@ -4239,7 +4239,7 @@ dependencies = [
[[package]]
name = "ide-command"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -4250,7 +4250,7 @@ dependencies = [
[[package]]
name = "ide-core"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"dunce",
"encoding_rs",
@@ -4267,7 +4267,7 @@ dependencies = [
[[package]]
name = "ide-coverage"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"ide-run",
@@ -4281,7 +4281,7 @@ dependencies = [
[[package]]
name = "ide-dap"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"base64 0.22.1",
"futures",
@@ -4310,7 +4310,7 @@ dependencies = [
[[package]]
name = "ide-db"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"base64 0.22.1",
"bb8",
@@ -4348,7 +4348,7 @@ dependencies = [
[[package]]
name = "ide-docker"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"serde",
@@ -4361,7 +4361,7 @@ dependencies = [
[[package]]
name = "ide-drag-out"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"gtk",
"objc2 0.6.5",
@@ -4375,7 +4375,7 @@ dependencies = [
[[package]]
name = "ide-extension"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"base64 0.22.1",
"blake3",
@@ -4396,7 +4396,7 @@ dependencies = [
[[package]]
name = "ide-flutter"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-android",
"ide-core",
@@ -4407,7 +4407,7 @@ dependencies = [
[[package]]
name = "ide-fonts"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"objc2-core-foundation",
"objc2-core-text",
@@ -4419,7 +4419,7 @@ dependencies = [
[[package]]
name = "ide-github"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"ide-vcs",
@@ -4432,7 +4432,7 @@ dependencies = [
[[package]]
name = "ide-heap"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"criterion",
"ide-core",
@@ -4450,7 +4450,7 @@ dependencies = [
[[package]]
name = "ide-host"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"base64 0.22.1",
"blake3",
@@ -4525,7 +4525,7 @@ dependencies = [
[[package]]
name = "ide-http"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"hyper-util",
"ide-core",
@@ -4545,7 +4545,7 @@ dependencies = [
[[package]]
name = "ide-index"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"blake3",
"criterion",
@@ -4567,7 +4567,7 @@ dependencies = [
[[package]]
name = "ide-jdwp"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-jvm-inspect",
"proptest",
@@ -4579,7 +4579,7 @@ dependencies = [
[[package]]
name = "ide-jsonrpc"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"encoding_rs",
"futures",
@@ -4596,7 +4596,7 @@ dependencies = [
[[package]]
name = "ide-jvm-attach"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"libc",
"tempfile",
@@ -4605,7 +4605,7 @@ dependencies = [
[[package]]
name = "ide-jvm-inspect"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"futures",
"serde",
@@ -4616,7 +4616,7 @@ dependencies = [
[[package]]
name = "ide-language"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"blake3",
"criterion",
@@ -4675,7 +4675,7 @@ dependencies = [
[[package]]
name = "ide-lsp"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"criterion",
"dunce",
@@ -4704,7 +4704,7 @@ dependencies = [
[[package]]
name = "ide-mcp"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"bytes",
"dunce",
@@ -4723,7 +4723,7 @@ dependencies = [
[[package]]
name = "ide-notebook"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"futures",
"ide-core",
@@ -4746,7 +4746,7 @@ dependencies = [
[[package]]
name = "ide-plugin"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"blake3",
"dunce",
@@ -4769,7 +4769,7 @@ dependencies = [
[[package]]
name = "ide-profiler"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"ide-jvm-attach",
@@ -4783,7 +4783,7 @@ dependencies = [
[[package]]
name = "ide-remote"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"dunce",
"futures",
@@ -4803,7 +4803,7 @@ dependencies = [
[[package]]
name = "ide-run"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"dunce",
"encoding_rs",
@@ -4827,7 +4827,7 @@ dependencies = [
[[package]]
name = "ide-scaffold"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"ide-tools",
@@ -4843,7 +4843,7 @@ dependencies = [
[[package]]
name = "ide-sdk"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"dunce",
"flate2",
@@ -4866,7 +4866,7 @@ dependencies = [
[[package]]
name = "ide-search"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"criterion",
"encoding_rs",
@@ -4887,7 +4887,7 @@ dependencies = [
[[package]]
name = "ide-spell"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"parking_lot",
@@ -4900,7 +4900,7 @@ dependencies = [
[[package]]
name = "ide-ssh"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"dirs 6.0.0",
"flate2",
@@ -4925,7 +4925,7 @@ dependencies = [
[[package]]
name = "ide-streams"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"ide-language",
@@ -4938,7 +4938,7 @@ dependencies = [
[[package]]
name = "ide-syntax"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"ide-language",
@@ -4953,7 +4953,7 @@ dependencies = [
[[package]]
name = "ide-terminal"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"ide-core",
"libc",
@@ -4967,7 +4967,7 @@ dependencies = [
[[package]]
name = "ide-text"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"criterion",
"ide-core",
@@ -4980,7 +4980,7 @@ dependencies = [
[[package]]
name = "ide-tools"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"flate2",
"hex",
@@ -5001,7 +5001,7 @@ dependencies = [
[[package]]
name = "ide-vcs"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"blake3",
"dunce",
@@ -5022,7 +5022,7 @@ dependencies = [
[[package]]
name = "ide-vfs"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"chardetng",
"dunce",
@@ -5049,7 +5049,7 @@ dependencies = [
[[package]]
name = "ide-web"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"dirs 6.0.0",
"ide-core",
@@ -5065,7 +5065,7 @@ dependencies = [
[[package]]
name = "ide-workspace"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"blake3",
"dunce",
@@ -5227,7 +5227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20fd6de4ccfcc187e38bc21cfa543cb5a302cb86a8b114eb7f0bf0dc9f8ac00f"
dependencies = [
"io-lifetimes 3.0.1",
"windows-sys 0.60.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -5265,7 +5265,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
dependencies = [
"hermit-abi",
"libc",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -6694,7 +6694,7 @@ dependencies = [
[[package]]
name = "openidea"
version = "0.1.49"
version = "0.1.50"
dependencies = [
"base64 0.22.1",
"blake3",
@@ -7424,9 +7424,9 @@ dependencies = [
[[package]]
name = "pulley-interpreter"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "335e459f9c7809af04768799880504d014d07e8e2fc6ae682fe2a105d8ced33f"
checksum = "99ecf828c291348e4066f8e45bf37c35ea6012b07a9201e7911c21f03ad1af3e"
dependencies = [
"cranelift-bitset",
"log",
@@ -7436,9 +7436,9 @@ dependencies = [
[[package]]
name = "pulley-macros"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd492ac929a6ca0357362d9fa0a09e31290feac5914550ccfb539b21f89c4b9e"
checksum = "20e35ece122b2e8bbd7ea9db0709b3d32f20555b73985efc3eaf6afa4ef2ecdf"
dependencies = [
"proc-macro2",
"quote",
@@ -7968,7 +7968,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -8036,7 +8036,7 @@ dependencies = [
"security-framework",
"security-framework-sys",
"webpki-root-certs",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -9783,7 +9783,7 @@ dependencies = [
"getrandom 0.3.4",
"once_cell",
"rustix",
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -11117,9 +11117,9 @@ dependencies = [
[[package]]
name = "wasmtime"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f32390bdc8d7cdb6259a1b855178bfed88226b4004b209fd48fb30e0deb01cd3"
checksum = "263d6a66a772efff2c98a1aa367e8e61dae32d2ecf95f85f4776733762322aa7"
dependencies = [
"addr2line",
"async-trait",
@@ -11159,9 +11159,9 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c10f8ef1c9ee5e0f125c775fe56a4d07b8525db30a96e6358c61d93bd11dee4"
checksum = "5f2f0898bedc77f110dca6f70394780f89af68a8ca19e12559ee73d4187a6fe9"
dependencies = [
"anyhow",
"cpp_demangle",
@@ -11190,9 +11190,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-component-macro"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "620c53182ebd26c9fff5b90dd53cf8ec3103c381403fd32f8d395da31a9e4a46"
checksum = "b140c28283bd2255a4bb8834621f7200bbe7581cbca91d803b5ba4adf9119a5e"
dependencies = [
"anyhow",
"proc-macro2",
@@ -11205,15 +11205,15 @@ dependencies = [
[[package]]
name = "wasmtime-internal-component-util"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "011e31ca343d9ba0ec623153cd94131b6f03973ef1a0ab791161f642e4a16a93"
checksum = "853075a197694ba7f0749e7af78b59e12c0956dff5b16dafbfc49c3b90cdbc93"
[[package]]
name = "wasmtime-internal-core"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab15e50a060b746493e6e95ef3ce4e6e7ebfdd7cc336a7dff0f0277e01b447ef"
checksum = "e6e13ab3aa598d863643ef9ec043d63fde7effca4465270446d5b868936b27a6"
dependencies = [
"hashbrown 0.17.1",
"libm",
@@ -11222,9 +11222,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-cranelift"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc3d27440a83fba26dd2784a997e13d9acb3606a75fb127c324929b52221c5c5"
checksum = "660103cff91df46f9f06568f3889b8b59a6ae0f56756abfcc002a0a69974cc9f"
dependencies = [
"cranelift-codegen",
"cranelift-control",
@@ -11248,9 +11248,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-fiber"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e54b28d0d453ca8932e4504065ae66a78f01fcb22b1a2ee287128d732fa9d6f"
checksum = "c4d0e958516bdf283b83015283774e11c86b66f2f4bd7d2ea52e9799fa59cddb"
dependencies = [
"cc",
"libc",
@@ -11262,9 +11262,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-jit-debug"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9293e75a3048b900f7b7c524702abca16d8a2332f970324eefc519f454cd5d69"
checksum = "ad61b1e661871bb7d11b5543202a05c44ed8682806b438f68ced629a22719463"
dependencies = [
"cc",
"wasmtime-internal-versioned-export-macros",
@@ -11272,9 +11272,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-jit-icache-coherence"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b852e568831b913d410541bb37edc45a5002e472208fbdbaf844ed801dd4255f"
checksum = "52c641b9e1bab449c7316896f01d4a0c426e2a502a5a8098e1af4a0392053e7a"
dependencies = [
"libc",
"wasmtime-internal-core",
@@ -11283,9 +11283,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-unwinder"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1f7349c9834a542275ad757340079e6453fccb429efce581454d23f85af92c0"
checksum = "03303a9abd333edcbd44fee3b1e0905ad156d3bcec311323d061cdff92e7d1f3"
dependencies = [
"cranelift-codegen",
"log",
@@ -11295,9 +11295,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-versioned-export-macros"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30b3e0768a450d9dea3e16b83f2498f0b08db0e32bad695e35564eef017be3f1"
checksum = "8db0c7f417e5ca3ba92d127d17b980529455d01c141be99204e6d309630c42de"
dependencies = [
"proc-macro2",
"quote",
@@ -11306,9 +11306,9 @@ dependencies = [
[[package]]
name = "wasmtime-internal-wit-bindgen"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9d085c540b95d0ffebf98c266e6f152e1acf96a9f676f224a74307b9d422c15"
checksum = "6292ee4f797f9befb64aa2b3477ec8576501d6302ec21fd2785a8d3f94cf8717"
dependencies = [
"anyhow",
"bitflags 2.13.2",
@@ -11320,9 +11320,9 @@ dependencies = [
[[package]]
name = "wasmtime-wasi"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f8ce6b9e77539b5f52d440346f876a84c513ec1b07162845282f8652f7f7f9"
checksum = "3175ff29e2992269f51ec372f7757941f11f87b265a614761726960d42ef6e4d"
dependencies = [
"async-trait",
"bitflags 2.13.2",
@@ -11344,9 +11344,9 @@ dependencies = [
[[package]]
name = "wasmtime-wasi-io"
version = "49.0.6"
version = "49.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9f90eb7ce6edbead27dba3a58843398875defa73b8dce4bbc29d0ce3dc9b40"
checksum = "3bb561839e32b61bf0cdd51efe3874fac5de1bd5775a5b7c41bdf70993e367ea"
dependencies = [
"async-trait",
"bytes",
@@ -11620,7 +11620,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys 0.61.2",
"windows-sys 0.52.0",
]
[[package]]
@@ -11788,15 +11788,6 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.60.2"
@@ -12069,7 +12060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
dependencies = [
"bitflags 2.13.2",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
+1 -1
Переглянути файл
@@ -5,7 +5,7 @@ members = ["crates/*", "src-tauri"]
exclude = ["sdk", "plugins"]
[workspace.package]
version = "0.1.49"
version = "0.1.50"
edition = "2024"
rust-version = "1.96"
license = "Apache-2.0"
+18 -48
Переглянути файл
@@ -194,14 +194,14 @@ impl AgentCatalogs {
(shared.paths.models_file.clone(), shared.paths.project_root.clone(), provider.to_owned())
}
fn fallback(shared: &Shared, provider: &str) -> CatalogData {
/// The catalog saved for this project, for before this run looked anything up.
fn saved(shared: &Shared, provider: &str) -> CatalogData {
let cache = shared.known.lock();
let Some(known) = cache.get(provider) else { return CatalogData::default() };
known.catalogs.get(&shared.root_key()).map(|saved| saved.catalog.clone()).unwrap_or_else(|| CatalogData {
config: known.config.clone(),
thought_levels: known.thought_levels.clone(),
refreshed_at_ms: None,
})
cache
.get(provider)
.and_then(|known| known.catalogs.get(&shared.root_key()))
.map(|saved| saved.catalog.clone())
.unwrap_or_default()
}
pub(crate) fn cached(&self, shared: &Shared, provider: &str) -> CatalogData {
@@ -210,32 +210,14 @@ impl AgentCatalogs {
.entries
.get(&Self::key(shared, provider))
.and_then(|e| e.catalog.clone())
.unwrap_or_else(|| Self::fallback(shared, provider))
.unwrap_or_else(|| Self::saved(shared, provider))
}
/// Availability for an explicit session switch must come from a recent discovery for this
/// launch, not from the display fallback or a different project's session report.
pub(super) fn fresh_model(
&self,
shared: &Shared,
spec: &provider::ProviderSpec,
model: &str,
) -> Option<crate::AgentConfigValue> {
let context = LaunchContext::new(spec.clone(), &shared.paths.project_root);
let select = |catalog: &CatalogData| {
let age = self.epoch_ms() - catalog.refreshed_at_ms?;
if !(0.0..FRESH_FOR.as_millis() as f64).contains(&age) {
return None;
}
catalog.model_option()?.values.iter().find(|value| value.value == model).cloned()
};
let state = self.state.lock();
if let Some(entry) = state.entries.get(&Self::key(shared, &spec.id)) {
return select(entry.catalog.as_ref().filter(|_| entry.context == context)?);
}
let cache = shared.known.lock();
let saved = cache.get(&spec.id)?.catalogs.get(&shared.root_key())?;
(saved.fingerprint == context.fingerprint()).then(|| select(&saved.catalog)).flatten()
/// The entry a chat may switch to: exactly what the picker offers from the cached catalog,
/// however long ago it was read. Refreshing keeps that catalog current; a listed model is
/// never refused because the catalog aged.
pub(super) fn listed_model(&self, shared: &Shared, provider: &str, model: &str) -> Option<crate::AgentConfigValue> {
self.cached(shared, provider).model_option()?.values.iter().find(|value| value.value == model).cloned()
}
pub(crate) fn levels(&self, shared: &Shared, provider: &str, model: &str) -> Option<Vec<AgentConfigOption>> {
@@ -246,14 +228,7 @@ impl AgentCatalogs {
}
drop(state);
let cache = shared.known.lock();
let known = cache.get(provider)?;
known
.catalogs
.get(&shared.root_key())
.map(|saved| &saved.catalog.thought_levels)
.unwrap_or(&known.thought_levels)
.get(model)
.cloned()
cache.get(provider)?.catalogs.get(&shared.root_key())?.catalog.thought_levels.get(model).cloned()
}
pub(super) async fn load_levels(
@@ -297,7 +272,7 @@ impl AgentCatalogs {
}
fn snapshot(&self, shared: &Shared, provider: &str, entry: &Entry) -> AgentModelCatalog {
let catalog = entry.catalog.clone().unwrap_or_else(|| Self::fallback(shared, provider));
let catalog = entry.catalog.clone().unwrap_or_default();
let model_failure = entry.requested_model.as_ref().and_then(|model| entry.model_failures.get(model));
let unknown_model = entry
.requested_model
@@ -382,12 +357,11 @@ impl AgentCatalogs {
},
);
}
let fallback =
state.entries.get(&key).filter(|entry| entry.catalog.is_none()).map(|_| Self::fallback(shared, &spec.id));
state.generation += 1;
let generation = state.generation;
let entry = state.entries.get_mut(&key).expect("catalog entry");
let catalog = entry.catalog.as_ref().or(fallback.as_ref()).expect("cached catalog");
let empty = CatalogData::default();
let catalog = entry.catalog.as_ref().unwrap_or(&empty);
let fresh = entry.successful.is_some_and(|at| now.duration_since(at) < FRESH_FOR);
let target = model
.filter(|model| {
@@ -496,7 +470,7 @@ impl AgentCatalogs {
entry.flight_model = None;
let success = match result {
Ok(found) => {
let previous = entry.catalog.take().unwrap_or_else(|| Self::fallback(shared, &key.2));
let previous = entry.catalog.take().unwrap_or_default();
let mut cache = shared.known.lock();
let known = cache.entry(key.2.clone()).or_default();
let mut catalog = CatalogData {
@@ -510,13 +484,9 @@ impl AgentCatalogs {
catalog.thought_levels.insert(model, levels);
}
}
known.config = catalog.config.clone();
known.thought_levels = catalog.thought_levels.clone();
if let Some(commands) = found.commands {
known.commands.insert(shared.root_key(), commands);
}
known.authoritative = true;
known.refreshed_at_ms = catalog.refreshed_at_ms;
known.catalogs.insert(
shared.root_key(),
SavedCatalog { fingerprint: entry.context.fingerprint(), catalog: catalog.clone() },
+23 -12
Переглянути файл
@@ -230,11 +230,9 @@ async fn successful_refresh_replaces_models_and_efforts_and_old_sessions_cannot_
let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
let mut events = events(&manager);
let old = config::options_of(&response(&["old", "retained"], &["low", "high"]));
manager.shared.remember(PROVIDER, Some(&old), None, Some("old"));
let cached = manager.refresh_models(PROVIDER, false, None).unwrap();
assert!(cached.refreshing);
assert_eq!(model_values(&cached), ["old", "retained"]);
assert!(cached.refreshed_at_ms.is_none(), "session reports are not fresh discovery");
assert!(model_values(&cached).is_empty(), "nothing is offered before the first discovery");
let pending = harness.next().await;
assert_eq!(pending.params["mcpServers"], json!([]));
pending.reply.send(Ok(response(&["retained", "new"], &["medium"]))).unwrap();
@@ -258,7 +256,10 @@ async fn successful_refresh_replaces_models_and_efforts_and_old_sessions_cannot_
assert_eq!(provider.config, fresh.config);
restored.shared.remember(PROVIDER, Some(&old), None, Some("old"));
assert_eq!(restored.shared.known_config(PROVIDER), fresh.config);
assert_eq!(restored.shared.known.lock()[PROVIDER].refreshed_at_ms, fresh.refreshed_at_ms);
assert_eq!(
restored.shared.paths.catalogs.cached(&restored.shared, PROVIDER).refreshed_at_ms,
fresh.refreshed_at_ms
);
assert!(!tmp.path().join("store").exists(), "refresh never creates tasks");
}
@@ -308,6 +309,11 @@ async fn discovered_model_reloads_the_same_session_on_the_next_message() {
switch_chat_model(ChatSwitch::Resume).await;
}
#[tokio::test]
async fn discovered_model_from_an_aged_catalog_can_still_be_selected() {
switch_chat_model(ChatSwitch::Aged).await;
}
#[tokio::test]
async fn discovered_model_leaves_the_original_session_intact_after_resume_failure() {
switch_chat_model(ChatSwitch::ResumeFails).await;
@@ -356,6 +362,7 @@ async fn discovered_model_lookup_does_not_overwrite_a_newer_selection() {
#[derive(Clone, Copy)]
enum ChatSwitch {
Live,
Aged,
Resume,
ResumeFails,
Unavailable,
@@ -376,7 +383,8 @@ async fn switch_chat_model(scenario: ChatSwitch) {
let mut harness = Harness::with_initialize(json!({
"protocolVersion": 1, "agentCapabilities": { "loadSession": true }
}));
let mut manager = make_manager(tmp.path(), Arc::default(), &harness);
let catalogs = Arc::new(AgentCatalogs::default());
let mut manager = make_manager(tmp.path(), catalogs.clone(), &harness);
let task = manager
.create(NewAgentTask {
prompt: AgentPrompt { text: "first".into(), ..Default::default() },
@@ -443,7 +451,11 @@ async fn switch_chat_model(scenario: ChatSwitch) {
}
assert_eq!(manager.task(&task.id).unwrap().state.lock().task.config, before_config);
let live = matches!(scenario, ChatSwitch::Live);
let live = matches!(scenario, ChatSwitch::Live | ChatSwitch::Aged);
if matches!(scenario, ChatSwitch::Aged) {
// The catalog stays what the picker offers however long ago it was read.
advance(&catalogs, 20 * 60);
}
let resumed_launch = if missing_settings { 3 } else { 2 };
let load_fails = matches!(scenario, ChatSwitch::ResumeFails);
let unavailable = matches!(scenario, ChatSwitch::Unavailable);
@@ -684,7 +696,7 @@ async fn next_chat_request(
}
#[tokio::test]
async fn legacy_cache_loads_without_claiming_authoritative_freshness() {
async fn a_cache_from_before_project_catalogs_offers_nothing_until_discovery_succeeds() {
let tmp = tempfile::tempdir().unwrap();
configure(tmp.path(), "one");
let options = config::options_of(&response(&["legacy"], &["low"]));
@@ -700,12 +712,11 @@ async fn legacy_cache_loads_without_claiming_authoritative_freshness() {
let manager = make_manager(tmp.path(), Arc::default(), &harness);
let mut events = events(&manager);
let cached = manager.refresh_models(PROVIDER, false, None).unwrap();
assert_eq!(model_values(&cached), ["legacy"]);
assert!(model_values(&cached).is_empty());
assert!(cached.refreshing && cached.refreshed_at_ms.is_none());
harness.next().await.reply.send(Err("Sign in required".into())).unwrap();
let failed = completed(&mut events).await;
assert_eq!(failed.config, cached.config);
assert!(failed.error.as_deref().unwrap().contains("Sign in required"));
harness.next().await.reply.send(Ok(response(&["current"], &["low"]))).unwrap();
let found = completed(&mut events).await;
assert_eq!(model_values(&found), ["current"]);
}
#[tokio::test]
+93 -66
Переглянути файл
@@ -54,6 +54,10 @@ pub type SecurityHook = Arc<dyn Fn() -> ide_core::settings::AgentSecuritySetting
/// Returns the user's choice of the approvals new tasks start with.
pub type NewTaskApprovalsHook = Arc<dyn Fn() -> ide_core::settings::NewTaskApprovals + Send + Sync>;
/// Returns the roots of the project's workspace an agent may work in: the project and the
/// attached projects the user trusts.
pub type WorkspaceRootsHook = Arc<dyn Fn() -> Vec<PathBuf> + Send + Sync>;
/// Entry changes are batched for this long before they are sent.
const FLUSH_DELAY: Duration = Duration::from_millis(40);
/// Updates that arrive this late after `session/load` returns are still replayed history.
@@ -134,11 +138,19 @@ pub type McpExecutableFn = dyn Fn() -> Option<PathBuf> + Send + Sync;
/// The `[agents.skills.<name>]` policies a session resolves against: the user's (global
/// `settings.toml`), the workspace's (`.openidea/settings.toml`), and whether the workspace
/// is trusted (an untrusted one can only turn skills off).
#[derive(Clone, Debug, Default)]
#[derive(Clone, Debug)]
pub struct SkillsPolicy {
pub user: BTreeMap<String, AgentSkillPolicy>,
pub workspace: BTreeMap<String, AgentSkillPolicy>,
pub workspace_trusted: bool,
/// All workspace folders (the project root plus any multi-repo workspace members).
pub workspace_roots: Vec<PathBuf>,
}
impl Default for SkillsPolicy {
fn default() -> Self {
Self { user: BTreeMap::new(), workspace: BTreeMap::new(), workspace_trusted: true, workspace_roots: Vec::new() }
}
}
/// Returns the skill policies for this project.
@@ -159,6 +171,7 @@ struct Shared {
sinks: RwLock<HashMap<String, AgentSink>>,
security: RwLock<Option<SecurityHook>>,
new_task_approvals: RwLock<Option<NewTaskApprovalsHook>>,
workspace_roots: RwLock<Option<WorkspaceRootsHook>>,
known: Arc<Mutex<HashMap<String, Known>>>,
providers: RwLock<Vec<provider::ProviderSpec>>,
/// Last probe of each provider.
@@ -174,28 +187,36 @@ struct Shared {
attention_seq: AtomicU64,
}
/// What an agent offered in its last session, for the New Task page.
/// What an agent offered, for the New Task page.
#[derive(Clone, Default, Serialize, Deserialize)]
struct Known {
#[serde(default)]
config: Vec<AgentConfigOption>,
/// Thinking levels reported for each model value, including its last choice.
#[serde(default, rename = "thoughtLevels")]
thought_levels: BTreeMap<String, Vec<AgentConfigOption>>,
/// By project root: skills and custom commands differ per project.
#[serde(default, rename = "projectCommands")]
commands: HashMap<String, Vec<AgentCommand>>,
/// Successful discovery, unlike a session report, owns availability.
#[serde(default)]
authoritative: bool,
#[serde(default, rename = "refreshedAtMs")]
refreshed_at_ms: Option<f64>,
/// Authoritative availability and freshness are scoped to project and launch context.
/// Model catalogs by project root, valid for the launch context they were read with.
#[serde(default, rename = "projectCatalogs")]
catalogs: HashMap<String, catalogs::SavedCatalog>,
}
impl Shared {
/// The workspace roots offered to a session besides its own directory and project, for an
/// agent that takes them (`sessionCapabilities.additionalDirectories`).
fn additional_directories(&self, init: &acp::Negotiated, cwd: &Path, project_root: Option<&Path>) -> Vec<String> {
let Some(hook) = self.workspace_roots.read().clone().filter(|_| init.session("additionalDirectories")) else {
return Vec::new();
};
let canonical = |p: &Path| dunce::canonicalize(p).unwrap_or_else(|_| p.to_path_buf());
let own: Vec<PathBuf> = std::iter::once(cwd).chain(project_root).map(canonical).collect();
let mut roots = Vec::new();
for root in hook().iter().map(|r| canonical(r)) {
let root = root.to_string_lossy().into_owned();
if !own.iter().any(|o| o.to_string_lossy() == root) && !roots.contains(&root) {
roots.push(root);
}
}
roots
}
fn spec(&self, id: &str) -> Option<provider::ProviderSpec> {
self.providers.read().iter().find(|p| p.id == id).cloned()
}
@@ -308,7 +329,8 @@ impl Shared {
self.paths.project_root.to_string_lossy().into_owned()
}
/// Cache levels only when `model` confirms which model the session reported them for.
/// Keeps the commands a session offered and the effort levels it reported for `model`, the
/// only model whose levels it describes.
fn remember(
&self,
provider: &str,
@@ -317,43 +339,22 @@ impl Shared {
model: Option<&str>,
) {
let acp = self.spec(provider).is_some_and(|spec| spec.driver == provider::Driver::Acp);
let mut cache = self.known.lock();
let known = cache.entry(provider.to_owned()).or_default();
let mut changed = false;
// Running tasks retain their own reported settings. Once discovery has
// succeeded, a session's older list/defaults cannot change New Task choices.
if !known.authoritative
&& let Some(config) = config.filter(|c| !c.is_empty())
{
if let Some(model) = model {
let levels: Vec<_> = config.iter().filter(|o| config::is_per_model_option(o)).cloned().collect();
if known.thought_levels.get(model) != Some(&levels) {
known.thought_levels.insert(model.to_owned(), levels);
changed = true;
}
}
if known.config != config {
known.config = config.to_vec();
if let Some(commands) = commands.filter(|c| !c.is_empty()) {
let mut cache = self.known.lock();
let known = cache.entry(provider.to_owned()).or_default();
if known.commands.get(&self.root_key()).map(Vec::as_slice) != Some(commands) {
known.commands.insert(self.root_key(), commands.to_vec());
self.persist_known(&cache);
changed = true;
}
}
// Discovery reads one model's options; a session on another model reports that model's.
let learned = model.filter(|_| acp && known.authoritative).zip(config).map(|(model, config)| {
if acp && let Some((model, config)) = model.zip(config) {
let levels: Vec<_> = config.iter().filter(|o| config::is_per_model_option(o)).cloned().collect();
(model, levels)
});
if let Some(commands) = commands.filter(|c| !c.is_empty())
&& known.commands.get(&self.root_key()).map(Vec::as_slice) != Some(commands)
{
known.commands.insert(self.root_key(), commands.to_vec());
changed = true;
}
if changed {
self.persist_known(&cache);
}
drop(cache);
if let Some((model, levels)) = learned.filter(|(_, levels)| !levels.is_empty()) {
self.paths.catalogs.learn_levels(self, provider, model, levels);
if !levels.is_empty() {
self.paths.catalogs.learn_levels(self, provider, model, levels);
}
}
if changed {
self.emit(AgentEvent::Providers);
@@ -584,6 +585,7 @@ impl AgentManager {
sinks: RwLock::new(HashMap::new()),
security: RwLock::new(None),
new_task_approvals: RwLock::new(None),
workspace_roots: RwLock::new(None),
known,
providers,
probes: Mutex::new(HashMap::new()),
@@ -651,6 +653,11 @@ impl AgentManager {
*self.shared.new_task_approvals.write() = Some(hook);
}
/// Sets the callback that lists the workspace roots offered to agents besides a task's own.
pub fn set_workspace_roots_hook(&self, hook: WorkspaceRootsHook) {
*self.shared.workspace_roots.write() = Some(hook);
}
/// The agents (custom ones re-read), whether each is installed, and what they offered last time.
pub fn providers(&self) -> Vec<AgentProvider> {
let specs = provider::load(self.shared.paths.custom_agents_dir.as_deref(), self.shared.env_secrets());
@@ -785,20 +792,22 @@ impl AgentManager {
}
let home = self.shared.paths.home_dir.clone();
if provider == "hermes" || provider.starts_with("hermes-") {
let hermes_home = home.clone();
let hermes_provider = provider.clone();
let found = blocking(move || {
let profile = hermes::root(home.as_deref()).and_then(|root| hermes::profile_home(&root, &provider));
let profile =
hermes::root(hermes_home.as_deref()).and_then(|root| hermes::profile_home(&root, &hermes_provider));
Ok(profile.map(|p| skills::hermes(&p)).unwrap_or_default())
})
.await?;
return Ok(skills::merge(offered, found));
}
if provider == "claude" || provider == "claude-acp" {
offered = skills::merge(offered, found);
} else if provider == "claude" || provider == "claude-acp" {
let claude_cwd = cwd.clone();
let found = blocking(move || Ok(skills::discover(&claude_cwd, home.as_deref()))).await?;
offered = skills::merge(offered, found);
}
// The hub's active skills complete on every agent; its `off` ones drop out here,
// which is all the enforcement an ACP agent gets.
// The hub's active skills complete on every agent; its `off` ones drop out here
// (including entries `offered` already held), which is all the enforcement an ACP agent gets.
let holder = self.task_for_commands(&provider, task);
let states = match holder {
Some(holder) => holder.skill_states().await,
@@ -808,10 +817,11 @@ impl AgentManager {
let policy = shared.skills_policy_hook.read().as_ref().map(|hook| hook()).unwrap_or_default();
(policy, shared.paths.project_root.clone())
};
let roots = if policy.workspace_roots.is_empty() { vec![root] } else { policy.workspace_roots };
let home = self.shared.paths.home_dir.clone();
blocking(move || {
Ok(skills::resolve(
skills::discover_skills(&root, home.as_deref()),
skills::discover_skills_in(&roots, home.as_deref()),
None,
&policy.workspace,
&policy.user,
@@ -1371,11 +1381,13 @@ impl AgentManager {
if !live.capabilities.fork || (keep < total && !live.capabilities.rollback) {
return Err(IdeError::invalid("this agent can't copy a conversation from there"));
}
let (cwd, provider_id, mcp_overrides) = {
let (cwd, provider_id, mcp_overrides, project_root) = {
let s = source.state.lock();
(s.task.cwd.0.clone(), s.task.provider.clone(), s.task.mcp_overrides.clone())
let t = &s.task;
(t.cwd.0.clone(), t.provider.clone(), t.mcp_overrides.clone(), t.project_root.clone().map(|p| p.0))
};
let mcp_servers = source.shared.mcp_servers_for_session(&provider_id, &live.init, &mcp_overrides);
let roots = source.shared.additional_directories(&live.init, &cwd, project_root.as_deref());
let skills_delivery = source.stage_skills(stage_key(live.driver), &cwd).await;
let cwd_s = dunce::canonicalize(&cwd).unwrap_or(cwd).to_string_lossy().into_owned();
let reply: Value = live
@@ -1383,7 +1395,7 @@ impl AgentManager {
.request(
"session/fork",
{
let mut params = session_params(&cwd_s, &mcp_servers, skills_delivery.as_ref());
let mut params = session_params(&cwd_s, &mcp_servers, skills_delivery.as_ref(), &roots);
params["sessionId"] = json!(live.session);
params
},
@@ -2113,15 +2125,24 @@ impl Task {
/// The skills offered in this project: every discovery resolved against the policies
/// and the task's overrides.
async fn skill_states(&self) -> Vec<AgentSkillState> {
let (policy, overrides, home, root) = {
let (policy, overrides, home, roots) = {
let shared = &self.shared;
let policy = shared.skills_policy_hook.read().as_ref().map(|hook| hook()).unwrap_or_default();
let overrides = self.state.lock().task.skill_overrides.clone();
(policy, overrides, shared.paths.home_dir.clone(), shared.paths.project_root.clone())
let (overrides, task_root) = {
let s = self.state.lock();
(s.task.skill_overrides.clone(), s.task.project_root.as_ref().map(|p| p.0.clone()))
};
let mut roots = Vec::new();
if let Some(tr) = task_root {
roots.push(tr);
}
roots.extend(policy.workspace_roots.iter().cloned());
roots.push(shared.paths.project_root.clone());
(policy, overrides, shared.paths.home_dir.clone(), roots)
};
blocking(move || {
Ok(skills::resolve(
skills::discover_skills(&root, home.as_deref()),
skills::discover_skills_in(&roots, home.as_deref()),
Some(&overrides),
&policy.workspace,
&policy.user,
@@ -2537,8 +2558,7 @@ impl Task {
async fn switch_discovered_model(&self, target: AgentConfigOption, value: String) -> IdeResult<()> {
let provider = self.state.lock().task.provider.clone();
let spec = self.shared.spec(&provider).ok_or_else(|| IdeError::not_found("no such agent"))?;
let candidate = self.shared.paths.catalogs.fresh_model(&self.shared, &spec, &value).ok_or_else(|| {
let candidate = self.shared.paths.catalogs.listed_model(&self.shared, &provider, &value).ok_or_else(|| {
IdeError::invalid(format!("{} has no value {value} in the current model catalog", target.name))
})?;
let selection = {
@@ -3024,8 +3044,12 @@ impl Task {
let sign_in_message = spec.sign_in_message(&init.auth_methods);
let can_load = init.load_session();
let (capabilities, embedded) = capabilities_of(&init);
let mcp_overrides = self.state.lock().task.mcp_overrides.clone();
let (mcp_overrides, project_root) = {
let s = self.state.lock();
(s.task.mcp_overrides.clone(), s.task.project_root.clone().map(|p| p.0))
};
let mcp_servers = self.shared.mcp_servers_for_session(provider_id, &init, &mcp_overrides);
let roots = self.shared.additional_directories(&init, cwd, project_root.as_deref());
let skills_delivery = self.stage_skills(stage_key(spec.driver), cwd).await;
// Agents that compare canonical paths fail in a symlinked directory (macOS `/tmp`).
let cwd_s = dunce::canonicalize(cwd).unwrap_or_else(|_| cwd.to_path_buf()).to_string_lossy().into_owned();
@@ -3041,7 +3065,7 @@ impl Task {
}
if let (Some(id), true, false) = (saved, can_load, start_fresh) {
self.replaying.store(true, Ordering::Release);
let mut params = session_params(&cwd_s, &mcp_servers, skills_delivery.as_ref());
let mut params = session_params(&cwd_s, &mcp_servers, skills_delivery.as_ref(), &roots);
params["sessionId"] = json!(&id);
let loaded = self.request_with_auth(&peer, &init, &mut tried_auth, "session/load", params).await;
tokio::time::sleep(REPLAY_GRACE).await;
@@ -3081,7 +3105,7 @@ impl Task {
let (session_id, result) = match session {
Some(s) => s,
None => {
let params = session_params(&cwd_s, &mcp_servers, skills_delivery.as_ref());
let params = session_params(&cwd_s, &mcp_servers, skills_delivery.as_ref(), &roots);
let v = self.request_with_auth(&peer, &init, &mut tried_auth, "session/new", params).await.map_err(
|e| match self.sign_in_error(&e, Some(&sign_in_message)) {
Some(msg) => SessionOpenError { message: msg, allow_acp_fallback: false },
@@ -4071,9 +4095,12 @@ fn stage_key(driver: provider::Driver) -> &'static str {
/// The session parameters `session/new`, `session/load` and `session/fork` share: the MCP
/// servers, and the ones off for this session, so an agent that also loads its own
/// configuration (Claude Code) can keep a same-named server of it off too — plus the
/// session's staged skills for the drivers that take them.
fn session_params(cwd: &str, mcp: &McpForSession, skills: Option<&skills::Delivery>) -> Value {
/// session's staged skills for the drivers that take them, and the workspace's other roots.
fn session_params(cwd: &str, mcp: &McpForSession, skills: Option<&skills::Delivery>, roots: &[String]) -> Value {
let mut params = json!({ "cwd": cwd, "mcpServers": mcp.servers });
if !roots.is_empty() {
params["additionalDirectories"] = json!(roots);
}
let mut meta = json!({});
if !mcp.off.is_empty() {
meta["mcpServersOff"] = json!(mcp.off);
+14
Переглянути файл
@@ -711,6 +711,8 @@ pub struct AgentChange {
pub removed: u32,
/// Path before a rename; the left side of its diff reads this path.
pub old_path: Option<String>,
/// The repository the file is in, when the task's project holds nested repositories.
pub repo: Option<IpcPath>,
}
/// A commit made while the task ran, with the files it changed against its first parent.
@@ -929,9 +931,21 @@ pub struct AgentSkill {
/// The frontmatter `name`, else the folder's name.
pub name: String,
pub description: String,
/// Optional `argument-hint` from frontmatter, completed in the `/` menu.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub hint: Option<String>,
/// Canonical folder holding `SKILL.md` (symlinks resolved, so duplicates collapse).
pub path: IpcPath,
pub source: AgentSkillSource,
/// Other skill roots whose symlinked entry resolved to this same canonical `path`.
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub also_in: Vec<AgentSkillSource>,
/// False when frontmatter sets `user-invocable: false` (omitted from `/` completion).
#[serde(default = "default_true")]
pub user_invocable: bool,
/// True when frontmatter sets `disable-model-invocation: true` (defaults to `slashOnly`).
#[serde(default)]
pub disable_model_invocation: bool,
/// The `SKILL.md` passes validation (`name` matches its folder, `description` present).
pub valid: bool,
/// What validation found (`name` mismatch, missing or over-long description…).
+13 -1
Переглянути файл
@@ -174,6 +174,8 @@ struct Session {
mcp_off: Vec<String>,
/// The staged skills folder passed as `--add-dir` (its `.claude/skills` holds the copies).
skills_add_dir: Option<PathBuf>,
/// The workspace's other roots, each passed as `--add-dir`.
additional_dirs: Vec<String>,
/// The staged skills' `--settings` JSON (`skillOverrides` for the native ones too).
skills_settings: Option<String>,
shim: Weak<Shim>,
@@ -366,6 +368,7 @@ impl Shim {
mcp_config,
mcp_off,
skills_add_dir: skills.and_then(|s| s.get("claudeAddDir")).and_then(Value::as_str).map(PathBuf::from),
additional_dirs: additional_dirs(params),
skills_settings: skills.and_then(|s| s.get("claudeSettings")).and_then(Value::as_str).map(str::to_owned),
shim: Arc::downgrade(self),
st: Mutex::new(State {
@@ -412,7 +415,7 @@ impl Shim {
"agentCapabilities": {
"loadSession": true,
"promptCapabilities": { "image": true, "embeddedContext": true },
"sessionCapabilities": { "fork": {} },
"sessionCapabilities": { "fork": {}, "additionalDirectories": {} },
"mcpCapabilities": { "stdio": true, "http": true, "sse": true },
"_meta": { "openidea": { "rollback": true, "steer": true, "backgroundTasks": true, "contextUsage": true } },
},
@@ -685,6 +688,9 @@ impl Session {
if let Some(dir) = &self.skills_add_dir {
args.extend(["--add-dir".to_owned(), dir.to_string_lossy().into_owned()]);
}
for dir in &self.additional_dirs {
args.extend(["--add-dir".to_owned(), dir.clone()]);
}
if let Some(settings) = &self.skills_settings {
args.extend(["--settings".to_owned(), settings.clone()]);
}
@@ -1522,6 +1528,12 @@ fn write_mcp_config(json: &str) -> std::io::Result<tempfile::TempPath> {
/// The servers switched off for the session (`_meta.openidea.mcpServersOff`) as Claude Code
/// permission rules that deny all of a server's tools (`mcp__<server>`), so a server of
/// Claude Code's own configuration stays off too.
/// The session's `additionalDirectories`: the workspace's other roots.
fn additional_dirs(params: &Value) -> Vec<String> {
let dirs = params.get("additionalDirectories").and_then(Value::as_array);
dirs.into_iter().flatten().filter_map(Value::as_str).map(str::to_owned).collect()
}
fn mcp_off(params: &Value) -> Vec<String> {
params
.pointer("/_meta/openidea/mcpServersOff")
+7
Переглянути файл
@@ -1275,3 +1275,10 @@ fn mcp_servers_become_an_mcp_config() {
drop(path);
assert!(!kept.exists());
}
#[test]
fn additional_directories_are_read_from_the_session_params() {
let params = json!({ "cwd": "/w/api", "additionalDirectories": ["/w/web", 3, "/w/docs"] });
assert_eq!(additional_dirs(&params), ["/w/web", "/w/docs"]);
assert!(additional_dirs(&json!({ "cwd": "/w/api" })).is_empty());
}
+8 -1
Переглянути файл
@@ -357,6 +357,13 @@ fn apply_thread_config(params: &Value, request: &mut Value) {
if !config.as_object().is_some_and(|m| m.is_empty()) {
request["config"] = config;
}
// The workspace's other roots join the thread's own: they are where `workspace-write`
// may write and what the model is told the workspace holds.
if let Some(extra) = params.get("additionalDirectories").and_then(Value::as_array).filter(|a| !a.is_empty())
&& let Some(cwd) = params.get("cwd").filter(|c| c.is_string())
{
request["runtimeWorkspaceRoots"] = std::iter::once(cwd).chain(extra).cloned().collect();
}
}
impl CodexShim {
@@ -406,7 +413,7 @@ impl CodexShim {
"loadSession": true,
"promptCapabilities": { "image": true, "audio": false, "embeddedContext": true },
"mcpCapabilities": { "http": false, "sse": false, "stdio": true },
"sessionCapabilities": { "fork": {}, "close": {} },
"sessionCapabilities": { "fork": {}, "close": {}, "additionalDirectories": {} },
"_meta": { "openidea": { "rollback": true, "steer": true } },
},
"agentInfo": { "name": "codex", "title": "Codex", "version": version },
+11
Переглянути файл
@@ -1847,3 +1847,14 @@ fn skills_become_commands_with_their_invocation_names() {
assert!(skill_commands(&json!({"data": []})).unwrap()["availableCommands"].as_array().unwrap().is_empty());
assert!(skill_commands(&json!({})).is_none());
}
#[test]
fn workspace_roots_join_the_thread_roots() {
let params = json!({ "cwd": "/w/api", "mcpServers": [], "additionalDirectories": ["/w/web"] });
let mut request = json!({});
apply_thread_config(&params, &mut request);
assert_eq!(request["runtimeWorkspaceRoots"], json!(["/w/api", "/w/web"]));
let mut request = json!({});
apply_thread_config(&json!({ "cwd": "/w/api", "mcpServers": [] }), &mut request);
assert!(request.get("runtimeWorkspaceRoots").is_none());
}
+497 -97
Переглянути файл
@@ -240,31 +240,54 @@ const HOME_ROOTS: &[(&str, AgentSkillSource)] = &[
/// duplicates collapsed by canonical path: the first of a path wins, and so does the first
/// of a name (the higher source), so a session never sees one skill twice.
pub fn discover_skills(workspace: &Path, home: Option<&Path>) -> Vec<AgentSkill> {
discover_skills_in(&[workspace.to_path_buf()], home)
}
/// Every skill found across `workspaces` (a project and any workspace/monorepo member
/// folders) and `home`, in source precedence order, symlinked duplicates collapsed by
/// canonical path while recording secondary sources in [`AgentSkill::also_in`].
pub fn discover_skills_in(workspaces: &[PathBuf], home: Option<&Path>) -> Vec<AgentSkill> {
let mut out: Vec<AgentSkill> = Vec::new();
let mut seen_paths: HashSet<PathBuf> = HashSet::new();
let mut seen_names: HashSet<String> = HashSet::new();
let mut roots: Vec<(PathBuf, AgentSkillSource)> = Vec::new();
roots.extend(WORKSPACE_ROOTS.iter().map(|(rel, source)| (workspace.join(rel), *source)));
let mut plugin_roots = Vec::new();
if let Some(home) = home {
roots.extend(HOME_ROOTS.iter().map(|(rel, source)| (home.join(rel), *source)));
// `copilot install` unpacks plugins under `installed-plugins/<plugin>/`, whose skills
// sit in a `skills` folder (or directly in the plugin folder).
let plugins = home.join(".copilot/installed-plugins");
if let Ok(plugins) = plugins.read_dir() {
for plugin in plugins.flatten() {
if plugin.path().is_dir() {
plugin_roots.push((plugin.path().join("skills"), AgentSkillSource::CopilotUser));
plugin_roots.push((plugin.path(), AgentSkillSource::CopilotUser));
}
let mut seen_workspaces: HashSet<PathBuf> = HashSet::new();
let mut all_workspaces: Vec<PathBuf> = Vec::new();
for ws in workspaces {
let canon = dunce::canonicalize(ws).unwrap_or_else(|_| ws.clone());
if seen_workspaces.insert(canon) {
all_workspaces.push(ws.clone());
}
}
for ws in &all_workspaces {
roots.extend(WORKSPACE_ROOTS.iter().map(|(rel, source)| (ws.join(rel), *source)));
}
// Nested monorepo packages (up to two levels below each workspace root, e.g. `apps/web`).
for ws in &all_workspaces {
for sub in monorepo_subdirs(ws, 2) {
let sub_canon = dunce::canonicalize(&sub).unwrap_or_else(|_| sub.clone());
if seen_workspaces.insert(sub_canon) {
roots.extend(WORKSPACE_ROOTS.iter().map(|(rel, source)| (sub.join(rel), *source)));
}
}
}
roots.extend(plugin_roots);
if let Some(home) = home {
roots.extend(HOME_ROOTS.iter().map(|(rel, source)| (home.join(rel), *source)));
roots.extend(copilot_installed_plugin_roots(&home.join(".copilot")));
}
for (root, source) in roots {
for skill in skills_of(&root, source) {
let path = dunce::canonicalize(&skill.path.0).unwrap_or_else(|_| skill.path.0.clone());
if !seen_paths.insert(path.clone()) || !seen_names.insert(skill.name.clone()) {
if !seen_paths.insert(path.clone()) {
if let Some(existing) = out.iter_mut().find(|s| s.path.0 == path)
&& existing.source != source
&& !existing.also_in.contains(&source)
{
existing.also_in.push(source);
}
continue;
}
if !seen_names.insert(skill.name.to_ascii_lowercase()) {
continue;
}
out.push(AgentSkill { path: path.into(), ..skill });
@@ -273,53 +296,204 @@ pub fn discover_skills(workspace: &Path, home: Option<&Path>) -> Vec<AgentSkill>
out
}
/// The skills of one root: `<name>/SKILL.md` folders, validated.
fn skills_of(root: &Path, source: AgentSkillSource) -> Vec<AgentSkill> {
let mut out: Vec<AgentSkill> = Vec::new();
let Ok(entries) = std::fs::read_dir(root) else { return out };
for entry in entries.flatten() {
let dir = entry.path();
let Some(folder) = dir.file_name().and_then(|n| n.to_str()).map(str::to_owned) else { continue };
if !dir.is_dir() || folder.starts_with('.') {
const SKIP_MONOREPO_DIRS: &[&str] =
&["node_modules", "target", "dist", "build", "out", "vendor", "coverage", ".git", ".openidea", ".idea"];
fn monorepo_subdirs(root: &Path, max_depth: usize) -> Vec<PathBuf> {
if max_depth == 0 {
return Vec::new();
}
let mut out = Vec::new();
for dir in sorted(root) {
let Some(name) = file_name(&dir) else { continue };
if SKIP_MONOREPO_DIRS.contains(&name.as_str()) {
continue;
}
let Ok(text) = std::fs::read_to_string(dir.join("SKILL.md")) else { continue };
let meta = Frontmatter::parse(&text);
let name = meta.get("name").filter(|n| !n.is_empty()).map(str::to_owned).unwrap_or_else(|| folder.clone());
let mut warnings = Vec::new();
if !valid_name(&name) {
warnings.push(format!("`name: {name}` is not 1-64 lowercase letters, digits or hyphens"));
let Ok(meta) = std::fs::symlink_metadata(&dir) else { continue };
if !meta.file_type().is_dir() {
continue;
}
if name != folder {
warnings.push(format!("`name: {name}` does not match the folder `{folder}`"));
if WORKSPACE_ROOTS.iter().any(|(rel, _)| dir.join(rel).is_dir()) {
out.push(dir.clone());
}
let description = meta.get("description").unwrap_or_default();
let description = strip_ansi(description).trim().to_owned();
if description.is_empty() {
warnings.push("no `description`: the model never sees when to use it".into());
} else if description.chars().count() > MAX_SKILL_DESCRIPTION {
warnings.push(format!("`description` is over {MAX_SKILL_DESCRIPTION} characters"));
if max_depth > 1 {
out.extend(monorepo_subdirs(&dir, max_depth - 1));
}
}
out
}
/// Discovers skill roots inside `~/.copilot/installed-plugins`, supporting both Copilot CLI's
/// 2-level `<marketplace-or-_direct>/<plugin>` layout (and `config.json` `installedPlugins`
/// enablement) and flat 1-level `<plugin>` folders.
fn copilot_installed_plugin_roots(copilot_dir: &Path) -> Vec<(PathBuf, AgentSkillSource)> {
let mut disabled_paths: HashSet<PathBuf> = HashSet::new();
let mut plugin_dirs: Vec<PathBuf> = Vec::new();
let mut seen_dirs: HashSet<PathBuf> = HashSet::new();
let mut push_plugin = |dir: PathBuf, disabled: &HashSet<PathBuf>| {
if !dir.is_dir() {
return;
}
let canon = dunce::canonicalize(&dir).unwrap_or_else(|_| dir.clone());
if disabled.contains(&canon) || !seen_dirs.insert(canon) {
return;
}
plugin_dirs.push(dir);
};
if let Ok(text) = std::fs::read_to_string(copilot_dir.join("config.json"))
&& let Ok(root) = serde_json::from_str::<serde_json::Value>(&crate::mcp::strip_jsonc(&text))
&& let Some(installed) = root.get("installedPlugins").and_then(serde_json::Value::as_array)
{
for entry in installed {
let Some(raw_cache) = entry.get("cache_path").and_then(serde_json::Value::as_str).map(str::trim) else {
continue;
};
if raw_cache.is_empty() {
continue;
}
let dir =
if Path::new(raw_cache).is_relative() { copilot_dir.join(raw_cache) } else { PathBuf::from(raw_cache) };
if entry.get("enabled").and_then(serde_json::Value::as_bool) == Some(false) {
disabled_paths.insert(dunce::canonicalize(&dir).unwrap_or(dir));
} else {
push_plugin(dir, &disabled_paths);
}
}
}
let plugins_root = copilot_dir.join("installed-plugins");
for entry in sorted(&plugins_root) {
if !entry.is_dir() {
continue;
}
if looks_like_plugin_dir(&entry) {
push_plugin(entry, &disabled_paths);
} else {
// 2-level `<marketplace>/<plugin>` or `_direct/<plugin>`.
for sub in sorted(&entry) {
if sub.is_dir() {
push_plugin(sub, &disabled_paths);
}
}
}
}
let mut roots = Vec::new();
for plugin in plugin_dirs {
let skills_sub = plugin.join("skills");
if skills_sub.is_dir() {
roots.push((skills_sub, AgentSkillSource::CopilotUser));
} else {
roots.push((plugin, AgentSkillSource::CopilotUser));
}
}
roots
}
fn looks_like_plugin_dir(dir: &Path) -> bool {
dir.join("skills").is_dir()
|| dir.join("plugin.json").is_file()
|| dir.join(".plugin").is_dir()
|| dir.join(".claude-plugin").is_dir()
|| dir.join(".cursor-plugin").is_dir()
|| dir.join("SKILL.md").is_file()
}
/// The skills of one root: `<name>/SKILL.md` folders and `<category>/<name>/SKILL.md`
/// category folders, validated.
fn skills_of(root: &Path, source: AgentSkillSource) -> Vec<AgentSkill> {
let mut out: Vec<AgentSkill> = Vec::new();
// Warn when a user drops `SKILL.md` directly inside a `skills/` root instead of `<name>/SKILL.md`.
if file_name(root).as_deref() == Some("skills")
&& let Ok(text) = std::fs::read_to_string(root.join("SKILL.md"))
{
let mut misplaced = parse_skill_file(root, "skills", &text, source);
misplaced.valid = false;
misplaced
.warnings
.insert(0, "SKILL.md is directly inside `skills/`: move it into a `<name>/SKILL.md` subfolder".into());
out.push(misplaced);
}
for dir in sorted(root) {
let Some(folder) = file_name(&dir) else { continue };
if !dir.is_dir() {
continue;
}
if let Ok(text) = std::fs::read_to_string(dir.join("SKILL.md")) {
out.push(parse_skill_file(&dir, &folder, &text, source));
continue;
}
// Category folder (`<root>/<category>/<skill>/SKILL.md`): only entered when `<dir>` itself
// has no `SKILL.md`, so a skill's own subdirectories remain resources rather than skills.
for sub in sorted(&dir) {
let Some(sub_folder) = file_name(&sub) else { continue };
if !sub.is_dir() {
continue;
}
if let Ok(text) = std::fs::read_to_string(sub.join("SKILL.md")) {
out.push(parse_skill_file(&sub, &sub_folder, &text, source));
}
}
out.push(AgentSkill {
name,
description: truncate(&description),
path: dir.into(),
source,
valid: warnings.is_empty(),
warnings,
});
}
out.sort_by(|a, b| a.name.cmp(&b.name));
out
}
fn parse_skill_file(dir: &Path, folder: &str, text: &str, source: AgentSkillSource) -> AgentSkill {
let meta = Frontmatter::parse(text);
let name = meta
.get("name")
.map(|n| strip_ansi(n).trim().to_owned())
.filter(|n| !n.is_empty())
.unwrap_or_else(|| folder.to_owned());
let mut warnings = Vec::new();
if !valid_name(&name) {
warnings.push(format!("`name: {name}` is not 1-64 lowercase letters, digits or hyphens"));
}
if name != folder {
warnings.push(format!("`name: {name}` does not match the folder `{folder}`"));
}
let description = meta.get("description").unwrap_or_default();
let description = strip_ansi(description).trim().to_owned();
if description.is_empty() {
warnings.push("no `description`: the model never sees when to use it".into());
} else if description.chars().count() > MAX_SKILL_DESCRIPTION {
warnings.push(format!("`description` is over {MAX_SKILL_DESCRIPTION} characters"));
}
let hint = meta.get("argument-hint").map(|h| strip_ansi(h).trim().to_owned()).filter(|h| !h.is_empty());
let user_invocable = !meta.get("user-invocable").is_some_and(|v| v.eq_ignore_ascii_case("false"));
let disable_model_invocation = meta.get("disable-model-invocation").is_some_and(|v| v.eq_ignore_ascii_case("true"));
AgentSkill {
name,
description: truncate(&description),
hint,
path: dir.to_path_buf().into(),
source,
also_in: Vec::new(),
user_invocable,
disable_model_invocation,
valid: warnings.is_empty(),
warnings,
}
}
/// A skill's mode, as one policy layer of the settings has it.
type Policies = BTreeMap<String, AgentSkillPolicy>;
fn lookup_mode(map: &BTreeMap<String, AgentSkillMode>, name: &str) -> Option<AgentSkillMode> {
map.get(name).copied().or_else(|| map.iter().find(|(k, _)| k.eq_ignore_ascii_case(name)).map(|(_, v)| *v))
}
fn lookup_policy<'a>(map: &'a Policies, name: &str) -> Option<&'a AgentSkillPolicy> {
map.get(name).or_else(|| map.iter().find(|(k, _)| k.eq_ignore_ascii_case(name)).map(|(_, v)| v))
}
/// Resolves every skill's mode: a session override, then the workspace's and the user's
/// `[agents.skills.<name>]` policy, then the default `auto` — with an untrusted workspace
/// able to turn skills off only: its own skills stay off (whatever the session chose), and
/// its policies hold only when they turn a skill off.
/// `[agents.skills.<name>]` policy, then the frontmatter default (`slashOnly` when
/// `disable-model-invocation: true`, else `auto`) — with an untrusted workspace able to
/// turn skills off only: its own skills stay off (whatever the session chose), and its
/// policies hold only when they turn a skill off.
pub fn resolve(
skills: Vec<AgentSkill>,
session: Option<&BTreeMap<String, AgentSkillMode>>,
@@ -337,19 +511,21 @@ pub fn resolve(
| AgentSkillSource::CodexWorkspace
| AgentSkillSource::CursorWorkspace
);
let default_mode =
if skill.disable_model_invocation { AgentSkillMode::SlashOnly } else { AgentSkillMode::Auto };
let (mode, origin) = if workspace_skill && !workspace_trusted {
// Workspace trust gates the workspace's own skills, whatever else says.
(AgentSkillMode::Off, AgentSkillOrigin::Trust)
} else if let Some(chosen) = session.and_then(|s| s.get(&skill.name)) {
(*chosen, AgentSkillOrigin::Session)
} else if let Some(chosen) = session.and_then(|s| lookup_mode(s, &skill.name)) {
(chosen, AgentSkillOrigin::Session)
} else if let Some(policy) =
workspace.get(&skill.name).filter(|p| workspace_trusted || p.mode == AgentSkillMode::Off)
lookup_policy(workspace, &skill.name).filter(|p| workspace_trusted || p.mode == AgentSkillMode::Off)
{
(policy.mode, AgentSkillOrigin::Workspace)
} else if let Some(policy) = user.get(&skill.name) {
} else if let Some(policy) = lookup_policy(user, &skill.name) {
(policy.mode, AgentSkillOrigin::User)
} else {
(AgentSkillMode::Auto, AgentSkillOrigin::None)
(default_mode, AgentSkillOrigin::None)
};
out.push(AgentSkillState { skill, mode, origin });
}
@@ -416,16 +592,24 @@ pub fn stage(
for state in states {
let name = state.skill.name.as_str();
let path = state.skill.path.0.as_path();
if file_name(path).as_deref() == Some("skills") && !state.skill.valid {
continue;
}
match state.mode {
AgentSkillMode::Off => {
out.codex_off.push((name.to_owned(), state.skill.path.to_string_lossy().into_owned()));
out.codex_off.push((name.to_owned(), codex_skill_md_path(path)));
}
// Claude Code runs a slash-only skill on `/name`, so it has to see the folder;
// Copilot and Codex have no such mode and get it disabled or left out.
// Copilot and Codex have no slash-only toggle and disable model auto-loading.
AgentSkillMode::SlashOnly => {
if let Some(tree) = claude_tree.as_ref().filter(|_| !native_claude(&state.skill, &cwd, home)) {
if state.skill.user_invocable
&& let Some(tree) = claude_tree.as_ref().filter(|_| !native_claude(&state.skill, &cwd, home))
{
link_skill(&tree.join(name), path)?;
}
if native_codex(&state.skill, &cwd, home) {
out.codex_off.push((name.to_owned(), codex_skill_md_path(path)));
}
}
AgentSkillMode::Auto => {
if let Some(tree) = claude_tree.as_ref().filter(|_| !native_claude(&state.skill, &cwd, home)) {
@@ -451,10 +635,16 @@ pub fn stage(
}
// Claude Code's `skillOverrides` and Copilot's `disabledSkills` take the names of the
// off and slash-only skills — the native copies included.
let off: Vec<&str> =
states.iter().filter(|s| s.mode == AgentSkillMode::Off).map(|s| s.skill.name.as_str()).collect();
let slash: Vec<&str> =
states.iter().filter(|s| s.mode == AgentSkillMode::SlashOnly).map(|s| s.skill.name.as_str()).collect();
let off: Vec<&str> = states
.iter()
.filter(|s| s.mode == AgentSkillMode::Off || (s.mode == AgentSkillMode::SlashOnly && !s.skill.user_invocable))
.map(|s| s.skill.name.as_str())
.collect();
let slash: Vec<&str> = states
.iter()
.filter(|s| s.mode == AgentSkillMode::SlashOnly && s.skill.user_invocable)
.map(|s| s.skill.name.as_str())
.collect();
if !off.is_empty() || !slash.is_empty() {
let mut overrides = serde_json::Map::new();
for (name, mode) in off.iter().map(|n| (*n, "off")).chain(slash.iter().map(|n| (*n, "user-invocable-only"))) {
@@ -469,32 +659,93 @@ pub fn stage(
Ok(out)
}
/// Claude Code sees this skill without the farm: its own `.claude/skills` of the working
/// directory (a worktree lacks the untracked originals) or the home.
/// Codex `[[skills.config]]` matches `path` against the canonical `SKILL.md` document path.
fn codex_skill_md_path(skill_dir: &Path) -> String {
let md = skill_dir.join("SKILL.md");
dunce::canonicalize(&md)
.or_else(|_| dunce::canonicalize(skill_dir).map(|dir| dir.join("SKILL.md")))
.unwrap_or(md)
.to_string_lossy()
.into_owned()
}
fn direct_link_matches(root: &Path, name: &str, target: &Path) -> bool {
let candidate = root.join(name);
candidate == target || dunce::canonicalize(&candidate).ok().as_deref() == Some(target)
}
/// Claude Code sees this skill without the farm when `<dir>/.claude/skills/<name>` in `cwd`
/// (or `~/.claude/skills/<name>`) already resolves to `skill.path` — including when `.claude/skills/<name>`
/// is a symlink to `.agents/skills/<name>`. Category-nested skills are not direct children, so
/// they still get staged flat into the farm.
fn native_claude(skill: &AgentSkill, cwd: &Path, home: Option<&Path>) -> bool {
let target = skill.path.0.as_path();
let home_canon = home.map(|h| dunce::canonicalize(h).unwrap_or_else(|_| h.to_path_buf()));
for ancestor in cwd.ancestors() {
if home_canon.as_deref().is_some_and(|h| h == ancestor) {
break;
}
if direct_link_matches(&ancestor.join(".claude/skills"), &skill.name, target) {
return true;
}
}
if let Some(h) = home_canon.as_deref()
&& direct_link_matches(&h.join(".claude/skills"), &skill.name, target)
{
return true;
}
match skill.source {
AgentSkillSource::ClaudeWorkspace => is_under(skill.path.0.as_path(), cwd),
AgentSkillSource::ClaudeUser => home.is_some_and(|h| is_under(skill.path.0.as_path(), &h.join(".claude"))),
AgentSkillSource::ClaudeWorkspace => target.parent() == Some(cwd.join(".claude/skills").as_path()),
AgentSkillSource::ClaudeUser => {
home_canon.as_deref().is_some_and(|h| target.parent() == Some(h.join(".claude/skills").as_path()))
}
_ => false,
}
}
/// Copilot reads the repository's `.github/skills` and the home's `.copilot` itself.
/// Copilot natively scans `.github/skills`, `.agents/skills` and `.claude/skills` in `cwd`,
/// plus `~/.copilot` and `~/.agents/skills` in `home`. `.openidea/skills` is NOT native.
fn native_copilot(skill: &AgentSkill, cwd: &Path, home: Option<&Path>) -> bool {
match skill.source {
AgentSkillSource::GithubWorkspace => is_under(skill.path.0.as_path(), cwd),
AgentSkillSource::CopilotUser => home.is_some_and(|h| is_under(skill.path.0.as_path(), &h.join(".copilot"))),
_ => false,
let target = skill.path.0.as_path();
for rel in [".github/skills", ".agents/skills", ".claude/skills"] {
let root = cwd.join(rel);
if is_under(target, &root) || direct_link_matches(&root, &skill.name, target) {
return true;
}
}
if let Some(h) = home {
let h = dunce::canonicalize(h).unwrap_or_else(|_| h.to_path_buf());
if is_under(target, &h.join(".copilot"))
|| is_under(target, &h.join(".agents/skills"))
|| direct_link_matches(&h.join(".copilot/skills"), &skill.name, target)
|| direct_link_matches(&h.join(".agents/skills"), &skill.name, target)
{
return true;
}
}
false
}
/// Codex reads its own folders itself.
/// Codex natively scans `.codex/skills` and `.agents/skills` in `cwd` and `home`.
fn native_codex(skill: &AgentSkill, cwd: &Path, home: Option<&Path>) -> bool {
match skill.source {
AgentSkillSource::CodexWorkspace => is_under(skill.path.0.as_path(), cwd),
AgentSkillSource::CodexUser => home.is_some_and(|h| is_under(skill.path.0.as_path(), &h.join(".codex"))),
_ => false,
let target = skill.path.0.as_path();
for rel in [".codex/skills", ".agents/skills"] {
let root = cwd.join(rel);
if is_under(target, &root) || direct_link_matches(&root, &skill.name, target) {
return true;
}
}
if let Some(h) = home {
let h = dunce::canonicalize(h).unwrap_or_else(|_| h.to_path_buf());
if is_under(target, &h.join(".codex/skills"))
|| is_under(target, &h.join(".agents/skills"))
|| direct_link_matches(&h.join(".codex/skills"), &skill.name, target)
|| direct_link_matches(&h.join(".agents/skills"), &skill.name, target)
{
return true;
}
}
false
}
fn is_under(path: &Path, root: &Path) -> bool {
@@ -553,21 +804,48 @@ fn sanitized(id: &str) -> String {
id.chars().filter(|c| c.is_ascii_alphanumeric() || *c == '-').collect()
}
/// The `/` menu's skills: the active ones as commands (the agent's own listing wins on a
/// name clash). `Off` ones drop out everywhere; an ACP agent gets no other enforcement, so
/// `slashOnly` ones stay listed — there is nothing to hold them back with.
fn bare_skill_name(name: &str) -> String {
name.trim_start_matches('$').to_ascii_lowercase()
}
/// The `/` menu's skills: active user-invocable skills as commands (the agent's own listing
/// wins on a name clash, including Codex's `$name` spelling). `Off` and `user-invocable: false`
/// skills are actively stripped from `offered` too, so previously cached or CLI-advertised
/// entries cannot leak back into OpenIDEA's `/` completion.
pub fn menu_commands(offered: Vec<AgentCommand>, states: &[AgentSkillState]) -> Vec<AgentCommand> {
let extra = states
let blocked: HashSet<String> = states
.iter()
.filter(|s| s.mode != AgentSkillMode::Off)
.map(|s| AgentCommand {
name: s.skill.name.clone(),
description: s.skill.description.clone(),
hint: None,
source: AgentCommandSource::Skill,
})
.filter(|s| s.mode == AgentSkillMode::Off || !s.skill.user_invocable)
.map(|s| bare_skill_name(&s.skill.name))
.collect();
merge(offered, extra)
let mut out: Vec<AgentCommand> =
offered.into_iter().filter(|c| !blocked.contains(&bare_skill_name(&c.name))).collect();
for state in states {
if state.mode == AgentSkillMode::Off
|| !state.skill.user_invocable
|| (file_name(&state.skill.path.0).as_deref() == Some("skills") && !state.skill.valid)
{
continue;
}
let target = bare_skill_name(&state.skill.name);
if let Some(existing) = out.iter_mut().find(|c| bare_skill_name(&c.name) == target) {
existing.source = AgentCommandSource::Skill;
if existing.hint.is_none() {
existing.hint = state.skill.hint.clone();
}
if existing.description.is_empty() {
existing.description = state.skill.description.clone();
}
} else {
out.push(AgentCommand {
name: state.skill.name.clone(),
description: state.skill.description.clone(),
hint: state.skill.hint.clone(),
source: AgentCommandSource::Skill,
});
}
}
out
}
#[cfg(test)]
@@ -708,8 +986,12 @@ mod tests {
AgentSkill {
name: name.into(),
description: format!("{name} does things"),
hint: None,
path: root.join(name).into(),
source,
also_in: Vec::new(),
user_invocable: true,
disable_model_invocation: false,
valid: true,
warnings: Vec::new(),
}
@@ -857,7 +1139,16 @@ mod tests {
true,
);
// Local (non-worktree) session: the project's GitHub skills are Copilot's own.
//For a local session, `.github/skills`, `.agents/skills` and `~/.agents/skills` are
// already scanned natively by Copilot; `.openidea/skills` and `~/.codex/skills` are staged.
let mut states = states;
std::fs::create_dir_all(repo.join(".openidea/skills/ideonly")).unwrap();
states.push(AgentSkillState {
skill: skill("ideonly", AgentSkillSource::Workspace, &repo.join(".openidea/skills")),
mode: AgentSkillMode::Auto,
origin: AgentSkillOrigin::None,
});
let farm = farm_dir(&root.join("store"), "task-1");
let delivery = stage(&farm, "claude", &states, &repo, Some(&home)).unwrap();
assert_eq!(delivery.claude_add_dir.as_deref(), Some(farm.as_path()));
@@ -865,7 +1156,7 @@ mod tests {
let staged = listed(&claude_tree);
assert_eq!(
staged,
["codexy", "gh", "lint", "muted", "tdd"],
["codexy", "gh", "ideonly", "lint", "muted", "tdd"],
"everything but the off one: none is native to Claude here, and slash-only needs the folder"
);
@@ -873,18 +1164,31 @@ mod tests {
assert_eq!(delivery.copilot_skill_directories, [farm.join("copilot").to_string_lossy().into_owned()]);
assert_eq!(delivery.copilot_disabled_skills, ["muted", "off"]);
let copilot_staged = listed(&farm.join("copilot"));
assert_eq!(copilot_staged, ["codexy", "lint", "tdd"], "`gh` is native to a local Copilot session");
assert_eq!(
copilot_staged,
["codexy", "ideonly"],
"`gh` (.github), `tdd` (.agents) and `lint` (~/.agents) are native to Copilot; `.openidea` & `~/.codex` are staged"
);
assert_eq!(
delivery.codex_off,
[("off".to_owned(), repo.join(".agents/skills").join("off").to_string_lossy().into_owned())]
[
(
"muted".to_owned(),
home.join(".agents").join("skills").join("muted").join("SKILL.md").to_string_lossy().into_owned(),
),
(
"off".to_owned(),
repo.join(".agents").join("skills").join("off").join("SKILL.md").to_string_lossy().into_owned(),
),
]
);
// A worktree task: the repo's skills are untracked, so nothing is native any more.
// A worktree task: the repo's skills are untracked, so workspace skills are staged now.
let worktree = root.join("wt");
std::fs::create_dir_all(&worktree).unwrap();
let _ = stage(&farm, "copilot", &states, &worktree, Some(&home)).unwrap();
let copilot_staged = listed(&farm.join("copilot"));
assert!(copilot_staged.contains(&"gh".to_string()));
assert!(copilot_staged.contains(&"gh".to_string()) && copilot_staged.contains(&"tdd".to_string()));
// Slash-only reaches Claude as `user-invocable-only`, off as `off`.
let delivery = stage(&farm, "claude", &states, &repo, Some(&home)).unwrap();
@@ -902,7 +1206,7 @@ mod tests {
true,
);
stage(&farm, "claude", &restated, &repo, Some(&home)).unwrap();
assert_eq!(listed(&claude_tree), ["codexy", "gh", "muted", "tdd"]);
assert_eq!(listed(&claude_tree), ["codexy", "gh", "ideonly", "muted", "tdd"]);
assert!(home.join(".agents/skills/lint").is_dir());
assert!(farm.join("copilot").is_dir(), "restaging Claude's tree leaves Copilot's alone");
@@ -918,16 +1222,112 @@ mod tests {
#[test]
fn hub_menu_filters_off_and_keeps_the_agents_own() {
let root = PathBuf::from("/r");
let mut hidden = skill("bg-only", AgentSkillSource::Workspace, &root);
hidden.user_invocable = false;
let mut with_hint = skill("verify", AgentSkillSource::Workspace, &root);
with_hint.hint = Some("[flow]".into());
with_hint.path = tempfile::tempdir().unwrap().path().to_path_buf().into();
write(&with_hint.path.0.join("SKILL.md"), "---\nname: verify\ndescription: v\n---\n");
let states = resolve(
vec![skill("tdd", AgentSkillSource::Workspace, &root), skill("lint", AgentSkillSource::User, &root)],
vec![
skill("tdd", AgentSkillSource::Workspace, &root),
skill("lint", AgentSkillSource::User, &root),
hidden,
with_hint,
],
Some(&BTreeMap::from([("lint".to_owned(), AgentSkillMode::Off)])),
&BTreeMap::new(),
&BTreeMap::new(),
true,
);
let menu = menu_commands(vec![cmd("tdd", "from the agent itself")], &states);
assert_eq!(names(&menu), ["tdd"]);
assert_eq!(menu[0].description, "from the agent itself");
// Even when the agent itself (or cached `known_commands` / Codex `$lint`) already offered
// `lint` or `bg-only`, `menu_commands` strips them, and merges `$tdd` without duplicating `tdd`.
let offered = vec![
cmd("$tdd", "from codex itself"),
AgentCommand { source: AgentCommandSource::Skill, ..cmd("lint", "offered before turning off") },
cmd("$lint", "codex offered before turning off"),
AgentCommand { source: AgentCommandSource::Skill, ..cmd("bg-only", "model only") },
cmd("compact", "Compact context"),
];
let menu = menu_commands(offered, &states);
assert_eq!(names(&menu), ["$tdd", "compact", "verify"]);
assert_eq!(menu[0].description, "from codex itself");
assert_eq!(menu[0].source, AgentCommandSource::Skill);
assert_eq!(menu[2].hint.as_deref(), Some("[flow]"));
}
#[test]
fn hub_discovers_copilot_two_level_plugins_categories_monorepos_and_frontmatter_flags() {
let tmp = tempfile::tempdir().unwrap();
let root = dunce::canonicalize(tmp.path()).unwrap();
let home = root.join("home");
let ws_a = root.join("ws-a");
let ws_b = root.join("ws-b");
// Category subfolder in `.agents/skills/testing/coverage/SKILL.md`.
write(
&ws_a.join(".agents/skills/testing/coverage/SKILL.md"),
"---\nname: coverage\ndescription: Coverage workflow\nargument-hint: \"[pkg]\"\ndisable-model-invocation: true\n---\n",
);
// Nested monorepo subpackage `apps/web/.agents/skills/web-e2e/SKILL.md`.
write(
&ws_a.join("apps/web/.agents/skills/web-e2e/SKILL.md"),
"---\nname: web-e2e\ndescription: Web e2e\n---\n",
);
// Second workspace member root `ws-b`.
write(&ws_b.join(".agents/skills/deploy/SKILL.md"), "---\nname: deploy\ndescription: Deploy\n---\n");
// Misplaced top-level `SKILL.md` directly inside `.claude/skills/SKILL.md`.
write(&ws_a.join(".claude/skills/SKILL.md"), "---\nname: misplaced\ndescription: Wrong level\n---\n");
// Copilot 2-level marketplace & `_direct` plugins + disabled plugin in `config.json`.
write(
&home.join(".copilot/installed-plugins/awesome-copilot/db-tools/skills/pg-tune/SKILL.md"),
"---\nname: pg-tune\ndescription: Tune Postgres\n---\n",
);
write(
&home.join(".copilot/installed-plugins/_direct/muted-plug/skills/secret-op/SKILL.md"),
"---\nname: secret-op\ndescription: Disabled plugin skill\n---\n",
);
write(
&home.join(".copilot/config.json"),
"// Managed by Copilot CLI\n{\"installedPlugins\":[{\"name\":\"muted-plug\",\"enabled\":false,\"cache_path\":\"installed-plugins/_direct/muted-plug\"}]}\n",
);
#[cfg(unix)]
{
std::fs::create_dir_all(ws_a.join(".claude/skills")).unwrap();
std::os::unix::fs::symlink(
ws_a.join(".agents/skills/testing/coverage"),
ws_a.join(".claude/skills/coverage"),
)
.unwrap();
}
let found = discover_skills_in(&[ws_a.clone(), ws_b], Some(&home));
let by = |n: &str| found.iter().find(|s| s.name == n);
let cov = by("coverage").expect("category skill discovered");
assert_eq!(cov.hint.as_deref(), Some("[pkg]"));
assert!(cov.disable_model_invocation);
#[cfg(unix)]
assert_eq!(cov.also_in, [AgentSkillSource::ClaudeWorkspace]);
assert!(by("web-e2e").is_some(), "nested monorepo subpackage skill discovered");
assert!(by("deploy").is_some(), "second workspace member skill discovered");
assert!(by("pg-tune").is_some(), "2-level Copilot marketplace plugin skill discovered");
assert!(by("secret-op").is_none(), "disabled Copilot plugin skipped");
let misplaced = by("misplaced").expect("misplaced top-level SKILL.md surfaced");
assert!(!misplaced.valid && misplaced.warnings[0].contains("subfolder"));
// `disable-model-invocation: true` resolves to `SlashOnly` by default, and because
// `.claude/skills/coverage` symlinks to it in `ws_a`, Claude does not stage a duplicate.
let states = resolve(found, None, &BTreeMap::new(), &BTreeMap::new(), true);
let cov_state = states.iter().find(|s| s.skill.name == "coverage").unwrap();
assert_eq!(cov_state.mode, AgentSkillMode::SlashOnly);
#[cfg(unix)]
{
let farm = farm_dir(&root.join("store"), "task-symlink");
let _ = stage(&farm, "claude", &states, &ws_a, Some(&home)).unwrap();
let claude_staged = listed(&farm.join(".claude/skills"));
assert!(
!claude_staged.contains(&"coverage".to_string()),
"symlinked `.claude/skills/coverage` not duplicated"
);
}
}
}
+234 -240
Переглянути файл
@@ -986,7 +986,7 @@ async fn commands_are_remembered_per_project_and_merged_with_skills_on_disk() {
wait_for(&mgr_a, &task.id, AgentStatus::NeedsInput).await;
assert_eq!(names(mgr_a.commands("claude", None).await.unwrap()), ["review", "triage"]);
assert_eq!(names(mgr_a.commands("claude", Some(&task.id)).await.unwrap()), ["review", "triage"]);
// Other agents get only what they offered, plus verified native builtins.
// Other agents also receive the project's active skills from the skills hub, plus verified native builtins.
assert_eq!(
names(mgr_a.commands("codex", None).await.unwrap()),
[
@@ -1001,6 +1001,7 @@ async fn commands_are_remembered_per_project_and_merged_with_skills_on_disk() {
"goal",
"rename",
"logout",
"triage",
]
);
mgr_a.cancel(&task.id, None).unwrap();
@@ -1010,7 +1011,6 @@ async fn commands_are_remembered_per_project_and_merged_with_skills_on_disk() {
// Another project shares the settings but not the commands.
let mgr_b = manager_at(&b, &models, Arc::new(FakeAgent::default()));
let claude = mgr_b.providers().into_iter().find(|p| p.id == "claude").unwrap();
assert_eq!(claude.config.len(), 2);
assert!(claude.commands.is_empty());
assert!(mgr_b.commands("claude", None).await.unwrap().is_empty());
let mgr_a = manager_at(&a, &models, Arc::new(FakeAgent::default()));
@@ -1197,7 +1197,6 @@ async fn a_task_runs_asks_for_permission_and_survives_a_restart() {
}
let providers = mgr.providers();
let claude = providers.iter().find(|p| p.id == "claude").unwrap();
assert_eq!(claude.config.iter().map(|o| o.id.as_str()).collect::<Vec<_>>(), ["model", "mode"]);
assert_eq!(claude.commands.len(), 1);
// A new manager (IDE restart) finds the task and resumes its session without duplicating history.
@@ -1206,7 +1205,6 @@ async fn a_task_runs_asks_for_permission_and_survives_a_restart() {
let mgr2 = manager(tmp.path(), agent2.clone());
assert_eq!(mgr2.entries(&task.id, None).unwrap().len(), 5);
assert_eq!(mgr2.task(&task.id).unwrap().state.lock().task.title, "Lexer fix");
assert_eq!(mgr2.providers().iter().find(|p| p.id == "claude").unwrap().config.len(), 2);
mgr2.prompt(&task.id, text("again"), false).await.unwrap();
tokio::time::sleep(Duration::from_millis(50)).await;
wait_for(&mgr2, &task.id, AgentStatus::Ready).await;
@@ -2167,52 +2165,6 @@ async fn usage_limits_and_late_settings() {
assert!(agent.calls.lock().iter().any(|c| c == "session/set_config_option \"high\""));
let config = mgr.task(&task.id).unwrap().state.lock().task.config.clone();
assert_eq!(config.iter().find(|o| o.id == "effort").unwrap().current.as_deref(), Some("high"));
for _ in 0..100 {
if mgr
.shared
.known
.lock()
.get("claude")
.and_then(|k| k.thought_levels.get("big"))
.and_then(|levels| levels.first())
.and_then(|o| o.current.as_deref())
== Some("high")
{
break;
}
tokio::time::sleep(Duration::from_millis(10)).await;
}
assert_eq!(mgr.shared.known.lock()["claude"].thought_levels["big"][0].current.as_deref(), Some("high"));
}
#[tokio::test(flavor = "multi_thread")]
async fn remembered_settings_drop_per_model_choices_for_the_next_task() {
let tmp = tempfile::tempdir().unwrap();
let agent = Arc::new(FakeAgent::default());
// The effort list depends on the model: what the last session ran means nothing once
// the user picks another model, so provider-wide defaults never include it.
*agent.extra_options.lock() = vec![json!({"id": "effort", "category": "thought_level",
"type": "select", "currentValue": "high",
"options": [{"value": "low", "name": "Low"}, {"value": "high", "name": "High"}]})];
let mgr = manager(tmp.path(), agent.clone());
let task = mgr
.create(NewAgentTask {
project_root: None,
prompt: text("again"),
provider: "claude".into(),
config: vec![],
isolation: Isolation::Local,
base: None,
..Default::default()
})
.await
.unwrap();
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
let provider = mgr.providers().into_iter().find(|p| p.id == "claude").unwrap();
assert!(provider.config.iter().all(|o| o.id != "effort"), "a per-model option isn't offered stale");
let model = provider.config.iter().find(|o| o.id == "model").unwrap();
assert_eq!(model.current.as_deref(), Some("big"), "the model choice survives");
}
fn effort_options(levels: &[&str], current: &str) -> Vec<Value> {
@@ -2220,51 +2172,6 @@ fn effort_options(levels: &[&str], current: &str) -> Vec<Value> {
"options": levels.iter().map(|v| json!({"value": v, "name": v})).collect::<Vec<_>>()})]
}
#[tokio::test(flavor = "multi_thread")]
async fn thinking_levels_are_remembered_per_provider_and_model() {
let tmp = tempfile::tempdir().unwrap();
let agent = Arc::new(FakeAgent::default());
*agent.model_options.lock() = HashMap::from([
("big".into(), effort_options(&["low", "high"], "high")),
("small".into(), effort_options(&["minimal", "medium"], "minimal")),
("plain".into(), vec![]),
]);
let mgr = manager(tmp.path(), agent.clone());
let task = mgr
.create(NewAgentTask {
project_root: None,
prompt: text("again"),
provider: "claude".into(),
config: vec![],
isolation: Isolation::Local,
base: None,
..Default::default()
})
.await
.unwrap();
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
mgr.set_config(&task.id, "model", "small".into()).await.unwrap();
mgr.set_config(&task.id, "effort", "medium".into()).await.unwrap();
mgr.set_config(&task.id, "model", "plain".into()).await.unwrap();
let p = mgr.providers().into_iter().find(|p| p.id == "claude").unwrap();
let big = &p.thought_levels["big"][0];
assert_eq!(big.current.as_deref(), Some("high"));
assert_eq!(big.values.iter().map(|v| v.value.as_str()).collect::<Vec<_>>(), ["low", "high"]);
let small = &p.thought_levels["small"][0];
assert_eq!(small.current.as_deref(), Some("medium"));
assert_eq!(small.values.iter().map(|v| v.value.as_str()).collect::<Vec<_>>(), ["minimal", "medium"]);
assert!(p.thought_levels["plain"].is_empty());
assert!(!p.thought_levels.contains_key("unknown"));
assert!(mgr.providers().iter().find(|p| p.id == "codex").unwrap().thought_levels.is_empty());
let saved: HashMap<String, Known> =
serde_json::from_slice(&std::fs::read(&mgr.shared.paths.models_file).unwrap()).unwrap();
assert_eq!(saved["claude"].thought_levels, p.thought_levels);
mgr.shutdown();
let restored = manager(tmp.path(), agent);
assert_eq!(restored.providers().into_iter().find(|p| p.id == "claude").unwrap().thought_levels, p.thought_levels);
restored.shutdown();
}
#[tokio::test(flavor = "multi_thread")]
async fn changing_an_idle_tasks_settings_keeps_its_models_effort_levels() {
// Idle selections use cached model controls or discover them before the next prompt.
@@ -2303,12 +2210,9 @@ async fn changing_an_idle_tasks_settings_keeps_its_models_effort_levels() {
}
restored.set_config(&task.id, "model", "big".into()).await.unwrap();
restored.set_config(&task.id, option, value.into()).await.unwrap();
let p = restored.providers().into_iter().find(|p| p.id == "claude-acp").unwrap();
let big = p.thought_levels.get("big").and_then(|levels| levels.first());
assert_eq!(big.map(|o| o.values.len()), Some(2), "{option}: {:?}", p.thought_levels);
let saved: HashMap<String, Known> =
serde_json::from_slice(&std::fs::read(&restored.shared.paths.models_file).unwrap()).unwrap();
assert_eq!(saved["claude-acp"].thought_levels, p.thought_levels, "{option}");
let levels = restored.shared.paths.catalogs.cached(&restored.shared, "claude-acp").thought_levels;
let big = levels.get("big").and_then(|levels| levels.first());
assert_eq!(big.map(|o| o.values.len()), Some(2), "{option}: {levels:?}");
restored.shutdown();
}
}
@@ -2541,100 +2445,6 @@ async fn upfront_effort_is_validated_after_changing_model_before_the_prompt() {
}
}
#[tokio::test(flavor = "multi_thread")]
async fn unreported_model_switch_does_not_cache_the_previous_models_levels() {
let tmp = tempfile::tempdir().unwrap();
let agent = Arc::new(FakeAgent::default());
*agent.extra_options.lock() = effort_options(&["low", "high"], "high");
let mgr = manager(tmp.path(), agent);
let task = mgr
.create(NewAgentTask {
project_root: None,
prompt: text("again"),
provider: "claude".into(),
config: vec![],
isolation: Isolation::Local,
base: None,
..Default::default()
})
.await
.unwrap();
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
mgr.set_config(&task.id, "model", "small".into()).await.unwrap();
let p = mgr.providers().into_iter().find(|p| p.id == "claude").unwrap();
assert!(!p.thought_levels.contains_key("small"));
assert_eq!(p.thought_levels["big"][0].current.as_deref(), Some("high"));
mgr.shutdown();
}
#[tokio::test(flavor = "multi_thread")]
async fn cached_effort_is_not_sent_without_real_session_options() {
let tmp = tempfile::tempdir().unwrap();
let agent = Arc::new(FakeAgent::default());
*agent.extra_options.lock() = effort_options(&["low", "high"], "low");
let mgr = manager(tmp.path(), agent.clone());
let new = |config| NewAgentTask {
project_root: None,
prompt: text("again"),
provider: "claude".into(),
config,
isolation: Isolation::Local,
base: None,
..Default::default()
};
let warm = mgr.create(new(vec![])).await.unwrap();
wait_for(&mgr, &warm.id, AgentStatus::Ready).await;
agent.calls.lock().clear();
agent.empty_config.store(true, Ordering::Release);
let task = mgr
.create(new(vec![
AgentConfigChoice { id: "model".into(), value: "big".into() },
AgentConfigChoice { id: "effort".into(), value: "high".into() },
]))
.await
.unwrap();
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
assert!(!agent.calls.lock().iter().any(|c| c == "session/set_config_option \"high\""));
assert!(
mgr.task(&task.id).unwrap().state.lock().task.config.iter().any(|o| o.id == "effort"),
"remembered session settings remain visible until the agent refreshes them"
);
mgr.shutdown();
}
#[tokio::test(flavor = "multi_thread")]
async fn reported_levels_refresh_even_without_a_model_option() {
let tmp = tempfile::tempdir().unwrap();
let agent = Arc::new(FakeAgent::default());
*agent.extra_options.lock() = effort_options(&["low", "high"], "high");
let mgr = manager(tmp.path(), agent.clone());
let task = mgr
.create(NewAgentTask {
project_root: None,
prompt: text("again"),
provider: "claude".into(),
config: vec![],
isolation: Isolation::Local,
base: None,
..Default::default()
})
.await
.unwrap();
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
for levels in [effort_options(&["minimal", "medium"], "medium"), vec![]] {
agent.update("s1", json!({"sessionUpdate": "config_option_update", "configOptions": levels}));
let expected = config::parse_options(&json!(levels));
for _ in 0..100 {
if mgr.shared.known.lock()["claude"].thought_levels["big"] == expected {
break;
}
tokio::time::sleep(Duration::from_millis(10)).await;
}
assert_eq!(mgr.shared.known.lock()["claude"].thought_levels["big"], expected);
}
mgr.shutdown();
}
#[test]
fn retry_updates_become_a_countdown() {
let update =
@@ -3192,49 +3002,6 @@ async fn a_failed_probe_is_retried_instead_of_remembered() {
assert!(!mgr.shared.probes.lock().contains_key("claude"));
}
/// A session report that changes the cached provider config notifies subscribers,
/// so the composer re-lists models without waiting for the next task (#1490).
/// Reports that change nothing stay silent.
#[tokio::test(flavor = "multi_thread")]
async fn remembered_config_changes_notify_subscribers_once() {
let tmp = tempfile::tempdir().unwrap();
let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
let events = Arc::new(Mutex::new(Vec::new()));
let sink = events.clone();
mgr.subscribe(Arc::new(move |e| sink.lock().push(e)));
events.lock().clear();
let reported = config::options_of(&json!({ "configOptions": [
{ "id": "model", "category": "model", "type": "select", "currentValue": "default",
"options": [{ "value": "default" }, { "value": "custom-opus" }] },
] }));
mgr.shared.remember("claude", Some(&reported), None, Some("default"));
assert!(
events.lock().iter().any(|ev| matches!(ev, AgentEvent::Providers)),
"a first report changing the cache notifies subscribers"
);
events.lock().clear();
// The same report again: the cache is unchanged, so subscribers hear nothing.
mgr.shared.remember("claude", Some(&reported), None, Some("default"));
assert!(events.lock().is_empty(), "an unchanged report must stay silent");
// A changed model list notifies again, and providers() serves the new list.
let updated = config::options_of(&json!({ "configOptions": [
{ "id": "model", "category": "model", "type": "select", "currentValue": "default",
"options": [{ "value": "default" }, { "value": "custom-opus" }, { "value": "custom-sonnet" }] },
] }));
mgr.shared.remember("claude", Some(&updated), None, Some("default"));
assert!(
events.lock().iter().any(|ev| matches!(ev, AgentEvent::Providers)),
"a changed model list notifies subscribers"
);
let claude = mgr.providers().into_iter().find(|p| p.id == "claude").unwrap();
let model = claude.config.iter().find(|o| o.category.as_deref() == Some("model")).unwrap();
let values: Vec<_> = model.values.iter().map(|v| v.value.as_str()).collect();
assert_eq!(values, ["default", "custom-opus", "custom-sonnet"]);
}
#[tokio::test(flavor = "multi_thread")]
async fn idle_agents_stop_and_resume_their_session_on_the_next_message() {
let new = || NewAgentTask {
@@ -3868,6 +3635,123 @@ async fn turn_changed(mgr: &AgentManager, id: &str) -> Vec<(String, ide_vcs::Cha
changes.into_iter().map(|c| (c.rel_path, c.kind, c.added, c.removed)).collect()
}
#[tokio::test(flavor = "multi_thread")]
async fn a_task_lists_what_it_changed_in_a_nested_repository() {
let tmp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(tmp.path()).unwrap();
let root = base.join("project");
for repo in [root.clone(), root.join("libs/validation")] {
std::fs::create_dir_all(&repo).unwrap();
std::fs::write(repo.join("a.txt"), "one\n").unwrap();
for args in [&["init", "-q", "-b", "main"][..], &["add", "a.txt"], &["commit", "-q", "-m", "init"]] {
let ok = std::process::Command::new("git")
.args(["-c", "user.name=t", "-c", "user.email=t@t", "-c", "commit.gpgsign=false"])
.args(args)
.current_dir(&repo)
.status()
.unwrap()
.success();
assert!(ok, "{args:?}");
}
}
let mgr = manager(&base.join("ide"), Arc::new(FakeAgent::default()));
let task = mgr
.create(NewAgentTask {
project_root: Some(IpcPath(root.clone())),
prompt: text("Hello"),
provider: "claude".into(),
isolation: Isolation::Local,
..Default::default()
})
.await
.unwrap();
one_turn(&mgr, &task.id, None, || {
std::fs::write(root.join("a.txt"), "two\n").unwrap();
std::fs::write(root.join("libs/validation/b.txt"), "new\n").unwrap();
})
.await;
let changed: Vec<(String, Option<IpcPath>)> =
mgr.changes(&task.id).await.unwrap().into_iter().map(|c| (c.rel_path, c.repo)).collect();
assert_eq!(
changed,
[
("a.txt".to_owned(), Some(IpcPath(root.clone()))),
("libs/validation/b.txt".to_owned(), Some(IpcPath(root.join("libs/validation")))),
]
);
mgr.rollback_changes(&task.id, None, AgentChangesView::SinceStart).await.unwrap();
assert_eq!(std::fs::read_to_string(root.join("a.txt")).unwrap(), "one\n");
assert!(!root.join("libs/validation/b.txt").exists());
mgr.shutdown();
}
#[tokio::test(flavor = "multi_thread")]
async fn the_last_turn_of_a_task_spans_nested_repositories() {
use ide_vcs::ChangeKind::{Added, Modified};
let tmp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(tmp.path()).unwrap();
let root = base.join("project");
let nested = root.join("libs/validation");
let git = |repo: &Path, args: &[&str]| {
let ok = std::process::Command::new("git")
.args(["-c", "user.name=t", "-c", "user.email=t@t", "-c", "commit.gpgsign=false"])
.args(args)
.current_dir(repo)
.status()
.unwrap()
.success();
assert!(ok, "{args:?}");
};
for repo in [&root, &nested] {
std::fs::create_dir_all(repo).unwrap();
std::fs::write(repo.join("a.txt"), "one\n").unwrap();
git(repo, &["init", "-q", "-b", "main"]);
git(repo, &["add", "a.txt"]);
git(repo, &["commit", "-q", "-m", "init"]);
}
let mgr = manager(&base.join("ide"), Arc::new(FakeAgent::default()));
let task = mgr
.create(NewAgentTask {
project_root: Some(IpcPath(root.clone())),
prompt: text("Hello"),
provider: "claude".into(),
isolation: Isolation::Local,
..Default::default()
})
.await
.unwrap();
one_turn(&mgr, &task.id, None, || std::fs::write(root.join("a.txt"), "two\n").unwrap()).await;
one_turn(&mgr, &task.id, Some("more"), || {
std::fs::write(nested.join("a.txt"), "two\n").unwrap();
std::fs::write(nested.join("b.txt"), "new\n").unwrap();
// Committed in the nested repository: still the turn's.
std::fs::write(nested.join("c.txt"), "committed\n").unwrap();
git(&nested, &["add", "c.txt"]);
git(&nested, &["commit", "-q", "-m", "c"]);
})
.await;
// Only the second turn's files, from the nested repository, named from the project.
assert_eq!(
turn_changed(&mgr, &task.id).await,
[
("libs/validation/a.txt".into(), Modified, 1, 1),
("libs/validation/b.txt".into(), Added, 1, 0),
("libs/validation/c.txt".into(), Added, 1, 0),
]
);
let repos: Vec<_> = mgr.turn_changes(&task.id).await.unwrap().into_iter().map(|c| c.repo).collect();
assert_eq!(repos, [Some(IpcPath(nested.clone())), Some(IpcPath(nested.clone())), Some(IpcPath(nested.clone()))]);
let then = mgr.base_text(&task.id, nested.join("a.txt"), AgentChangesView::LastTurn).await.unwrap();
assert_eq!(then.as_deref(), Some("one\n"));
mgr.rollback_changes(&task.id, None, AgentChangesView::LastTurn).await.unwrap();
assert_eq!(std::fs::read_to_string(nested.join("a.txt")).unwrap(), "one\n");
assert!(!nested.join("b.txt").exists());
assert_eq!(std::fs::read_to_string(root.join("a.txt")).unwrap(), "two\n", "the first turn's change stays");
mgr.shutdown();
}
#[tokio::test(flavor = "multi_thread")]
async fn the_last_turn_lists_and_rolls_back_only_its_own_changes() {
use ide_vcs::ChangeKind::{Added, Deleted, Modified};
@@ -4560,6 +4444,83 @@ async fn per_session_mcp_overrides_filter_session_and_reload_when_idle() {
mgr.shutdown();
}
#[tokio::test(flavor = "multi_thread")]
async fn per_session_skill_overrides_filter_commands_persist_and_reload_when_idle() {
let tmp = tempfile::tempdir().unwrap();
let root = tmp.path();
std::fs::create_dir_all(root.join(".agents/skills/tdd")).unwrap();
std::fs::write(root.join(".agents/skills/tdd/SKILL.md"), "---\nname: tdd\ndescription: TDD\n---\n").unwrap();
std::fs::create_dir_all(root.join(".claude/skills/noisy")).unwrap();
std::fs::write(root.join(".claude/skills/noisy/SKILL.md"), "---\nname: noisy\ndescription: Noisy\n---\n").unwrap();
let agent = Arc::new(FakeAgent::default());
let mgr = manager(root, agent.clone());
mgr.set_skills_policy_hook(Box::new({
let root = root.to_path_buf();
move || SkillsPolicy {
user: BTreeMap::from([("tdd".into(), AgentSkillPolicy { mode: AgentSkillMode::Off })]),
workspace: BTreeMap::new(),
workspace_trusted: true,
workspace_roots: vec![root.clone()],
}
}));
// Start task with `tdd` (default off) enabled for this session and `noisy` turned off.
let task = mgr
.create(NewAgentTask {
project_root: None,
prompt: text("again"),
provider: "claude".into(),
config: Vec::new(),
isolation: Isolation::Local,
base: None,
mcp_overrides: BTreeMap::new(),
idle: false,
skill_overrides: BTreeMap::from([
("tdd".into(), AgentSkillMode::Auto),
("noisy".into(), AgentSkillMode::Off),
]),
})
.await
.unwrap();
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
let cmd_names: Vec<String> =
mgr.commands("claude", Some(&task.id)).await.unwrap().into_iter().map(|c| c.name).collect();
assert!(cmd_names.contains(&"tdd".to_string()), "{cmd_names:?}");
assert!(
!cmd_names.contains(&"noisy".to_string()),
"`noisy` offered on disk must be stripped when off: {cmd_names:?}"
);
// Flip overrides while idle -> recycles resumable session so next turn calls `session/load`.
let updated = mgr
.set_skill_overrides(
&task.id,
BTreeMap::from([("tdd".into(), AgentSkillMode::Off), ("noisy".into(), AgentSkillMode::Auto)]),
)
.unwrap();
assert_eq!(updated.skill_overrides.get("tdd"), Some(&AgentSkillMode::Off));
assert_eq!(updated.skill_overrides.get("noisy"), Some(&AgentSkillMode::Auto));
let cmd_names_after: Vec<String> =
mgr.commands("claude", Some(&task.id)).await.unwrap().into_iter().map(|c| c.name).collect();
assert!(!cmd_names_after.contains(&"tdd".to_string()), "{cmd_names_after:?}");
assert!(cmd_names_after.contains(&"noisy".to_string()), "{cmd_names_after:?}");
mgr.prompt(&task.id, text("again"), false).await.unwrap();
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
assert_eq!(agent.mcp_calls.lock().last().map(|c| c.0.as_str()), Some("session/load"));
mgr.shutdown();
// Persisted task file preserves `skill_overrides` across restart.
let restored_mgr = manager(root, Arc::new(FakeAgent::default()));
let restored = restored_mgr.subscribe(Arc::new(|_| {})).into_iter().find(|t| t.id == task.id).unwrap();
assert_eq!(restored.skill_overrides.get("tdd"), Some(&AgentSkillMode::Off));
assert_eq!(restored.skill_overrides.get("noisy"), Some(&AgentSkillMode::Auto));
restored_mgr.shutdown();
}
#[tokio::test(flavor = "multi_thread")]
async fn copilot_falls_back_to_acp_when_headless_probe_session_or_prompt_fails() {
#[derive(Clone, Copy)]
@@ -4766,10 +4727,43 @@ done
#[test]
fn session_params_name_the_servers_off() {
let mcp = McpForSession { servers: vec![json!({ "name": "docs" })], off: vec!["github".into()] };
let params = session_params("/p", &mcp, None);
let params = session_params("/p", &mcp, None, &[]);
assert_eq!(params["cwd"], "/p");
assert_eq!(params["mcpServers"][0]["name"], "docs");
assert_eq!(params["_meta"]["openidea"]["mcpServersOff"], json!(["github"]));
let none = McpForSession { servers: Vec::new(), off: Vec::new() };
assert!(session_params("/p", &none, None).get("_meta").is_none());
assert!(session_params("/p", &none, None, &[]).get("_meta").is_none());
}
#[test]
fn session_params_offer_the_workspace_roots() {
let none = McpForSession { servers: Vec::new(), off: Vec::new() };
let params = session_params("/w/api", &none, None, &["/w/web".to_owned()]);
assert_eq!(params["additionalDirectories"], json!(["/w/web"]));
assert!(session_params("/w/api", &none, None, &[]).get("additionalDirectories").is_none());
}
#[tokio::test]
async fn workspace_roots_go_to_agents_that_take_them() {
let tmp = tempfile::tempdir().unwrap();
let [api, web, worktree] = ["api", "web", "worktree"].map(|d| tmp.path().join(d));
for d in [&api, &web, &worktree] {
std::fs::create_dir_all(d).unwrap();
}
let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
let hook_roots = [api.clone(), web.clone(), web.clone()];
mgr.set_workspace_roots_hook(Arc::new(move || hook_roots.to_vec()));
let init = |capabilities: Value| acp::Negotiated {
generation: 1,
capabilities,
agent_info: None,
auth_methods: Vec::new(),
meta: None,
};
let takes = init(json!({ "sessionCapabilities": { "additionalDirectories": {} } }));
let web = dunce::canonicalize(&web).unwrap().to_string_lossy().into_owned();
assert_eq!(mgr.shared.additional_directories(&takes, &api, None), vec![web.clone()]);
// A task in a worktree of `api` isn't offered the project's own checkout.
assert_eq!(mgr.shared.additional_directories(&takes, &worktree, Some(&api)), vec![web]);
assert!(mgr.shared.additional_directories(&init(json!({})), &api, None).is_empty());
}
+238 -30
Переглянути файл
@@ -25,6 +25,98 @@ fn discover(path: &Path) -> IdeResult<Option<Repo>> {
Ok(repo)
}
/// The repositories of a project with nested ones (an own `.git` under the project root, not a
/// submodule), with the folder their files are named from: the root of the repository holding
/// `cwd`, else `cwd`. `None` when only the repository holding `cwd` (if any) is there.
fn nested_repos(cwd: &Path) -> IdeResult<Option<(PathBuf, Vec<Repo>)>> {
let Ok(cwd) = dunce::canonicalize(cwd) else { return Ok(None) };
let found = ide_vcs::Repos::discover(&cwd, &|_| false)?;
if found.all().iter().all(|r| cwd.starts_with(r.root())) {
return Ok(None);
}
let base = found.all().iter().map(|r| r.root()).filter(|r| cwd.starts_with(r)).max().unwrap_or(&cwd).to_path_buf();
let mut repos = Vec::new();
for r in found.all() {
repos.extend(discover(r.root())?);
}
Ok(Some((base, repos)))
}
/// Whether the project at `cwd` holds repositories nested in it: its changes are each one's.
pub(crate) fn spans_repos(cwd: &Path) -> bool {
nested_repos(cwd).is_ok_and(|r| r.is_some())
}
/// The repositories a turn's files are in, and the folder those files are named from.
struct TurnRepos {
base: PathBuf,
repos: Vec<Repo>,
/// The project holds nested repositories: each one's `HEAD` is recorded on its own.
nested: bool,
}
impl TurnRepos {
fn of(cwd: &Path) -> IdeResult<Option<Self>> {
if let Some((base, repos)) = nested_repos(cwd)? {
return Ok(Some(Self { base, repos, nested: true }));
}
Ok(discover(cwd)?.map(|repo| Self { base: repo.root().to_path_buf(), repos: vec![repo], nested: false }))
}
/// The innermost repository holding `path`.
fn owner(&self, path: &Path) -> Option<&Repo> {
self.repos.iter().filter(|r| path.starts_with(r.root())).max_by_key(|r| r.root().as_os_str().len())
}
/// `repo`'s `HEAD` as the turn `start` began.
fn head_then<'a>(&self, start: &'a TurnStart, repo: &Repo) -> Option<&'a str> {
if self.nested { start.heads.get(&root_key(repo.root())) } else { start.head.as_ref() }.map(String::as_str)
}
}
fn root_key(root: &Path) -> String {
root.to_string_lossy().into_owned()
}
/// `path` as a task in `base` names it, if it is not in a repository nested below `repo` (that
/// one lists it itself; to `repo` its folder is untracked).
fn nested_rel(base: &Path, repo: &Repo, roots: &[PathBuf], path: &Path) -> Option<String> {
let rel = path.strip_prefix(base).ok()?;
if path.is_dir()
|| roots.iter().any(|n| n.as_path() != repo.root() && n.starts_with(repo.root()) && path.starts_with(n))
{
return None;
}
Some(rel.to_string_lossy().replace('\\', "/"))
}
/// The uncommitted changes in every repository of the project, against each one's `HEAD`.
fn nested_changes(cwd: &Path) -> IdeResult<Vec<AgentChange>> {
let Some((base, repos)) = nested_repos(cwd)? else { return Ok(Vec::new()) };
let roots: Vec<PathBuf> = repos.iter().map(|r| r.root().to_path_buf()).collect();
let mut out: Vec<AgentChange> = Vec::new();
for repo in &repos {
let listed = match repo.head()?.1 {
Some(head) => changes(repo.root(), &head)?,
None => {
repo.status()?.into_iter().filter(|s| s.path.is_file()).map(|s| added(s.path, s.rel_path)).collect()
}
};
for mut c in listed {
let Some(rel) = nested_rel(&base, repo, &roots, &c.path.0) else { continue };
if out.iter().any(|o| o.path == c.path) {
continue;
}
c.rel_path = rel;
c.old_path = None;
c.repo = Some(IpcPath(repo.root().to_path_buf()));
out.push(c);
}
}
out.sort_by(|a, b| a.rel_path.cmp(&b.rel_path));
Ok(out)
}
fn repo_at(path: &Path) -> IdeResult<Repo> {
discover(path)?.ok_or_else(|| IdeError::unavailable(format!("{} is not in a git repository", path.display())))
}
@@ -38,6 +130,9 @@ pub(crate) fn head_of(path: &Path) -> IdeResult<(String, String)> {
/// `HEAD`'s commit in `cwd`, `None` outside a repository or before its first commit.
pub(crate) fn head_commit(cwd: &Path) -> IdeResult<Option<String>> {
if spans_repos(cwd) {
return Ok(Some("HEAD".to_owned()));
}
match discover(cwd)? {
Some(repo) => Ok(repo.head()?.1),
None => Ok(None),
@@ -127,6 +222,7 @@ pub(crate) fn changes(cwd: &Path, base: &str) -> IdeResult<Vec<AgentChange>> {
added,
removed,
old_path: f.old_path,
repo: None,
}
})
.collect();
@@ -143,6 +239,9 @@ pub(crate) fn changes(cwd: &Path, base: &str) -> IdeResult<Vec<AgentChange>> {
/// Files renamed since `rev`, by their new repository-relative path: the old path, as a deletion
/// to roll back along with the rename.
pub(crate) fn rename_sources(cwd: &Path, rev: &str) -> IdeResult<BTreeMap<String, AgentChange>> {
if spans_repos(cwd) {
return Ok(BTreeMap::new());
}
let Some(repo) = discover(cwd)? else { return Ok(BTreeMap::new()) };
let root = repo.root().to_path_buf();
Ok(repo
@@ -157,6 +256,7 @@ pub(crate) fn rename_sources(cwd: &Path, rev: &str) -> IdeResult<BTreeMap<String
added: 0,
removed: 0,
old_path: None,
repo: None,
};
Some((f.path, source))
})
@@ -165,7 +265,7 @@ pub(crate) fn rename_sources(cwd: &Path, rev: &str) -> IdeResult<BTreeMap<String
fn added(path: IpcPath, rel_path: String) -> AgentChange {
let added = std::fs::read_to_string(&*path).map_or(0, |t| t.lines().count() as u32);
AgentChange { path, rel_path, kind: ChangeKind::Added, added, removed: 0, old_path: None }
AgentChange { path, rel_path, kind: ChangeKind::Added, added, removed: 0, old_path: None, repo: None }
}
/// The commits from `base` (exclusive) to `head` (inclusive) in `cwd`, newest first, each
@@ -201,6 +301,7 @@ pub(crate) fn commits(cwd: &Path, base: &str, head: &str) -> IdeResult<Vec<Agent
added,
removed,
old_path: f.old_path,
repo: None,
}
})
.collect();
@@ -266,6 +367,9 @@ impl TaskBase {
pub(crate) fn changes(&self, before: &BTreeMap<String, Stamp>) -> IdeResult<Vec<AgentChange>> {
let (cwd, start) = match self {
Self::Worktree { cwd, base } => return Ok(without_untouched(changes(cwd, base)?, before)),
Self::Local { cwd, .. } if spans_repos(cwd) => {
return Ok(without_untouched(nested_changes(cwd)?, before));
}
Self::Local { cwd, start } => (cwd, start.as_deref()),
};
let Some(repo) = discover(cwd)? else { return Ok(Vec::new()) };
@@ -324,6 +428,9 @@ impl TaskBase {
/// reads cannot put a file in both lists.
pub(crate) fn grouped_changes(&self, before: &BTreeMap<String, Stamp>) -> IdeResult<AgentChanges> {
let cwd = self.cwd();
if spans_repos(cwd) {
return Ok(AgentChanges { uncommitted: self.changes(before)?, commits: Vec::new() });
}
let Some(repo) = discover(cwd)? else { return Ok(AgentChanges::default()) };
let head = repo.head()?.1;
let uncommitted = match &head {
@@ -353,6 +460,8 @@ impl TaskBase {
pub(crate) fn rev(&self) -> IdeResult<Option<String>> {
let (cwd, start) = match self {
Self::Worktree { base, .. } => return Ok(Some(base.clone())),
// Each repository goes back to its own `HEAD`.
Self::Local { cwd, .. } if spans_repos(cwd) => return Ok(Some("HEAD".to_owned())),
Self::Local { cwd, start } => (cwd, start.as_deref()),
};
let Some(repo) = discover(cwd)? else { return Ok(None) };
@@ -545,6 +654,18 @@ pub(crate) fn stamp(path: &Path) -> Stamp {
pub(crate) fn snapshot(cwd: &Path) -> IdeResult<BTreeMap<String, Stamp>> {
// Paths and stamps only: no diff and no line counts, which read every untracked file
// and held up starting a task in a checkout with many of them.
if let Some((base, repos)) = nested_repos(cwd)? {
let roots: Vec<PathBuf> = repos.iter().map(|r| r.root().to_path_buf()).collect();
let mut out = BTreeMap::new();
for repo in &repos {
for s in repo.status()? {
if let Some(rel) = nested_rel(&base, repo, &roots, &s.path) {
out.insert(rel, stamp(&s.path));
}
}
}
return Ok(out);
}
let Some(repo) = Repo::discover(cwd)? else { return Ok(BTreeMap::new()) };
Ok(repo.status()?.into_iter().map(|s| (s.rel_path, stamp(&s.path))).collect())
}
@@ -587,10 +708,16 @@ fn saved_name(rel: &str) -> String {
/// into `dir`, so rolling back the task's changes to them restores the user's own edits.
/// Whether anything was saved.
pub(crate) fn save_before(cwd: &Path, before: &BTreeMap<String, Stamp>, dir: &Path) -> IdeResult<bool> {
let Some(repo) = Repo::discover(cwd)? else { return Ok(false) };
let root = match nested_repos(cwd)? {
Some((base, _)) => base,
None => match Repo::discover(cwd)? {
Some(repo) => repo.root().to_path_buf(),
None => return Ok(false),
},
};
let mut saved = false;
for (rel, stamp) in before {
let path = repo.root().join(rel);
let path = root.join(rel);
if stamp.is_none() || !std::fs::metadata(&path).is_ok_and(|m| m.is_file() && m.len() <= SAVED_MAX) {
continue;
}
@@ -625,7 +752,8 @@ pub(crate) fn restore(
}
None => match rev {
Some(rev) => {
let repo = Repo::discover(cwd)?.ok_or_else(|| IdeError::invalid("not in a git repository"))?;
let at = change.repo.as_ref().map_or(cwd, |r| r.0.as_path());
let repo = Repo::discover(at)?.ok_or_else(|| IdeError::invalid("not in a git repository"))?;
repo.file_bytes_at(&change.path.0, Some(rev))?
}
None => None,
@@ -665,6 +793,9 @@ pub(crate) struct TurnStart {
/// `HEAD` then (`None` outside a repository or before its first commit).
#[serde(default, skip_serializing_if = "Option::is_none")]
pub head: Option<String>,
/// With nested repositories, each one's `HEAD` then, by its root.
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
pub heads: BTreeMap<String, String>,
/// The files already changed then, stamped.
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
pub before: BTreeMap<String, Stamp>,
@@ -680,8 +811,16 @@ pub(crate) struct TurnStart {
/// The copies `previous` saved of files unchanged since are kept rather than made again, so
/// starting a turn copies little more than what the turn before it changed.
pub(crate) fn start_turn(cwd: &Path, dir: &Path, previous: Option<&TurnStart>) -> IdeResult<TurnStart> {
let Some(repo) = discover(cwd)? else { return Ok(TurnStart::default()) };
let head = repo.head()?.1;
let Some(at) = TurnRepos::of(cwd)? else { return Ok(TurnStart::default()) };
let mut heads = BTreeMap::new();
let head = if at.nested {
for repo in &at.repos {
heads.extend(repo.head()?.1.map(|h| (root_key(repo.root()), h)));
}
None
} else {
at.repos[0].head()?.1
};
// As the turn's end is read, so the two compare.
let before = snapshot(cwd)?;
let mut saved = BTreeSet::new();
@@ -702,7 +841,7 @@ pub(crate) fn start_turn(cwd: &Path, dir: &Path, previous: Option<&TurnStart>) -
}
}
for (rel, stamp) in &before {
let path = repo.root().join(rel);
let path = at.base.join(rel);
if stamp.is_none()
|| saved.contains(rel)
|| !std::fs::metadata(&path).is_ok_and(|m| m.is_file() && m.len() <= SAVED_MAX)
@@ -715,7 +854,7 @@ pub(crate) fn start_turn(cwd: &Path, dir: &Path, previous: Option<&TurnStart>) -
saved.insert(rel.clone());
}
}
Ok(TurnStart { head, before, saved, changed: None })
Ok(TurnStart { head, heads, before, saved, changed: None })
}
/// The files that changed in `cwd` since the turn `start` began: in the working tree (as
@@ -724,20 +863,25 @@ pub(crate) fn changed_in_turn(cwd: &Path, start: &TurnStart) -> IdeResult<(Vec<S
let end = snapshot(cwd)?;
let worktree = changed_between(&start.before, &end);
let mut all: BTreeSet<String> = worktree.iter().cloned().collect();
if let Some(repo) = discover(cwd)?
&& let (Some(from), Some(to)) = (&start.head, repo.head()?.1)
&& *from != to
{
let Some(at) = TurnRepos::of(cwd)? else { return Ok((worktree, all)) };
for repo in &at.repos {
let (Some(from), Some(to)) = (at.head_then(start, repo), repo.head()?.1) else { continue };
if from == to {
continue;
}
// Named from the base, as the working tree's files are.
let prefix = rel_in(&at.base, repo.root())?;
let named = |rel: String| if prefix.is_empty() { rel } else { format!("{prefix}/{rel}") };
for f in repo.diff_revisions(from, &to)? {
all.extend(f.old_path);
all.insert(f.path);
all.extend(f.old_path.map(named));
all.insert(named(f.path));
}
}
Ok((worktree, all))
}
/// The content of `rel` as the turn `start` began (`None`: no file), its copies in `dir`.
fn at_turn_start(repo: &Repo, rel: &str, start: &TurnStart, dir: &Path) -> IdeResult<Option<Vec<u8>>> {
fn at_turn_start(at: &TurnRepos, rel: &str, start: &TurnStart, dir: &Path) -> IdeResult<Option<Vec<u8>>> {
match start.before.get(rel) {
Some(None) => Ok(None),
Some(Some(_)) => match start.saved.contains(rel).then(|| saved_copy(dir, rel)).flatten() {
@@ -746,10 +890,13 @@ fn at_turn_start(repo: &Repo, rel: &str, start: &TurnStart, dir: &Path) -> IdeRe
"{rel} had changes when the turn started that weren't saved; roll it back in Git instead"
))),
},
None => match &start.head {
Some(head) => repo.file_bytes_at(&repo.root().join(rel), Some(head)),
None => Ok(None),
},
None => {
let path = at.base.join(rel);
match at.owner(&path).and_then(|repo| Some((repo, at.head_then(start, repo)?))) {
Some((repo, head)) => repo.file_bytes_at(&path, Some(head)),
None => Ok(None),
}
}
}
}
@@ -771,13 +918,13 @@ pub(crate) fn turn_changes(
dir: &Path,
changed: &BTreeSet<String>,
) -> IdeResult<Vec<AgentChange>> {
let Some(repo) = discover(cwd)? else { return Ok(Vec::new()) };
let Some(at) = TurnRepos::of(cwd)? else { return Ok(Vec::new()) };
let mut out = Vec::new();
for rel in changed {
let path = repo.root().join(rel);
let path = at.base.join(rel);
// A folder (a submodule, say) or a file that can't be read has nothing to compare.
let Some(now) = existing(&path) else { continue };
let (kind, (added, removed)) = match at_turn_start(&repo, rel, start, dir) {
let (kind, (added, removed)) = match at_turn_start(&at, rel, start, dir) {
Ok(then) if then == now => continue,
Ok(then) => {
let kind = match (&then, &now) {
@@ -790,19 +937,29 @@ pub(crate) fn turn_changes(
// Its start wasn't saved: listed, without counts.
Err(_) => (ChangeKind::Modified, (0, 0)),
};
out.push(AgentChange { path: IpcPath(path), rel_path: rel.clone(), kind, added, removed, old_path: None });
out.push(AgentChange {
rel_path: rel.clone(),
kind,
added,
removed,
old_path: None,
repo: at.nested.then(|| at.owner(&path).map(|r| IpcPath(r.root().to_path_buf()))).flatten(),
path: IpcPath(path),
});
}
Ok(out)
}
/// The text of `path` as the turn `start` began, `None` when there was no file.
pub(crate) fn turn_text(cwd: &Path, path: &Path, start: &TurnStart, dir: &Path) -> IdeResult<Option<String>> {
let Some(repo) = discover(cwd)? else { return Ok(None) };
let rel = rel_in(repo.root(), path)?;
if let (None, Some(head)) = (start.before.get(&rel), &start.head) {
let Some(at) = TurnRepos::of(cwd)? else { return Ok(None) };
let rel = rel_in(&at.base, path)?;
if !start.before.contains_key(&rel)
&& let Some(head) = at.owner(&at.base.join(&rel)).and_then(|repo| at.head_then(start, repo))
{
return file_at(cwd, path, head);
}
let Some(bytes) = at_turn_start(&repo, &rel, start, dir)? else { return Ok(None) };
let Some(bytes) = at_turn_start(&at, &rel, start, dir)? else { return Ok(None) };
let encoding = match ide_vfs::load_text(path) {
Ok(loaded) => encoding_rs::Encoding::for_label(loaded.encoding.as_bytes()).unwrap_or(encoding_rs::UTF_8),
Err(_) => ide_vfs::detect_encoding(&bytes, None),
@@ -828,12 +985,15 @@ fn rel_in(root: &Path, path: &Path) -> IdeResult<String> {
/// Puts `change` back as it was when the turn `start` began.
pub(crate) fn restore_turn(cwd: &Path, start: &TurnStart, dir: &Path, change: &AgentChange) -> IdeResult<()> {
let repo = repo_at(cwd)?;
put(&change.path.0, at_turn_start(&repo, &change.rel_path, start, dir)?)
let at = TurnRepos::of(cwd)?
.ok_or_else(|| IdeError::unavailable(format!("{} is not in a git repository", cwd.display())))?;
put(&change.path.0, at_turn_start(&at, &change.rel_path, start, dir)?)
}
pub(crate) fn file_at(cwd: &Path, path: &Path, rev: &str) -> IdeResult<Option<String>> {
let Some(repo) = discover(cwd)? else { return Ok(None) };
// With nested repositories, the file's own one.
let at = if spans_repos(cwd) { path.parent().unwrap_or(cwd) } else { cwd };
let Some(repo) = discover(at)? else { return Ok(None) };
let encoding = match ide_vfs::load_text(path) {
Ok(loaded) => encoding_rs::Encoding::for_label(loaded.encoding.as_bytes()).unwrap_or(encoding_rs::UTF_8),
Err(_) => ide_vfs::detect_encoding(&repo.file_bytes_at(path, Some(rev))?.unwrap_or_default(), None),
@@ -962,6 +1122,54 @@ mod tests {
assert!(ok, "git {args:?}");
}
#[test]
fn a_project_with_nested_repositories_sees_changes_in_each_one() {
let tmp = tempfile::tempdir().unwrap();
let root = dunce::canonicalize(tmp.path()).unwrap();
let (nested, deeper) = (root.join("libs/validation"), root.join("libs/validation/pkg/sdk"));
for repo in [&root, &nested, &deeper] {
std::fs::create_dir_all(repo).unwrap();
git(repo, &["init", "-q", "-b", "main"]);
std::fs::write(repo.join("a.txt"), "one\n").unwrap();
git(repo, &["add", "a.txt"]);
git(repo, &["commit", "-q", "-m", "init"]);
}
assert!(spans_repos(&root));
std::fs::write(root.join("mine.txt"), "the user's\n").unwrap();
let before = snapshot(&root).unwrap();
assert_eq!(before.keys().collect::<Vec<_>>(), ["mine.txt"]);
std::fs::write(root.join("a.txt"), "two\n").unwrap();
std::fs::write(nested.join("a.txt"), "two\n").unwrap();
std::fs::write(nested.join("b.txt"), "new\n").unwrap();
std::fs::write(deeper.join("a.txt"), "two\n").unwrap();
let at = TaskBase::Local { cwd: root.clone(), start: None };
let changed = at.changes(&before).unwrap();
let listed: Vec<(&str, &Path)> =
changed.iter().map(|c| (c.rel_path.as_str(), c.repo.as_ref().unwrap().0.as_path())).collect();
assert_eq!(
listed,
[
("a.txt", root.as_path()),
("libs/validation/a.txt", nested.as_path()),
("libs/validation/b.txt", nested.as_path()),
("libs/validation/pkg/sdk/a.txt", deeper.as_path()),
]
);
assert_eq!(at.grouped_changes(&before).unwrap().uncommitted.len(), 4);
assert_eq!(file_at(&root, &nested.join("a.txt"), "HEAD").unwrap().as_deref(), Some("one\n"));
let rev = at.rev().unwrap();
for change in &changed {
restore(&root, rev.as_deref(), change, &before, None).unwrap();
}
for repo in [&root, &nested, &deeper] {
assert_eq!(std::fs::read_to_string(repo.join("a.txt")).unwrap(), "one\n");
}
assert!(!nested.join("b.txt").exists());
assert!(root.join("mine.txt").exists(), "the user's own change stays");
}
#[test]
fn worktree_changes_are_listed_against_the_base() {
let tmp = tempfile::tempdir().unwrap();
+112 -13
Переглянути файл
@@ -15,8 +15,8 @@ pub use fingerprint::{LaunchFingerprint, launch_fingerprint, menu_fingerprint};
pub use launch_resources::process_launch_resources;
pub use modules::record_module_build;
pub use single::{
SingleFileTarget, compile_file_plan, find_javac, javac_step, module_classpath, single_file_classpath,
single_file_target,
SingleFileTarget, compile_file_plan, find_javac, javac_step, module_classpath, module_classpaths,
single_file_classpath, single_file_target,
};
pub use structure::{
StructureJdk, StructureRoots, artifact_file, artifact_output, language_release, structure_outputs, structure_plan,
@@ -916,6 +916,47 @@ fn launch_plan(
Ok(plan)
}
/// Directory of the linked Maven reactor that builds the launch module at `module`;
/// launches of one reactor can share a build ([`build_for_launches`]).
pub fn launch_reactor(root: &Path, model: &BuildModel, module: &Path) -> Option<String> {
maven_reactor(model.maven.as_ref()?, &rel_str(root, module)).map(|top| top.dir.clone())
}
/// One Maven step building every module of `modules` (all of one reactor) with what they
/// depend on: `-pl a,b -am`, so their shared upstream modules build once (#3971).
fn merged_launch_plan(
root: &Path,
model: &BuildModel,
modules: &[PathBuf],
test: bool,
kind: BuildKind,
cancel: &CancellationToken,
) -> IdeResult<BuildPlan> {
let mut plan = launch_plan(root, model, &modules[0], test, kind, cancel)?;
if plan.system != BuildSystem::Maven || modules.len() == 1 {
return Ok(plan);
}
let mut selection = Vec::new();
for module in modules {
let one = launch_plan(root, model, module, test, kind, cancel)?;
if one.steps.len() != 1 || one.steps[0].cwd != plan.steps[0].cwd {
return Err(IdeError::invalid("launch modules belong to different Maven reactors"));
}
match one.steps[0].args.iter().position(|a| a == "-pl") {
Some(i) => selection.push(one.steps[0].args[i + 1].clone()),
// The reactor root itself builds every module.
None => return Ok(one),
}
}
selection.sort();
selection.dedup();
let step = &mut plan.steps[0];
if let Some(i) = step.args.iter().position(|a| a == "-pl") {
step.args[i + 1] = selection.join(",");
}
Ok(plan)
}
#[derive(Debug)]
pub struct LaunchBuild {
pub class_dirs: Vec<PathBuf>,
@@ -932,7 +973,21 @@ pub fn build_for_launch(
kind: BuildKind,
cancel: &CancellationToken,
) -> IdeResult<LaunchBuild> {
let plan = launch_plan(root, model, module, test, kind, cancel)?;
let mut built = build_for_launches(root, model, &[module.to_path_buf()], test, kind, cancel)?;
Ok(built.pop().unwrap())
}
/// [`build_for_launch`] of several modules of one Maven reactor in a single Maven run:
/// one result per module, in order, sharing the build's failure.
pub fn build_for_launches(
root: &Path,
model: &BuildModel,
modules: &[PathBuf],
test: bool,
kind: BuildKind,
cancel: &CancellationToken,
) -> IdeResult<Vec<LaunchBuild>> {
let plan = merged_launch_plan(root, model, modules, test, kind, cancel)?;
let result = run(root, &plan, cancel, &|_| {})?;
let failure = if !result.success {
let errors: Vec<String> = result
@@ -949,17 +1004,21 @@ pub fn build_for_launch(
} else {
None
};
let class_dirs = if plan.system == BuildSystem::Maven
&& let Some(m) = &model.maven
{
maven_launch_projects(root, m, module, test)
.iter()
.flat_map(|p| launch_class_dirs(plan.system, &subdir(root, &p.dir), test && subdir(root, &p.dir) == module))
.collect()
} else {
launch_class_dirs(plan.system, module, test)
let class_dirs = |module: &Path| {
if plan.system == BuildSystem::Maven
&& let Some(m) = &model.maven
{
maven_launch_projects(root, m, module, test)
.iter()
.flat_map(|p| {
launch_class_dirs(plan.system, &subdir(root, &p.dir), test && subdir(root, &p.dir) == module)
})
.collect()
} else {
launch_class_dirs(plan.system, module, test)
}
};
Ok(LaunchBuild { class_dirs, failure })
Ok(modules.iter().map(|m| LaunchBuild { class_dirs: class_dirs(m), failure: failure.clone() }).collect())
}
fn launch_class_dirs(system: BuildSystem, module: &Path, test: bool) -> Vec<PathBuf> {
@@ -1659,6 +1718,46 @@ mod tests {
}
}
#[test]
fn launches_of_one_reactor_merge_into_one_module_selection() {
let tmp = tempfile::tempdir().unwrap();
let root = tmp.path();
for dir in ["app", "lib", "unrelated"] {
write(root, &format!("{dir}/pom.xml"), "<project/>");
}
let mut model = reactor_model();
let cancel = CancellationToken::new();
let modules = |dirs: &[&str]| dirs.iter().map(|d| root.join(d)).collect::<Vec<_>>();
let selection = |plan: BuildPlan| {
let args = &plan.steps[0].args;
args.iter().position(|a| a == "-pl").map(|i| (args[i + 1].clone(), args[i + 2].clone(), args.len()))
};
assert_eq!(launch_reactor(root, &model, &root.join("lib")).as_deref(), Some(""));
let plan = merged_launch_plan(root, &model, &modules(&["lib", "app", "lib"]), false, BuildKind::Build, &cancel)
.unwrap();
assert_eq!(plan.steps.len(), 1);
assert_eq!(plan.steps[0].args.last().unwrap(), "compile");
assert_eq!(selection(plan), Some(("app,lib".into(), "-am".into(), 10)));
// One module: exactly the single launch's step.
let single = merged_launch_plan(root, &model, &modules(&["app"]), true, BuildKind::Rebuild, &cancel).unwrap();
let expected = launch_plan(root, &model, &root.join("app"), true, BuildKind::Rebuild, &cancel).unwrap();
assert_eq!(single.steps[0].args, expected.steps[0].args);
// The reactor root among them builds the whole reactor.
model.maven.as_mut().unwrap().projects[0].packaging = "jar".into();
let whole = merged_launch_plan(root, &model, &modules(&["app", ""]), false, BuildKind::Build, &cancel).unwrap();
assert_eq!(selection(whole), None);
// Another linked reactor can't join the step.
let m = model.maven.as_mut().unwrap();
m.projects[4].aggregated = false;
m.projects[4].command = "other".into();
m.projects[0].modules.retain(|p| p != "unrelated/pom.xml");
assert_eq!(launch_reactor(root, &model, &root.join("unrelated")).as_deref(), Some("unrelated"));
assert!(
merged_launch_plan(root, &model, &modules(&["app", "unrelated"]), false, BuildKind::Build, &cancel)
.is_err()
);
}
#[cfg(unix)]
#[test]
fn external_launch_returns_upstream_outputs_and_blocks_failure_or_cancellation() {
+157 -47
Переглянути файл
@@ -129,31 +129,73 @@ pub fn module_classpath(
cache: &Path,
cancel: &ide_core::CancellationToken,
) -> IdeResult<String> {
let target = module_target(root, model, module, test)?;
let fingerprint = launch_fingerprint(root, model, &target.module, test, local_repo, cancel)?;
let cache_path = classpath_cache_path(root, cache, &target.module, test);
if let (Some(fingerprint), Some(path)) = (&fingerprint, &cache_path)
&& let Ok(bytes) = fs::read(path)
&& let Ok(cached) = serde_json::from_slice::<CachedClasspath>(&bytes)
&& cached.version == CLASSPATH_CACHE_VERSION
&& cached.fingerprint == *fingerprint
&& classpath_entries_exist(root, &cached.classpath)
{
return Ok(cached.classpath);
module_classpaths(root, model, &[module.to_path_buf()], test, local_repo, cache, cancel)
}
/// [`module_classpath`] of `modules[0]`. The other modules, launched together with it
/// (#3971), share its Maven probe when they have no cached classpath, which leaves
/// theirs cached for their own launches.
pub fn module_classpaths(
root: &Path,
model: &BuildModel,
modules: &[PathBuf],
test: bool,
local_repo: Option<PathBuf>,
cache: &Path,
cancel: &ide_core::CancellationToken,
) -> IdeResult<String> {
let mut probes: Vec<Probe> = Vec::new();
for (i, module) in modules.iter().enumerate() {
let target = match module_target(root, model, module, test) {
Ok(target) => target,
Err(e) if i == 0 => return Err(e),
Err(_) => continue,
};
if i > 0 && (target.top.dir != probes[0].0.top.dir || probes.iter().any(|p| p.0.module == target.module)) {
continue;
}
let fingerprint = launch_fingerprint(root, model, &target.module, test, local_repo.clone(), cancel)?;
let cache_path = classpath_cache_path(root, cache, &target.module, test);
if let (Some(fingerprint), Some(path)) = (&fingerprint, &cache_path)
&& let Ok(bytes) = fs::read(path)
&& let Ok(cached) = serde_json::from_slice::<CachedClasspath>(&bytes)
&& cached.version == CLASSPATH_CACHE_VERSION
&& cached.fingerprint == *fingerprint
&& classpath_entries_exist(root, &cached.classpath)
{
if i == 0 {
return Ok(cached.classpath);
}
continue;
}
probes.push(Probe(target, fingerprint, cache_path));
}
let classpath = classpath(root, model, &target, if test { "test" } else { "runtime" }, true)?;
let scope = if test { "test" } else { "runtime" };
let targets: Vec<&SingleFileTarget> = probes.iter().map(|p| &p.0).collect();
let classpaths = match classpaths(root, model, &targets, scope, true) {
Ok(classpaths) => classpaths,
// Another module's failure must not cost this launch its own probe.
Err(_) if targets.len() > 1 && !cancel.is_cancelled() => classpaths(root, model, &targets[..1], scope, true)?,
Err(e) => return Err(e),
};
if cancel.is_cancelled() {
return Err(IdeError::cancelled());
}
if let (Some(fingerprint), Some(path)) = (fingerprint, cache_path) {
let cached = CachedClasspath { version: CLASSPATH_CACHE_VERSION, fingerprint, classpath: classpath.clone() };
if let Err(error) = cache_classpath(&path, &cached) {
tracing::debug!(path = %path.display(), %error, "Cannot cache the Java launch classpath");
for (Probe(_, fingerprint, cache_path), classpath) in probes.into_iter().zip(&classpaths) {
if let (Some(fingerprint), Some(path)) = (fingerprint, cache_path) {
let cached =
CachedClasspath { version: CLASSPATH_CACHE_VERSION, fingerprint, classpath: classpath.clone() };
if let Err(error) = cache_classpath(&path, &cached) {
tracing::debug!(path = %path.display(), %error, "Cannot cache the Java launch classpath");
}
}
}
Ok(classpath)
Ok(classpaths.into_iter().next().unwrap())
}
/// A module whose classpath the Maven probe resolves, with its cache key and file.
struct Probe(SingleFileTarget, Option<LaunchFingerprint>, Option<PathBuf>);
/// One cache file per module and scope. Mirroring the module path keeps nested
/// modules and their different dependency scopes from overwriting each other.
fn classpath_cache_path(root: &Path, cache: &Path, module: &Path, test: bool) -> Option<PathBuf> {
@@ -195,6 +237,62 @@ fn classpath(
scope: &str,
compile_first: bool,
) -> IdeResult<String> {
Ok(classpaths(root, model, &[target], scope, compile_first)?.pop().unwrap())
}
/// The classpath of each of `targets` (modules of one reactor) from one Maven probe.
fn classpaths(
root: &Path,
model: &BuildModel,
targets: &[&SingleFileTarget],
scope: &str,
compile_first: bool,
) -> IdeResult<Vec<String>> {
let top = &targets[0].top;
let probe = CP_FILE;
let mut args = vec!["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG];
args.extend(top.options.iter().map(String::as_str));
// The reactor root among them builds every module.
let selection = if targets.iter().any(|t| t.pl.is_empty()) {
String::new()
} else {
let mut pl: Vec<&str> = targets.iter().map(|t| t.pl.as_str()).collect();
pl.sort();
pl.dedup();
pl.join(",")
};
if !selection.is_empty() {
args.extend(["-pl", selection.as_str(), "-am"]);
}
let output_arg = format!("-Dmdep.outputFile={probe}");
let scope_arg = format!("-Dmdep.includeScope={scope}");
// A launch build may only have reached `compile`. Running `compile` in this
// same Maven session lets the dependency plugin resolve Reactor siblings from
// their target/classes without paying for package-phase plugins.
if compile_first {
args.push("compile");
}
args.extend(["dependency:build-classpath", output_arg.as_str(), scope_arg.as_str(), "-q"]);
let top_dir = subdir(root, &top.dir);
let mut command = ProcCommand::new(&top.command);
command.args(&args).envs(&top.env).current_dir(&top_dir);
let status = ide_core::process::prepare(&mut command)
.output()
.map_err(|e| IdeError::internal(format!("cannot resolve the compile classpath: {e}")))?;
if !status.status.success() {
let stdout = String::from_utf8_lossy(&status.stdout);
let stderr = String::from_utf8_lossy(&status.stderr);
// Maven reports reactor/dependency failures on stdout, not only stderr.
let tail: Vec<&str> = stdout.lines().chain(stderr.lines()).filter(|l| !l.trim().is_empty()).collect();
let tail = tail.iter().rev().take(5).rev().cloned().collect::<Vec<_>>().join("\n");
return Err(IdeError::internal(format!("cannot resolve the compile classpath:\n{tail}")));
}
targets.iter().map(|target| target_classpath(root, model, target)).collect()
}
/// The classpath of `target` after a probe: its reactor class directories, then
/// the dependencies Maven wrote to the module's probe file.
fn target_classpath(root: &Path, model: &BuildModel, target: &SingleFileTarget) -> IdeResult<String> {
let mut entries: Vec<String> = Vec::new();
// The module's own classes first: the file almost always uses classes next to it.
let own: &[&str] = if target.test { &["target/test-classes", "target/classes"] } else { &["target/classes"] };
@@ -220,37 +318,8 @@ fn classpath(
}
}
}
let probe = CP_FILE;
let mut args = vec!["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG];
args.extend(target.top.options.iter().map(String::as_str));
if !target.pl.is_empty() {
args.extend(["-pl", target.pl.as_str(), "-am"]);
}
let output_arg = format!("-Dmdep.outputFile={probe}");
let scope_arg = format!("-Dmdep.includeScope={scope}");
// A launch build may only have reached `compile`. Running `compile` in this
// same Maven session lets the dependency plugin resolve Reactor siblings from
// their target/classes without paying for package-phase plugins.
if compile_first {
args.push("compile");
}
args.extend(["dependency:build-classpath", output_arg.as_str(), scope_arg.as_str(), "-q"]);
let top_dir = subdir(root, &target.top.dir);
let mut command = ProcCommand::new(&target.top.command);
command.args(&args).envs(&target.top.env).current_dir(&top_dir);
let status = ide_core::process::prepare(&mut command)
.output()
.map_err(|e| IdeError::internal(format!("cannot resolve the compile classpath: {e}")))?;
if !status.status.success() {
let stdout = String::from_utf8_lossy(&status.stdout);
let stderr = String::from_utf8_lossy(&status.stderr);
// Maven reports reactor/dependency failures on stdout, not only stderr.
let tail: Vec<&str> = stdout.lines().chain(stderr.lines()).filter(|l| !l.trim().is_empty()).collect();
let tail = tail.iter().rev().take(5).rev().cloned().collect::<Vec<_>>().join("\n");
return Err(IdeError::internal(format!("cannot resolve the compile classpath:\n{tail}")));
}
// With `-am` every visited module writes its own file; only this module's counts.
let cp_file = target.module.join(probe);
let cp_file = target.module.join(CP_FILE);
let content = fs::read_to_string(&cp_file).map_err(|e| {
IdeError::internal(format!("cannot resolve the compile classpath: {} ({e})", cp_file.display()))
})?;
@@ -528,6 +597,47 @@ mod tests {
assert!(args.lines().any(|a| a == "-Dmdep.includeScope=test"), "{args}");
}
/// Modules launched together resolve their classpaths in one Maven probe and leave
/// the others' cached; a probe another module breaks still resolves the first one.
#[cfg(unix)]
#[test]
fn launch_modules_share_one_classpath_probe() {
use std::os::unix::fs::PermissionsExt;
let dir = tempfile::tempdir().unwrap();
let root = dir.path();
fixture(root);
write(root, "lib/src/main/java/demo/Lib.java", "class Lib {}");
let script = root.join("mvnw");
fs::write(
&script,
"#!/bin/sh\necho \"$@\" >> calls.txt\npl='.'\nwhile [ $# -gt 0 ]; do\nif [ \"$1\" = \"-pl\" ]; then pl=\"$2\"; shift 2; else shift; fi\ndone\ncase \"$pl\" in *lib*) [ -f lib/broken ] && exit 1;; esac\nfor m in $(echo \"$pl\" | tr ',' ' '); do mkdir -p \"$m/target\" repo; touch \"repo/$m.jar\"; printf \"$PWD/repo/$m.jar\" > \"$m/target/ide-compile-cp.txt\"; done\n",
)
.unwrap();
fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap();
let model = crate::load(root, &root.join("cache"), None);
let cache = root.join("cache");
let cancel = CancellationToken::new();
let calls = || fs::read_to_string(root.join("calls.txt")).unwrap_or_default().lines().count();
let modules = [root.join("app"), root.join("lib"), root.join("app")];
let app = module_classpaths(root, &model, &modules, false, None, &cache, &cancel).unwrap();
assert!(app.contains("/repo/app.jar") && !app.contains("repo/lib.jar"), "{app}");
assert_eq!(calls(), 1);
assert!(fs::read_to_string(root.join("calls.txt")).unwrap().contains("-pl app,lib -am compile"));
let lib = module_classpath(root, &model, &root.join("lib"), false, None, &cache, &cancel).unwrap();
assert!(lib.contains("/repo/lib.jar"), "{lib}");
assert_eq!(calls(), 1, "lib's classpath came from the shared probe");
// A probe another module breaks is retried for the first module alone.
write(root, "lib/src/main/java/demo/Lib.java", "class Lib { int changed; }");
write(root, "lib/broken", "");
let app = module_classpaths(root, &model, &[root.join("app"), root.join("lib")], false, None, &cache, &cancel)
.unwrap();
assert!(app.contains("/repo/app.jar"), "{app}");
assert_eq!(calls(), 3, "the shared probe failed, then app was probed alone");
// The first module's own failure stays its failure.
assert!(module_classpath(root, &model, &root.join("lib"), false, None, &cache, &cancel).is_err());
}
/// The launch classpath follows the Maven runner JDK and is reused until that
/// build input changes; the probe does not run packaging plugins.
#[cfg(unix)]
+6
Переглянути файл
@@ -288,6 +288,8 @@ pub struct SmartKeysSettings {
pub pair_quotes: bool,
pub surround_selection: bool,
pub tab_out_of_pair: bool,
/// A `;` typed before the closing `)` of a statement goes to the end of the statement.
pub semicolon_at_statement_end: bool,
/// Simultaneous `<tag></tag>` editing: renaming a tag renames its matching tag.
pub simultaneous_tag_editing: bool,
/// Reformat on paste: `none` | `indentBlock` | `indentEachLine`.
@@ -309,6 +311,7 @@ impl Default for SmartKeysSettings {
pair_quotes: true,
surround_selection: true,
tab_out_of_pair: true,
semicolon_at_statement_end: true,
simultaneous_tag_editing: true,
reformat_on_paste: "indentEachLine".into(),
escape_on_paste: true,
@@ -435,6 +438,9 @@ pub struct TextAttributesOverride {
pub effect: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub effect_color: Option<String>,
/// IDEA's `ERROR_STRIPE_COLOR`: the diff overview-lane marker of a change type.
#[serde(skip_serializing_if = "Option::is_none")]
pub error_stripe_color: Option<String>,
}
/// Editor › Code Style › <Language> › Tabs and Indents (unset fields inherit).
+29
Переглянути файл
@@ -72,6 +72,16 @@ impl WindowButtonLayout {
let right = side(parts.next());
(!left.is_empty() || !right.is_empty()).then_some(Self { left, right })
}
/// The layout on Linux: the desktop's `gtk-decoration-layout` when a desktop session is running.
/// Without one (WSLg, a bare compositor) GTK reports its built-in fallback, close only, which
/// leaves no way to minimise or maximise the frameless window, so the default applies.
pub fn for_linux(gtk_layout: Option<&str>, var: impl Fn(&str) -> Option<String>) -> Self {
let desktop = ["XDG_CURRENT_DESKTOP", "XDG_SESSION_DESKTOP", "DESKTOP_SESSION"]
.iter()
.any(|key| var(key).is_some_and(|value| !value.trim().is_empty()));
gtk_layout.filter(|_| desktop).and_then(Self::from_gtk_decoration_layout).unwrap_or_default()
}
}
#[cfg(test)]
@@ -118,6 +128,25 @@ mod tests {
}
}
#[test]
fn linux_layout_needs_a_desktop_session() {
let env = |vars: &'static [(&'static str, &'static str)]| {
move |key: &str| vars.iter().find(|(k, _)| *k == key).map(|(_, v)| v.to_string())
};
let gnome = env(&[("XDG_CURRENT_DESKTOP", "ubuntu:GNOME")]);
assert_eq!(WindowButtonLayout::for_linux(Some("appmenu:close"), gnome), layout(&[], &[Close]).unwrap());
let kde = env(&[("DESKTOP_SESSION", "plasma")]);
assert_eq!(
WindowButtonLayout::for_linux(Some("close,maximize,minimize:icon"), kde),
layout(&[Close, Maximize, Minimize], &[]).unwrap()
);
// WSLg: no desktop session, GTK's fallback layout.
let wslg = env(&[("WAYLAND_DISPLAY", "wayland-0"), ("XDG_CURRENT_DESKTOP", " ")]);
assert_eq!(WindowButtonLayout::for_linux(Some("menu:close"), wslg), WindowButtonLayout::default());
let gnome = env(&[("XDG_SESSION_DESKTOP", "gnome")]);
assert_eq!(WindowButtonLayout::for_linux(None, gnome), WindowButtonLayout::default());
}
#[test]
fn default_layout_is_on_the_right() {
assert_eq!(WindowButtonLayout::default(), layout(&[], &[Minimize, Maximize, Close]).unwrap());
+29 -1
Переглянути файл
@@ -1254,6 +1254,7 @@ pub struct ArduinoSettings {
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
#[serde(default, rename_all = "camelCase")]
pub struct MarkdownSettings {
pub preview_layout: MarkdownPreviewLayout,
/// Preview (and notebook Markdown cell) font size in px; unset follows the editor font size.
pub preview_font_size: Option<u32>,
/// "Detect commands that can be run right from Markdown files": gutter run icons on
@@ -1265,10 +1266,23 @@ pub struct MarkdownSettings {
impl Default for MarkdownSettings {
fn default() -> Self {
Self { preview_font_size: None, run_commands: true, command_directory: None }
Self {
preview_layout: MarkdownPreviewLayout::default(),
preview_font_size: None,
run_commands: true,
command_directory: None,
}
}
}
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")]
pub enum MarkdownPreviewLayout {
#[default]
SideBySide,
Stacked,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
#[serde(rename_all = "lowercase")]
pub enum MarkdownCommandDirectory {
@@ -1889,6 +1903,20 @@ mod tests {
}
}
#[test]
fn markdown_preview_layout_defaults_and_round_trips() {
let old: Settings = serde_json::from_str(r#"{"languages":{"markdown":{"previewFontSize":16}}}"#).unwrap();
assert_eq!(old.languages.markdown.preview_layout, MarkdownPreviewLayout::SideBySide);
assert_eq!(old.languages.markdown.preview_font_size, Some(16));
let stacked: Settings =
serde_json::from_str(r#"{"languages":{"markdown":{"previewLayout":"stacked"}}}"#).unwrap();
assert_eq!(stacked.languages.markdown.preview_layout, MarkdownPreviewLayout::Stacked);
let saved = serde_json::to_value(&stacked).unwrap();
assert_eq!(saved["languages"]["markdown"]["previewLayout"], "stacked");
assert_eq!(serde_json::from_value::<Settings>(saved).unwrap().languages.markdown, stacked.languages.markdown);
}
#[test]
fn cmake_profile_argument_arrays_round_trip() {
let mut settings = Settings::default();
+2
Переглянути файл
@@ -151,6 +151,7 @@ pub struct CommitSettings {
/// Commit from the Commit tool window; off = Local Changes in the Git tool
/// window and a Commit dialog.
pub non_modal: bool,
pub include_changes_by_default: bool,
/// Start with an empty message instead of the last one / the changelist's.
pub clear_initial_message: bool,
pub analyze_code: bool,
@@ -190,6 +191,7 @@ impl Default for CommitSettings {
fn default() -> Self {
Self {
non_modal: true,
include_changes_by_default: true,
clear_initial_message: false,
analyze_code: true,
check_todo: true,
+90
Переглянути файл
@@ -0,0 +1,90 @@
//! Exception breakpoints on a chosen class. The manager keeps one list; a session given a backend
//! for them at start arms it before `configurationDone`, so a throw in the program's first line
//! stops, and again after each `setExceptionBreakpoints`, which drops them in java-debug.
use crate::session::Session;
use crate::{DebugManager, jvm_memory};
use ide_jvm_inspect::ExceptionClassSpec;
use serde::{Deserialize, Serialize};
use specta::Type;
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct ExceptionClassBreakpoint {
pub id: String,
/// Fully qualified binary name (`com.acme.Outer$Inner`); its subclasses stop too.
pub class_name: String,
pub caught: bool,
pub uncaught: bool,
pub enabled: bool,
/// Patterns (`com.acme.*`, `*Test`, a full name) for the class whose code throws.
pub class_filters: Vec<String>,
pub class_exclusion_filters: Vec<String>,
}
/// What a session's exception class breakpoints can do.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct ExceptionClassSupport {
/// Whose class names the session takes: `java`.
pub family: String,
pub condition: bool,
pub class_filters: bool,
/// Filters on the class whose code catches the exception.
pub catch_filters: bool,
}
/// The JVM backends stop through java-debug's own exception events, which a condition or a
/// catch-location filter cannot veto.
pub(crate) fn support(s: &Session) -> Option<ExceptionClassSupport> {
s.exception_classes.is_some().then(|| ExceptionClassSupport {
family: "java".into(),
condition: false,
class_filters: true,
catch_filters: false,
})
}
fn spec(b: &ExceptionClassBreakpoint) -> ExceptionClassSpec {
ExceptionClassSpec {
id: b.id.clone(),
class_name: b.class_name.clone(),
caught: b.caught,
uncaught: b.uncaught,
enabled: b.enabled,
class_filters: b.class_filters.clone(),
class_exclusion_filters: b.class_exclusion_filters.clone(),
}
}
impl DebugManager {
/// Arms the manager's list in `s`; the caller holds `s.exception_turn`. `clear`: also when the
/// list is empty, to take down what an earlier list armed.
pub(crate) async fn arm_exception_classes(&self, s: &Session, clear: bool) {
let Some(backend) = &s.exception_classes else { return };
let specs: Vec<_> = self.exception_classes.lock().iter().map(spec).collect();
// Without either, no VM is known yet: `configure` arms once it is.
let target = jvm_memory::vm_target(s);
if (specs.is_empty() && !clear) || (target.pid.is_none() && target.attach_port.is_none()) {
return;
}
match backend.set(&target, &specs).await {
Ok(states) => tracing::debug!("exception class breakpoints of session {}: {states:?}", s.id.0),
Err(e) => tracing::debug!("exception class breakpoints of session {} failed: {e}", s.id.0),
}
}
/// Stores exception breakpoints on chosen classes (kept without a session, armed on start)
/// and arms them in every session that takes them. Also in one still starting: one that has
/// armed already would miss the list, and one that has not answers `vmNotFound` until then.
pub async fn set_exception_class_breakpoints(&self, list: Vec<ExceptionClassBreakpoint>) {
*self.exception_classes.lock() = list;
for s in self.live_sessions() {
if s.exception_classes.is_none() || s.conn.is_closed() {
continue;
}
let _turn = s.exception_turn.lock().await;
self.arm_exception_classes(&s, true).await;
}
}
}
+45 -5
Переглянути файл
@@ -12,6 +12,7 @@ pub mod adapter;
pub mod attach;
mod cargo;
pub mod connection;
mod exception_classes;
pub mod jdwp;
mod js_cdp;
mod js_debug;
@@ -24,6 +25,7 @@ pub mod unity;
use adapter::{AdapterLauncher, AdapterSpec, ProcessLauncher};
use connection::{Connection, DapError};
pub use exception_classes::{ExceptionClassBreakpoint, ExceptionClassSupport};
use futures::future::join_all;
use ide_core::{DebugSessionId, IdeError, IdeResult, SharedSink};
use ide_language::LanguageRegistry;
@@ -283,6 +285,8 @@ pub struct SessionExceptionFilters {
pub session: DebugSessionId,
pub adapter: String,
pub filters: Vec<ExceptionFilter>,
/// Set when the session takes exception breakpoints on a chosen class.
pub classes: Option<ExceptionClassSupport>,
}
/// What triggered a hot reload; `flutter debug_adapter` takes it as `reason`.
@@ -336,6 +340,7 @@ pub struct DebugManager {
states: Mutex<HashMap<PathBuf, Vec<BreakpointState>>>,
/// Explicit exception filter choices (filter id → enabled); unset filters use the adapter default.
exception_choices: Mutex<BTreeMap<String, bool>>,
exception_classes: Mutex<Vec<ExceptionClassBreakpoint>>,
function_breakpoints: Mutex<Vec<FunctionBreakpoint>>,
data_breakpoints: Mutex<Vec<DataBreakpoint>>,
/// In-flight stops, by session: a second Stop sets `stop_force`, the waiting one kills.
@@ -788,6 +793,7 @@ impl DebugManager {
breakpoints: Mutex::default(),
states: Mutex::default(),
exception_choices: Mutex::default(),
exception_classes: Mutex::default(),
function_breakpoints: Mutex::default(),
data_breakpoints: Mutex::default(),
stopping: Mutex::default(),
@@ -836,6 +842,18 @@ impl DebugManager {
config: LaunchConfig,
owner: SessionOwner,
custom_command: impl FnOnce(&str) -> Option<String>,
) -> IdeResult<DebugSessionId> {
self.start_with_exception_classes(config, owner, custom_command, None).await
}
/// [`start_with`](Self::start_with), the session arming [`Self::set_exception_class_breakpoints`]
/// through `exception_classes`.
pub async fn start_with_exception_classes(
&self,
config: LaunchConfig,
owner: SessionOwner,
custom_command: impl FnOnce(&str) -> Option<String>,
exception_classes: Option<Arc<dyn ide_jvm_inspect::ExceptionClassBreakpoints>>,
) -> IdeResult<DebugSessionId> {
let mut arguments = launch_arguments(&config)?;
// An IDE-side marker (never sent to the adapter): the session is a Flutter
@@ -977,7 +995,19 @@ impl DebugManager {
}
}
let port = debug_server.map(|s| s.port);
self.start_session(id, owner, config.name, config.adapter, None, config.request, arguments, spec, port).await
self.start_session(
id,
owner,
config.name,
config.adapter,
None,
config.request,
arguments,
spec,
port,
exception_classes,
)
.await
}
/// `startDebugging` reverse request: a child session on the same adapter.
@@ -1002,6 +1032,7 @@ impl DebugManager {
configuration,
parent.spec.clone(),
parent.port,
None,
)
.await
.map(|_| ())
@@ -1019,6 +1050,7 @@ impl DebugManager {
arguments: Value,
spec: AdapterSpec,
reuse_port: Option<u16>,
exception_classes: Option<Arc<dyn ide_jvm_inspect::ExceptionClassBreakpoints>>,
) -> IdeResult<DebugSessionId> {
if request != "launch" && request != "attach" {
return Err(IdeError::invalid(format!("request must be `launch` or `attach`, got `{request}`")));
@@ -1033,8 +1065,9 @@ impl DebugManager {
let rdbg_pid = (adapter_name == "rdbg" && request == "launch")
.then(|| io.child.as_ref().and_then(tokio::process::Child::id))
.flatten();
let session =
Arc::new(Session::new(id, owner, name, adapter_name, parent, request, conn, spec, io.port, io.child));
let mut session = Session::new(id, owner, name, adapter_name, parent, request, conn, spec, io.port, io.child);
session.exception_classes = exception_classes;
let session = Arc::new(session);
if let Some(launch_type) = arguments.get("type").and_then(Value::as_str) {
let _ = session.launch_type.set(launch_type.to_owned());
}
@@ -1259,8 +1292,12 @@ impl DebugManager {
tracing::debug!("setDataBreakpoints failed: {e}");
}
let has_filters = s.caps.lock().get("exceptionBreakpointFilters").and_then(Value::as_array).is_some();
if has_filters {
let _ = self.send_exception_breakpoints(s).await;
{
let _turn = s.exception_turn.lock().await;
if has_filters {
let _ = self.send_exception_breakpoints(s).await;
}
self.arm_exception_classes(s, false).await;
}
if s.supports("supportsConfigurationDoneRequest") {
if s.adapter == kotlin::ADAPTER {
@@ -1481,6 +1518,7 @@ impl DebugManager {
session: s.id,
adapter: s.adapter.clone(),
filters: exception_filters_from(&s.caps.lock()),
classes: exception_classes::support(s),
})
.collect()
}
@@ -1496,9 +1534,11 @@ impl DebugManager {
if exception_filters_from(&s.caps.lock()).is_empty() {
continue;
}
let _turn = s.exception_turn.lock().await;
if let Err(e) = self.send_exception_breakpoints(&s).await {
tracing::debug!("setExceptionBreakpoints on session {} failed: {e}", s.id.0);
}
self.arm_exception_classes(&s, false).await;
}
Ok(())
}
+7
Переглянути файл
@@ -118,6 +118,11 @@ pub(crate) struct Session {
pub kotlin_mirror: Mutex<Option<crate::kotlin::SourceMirror>>,
pub jvm_memory: tokio::sync::Mutex<crate::JvmMemoryState>,
pub stream_tracer: parking_lot::Mutex<Option<Arc<dyn ide_jvm_inspect::StreamTracer>>>,
/// Given at start: the class breakpoints must be armed before `configurationDone`.
pub(crate) exception_classes: Option<Arc<dyn ide_jvm_inspect::ExceptionClassBreakpoints>>,
/// Held from `setExceptionBreakpoints`, which drops the class breakpoints, until they are
/// armed again, so that the last list armed is the manager's.
pub(crate) exception_turn: tokio::sync::Mutex<()>,
pub(crate) stream_trace: parking_lot::Mutex<Option<crate::stream_trace::ActiveTrace>>,
/// The last trace that finished, until the stop its records were read in ends.
pub(crate) stream_trace_done: parking_lot::Mutex<Option<crate::stream_trace::DoneTrace>>,
@@ -286,6 +291,8 @@ impl Session {
kotlin_mirror: Mutex::new(None),
jvm_memory: tokio::sync::Mutex::default(),
stream_tracer: parking_lot::Mutex::new(None),
exception_classes: None,
exception_turn: tokio::sync::Mutex::default(),
stream_trace: parking_lot::Mutex::new(None),
stream_trace_done: parking_lot::Mutex::new(None),
quirks: kotlin_lsp::Quirks::default(),
+1
Переглянути файл
@@ -1,5 +1,6 @@
//! Protocol flow against an in-memory fake adapter.
mod exception_classes;
mod jvm_inspect;
mod stream_trace;
+154
Переглянути файл
@@ -0,0 +1,154 @@
//! Exception breakpoints on a chosen class, armed through a session's backend.
use super::*;
use ide_jvm_inspect::{ExceptionArmState, ExceptionClassBreakpoints, ExceptionClassSpec, InspectFuture, VmTarget};
/// The target, the list, and the DAP requests sent before it.
type ArmCall = (VmTarget, Vec<ExceptionClassSpec>, Vec<String>);
/// Records each list it is given with the DAP requests sent before it.
struct FakeArmer {
log: Log,
calls: Mutex<Vec<ArmCall>>,
}
impl FakeArmer {
fn new(h: &Harness) -> Arc<Self> {
Arc::new(Self { log: h.log.clone(), calls: Mutex::default() })
}
fn lists(&self) -> Vec<Vec<String>> {
self.calls.lock().iter().map(|(_, specs, _)| specs.iter().map(|s| s.class_name.clone()).collect()).collect()
}
/// The DAP requests sent before each call.
fn before(&self) -> Vec<Vec<String>> {
self.calls.lock().iter().map(|(_, _, sent)| sent.clone()).collect()
}
}
impl ExceptionClassBreakpoints for FakeArmer {
fn set<'a>(
&'a self,
target: &'a VmTarget,
breakpoints: &'a [ExceptionClassSpec],
) -> InspectFuture<'a, Vec<(String, ExceptionArmState)>> {
let sent = self
.log
.lock()
.iter()
.filter(|m| m["type"] == "request")
.map(|m| m["command"].as_str().unwrap().to_owned())
.collect();
self.calls.lock().push((target.clone(), breakpoints.to_vec(), sent));
let states = breakpoints.iter().map(|b| (b.id.clone(), ExceptionArmState::Armed)).collect();
Box::pin(async move { Ok(states) })
}
}
fn class_bp(id: &str, class_name: &str) -> ExceptionClassBreakpoint {
ExceptionClassBreakpoint {
id: id.into(),
class_name: class_name.into(),
caught: true,
uncaught: true,
enabled: true,
class_filters: vec![],
class_exclusion_filters: vec![],
}
}
/// A java-debug attach to a JVM on another machine: the target is known from the request alone.
fn attach() -> LaunchConfig {
LaunchConfig {
extra_json: Some(json!({"hostName": "10.0.0.5", "port": 5005}).to_string()),
..java_config("attach")
}
}
async fn start(h: &Harness, config: LaunchConfig, armer: &Arc<FakeArmer>) -> DebugSessionId {
let backend: Arc<dyn ExceptionClassBreakpoints> = armer.clone();
h.manager.start_with_exception_classes(config, h.owner.clone(), |_| None, Some(backend)).await.unwrap()
}
#[tokio::test]
async fn armed_after_the_exception_filters_and_before_configuration_done() {
let h = harness(Script::default());
let armer = FakeArmer::new(&h);
let filtered = ExceptionClassBreakpoint {
caught: false,
enabled: false,
class_filters: vec!["com.acme.*".into()],
class_exclusion_filters: vec!["*Test".into()],
..class_bp("b", "com.acme.Boom")
};
h.manager.set_exception_class_breakpoints(vec![class_bp("a", "java.lang.IllegalStateException"), filtered]).await;
start(&h, attach(), &armer).await;
assert_eq!(armer.before(), [["initialize", "attach", "setExceptionBreakpoints"]]);
let (target, specs, _) = armer.calls.lock()[0].clone();
assert_eq!((target.pid, target.attach_host.as_deref(), target.attach_port), (None, Some("10.0.0.5"), Some(5005)));
assert_eq!(
specs[1],
ExceptionClassSpec {
id: "b".into(),
class_name: "com.acme.Boom".into(),
caught: false,
uncaught: true,
enabled: false,
class_filters: vec!["com.acme.*".into()],
class_exclusion_filters: vec!["*Test".into()],
}
);
assert!(h.commands().contains(&"configurationDone".to_owned()));
}
#[tokio::test]
async fn armed_again_after_every_set_exception_breakpoints() {
let h = harness(Script::default());
let armer = FakeArmer::new(&h);
h.manager.set_exception_class_breakpoints(vec![class_bp("a", "com.acme.Boom")]).await;
start(&h, attach(), &armer).await;
h.manager.set_exception_breakpoints(BTreeMap::from([("raised".into(), true)])).await.unwrap();
assert_eq!(armer.lists(), [["com.acme.Boom"], ["com.acme.Boom"]]);
let last = armer.before().pop().unwrap();
assert_eq!(last.iter().filter(|c| *c == "setExceptionBreakpoints").count(), 2, "{last:?}");
}
#[tokio::test]
async fn a_new_list_reaches_the_sessions_that_take_it() {
let h = harness(Script::default());
let armer = FakeArmer::new(&h);
start(&h, attach(), &armer).await;
let other = h.start(attach()).await.unwrap();
assert!(armer.lists().is_empty(), "nothing to arm at start");
h.manager.set_exception_class_breakpoints(vec![class_bp("a", "com.acme.Boom")]).await;
h.manager.set_exception_class_breakpoints(vec![]).await;
assert_eq!(armer.lists(), [vec!["com.acme.Boom".to_owned()], vec![]], "an empty list takes them down");
let filters = h.manager.exception_filters(None);
let support = |id| filters.iter().find(|f| f.session == id).unwrap().classes.clone();
assert_eq!(support(other), None);
let java = filters.iter().find(|f| f.session != other).unwrap().session;
assert_eq!(
support(java),
Some(ExceptionClassSupport {
family: "java".into(),
condition: false,
class_filters: true,
catch_filters: false
})
);
}
#[tokio::test]
async fn nothing_is_sent_before_the_jvm_is_known() {
let h = harness(Script::default());
let armer = FakeArmer::new(&h);
h.manager.set_exception_class_breakpoints(vec![class_bp("a", "com.acme.Boom")]).await;
// The fake adapter sends no `process` event before `configurationDone`: no pid to name.
start(&h, java_config("launch"), &armer).await;
assert!(armer.lists().is_empty());
}
+10 -1
Переглянути файл
@@ -22,6 +22,9 @@ const LIMIT: usize = 16 * 1024 * 1024;
pub struct DbJdbcDriver {
pub id: String,
pub name: String,
/// Data source preset id; absent for a generic JDBC profile.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub vendor: Option<String>,
pub jars: Vec<String>,
pub class_name: String,
pub url_template: String,
@@ -146,7 +149,7 @@ impl DbManager {
fn jdbc_approval(&self, source: &DataSource) -> IdeResult<(PathBuf, String)> {
let registry = self.jdbc_registry()?;
let key = serde_json::to_vec(&(&self.root, &source.id)).map_err(|e| IdeError::internal(e.to_string()))?;
let settings = serde_json::to_vec(&(
let mut settings = serde_json::to_vec(&(
&source.jdbc_driver,
&source.url,
&source.user,
@@ -155,6 +158,9 @@ impl DbManager {
&source.options,
))
.map_err(|e| IdeError::internal(e.to_string()))?;
if self.jdbc_password_isolated(source) {
settings.extend_from_slice(b"\0jdbc-password");
}
Ok((
registry.with_file_name("jdbc-approvals").join(blake3::hash(&key).to_hex().as_str()),
blake3::hash(&settings).to_hex().to_string(),
@@ -195,6 +201,9 @@ impl DbManager {
.into_iter()
.find(|d| d.id == source.jdbc_driver)
.ok_or_else(|| IdeError::invalid("Select an installed JDBC driver profile"))?;
if !source.vendor.is_empty() && driver.vendor.as_deref() != Some(source.vendor.as_str()) {
return Err(IdeError::invalid("The JDBC driver profile is not associated with this data source type"));
}
JdbcPool::connect(source, password, driver, self.jdbc_registry()?.with_file_name("jdbc"))
.await
.map(Box::new)
+149 -15
Переглянути файл
@@ -25,8 +25,8 @@ pub use conn::{Held, Pool, QueryResult, ResultColumn};
pub use history::HistoryEntry;
pub use plan::{PlanNode, PlanProperty};
pub use source::{
DataSource, DbColor, DbDriver, DbIntrospection, DbOptions, DbProperty, DbSnowflake, DbSnowflakeAuth, DbSsh,
DbSshAuth, DbSslMode, DbTxMode,
DataSource, DbColor, DbDriver, DbIntrospection, DbOptions, DbProperty, DbSchemaSelection, DbSnowflake,
DbSnowflakeAuth, DbSsh, DbSshAuth, DbSslMode, DbTxMode, DbVisibilityChange,
};
pub use sql::{CellValue, DbRowEdit, SortKey};
@@ -475,6 +475,29 @@ impl DbManager {
}
}
fn non_password_snowflake(source: &DataSource) -> Option<DbSnowflake> {
let settings = match source.driver {
DbDriver::Snowflake => source.resolved().map(|source| source.snowflake()).unwrap_or_default(),
DbDriver::Jdbc => source.snowflake.clone()?,
_ => return None,
};
(settings.auth != DbSnowflakeAuth::Password).then_some(settings)
}
fn jdbc_password_isolated(&self, source: &DataSource) -> bool {
source.driver == DbDriver::Jdbc
&& (Self::non_password_snowflake(source).is_some()
|| self
.sources()
.unwrap_or_default()
.iter()
.any(|stored| stored.id == source.id && Self::non_password_snowflake(stored).is_some()))
}
fn password_key(&self, source: &DataSource) -> String {
if self.jdbc_password_isolated(source) { secrets::jdbc_key(&source.id) } else { source.id.clone() }
}
/// The connection settings of target `target` ([`DataSource::resolved`]), with
/// its database for `<id>:<database>`.
pub fn source(&self, target: &str) -> IdeResult<DataSource> {
@@ -495,15 +518,21 @@ impl DbManager {
Ok(source)
}
/// Saves the data source list; connections of removed or changed sources are closed.
/// Saves the data source list, preserving connections when only visibility rules change.
/// Global ones (`global`) go to the app-wide list, the others to the project's.
pub async fn save_sources(&self, sources: Vec<DataSource>) -> IdeResult<()> {
pub async fn save_sources(&self, mut sources: Vec<DataSource>) -> IdeResult<()> {
if sources.iter().any(|s| s.global && s.plugin_owner.is_some()) {
return Err(IdeError::invalid("plugin-owned data sources must stay project-scoped"));
}
let old = {
let _guard = plugin::EDIT.lock();
let old = self.sources().unwrap_or_default();
for source in sources.iter_mut().filter(|s| s.driver == DbDriver::Jdbc) {
// Retain the credential scope even when URL-only settings supplied the old authenticator.
if let Some(settings) = old.iter().find(|s| s.id == source.id).and_then(Self::non_password_snowflake) {
source.snowflake = Some(settings);
}
}
let (global, project): (Vec<_>, Vec<_>) = sources.iter().cloned().partition(|s| s.global);
match &self.global {
// Rewritten only when it changes: other projects' windows edit the same file.
@@ -522,9 +551,10 @@ impl DbManager {
};
for o in old {
match sources.iter().find(|s| s.id == o.id) {
Some(n) if *n == o => {}
Some(n) if o.same_except_visibility(n) => {}
gone_or_changed => {
let keys = [o.id.clone(), secrets::ssh_key(&o.id), Self::sso_credential(&o.id)];
let keys =
[o.id.clone(), secrets::jdbc_key(&o.id), secrets::ssh_key(&o.id), Self::sso_credential(&o.id)];
match gone_or_changed {
None => {
self.catalogs.forget(&o.id);
@@ -555,6 +585,31 @@ impl DbManager {
Ok(())
}
/// Updates one scope of a source's visibility against its latest saved rules.
pub fn save_source_visibility(&self, id: &str, available: &[String], change: DbVisibilityChange) -> IdeResult<()> {
let _guard = plugin::EDIT.lock();
let mut sources = source::load(&self.root)?;
let scoped_global = self.global.as_ref().filter(|_| !sources.iter().any(|source| source.id == id));
if let Some((dir, _)) = scoped_global {
sources = source::load_global(dir)?;
}
let selected = sources
.iter_mut()
.find(|source| source.id == id)
.ok_or_else(|| IdeError::not_found(format!("no data source {id}")))?;
let previous = selected.introspection.clone();
change.apply(&mut selected.introspection, available);
if selected.introspection == previous {
return Ok(());
}
if let Some((dir, _)) = scoped_global {
source::save_global(dir, &sources)?;
} else {
source::save(&self.root, &sources)?;
}
Ok(())
}
/// Watches the data source files (the project's and the global one) for edits made
/// outside the IDE; `on_change` runs on a background thread once they settle, and
/// should call [`DbManager::reconcile_sources`]. Stops when the result is dropped.
@@ -563,9 +618,9 @@ impl DbManager {
SourcesWatch::start(&self.root, self.global.as_ref().map(|(dir, _)| dir.as_path()), on_change)
}
/// Re-reads the data sources after their files changed on disk: connections of
/// removed or changed sources close, as on [`DbManager::save_sources`] (saved
/// passwords stay, the source may come back). Returns whether the list the tree
/// Re-reads the data sources after their files changed on disk and closes affected
/// connections as on [`DbManager::save_sources`] (saved passwords stay, the source
/// may come back). Returns whether the list the tree
/// shows changed, or the files no longer parse (the tree reports the error).
pub async fn reconcile_sources(&self) -> bool {
let now = match self.sources() {
@@ -580,7 +635,7 @@ impl DbManager {
return false;
}
for o in &before {
if now.iter().find(|s| s.id == o.id) != Some(o) {
if now.iter().find(|s| s.id == o.id).is_none_or(|n| !o.same_except_visibility(n)) {
self.disconnect_source(&o.id).await;
}
}
@@ -590,7 +645,12 @@ impl DbManager {
/// Remembers `password` for the session, and in the saved passwords when
/// the data source saves passwords (`None` forgets it).
pub async fn set_password(&self, id: &str, password: Option<String>, save: bool) -> IdeResult<()> {
self.remember(id, id.to_owned(), password, save).await
let source = self.sources()?.into_iter().find(|s| s.id == id);
let (store, key) = match source.as_ref() {
Some(source) => (self.store_of(source), self.password_key(source)),
None => (&self.saved_passwords, id.to_owned()),
};
self.remember(store, key, password, save).await
}
/// [`DbManager::set_password`] for the SSH password / key passphrase.
@@ -602,10 +662,10 @@ impl DbManager {
self.ssh.set_secret(&c, secret, save);
return Ok(());
}
self.remember(id, secrets::ssh_key(id), secret, save).await
self.remember(self.saved_for(id), secrets::ssh_key(id), secret, save).await
}
async fn remember(&self, id: &str, key: String, secret: Option<String>, save: bool) -> IdeResult<()> {
async fn remember(&self, store: &SecretStore, key: String, secret: Option<String>, save: bool) -> IdeResult<()> {
match &secret {
Some(p) => {
self.session_passwords.lock().insert(key.clone(), p.clone());
@@ -614,7 +674,6 @@ impl DbManager {
self.session_passwords.lock().remove(&key);
}
}
let store = self.saved_for(id);
let result = match (secret, save) {
(Some(p), true) => store.set(&key, &p),
_ => {
@@ -640,7 +699,10 @@ impl DbManager {
}
async fn password(&self, source: &DataSource) -> Option<String> {
match self.secret(source, source.id.clone(), source.driver != DbDriver::Sqlite && source.save_password).await {
match self
.secret(source, self.password_key(source), source.driver != DbDriver::Sqlite && source.save_password)
.await
{
Some(p) => Some(p),
None => source.url_password(),
}
@@ -1763,6 +1825,78 @@ mod tests {
);
}
#[tokio::test]
async fn switching_from_snowflake_key_pair_keeps_the_jdbc_password_separate() -> IdeResult<()> {
let tmp = tempfile::tempdir()?;
let db = manager(tmp.path()).with_global_sources(tmp.path().join("global"));
let native = DataSource {
id: "snowflake".into(),
name: "Snowflake".into(),
driver: DbDriver::Snowflake,
save_password: true,
url_only: true,
url: "jdbc:snowflake://example.invalid/?authenticator=SNOWFLAKE_JWT".into(),
..Default::default()
};
db.save_sources(vec![native.clone()]).await?;
db.set_password(&native.id, Some("native-passphrase".into()), true).await?;
let jdbc = DataSource { driver: DbDriver::Jdbc, url: "jdbc:fixture:".into(), ..native.clone() };
// Test Connection can use the JDBC draft before the user saves it.
assert_eq!(db.password(&jdbc).await, None);
assert_eq!(db.password(&native).await.as_deref(), Some("native-passphrase"));
db.approve_jdbc_source(&jdbc)?;
db.save_sources(vec![jdbc.clone()]).await?;
assert_eq!(db.password(&db.source(&jdbc.id)?).await, None);
db.set_password(&jdbc.id, Some("jdbc-password".into()), true).await?;
let reopened = manager(tmp.path()).with_global_sources(tmp.path().join("global"));
let saved = reopened.source(&jdbc.id)?;
assert_eq!(reopened.password(&saved).await.as_deref(), Some("jdbc-password"));
let err = reopened.pool(&jdbc.id).await.err().expect("no JDBC profile installed");
assert!(err.message.contains("Select an installed JDBC driver profile"));
source::save(&reopened.root, std::slice::from_ref(&jdbc))?;
let err = reopened.pool(&jdbc.id).await.err().expect("edited settings need approval");
assert!(err.message.contains("Review this project's JDBC URL and properties"));
source::save(&reopened.root, std::slice::from_ref(&saved))?;
let global = DataSource { global: true, ..saved };
reopened.save_sources(vec![global.clone()]).await?;
assert_eq!(reopened.password(&reopened.source(&jdbc.id)?).await.as_deref(), Some("jdbc-password"));
let native = DataSource { global: true, ..native };
reopened.save_sources(vec![native.clone()]).await?;
assert_eq!(reopened.password(&native).await.as_deref(), Some("native-passphrase"));
reopened.save_sources(Vec::new()).await?;
assert_eq!(reopened.password(&native).await, None);
assert_eq!(reopened.password(&global).await, None);
Ok(())
}
#[tokio::test]
async fn switching_from_snowflake_password_keeps_the_password() -> IdeResult<()> {
let tmp = tempfile::tempdir()?;
let db = manager(tmp.path());
let native = DataSource {
id: "snowflake".into(),
name: "Snowflake".into(),
driver: DbDriver::Snowflake,
save_password: true,
url_only: true,
url: "jdbc:snowflake://example.invalid/?authenticator=snowflake".into(),
..Default::default()
};
db.save_sources(vec![native.clone()]).await?;
db.set_password(&native.id, Some("existing-password".into()), true).await?;
let jdbc = DataSource { driver: DbDriver::Jdbc, url: "jdbc:fixture:".into(), ..native };
assert_eq!(db.password(&jdbc).await.as_deref(), Some("existing-password"));
db.save_sources(vec![jdbc.clone()]).await?;
let reopened = manager(tmp.path());
assert_eq!(reopened.password(&reopened.source(&jdbc.id)?).await.as_deref(), Some("existing-password"));
Ok(())
}
#[tokio::test]
async fn moves_plaintext_passwords_of_older_versions_off_disk() {
let tmp = tempfile::tempdir().unwrap();
+5
Переглянути файл
@@ -18,6 +18,11 @@ pub fn ssh_key(id: &str) -> String {
format!("{id}#ssh")
}
/// JDBC password when the original credential is a Snowflake passphrase or token.
pub fn jdbc_key(id: &str) -> String {
format!("{id}#jdbc")
}
fn file_key(project: &str, key: &str) -> String {
format!("{project}|{key}")
}
+154
Переглянути файл
@@ -6,6 +6,7 @@
use ide_core::{IdeError, IdeResult, IpcPath, project_dir};
use serde::{Deserialize, Serialize};
use specta::Type;
use std::collections::BTreeMap;
use std::path::Path;
pub(crate) const FILE: &str = "data-sources.toml";
@@ -101,6 +102,9 @@ pub struct DbIntrospection {
pub databases: Vec<String>,
pub all_schemas: bool,
pub schemas: Vec<String>,
/// A database can replace the source's schema rules with all schemas or a list of exact names.
#[serde(skip_serializing_if = "BTreeMap::is_empty")]
pub schemas_by_database: BTreeMap<String, DbSchemaSelection>,
/// `pg_catalog`, `information_schema`, `mysql`…, and service databases (`rdsadmin`…).
pub show_system: bool,
/// PostgreSQL template databases (`template0`, `template1`).
@@ -117,6 +121,7 @@ impl Default for DbIntrospection {
databases: Vec::new(),
all_schemas: true,
schemas: Vec::new(),
schemas_by_database: BTreeMap::new(),
show_system: false,
show_templates: false,
object_filter: String::new(),
@@ -125,6 +130,18 @@ impl Default for DbIntrospection {
}
impl DbIntrospection {
pub(crate) fn with_visibility_from(self, source: &Self) -> Self {
Self {
all_databases: source.all_databases,
databases: source.databases.clone(),
all_schemas: source.all_schemas,
schemas: source.schemas.clone(),
schemas_by_database: source.schemas_by_database.clone(),
object_filter: source.object_filter.clone(),
..self
}
}
/// Whether the tree shows this schema: every one with `all_schemas`, otherwise it has to
/// match one of the `schemas` patterns. The completion model uses the same test, so it
/// offers exactly the tables the tree lists (and does not read the ones it never shows).
@@ -163,6 +180,60 @@ fn schema_matches(pattern: &str, name: &str) -> bool {
p[pi..].iter().all(|&c| c == '*')
}
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
#[serde(default)]
pub struct DbSchemaSelection {
pub all: bool,
pub names: Vec<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
#[serde(tag = "kind", rename_all = "camelCase")]
pub enum DbVisibilityChange {
Databases { selection: DbSchemaSelection },
Schemas { selection: DbSchemaSelection },
DatabaseSchemas { database: String, selection: Option<DbSchemaSelection> },
}
impl DbVisibilityChange {
pub(crate) fn apply(self, introspection: &mut DbIntrospection, available: &[String]) {
let available: std::collections::HashSet<_> = available.iter().map(String::as_str).collect();
let keep_names = |before: &mut Vec<String>, selection: DbSchemaSelection, exact: bool| {
if selection.all || (!exact && before.iter().any(|name| name.contains(['*', '?']))) {
return;
}
before.retain(|name| !available.contains(if exact { name.as_str() } else { name.trim() }));
let mut seen: std::collections::HashSet<_> = before.iter().cloned().collect();
before.extend(
selection
.names
.into_iter()
.filter(|name| (exact || !name.contains(['*', '?'])) && seen.insert(name.clone())),
);
};
match self {
Self::Databases { selection } => {
introspection.all_databases = selection.all;
keep_names(&mut introspection.databases, selection, false);
}
Self::Schemas { selection } => {
introspection.all_schemas = selection.all;
keep_names(&mut introspection.schemas, selection, false);
}
Self::DatabaseSchemas { database, selection } => match selection {
Some(selection) => {
let rule = introspection.schemas_by_database.entry(database).or_default();
rule.all = selection.all;
keep_names(&mut rule.names, selection, true);
}
None => {
introspection.schemas_by_database.remove(&database);
}
},
}
}
}
/// Advanced tab: a driver property. PostgreSQL: run-time parameters (and
/// `application_name`); MySQL: session variables (and `charset`, `collation`);
/// SQLite: pragmas. See [`crate::conn`].
@@ -430,6 +501,14 @@ pub fn parse_url(raw: &str) -> IdeResult<ParsedUrl> {
}
impl DataSource {
pub(crate) fn same_except_visibility(&self, other: &Self) -> bool {
if self == other {
return true;
}
let introspection = other.introspection.clone().with_visibility_from(&self.introspection);
*self == Self { introspection, ..other.clone() }
}
/// The settings to connect with: with [`DataSource::url_only`], host, port,
/// database, user, SSL and driver properties come from the URL (properties
/// of the Advanced tab still apply after the URL's).
@@ -661,6 +740,81 @@ mod tests {
assert_eq!(load(tmp.path()).unwrap(), vec![s]);
}
#[test]
fn visibility_change_preserves_patterns_unavailable_names_and_other_scopes() {
let mut introspection = DbIntrospection {
schemas: vec!["app_*".into(), "unavailable_?".into()],
databases: vec!["reporting".into(), "offline".into()],
schemas_by_database: BTreeMap::from([
("reporting".into(), DbSchemaSelection { all: false, names: vec!["private".into()] }),
("sandbox".into(), DbSchemaSelection { all: false, names: vec!["experiments".into()] }),
]),
show_system: true,
..Default::default()
};
DbVisibilityChange::Schemas { selection: DbSchemaSelection { all: false, names: vec!["demo".into()] } }
.apply(&mut introspection, &["app_sales".into(), "demo".into()]);
assert_eq!(introspection.schemas, ["app_*", "unavailable_?"]);
DbVisibilityChange::Databases { selection: DbSchemaSelection { all: false, names: vec!["sandbox".into()] } }
.apply(&mut introspection, &["reporting".into(), "sandbox".into()]);
assert_eq!(introspection.databases, ["offline", "sandbox"]);
DbVisibilityChange::DatabaseSchemas {
database: "reporting".into(),
selection: Some(DbSchemaSelection {
all: false,
names: vec!["finance".into(), "finance".into(), "private".into()],
}),
}
.apply(&mut introspection, &["public".into(), "finance".into()]);
assert_eq!(introspection.schemas_by_database["reporting"].names, ["private", "finance"]);
assert_eq!(introspection.schemas_by_database["sandbox"].names, ["experiments"]);
assert!(introspection.show_system);
}
#[test]
fn schema_override_can_omit_default_fields() {
let introspection: DbIntrospection = toml::from_str(
r#"
[schemasByDatabase.reporting]
all = true
[schemasByDatabase.sandbox]
names = ["finance"]
"#,
)
.unwrap();
assert_eq!(
introspection.schemas_by_database,
BTreeMap::from([
("reporting".into(), DbSchemaSelection { all: true, names: vec![] }),
("sandbox".into(), DbSchemaSelection { all: false, names: vec!["finance".into()] }),
])
);
}
#[test]
fn round_trips_database_schema_overrides() {
let tmp = tempfile::tempdir().unwrap();
let source = DataSource {
id: "postgres".into(),
name: "PostgreSQL Demo".into(),
driver: DbDriver::Postgres,
introspection: DbIntrospection {
all_schemas: false,
schemas: vec!["app_*".into()],
schemas_by_database: BTreeMap::from([
("analytics".into(), DbSchemaSelection { all: true, names: vec![] }),
("reporting.eu".into(), DbSchemaSelection { all: false, names: vec!["public".into()] }),
("sandbox".into(), DbSchemaSelection { all: false, names: vec![] }),
]),
..Default::default()
},
..Default::default()
};
save(tmp.path(), std::slice::from_ref(&source)).unwrap();
assert_eq!(load(tmp.path()).unwrap(), vec![source]);
}
#[test]
fn sqlserver_defaults() {
assert_eq!(DbDriver::SqlServer.default_port(), Some(1433));
+41
Переглянути файл
@@ -17,12 +17,14 @@ async fn jdbc_profiles_persist_and_project_files_cannot_start_drivers() -> IdeRe
db.save_jdbc_driver(DbJdbcDriver {
id: "fixture".into(),
name: "Test".into(),
vendor: None,
jars: vec![jar.display().to_string()],
class_name: "test.Driver".into(),
url_template: "jdbc:test:".into(),
})?;
let reopened = manager(tmp.path());
assert_eq!(reopened.jdbc_drivers()?[0].class_name, "test.Driver");
assert_eq!(reopened.jdbc_drivers()?[0].vendor, None);
let source = DataSource {
id: "local".into(),
name: "local".into(),
@@ -53,6 +55,40 @@ async fn jdbc_profiles_persist_and_project_files_cannot_start_drivers() -> IdeRe
Ok(())
}
#[tokio::test]
async fn named_jdbc_sources_persist_the_type_and_reject_a_profile_for_another_type() -> IdeResult<()> {
let tmp = tempfile::tempdir()?;
let jar = tmp.path().join("fixture.jar");
std::fs::write(&jar, [])?;
let db = manager(tmp.path());
db.save_jdbc_driver(DbJdbcDriver {
id: "fixture".into(),
name: "Test".into(),
vendor: Some("tidb".into()),
jars: vec![jar.display().to_string()],
class_name: "test.Driver".into(),
url_template: String::new(),
})?;
let source = DataSource {
id: "local".into(),
name: "local".into(),
driver: DbDriver::Jdbc,
vendor: "mariadb".into(),
jdbc_driver: "fixture".into(),
url: "jdbc:test:".into(),
..Default::default()
};
db.save_sources(vec![source]).await?;
let reopened = manager(tmp.path());
let source = reopened.source("local")?;
assert_eq!(reopened.jdbc_drivers()?[0].vendor.as_deref(), Some("tidb"));
assert_eq!(source.driver, DbDriver::Jdbc);
assert_eq!(source.vendor, "mariadb");
let err = reopened.test(&source, None, None).await.unwrap_err();
assert!(err.message.contains("not associated with this data source type"));
Ok(())
}
#[tokio::test]
#[ignore = "requires DUCKDB_JDBC_JAR and a local Java 17+ runtime"]
async fn duckdb_custom_driver_through_database_manager() -> IdeResult<()> {
@@ -63,6 +99,7 @@ async fn duckdb_custom_driver_through_database_manager() -> IdeResult<()> {
db.save_jdbc_driver(DbJdbcDriver {
id: "duck".into(),
name: "DuckDB".into(),
vendor: None,
jars: vec![jar],
class_name: "org.duckdb.DuckDBDriver".into(),
url_template: "jdbc:duckdb:".into(),
@@ -135,6 +172,7 @@ async fn clickhouse_vendor_driver_reads_catalog_and_results() -> IdeResult<()> {
db.save_jdbc_driver(DbJdbcDriver {
id: "clickhouse".into(),
name: "ClickHouse JDBC".into(),
vendor: Some("clickhouse".into()),
jars,
class_name: "com.clickhouse.jdbc.ClickHouseDriver".into(),
url_template: "jdbc:clickhouse://".into(),
@@ -143,6 +181,7 @@ async fn clickhouse_vendor_driver_reads_catalog_and_results() -> IdeResult<()> {
id: "test".into(),
name: "ClickHouse JDBC".into(),
driver: DbDriver::Jdbc,
vendor: "clickhouse".into(),
jdbc_driver: "clickhouse".into(),
url: format!("jdbc:clickhouse://127.0.0.1:{port}/default"),
user: "fixture".into(),
@@ -181,6 +220,7 @@ async fn unresponsive_driver_closes_before_reconnect() -> IdeResult<()> {
db.save_jdbc_driver(DbJdbcDriver {
id: "fixture".into(),
name: "Fixture".into(),
vendor: None,
jars: vec![std::env::var("JDBC_FIXTURE_JAR").unwrap()],
class_name: "ai.openidea.jdbc.SelfTest$Fixture".into(),
url_template: String::new(),
@@ -229,6 +269,7 @@ async fn a_lost_session_reconnects_on_the_next_statement() -> IdeResult<()> {
db.save_jdbc_driver(DbJdbcDriver {
id: "fixture".into(),
name: "Fixture".into(),
vendor: None,
jars: vec![std::env::var("JDBC_FIXTURE_JAR").unwrap()],
class_name: "ai.openidea.jdbc.SelfTest$Fixture".into(),
url_template: String::new(),
+68 -1
Переглянути файл
@@ -2,7 +2,8 @@
use ide_core::{CancellationToken, IdeResult};
use ide_db::{
CellValue, DataSource, DbDriver, DbManager, DbOptions, DbProperty, DbRowEdit, DbTableKind, QueryResult, SortKey,
CellValue, DataSource, DbDriver, DbManager, DbOptions, DbProperty, DbRowEdit, DbSchemaSelection, DbTableKind,
DbVisibilityChange, QueryResult, SortKey,
};
async fn setup() -> (tempfile::TempDir, DbManager) {
@@ -242,6 +243,72 @@ async fn manual_commit_keeps_a_transaction_until_commit_or_rollback() -> IdeResu
Ok(())
}
#[tokio::test]
async fn visibility_edits_preserve_the_held_transaction() -> IdeResult<()> {
let (tmp, db) = setup().await;
let c = CancellationToken::new();
db.set_manual_commit("s1", true).await?;
db.execute("s1", "INSERT INTO users (name) VALUES ('dee')", 1, &c).await?;
assert_eq!(count(&db).await, "4");
let mut source = db.source("s1")?;
source.introspection.all_schemas = false;
source.introspection.schemas.clear();
db.save_sources(vec![source.clone()]).await?;
assert!(db.is_connected("s1"), "saving rules must keep the active connection");
assert_eq!(count(&db).await, "4", "the held transaction must still see its uncommitted row");
db.save_source_visibility(
"s1",
&["main".into()],
DbVisibilityChange::Schemas { selection: DbSchemaSelection { all: true, names: vec![] } },
)?;
assert!(db.source("s1")?.introspection.all_schemas);
assert_eq!(count(&db).await, "4", "the scoped save must keep the live transaction");
db.reconcile_sources().await;
let root = tmp.path();
let ssh = std::sync::Arc::new(ide_ssh::SshManager::new(root.join("ssh-passwords.json")));
let other = DbManager::new(root.to_path_buf(), root.join("passwords.json"), root.join("history.json"), ssh);
source = db.source("s1")?;
source.introspection.object_filter = "user*".into();
other.save_sources(vec![source.clone()]).await?;
assert!(db.reconcile_sources().await);
assert_eq!(count(&db).await, "4", "a visibility edit from another window must keep the transaction");
db.finish_transaction("s1", true).await?;
assert_eq!(count(&db).await, "4");
source.introspection.show_system = true;
db.save_sources(vec![source]).await?;
assert!(!db.is_connected("s1"), "raw metadata option changes keep their invalidation path");
Ok(())
}
#[tokio::test]
async fn visibility_save_does_not_mask_an_unreconciled_connection_edit() -> IdeResult<()> {
let (tmp, db) = setup().await;
let first = db.source("s1")?;
let second = DataSource { id: "s2".into(), name: "Another source".into(), ..first.clone() };
db.save_sources(vec![first.clone(), second.clone()]).await?;
db.reconcile_sources().await;
assert!(db.is_connected("s1"));
let root = tmp.path();
let ssh = std::sync::Arc::new(ide_ssh::SshManager::new(root.join("ssh-passwords.json")));
let external = DbManager::new(root.to_path_buf(), root.join("passwords.json"), root.join("history.json"), ssh);
external.save_sources(vec![DataSource { read_only: true, ..first }, second]).await?;
db.save_source_visibility(
"s2",
&["main".into()],
DbVisibilityChange::Schemas { selection: DbSchemaSelection { all: false, names: vec![] } },
)?;
assert!(db.is_connected("s1"));
assert!(db.reconcile_sources().await);
assert!(!db.is_connected("s1"));
assert!(!db.source("s2")?.introspection.all_schemas);
Ok(())
}
#[tokio::test]
async fn targets_name_a_database_of_a_data_source() -> IdeResult<()> {
let (_tmp, db) = setup().await;
+65 -2
Переглянути файл
@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};
use specta::Type;
use std::path::{Path, PathBuf};
use std::process::Command;
use std::sync::OnceLock;
use std::sync::{Condvar, Mutex, OnceLock};
use std::time::Duration;
/// Listing and lifecycle commands normally answer in well under a second; a
@@ -315,9 +315,56 @@ pub fn container_stats(ep: &DockerEndpoint, id: &str) -> IdeResult<DockerContain
parse_container_stats(&out).ok_or_else(|| IdeError::not_found("no container stats returned"))
}
/// How long log lines collect before they are handed on together.
const LOG_BATCH: Duration = Duration::from_millis(30);
/// Streams a container's logs (`tail` last lines, then follows while `follow`)
/// until it ends or `cancel` fires.
/// until it ends or `cancel` fires. Lines arrive in batches, at most one per
/// [`LOG_BATCH`]: a webview delivers each IPC message on its own, so a message
/// per line made a 1000-line tail take tens of seconds on Windows.
pub fn logs(
ep: &DockerEndpoint,
id: &str,
tail: u32,
follow: bool,
timestamps: bool,
cancel: &CancellationToken,
on_lines: &(dyn Fn(Vec<DockerLogLine>) + Sync),
) -> IdeResult<()> {
batched(LOG_BATCH, on_lines, |on_line| stream_logs(ep, id, tail, follow, timestamps, cancel, on_line))
}
/// Runs `produce` with a per-item callback and hands the items to `emit` in order,
/// collected over `every`, from a second thread so a quiet stream still flushes.
fn batched<T: Send, R>(every: Duration, emit: &(dyn Fn(Vec<T>) + Sync), produce: impl FnOnce(&dyn Fn(T)) -> R) -> R {
let pending = Mutex::new(Vec::new());
let finished = (Mutex::new(false), Condvar::new());
let flush = || {
let items = std::mem::take(&mut *pending.lock().unwrap_or_else(|e| e.into_inner()));
if !items.is_empty() {
emit(items);
}
};
std::thread::scope(|scope| {
scope.spawn(|| {
let (done, wake) = &finished;
let mut stop = done.lock().unwrap_or_else(|e| e.into_inner());
loop {
stop = wake.wait_timeout(stop, every).unwrap_or_else(|e| e.into_inner()).0;
flush();
if *stop {
break;
}
}
});
let result = produce(&|item| pending.lock().unwrap_or_else(|e| e.into_inner()).push(item));
*finished.0.lock().unwrap_or_else(|e| e.into_inner()) = true;
finished.1.notify_one();
result
})
}
fn stream_logs(
ep: &DockerEndpoint,
id: &str,
tail: u32,
@@ -606,6 +653,22 @@ pub fn cli(
mod local_tests {
use super::*;
#[test]
fn log_lines_arrive_in_order_as_few_batches() {
let batches = Mutex::new(Vec::<Vec<u32>>::new());
let result = batched(Duration::from_millis(30), &|b| batches.lock().unwrap().push(b), |line| {
(0..1000).for_each(line);
std::thread::sleep(Duration::from_millis(80));
line(1000);
"done"
});
assert_eq!(result, "done");
let batches = batches.into_inner().unwrap();
assert_eq!(batches.concat(), (0..=1000).collect::<Vec<_>>(), "every line once, in order");
assert!(batches.len() <= 3, "a burst is one message, not one per line: {} batches", batches.len());
assert_eq!(batches.last().unwrap(), &[1000], "a line after a quiet spell is flushed on its own");
}
#[test]
fn the_selected_context_overrides_docker_host() {
let local = "unix:///var/run/docker.sock";
+2 -1
Переглянути файл
@@ -34,7 +34,7 @@ use std::path::{Component, Path, PathBuf};
pub const MANIFEST_FILE: &str = "plugin.toml";
/// The plugin API (engine) version this host implements.
pub const ENGINE_VERSION: &str = "1.14.0";
pub const ENGINE_VERSION: &str = "1.15.0";
/// The 0.1 API, still accepted for contribution-only packages and 0.1 components.
pub const LEGACY_API: &str = "0.1";
/// Marketplace categories, in the order they are shown.
@@ -164,6 +164,7 @@ pub const EVENT_KINDS: &[&str] = &[
"file-saved",
"files-changed",
"editor-focused",
"caret-moved",
"action-performed",
"vcs-changed",
"problems-changed",
+1 -1
Переглянути файл
@@ -345,7 +345,7 @@ impl Host {
}
if let Some(plugins) = plugins::editor_plugin_host() {
plugins.invalidate_client_navigation(&project.root, Some(window), None);
plugins.set_active_file(window, None);
plugins.set_active_file(window, None, None);
}
if !project.light {
self.environment.project_closed();
+22 -5
Переглянути файл
@@ -23,7 +23,25 @@ const DEFAULT_TREE_DEPTH: i64 = 5;
const TREE_LIMIT: usize = 100;
pub fn tools() -> Vec<Tool> {
vec![read_file(), list_directory_tree()]
vec![get_workspace_roots(), read_file(), list_directory_tree()]
}
// --- get_workspace_roots ---------------------------------------------------------
fn get_workspace_roots() -> Tool {
Tool::new(
"get_workspace_roots",
"Returns the root directories of the IDE workspace: this project and the trusted projects attached to it
in the same window, as absolute paths. A task works in one directory, but its workspace can hold several projects.
Call this when asked about the workspace, project or working directories, and before planning a change that may span
projects. Other tools reach an attached project by its root as `projectPath`.",
|call| async move {
let root = call.root().to_path_buf();
let mut roots = vec![root.clone()];
roots.extend(crate::mcp::tool::trusted_attachments(&call.host.trust, &root));
Output::json(json!({ "projectRoot": root, "roots": roots }))
},
)
}
// --- read_file -----------------------------------------------------------------
@@ -184,10 +202,9 @@ marked directory are not marked again.",
}
let deadline = Instant::now() + Duration::from_millis(timeout.max(0) as u64);
let cancel = call.cancel.clone();
let marks = Marks {
root: call.root().to_path_buf(),
excludes: FileMask::new(&[], &call.project().search_excludes()).ok(),
};
// Matched from the root holding the directory: an attached project has its own exclusions.
let root = call.project().root_of(&dir);
let marks = Marks { excludes: FileMask::new(&[], &call.project().search_excludes_in(&root)).ok(), root };
// The directory itself, when it or one above it is left out.
let root_mark = marker(ide_index::walk_skips(call.root(), &dir), marks.ide_excluded(&dir, true));
let mut tree = TreeRender {
+2
Переглянути файл
@@ -16,6 +16,8 @@ mod search;
pub mod service;
mod symbols;
mod tool;
pub(crate) use tool::trusted_attachments;
mod util;
use crate::Host;
+12 -4
Переглянути файл
@@ -837,8 +837,6 @@ async fn file_search(call: Call) -> IdeResult<Output> {
.add(build_glob(&normalize_glob(&q, call.root(), &[])?)?)
.build()
.map_err(|_| IdeError::invalid(format!("Invalid glob pattern: {q}")))?;
// Ignored names and "Exclude files" patterns, which `read_dir` does not flag.
let excludes = if include_excluded { None } else { Some(FileMask::new(&[], &call.project().search_excludes())?) };
let root = call.root().to_path_buf();
let content = call.project().content_roots();
// Where a folder's exclusions are matched from: the content root holding it, or the project.
@@ -862,6 +860,15 @@ async fn file_search(call: Call) -> IdeResult<Output> {
.map(|r| (r.clone(), r))
.collect(),
};
// Ignored names and "Exclude files" patterns, which `read_dir` does not flag, by walked root.
let mut excludes = Vec::new();
if !include_excluded {
for (_, base) in &roots {
if !excludes.iter().any(|(b, _)| b == base) {
excludes.push((base.clone(), FileMask::new(&[], &call.project().search_excludes_in(base))?));
}
}
}
let host = call.host();
let walk = Walk {
host: host.clone(),
@@ -898,7 +905,7 @@ struct Walk {
window: String,
root: PathBuf,
include_excluded: bool,
excludes: Option<FileMask>,
excludes: Vec<(PathBuf, FileMask)>,
glob: GlobSet,
scope: PathScope,
limit: usize,
@@ -931,7 +938,8 @@ impl Walk {
continue;
}
let Ok(in_base) = entry.path.strip_prefix(base) else { continue };
if self.excludes.as_ref().is_some_and(|m| !m.matches(&in_base.to_string_lossy().replace('\\', "/"))) {
let mask = self.excludes.iter().find(|(b, _)| b == base).map(|(_, m)| m);
if mask.is_some_and(|m| !m.matches(&in_base.to_string_lossy().replace('\\', "/"))) {
continue;
}
match entry.kind {
+6 -4
Переглянути файл
@@ -65,10 +65,7 @@ impl Call {
}
/// The projects attached to this one that the user trusts (each is trusted on its own).
fn trusted_attachments(&self) -> Vec<PathBuf> {
attached_projects(self.root())
.into_iter()
.filter(|root| self.host.trust.trusted(root).unwrap_or(false))
.collect()
trusted_attachments(&self.host.trust, self.root())
}
pub async fn ask(&self, request: ide_core::event::McpUiRequest) -> IdeResult<()> {
self.host.mcp_requests.ask(self, request).await
@@ -327,6 +324,11 @@ pub fn ensure_inside(root: &Path, path: &Path) -> IdeResult<()> {
resolve_inside(root, &path.to_string_lossy()).map(|_| ())
}
/// The projects attached to the one at `root` that the user trusts (each is trusted on its own).
pub(crate) fn trusted_attachments(trust: &crate::trust::TrustStore, root: &Path) -> Vec<PathBuf> {
attached_projects(root).into_iter().filter(|p| trust.trusted(p).unwrap_or(false)).collect()
}
/// The projects attached to the one at `root` (its workspace members), `root` itself left out.
pub(crate) fn attached_projects(root: &Path) -> Vec<PathBuf> {
ide_workspace::workspace::Workspace::load(root)
+16 -4
Переглянути файл
@@ -1045,11 +1045,10 @@ pub fn agent_set_skill_overrides(
#[command(trust = always)]
pub async fn agent_skills_list(host: &Host, window: &str) -> IdeResult<Vec<AgentSkillState>> {
let project = host.project(window)?;
let root = project.root.clone();
let (policy, home) = (skills_policy(&project), dirs::home_dir());
tokio::task::spawn_blocking(move || {
Ok(ide_agent::skills::resolve(
ide_agent::skills::discover_skills(&root, home.as_deref()),
ide_agent::skills::discover_skills_in(&policy.workspace_roots, home.as_deref()),
None,
&policy.workspace,
&policy.user,
@@ -1103,11 +1102,10 @@ pub fn agent_skills_set_mode(
}
match project {
Some(project) => {
let root = project.root.clone();
let policy = skills_policy(&project);
let home = dirs::home_dir();
Ok(ide_agent::skills::resolve(
ide_agent::skills::discover_skills(&root, home.as_deref()),
ide_agent::skills::discover_skills_in(&policy.workspace_roots, home.as_deref()),
None,
&policy.workspace,
&policy.user,
@@ -1162,12 +1160,26 @@ fn persist_skills_map(
Ok(())
}
/// Workspace folders to scan for skills: the project root plus any multi-repo workspace members.
pub(crate) fn workspace_skill_roots(root: &std::path::Path) -> Vec<std::path::PathBuf> {
let mut roots = vec![root.to_path_buf()];
if let Ok(Some(ws)) = ide_workspace::workspace::Workspace::load(root) {
for member in ws.projects {
if member.exists() && !roots.contains(&member) {
roots.push(member);
}
}
}
roots
}
/// The skill policies a session of `project` resolves against.
fn skills_policy(project: &crate::Project) -> SkillsPolicy {
SkillsPolicy {
user: project.settings.layer(ide_workspace::settings::SettingsScope::Global).agents.skills.clone(),
workspace: project.settings.layer(ide_workspace::settings::SettingsScope::Project).agents.skills.clone(),
workspace_trusted: project.trusted.load(std::sync::atomic::Ordering::Acquire),
workspace_roots: workspace_skill_roots(&project.root),
}
}
+4 -4
Переглянути файл
@@ -81,12 +81,12 @@ pub(crate) fn sources_in(root: &Path, excludes: &[String]) -> Vec<StepSource> {
/// Every Cucumber source of the project (its folder and the content roots outside it).
pub fn cucumber_sources(host: &Host, window: &str) -> IdeResult<Vec<StepSource>> {
let project = host.project(window)?;
let mut excludes = project.search_excludes();
// Cucumber's own sources (and every other package's) are not the project's steps.
excludes.push("node_modules".to_owned());
excludes.push("site-packages".to_owned());
let mut out = Vec::new();
for root in std::iter::once(project.root.clone()).chain(project.content_roots()) {
let mut excludes = project.search_excludes_in(&root);
// Cucumber's own sources (and every other package's) are not the project's steps.
excludes.push("node_modules".to_owned());
excludes.push("site-packages".to_owned());
out.extend(sources_in(&root, &excludes));
}
out.sort_by(|a, b| a.path.cmp(&b.path));
+163 -24
Переглянути файл
@@ -2,13 +2,14 @@
//! remote server ([`crate::rpc`]). `db_export_file` stays in the desktop
//! shell: its path comes from a local save dialog, so the export must land
//! on the user's machine, not the side the project runs on.
use super::Channel;
use crate::Host;
use ide_command::command;
use ide_core::{IdeError, IdeResult, IpcPath, RequestId};
use ide_db::split::SqlStatement;
use ide_db::{
CompletionModel, DataSource, Databases, DbObjectKind, DbRowEdit, HistoryEntry, PlanNode, QueryResult,
SchemaObjects, SortKey, TableDetails, TableInfo, TablePage,
CompletionModel, DataSource, Databases, DbObjectKind, DbRowEdit, DbVisibilityChange, HistoryEntry, PlanNode,
QueryResult, SchemaObjects, SortKey, TableDetails, TableInfo, TablePage,
};
use serde::{Deserialize, Serialize};
use specta::Type;
@@ -24,6 +25,14 @@ pub struct StatementOutcome {
pub error: Option<String>,
}
#[derive(Serialize, Deserialize, Type)]
#[serde(tag = "type", rename_all = "camelCase")]
pub enum ExecutionEvent {
Started { index: u32 },
Completed { index: u32, outcome: StatementOutcome },
Done { error: Option<IdeError> },
}
#[command(trust = trusted)]
pub fn db_approve_jdbc_source(host: &Host, window: &str, source: DataSource) -> IdeResult<()> {
host.project(window)?.db.approve_jdbc_source(&source)
@@ -63,6 +72,25 @@ pub async fn db_save_sources(host: &Host, window: &str, sources: Vec<DataSource>
// Replaces the project's data sources with `sources`.
let db = host.project(window)?.db.clone();
db.save_sources(sources).await?;
sources_changed(host, window)
}
#[command(trust = trusted)]
pub async fn db_save_source_visibility(
host: &Host,
window: &str,
id: String,
available: Vec<String>,
change: DbVisibilityChange,
) -> IdeResult<()> {
let db = host.project(window)?.db.clone();
tokio::task::spawn_blocking(move || db.save_source_visibility(&id, &available, change))
.await
.map_err(|e| IdeError::internal(e.to_string()))??;
sources_changed(host, window)
}
fn sources_changed(host: &Host, window: &str) -> IdeResult<()> {
let root = host.project(window)?.root.clone();
for project in host.projects().into_iter().filter(|p| p.root == root) {
project.sink.emit(ide_core::IdeEvent::DbSourcesChanged);
@@ -357,36 +385,79 @@ pub async fn db_execute(
max_rows: u32,
schema: Option<String>,
) -> IdeResult<Vec<StatementOutcome>> {
// Runs `statements` in order on data source `id`, stopping at the first
// error. Each result reads past its first `skip` rows (a later page) and keeps
// `max_rows`. `schema` is the console's active context: the connection running
// each statement is put in it first. Cancel with `cancel_request(request)`.
let mut outcomes = Vec::new();
execute_statements(host, window, request, &id, statements, skip, max_rows, schema.as_deref(), |event| {
if let ExecutionEvent::Completed { outcome, .. } = event {
outcomes.push(outcome);
}
Ok(())
})
.await?;
Ok(outcomes)
}
#[allow(clippy::too_many_arguments)]
#[command(trust = trusted)]
pub async fn db_execute_stream(
host: &Host,
window: &str,
request: RequestId,
id: String,
statements: Vec<SqlStatement>,
max_rows: u32,
schema: Option<String>,
on_progress: Channel<ExecutionEvent>,
) -> IdeResult<()> {
let result = execute_statements(host, window, request, &id, statements, 0, max_rows, schema.as_deref(), |event| {
on_progress.send(event)
})
.await;
// The invocation reply can reach the viewer before a large result frame.
on_progress.send(ExecutionEvent::Done { error: result.err() })
}
/// Runs in order on one request and stops on cancellation or the first error.
#[allow(clippy::too_many_arguments)]
async fn execute_statements(
host: &Host,
window: &str,
request: RequestId,
id: &str,
statements: Vec<SqlStatement>,
skip: u32,
max_rows: u32,
schema: Option<&str>,
mut emit: impl FnMut(ExecutionEvent) -> IdeResult<()>,
) -> IdeResult<()> {
let db = host.project(window)?.db.clone();
let cancel = host.begin_request(request);
let mut out = Vec::new();
for statement in statements {
match db
.execute_from(&id, &statement.text, skip as usize, max_rows.max(1) as usize, &cancel, schema.as_deref())
.await
{
Ok(result) => out.push(StatementOutcome { statement, result: Some(result), error: None }),
Err(e) if e.kind == ide_core::error::ErrorKind::Cancelled => {
host.end_request(request);
return Err(e);
let result = async {
for (index, statement) in statements.into_iter().enumerate() {
if cancel.is_cancelled() {
return Err(IdeError::cancelled());
}
Err(e) if e.kind == ide_core::error::ErrorKind::PermissionDenied && out.is_empty() => {
// Not connected for lack of a password: the UI asks and retries.
host.end_request(request);
return Err(e);
}
Err(e) => {
out.push(StatementOutcome { statement, result: None, error: Some(e.message) });
emit(ExecutionEvent::Started { index: index as u32 })?;
let outcome = match db
.execute_from(id, &statement.text, skip as usize, max_rows.max(1) as usize, &cancel, schema)
.await
{
Ok(result) => StatementOutcome { statement, result: Some(result), error: None },
Err(e) if e.kind == ide_core::error::ErrorKind::Cancelled => return Err(e),
// The UI may retry a login failure only before any statement has completed.
Err(e) if e.kind == ide_core::error::ErrorKind::PermissionDenied && index == 0 => return Err(e),
Err(e) => StatementOutcome { statement, result: None, error: Some(e.message) },
};
let failed = outcome.error.is_some();
emit(ExecutionEvent::Completed { index: index as u32, outcome })?;
if failed {
break;
}
}
Ok(())
}
.await;
host.end_request(request);
Ok(out)
result
}
#[allow(clippy::too_many_arguments)]
@@ -539,6 +610,7 @@ ide_command::domain!(
db_disconnect,
db_drop_database,
db_execute,
db_execute_stream,
db_explain,
db_finish_transaction,
db_history,
@@ -550,6 +622,7 @@ ide_command::domain!(
db_object_ddl,
db_remove_history,
db_retain_catalog,
db_save_source_visibility,
db_save_sources,
db_saved_catalog,
db_schema_objects,
@@ -567,3 +640,69 @@ ide_command::domain!(
db_test_tunnel,
db_trust_ssh_host,
);
#[cfg(test)]
mod tests {
use super::*;
use crate::HostConfig;
use ide_db::DbDriver;
use std::sync::Arc;
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn a_reporting_error_stops_the_batch_and_releases_the_request() {
let temp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(temp.path()).unwrap();
let root = base.join("project");
std::fs::create_dir(&root).unwrap();
let host = Host::new(HostConfig {
config_dir: base.join("config"),
data_dir: base.join("data"),
local_data_dir: base.join("local"),
languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
syntax: Arc::default(),
sink_for: Box::new(|_| Arc::new(|_| {})),
owner: |w| w,
runtime: tokio::runtime::Handle::current(),
project_environment: false,
});
let window = "main";
host.open_project(window, &root).unwrap();
host.set_project_trust(&root, true, false).await.unwrap();
let id = "test";
let file = root.join("test.sqlite");
std::fs::File::create(&file).unwrap();
db_save_sources(
&host,
window,
vec![DataSource { id: id.into(), name: id.into(), file: Some(file.into()), ..Default::default() }],
)
.await
.unwrap();
let statements =
ide_db::split::split("CREATE TABLE items (n INTEGER); INSERT INTO items VALUES (1);", DbDriver::Sqlite);
let request = RequestId(1);
let error = execute_statements(&host, window, request, id, statements, 0, 10, None, |event| match event {
ExecutionEvent::Started { index: 0 } => Ok(()),
ExecutionEvent::Completed { index: 0, outcome } => {
assert!(outcome.error.is_none(), "{:?}", outcome.error);
Err(IdeError::internal("cannot report result"))
}
_ => panic!("the failed callback must stop execution"),
})
.await
.unwrap_err();
assert_eq!(error.message, "cannot report result");
// After cleanup, cancel is remembered for the next request with this id.
host.cancel_request(request);
assert!(host.begin_request(request).is_cancelled());
let query = ide_db::split::split(
"SELECT 99 AS n UNION ALL SELECT count(*) FROM items ORDER BY n DESC",
DbDriver::Sqlite,
);
let outcomes = db_execute(&host, window, RequestId(2), id.into(), query, 1, 10, None).await.unwrap();
assert_eq!(outcomes[0].result.as_ref().unwrap().rows, vec![vec![Some("0".into())]]);
}
}
+25 -1
Переглянути файл
@@ -129,7 +129,8 @@ pub async fn debug_start(host: &Host, window: &str, config: LaunchConfig) -> Ide
};
host.require_trust(window)?;
let server_port = debug_server_port(&config);
let result = host.debugger.start_with(config, owner, custom).await;
let exception_classes = server_port.and_then(|port| exception_class_backend(host, window, port));
let result = host.debugger.start_with_exception_classes(config, owner, custom, exception_classes).await;
flush_output();
if let Ok(id) = &result {
let sink = host.window_sink(label);
@@ -208,6 +209,18 @@ fn attach_jvm_inspector(host: &Host, window: &str, session: DebugSessionId, port
}
}
/// Given before the session starts, unlike the inspector: the breakpoints are armed before
/// `configurationDone`, so a throw in `main`'s first line stops.
fn exception_class_backend(
host: &Host,
window: &str,
port: u16,
) -> Option<std::sync::Arc<dyn ide_jvm_inspect::ExceptionClassBreakpoints>> {
let project = host.project(window).ok()?;
let module = project.lsp.java_debug_server_module(port)?;
Some(std::sync::Arc::new(ide_lsp::JdtExceptionBreakpoints::new(project.lsp.clone(), module)))
}
/// A JVM the debugger starts itself: an Application or Spring Boot configuration, launched by
/// java-debug, java-analyzer or the Kotlin debugger (JAR Application debugs through a run with a
/// JDWP agent).
@@ -453,6 +466,16 @@ pub async fn debug_set_exception_breakpoints(
host.debugger.set_exception_breakpoints(choices).await
}
/// Exception breakpoints on chosen classes (all sessions that take them, and later ones).
#[command(trust = trusted)]
pub async fn debug_set_exception_class_breakpoints(
host: &Host,
breakpoints: Vec<ExceptionClassBreakpoint>,
) -> IdeResult<()> {
host.debugger.set_exception_class_breakpoints(breakpoints).await;
Ok(())
}
#[allow(clippy::too_many_arguments)]
#[command(trust = trusted)]
pub async fn debug_set_variable(
@@ -849,6 +872,7 @@ ide_command::domain!(
debug_set_breakpoints,
debug_set_data_breakpoints,
debug_set_exception_breakpoints,
debug_set_exception_class_breakpoints,
debug_set_function_breakpoints,
debug_set_variable,
debug_stack_trace,
+128 -49
Переглянути файл
@@ -1,5 +1,5 @@
use super::Channel;
use crate::Host;
use crate::{Host, Project};
use ide_command::command;
use ide_core::{IdeError, IdeResult, RequestId};
use ide_vfs::FileEntry;
@@ -21,6 +21,7 @@ pub async fn fs_compare_directories(
window: &str,
left: PathBuf,
right: PathBuf,
mode: ide_vfs::DirectoryCompareMode,
request: RequestId,
on_progress: Channel<ide_vfs::DirectoryCompareProgress>,
) -> IdeResult<Vec<ide_vfs::DirectoryCompareEntry>> {
@@ -29,19 +30,58 @@ pub async fn fs_compare_directories(
let result = host
.blocking(move || {
let last = std::cell::Cell::new(std::time::Instant::now() - std::time::Duration::from_secs(1));
ide_vfs::compare_directories(&left, &right, Some(&project.root), &project.exclude_globs(), &cancel, |p| {
// Bound IPC traffic even when hashing multi-gigabyte files.
if last.get().elapsed() >= std::time::Duration::from_millis(80) || p.total == Some(p.compared) {
let _ = on_progress.send(p);
last.set(std::time::Instant::now());
}
})
ide_vfs::compare_directories(
&left,
&right,
mode,
Some(&project.root),
&project.exclude_globs(),
&cancel,
|p| {
// Bound IPC traffic even when hashing multi-gigabyte files.
if last.get().elapsed() >= std::time::Duration::from_millis(80) || p.total == Some(p.compared) {
let _ = on_progress.send(p);
last.set(std::time::Instant::now());
}
},
)
})
.await;
host.end_request(request);
result
}
fn comparison_entry_path(path: &Path) -> IdeResult<()> {
if path.as_os_str().is_empty() || path.components().any(|c| !matches!(c, std::path::Component::Normal(_))) {
return Err(IdeError::invalid("expected a relative comparison entry path"));
}
Ok(())
}
fn copy_entry(
project: &Project,
source_root: &Path,
destination_root: &Path,
path: &Path,
overwrite: bool,
) -> IdeResult<()> {
let from = source_root.join(path);
let to = destination_root.join(path);
if overwrite {
project.history.record_deletion(&to, DELETE_SNAPSHOT_LIMIT);
}
project.with_disk_sync(|| {
ide_vfs::copy_merge(
&from,
&to,
overwrite,
Some(&project.root),
&project.exclude_globs(),
(source_root, destination_root),
)
})
}
#[command(trust = always)]
pub async fn fs_copy_merge(
host: &Host,
@@ -51,28 +91,63 @@ pub async fn fs_copy_merge(
path: PathBuf,
overwrite: bool,
) -> IdeResult<()> {
if path.as_os_str().is_empty() || path.components().any(|c| !matches!(c, std::path::Component::Normal(_))) {
return Err(ide_core::IdeError::invalid("expected a relative comparison entry path"));
comparison_entry_path(&path)?;
let project = host.project(window)?;
host.blocking(move || copy_entry(&project, &source_root, &destination_root, &path, overwrite)).await
}
/// Runs Compare Directories' synchronisation operations in order. A failed operation is
/// reported and the rest still run; cancellation stops before the next one.
#[command(trust = always)]
pub async fn fs_synchronize_directories(
host: &Host,
window: &str,
left: PathBuf,
right: PathBuf,
operations: Vec<ide_vfs::DirectorySyncOperation>,
request: RequestId,
on_progress: Channel<ide_vfs::DirectorySyncProgress>,
) -> IdeResult<Vec<ide_vfs::DirectorySyncFailure>> {
for op in &operations {
comparison_entry_path(Path::new(&op.path))?;
}
let project = host.project(window)?;
host.blocking(move || {
let from = source_root.join(&path);
let to = destination_root.join(&path);
if overwrite {
project.history.record_deletion(&to, DELETE_SNAPSHOT_LIMIT);
}
project.with_disk_sync(|| {
ide_vfs::copy_merge(
&from,
&to,
overwrite,
Some(&project.root),
&project.exclude_globs(),
(&source_root, &destination_root),
)
let cancel = host.begin_request(request);
let result = host
.blocking(move || {
use ide_vfs::DirectorySyncAction::*;
let total = operations.len() as u32;
let mut failures = Vec::new();
for (done, op) in operations.into_iter().enumerate() {
if cancel.is_cancelled() {
return Err(IdeError::cancelled());
}
let _ = on_progress.send(ide_vfs::DirectorySyncProgress {
done: done as u32,
total,
path: op.path.clone(),
});
let path = Path::new(&op.path);
let result = match op.action {
CopyToLeft => copy_entry(&project, &right, &left, path, op.overwrite),
CopyToRight => copy_entry(&project, &left, &right, path, op.overwrite),
DeleteLeft => delete_recorded(Some(&project), &left.join(path), false).map(|_| ()),
DeleteRight => delete_recorded(Some(&project), &right.join(path), false).map(|_| ()),
};
if let Err(e) = result {
failures.push(ide_vfs::DirectorySyncFailure {
path: op.path,
action: op.action,
message: e.message,
});
}
}
let _ = on_progress.send(ide_vfs::DirectorySyncProgress { done: total, total, path: String::new() });
Ok(failures)
})
})
.await
.await;
host.end_request(request);
result
}
/// Files of a deleted folder snapshotted in Local History.
@@ -85,11 +160,13 @@ pub async fn fs_read_dir(host: &Host, window: &str, path: PathBuf) -> IdeResult<
host.blocking(move || {
let excludes = project
.map(|p| {
let globs = p.exclude_globs();
// An attached project's folders follow its own exclusions.
let root = p.root_of(&path);
let globs = p.exclude_globs_in(&root);
// `read_dir` matches relative to the enclosing repository: re-anchor
// project-root patterns (`/build`) when the project is a repo subfolder.
let repo = p.root.ancestors().find(|d| d.join(".git").exists());
match repo.and_then(|r| p.root.strip_prefix(r).ok()).filter(|rel| !rel.as_os_str().is_empty()) {
// root patterns (`/build`) when the project is a repo subfolder.
let repo = root.ancestors().find(|d| d.join(".git").exists());
match repo.and_then(|r| root.strip_prefix(r).ok()).filter(|rel| !rel.as_os_str().is_empty()) {
Some(rel) => {
let rel = rel.to_string_lossy().replace('\\', "/");
globs.into_iter().map(|g| if g.starts_with('/') { format!("/{rel}{g}") } else { g }).collect()
@@ -175,26 +252,27 @@ pub async fn fs_delete_with_undo(host: &Host, window: &str, path: PathBuf) -> Id
async fn delete_with_history(host: &Host, window: &str, path: PathBuf, undoable: bool) -> IdeResult<DeletionUndo> {
let project = if undoable { Some(host.project(window)?) } else { host.project(window).ok() };
host.blocking(move || {
let paths = ide_workspace::file_ops::deletion_paths(&path)?;
let mut undo = DeletionUndo::default();
if let Some(p) = &project {
if undoable {
undo = p.history.capture_deletion_undo(&paths, DELETE_SNAPSHOT_LIMIT);
} else {
for pth in &paths {
p.history.record_deletion(pth, DELETE_SNAPSHOT_LIMIT);
}
host.blocking(move || delete_recorded(project.as_deref(), &path, undoable)).await
}
fn delete_recorded(project: Option<&Project>, path: &Path, undoable: bool) -> IdeResult<DeletionUndo> {
let paths = ide_workspace::file_ops::deletion_paths(path)?;
let mut undo = DeletionUndo::default();
if let Some(p) = project {
if undoable {
undo = p.history.capture_deletion_undo(&paths, DELETE_SNAPSHOT_LIMIT);
} else {
for pth in &paths {
p.history.record_deletion(pth, DELETE_SNAPSHOT_LIMIT);
}
}
ide_workspace::file_ops::delete(&path)?;
// A checkout backend opens the paths for delete; Git's hook is a no-op.
if let Some(p) = project {
let _ = p.with_backend_of(&path, |r| r.files_deleted(&paths));
}
Ok(undo)
})
.await
}
ide_workspace::file_ops::delete(path)?;
// A checkout backend opens the paths for delete; Git's hook is a no-op.
if let Some(p) = project {
let _ = p.with_backend_of(path, |r| r.files_deleted(&paths));
}
Ok(undo)
}
#[command(trust = always)]
@@ -306,5 +384,6 @@ ide_command::domain!(
fs_read_text,
fs_rename,
fs_set_writable,
fs_synchronize_directories,
fs_undo_delete,
);
+155 -12
Переглянути файл
@@ -50,6 +50,7 @@ pub(crate) async fn resolve_launch(
if !project.lsp.java_served_by_jdtls(&module) {
return resolve_launch_without_jdtls(host, &project, module, test, policy, cancel).await;
}
let waiting = project.java_launches_waiting.add(module.clone(), test, policy);
let settings = project.settings.effective();
// A launch builds incrementally unless the configuration asks for Rebuild or NoBuild.
let build = policy != BuildPolicy::NoBuild;
@@ -98,6 +99,12 @@ pub(crate) async fn resolve_launch(
drop_processor_recreate_errors(&mut info);
}
}
let model = std::sync::Arc::new(model);
let members = if delegated {
build_members(&project, &model, &module, test, prefer_maven, &waiting, cancel).await?
} else {
Vec::new()
};
let lsp_ms = started.elapsed().as_millis();
let data_dir = host.local_data_dir.clone();
let cancel = cancel.clone();
@@ -106,16 +113,20 @@ pub(crate) async fn resolve_launch(
let local_repo = ide_sdk::apply::maven_local_repository(&project.root, &settings);
// Module outputs the launch runs from a snapshot of: the originals must not come back.
let mut snapshotted = Vec::new();
// The modules of the launches sharing this build also share its classpath probe.
let probed: Vec<PathBuf> =
std::iter::once(module.clone()).chain(members.iter().map(|m| m.module.clone())).collect();
let built = if delegated {
let rebuild_on_jdt_errors = rebuild_on_jdt_errors(policy, prefer_maven, info.error_count);
let outputs = project.java_launch_snapshots.lock().build(
&project.root,
&model,
&module,
cache::BuildOptions { test, policy, rebuild_on_jdt_errors },
cache::BuildOptions { test, policy, rebuild_on_jdt_errors, members },
local_repo.clone(),
&cancel,
)?;
drop(waiting);
let copies = use_snapshot(&mut info, &outputs.originals, &outputs.snapshot);
apply_external_build_result(&mut info, outputs.failure, outputs.authoritative);
snapshotted = outputs.originals;
@@ -138,10 +149,10 @@ pub(crate) async fn resolve_launch(
// m2e runs inside jdtls on the server JDK and can resolve a different
// Maven profile/classifier than the module build. Ask the same Maven
// process that built the module for its runtime/test dependencies.
let maven_cp = compile::module_classpath(
let maven_cp = compile::module_classpaths(
&project.root,
&model,
&module,
&probed,
test,
local_repo,
&project.build_cache_dir(),
@@ -301,19 +312,30 @@ fn finish_launch(
// The module/project JDK, else the JDK the Java language server builds the module with, else one
// matching its Java version.
let project_jdk = ide_sdk::apply::module_jdk(root, module, settings);
let from_server = info.java_home.as_deref().map(ide_sdk::java::java_executable).filter(|p| p.is_file());
let java = project_jdk.map(|j| ide_sdk::java::java_executable(&j.home)).or(from_server).or_else(|| {
// The build model's level includes what the module inherits from its parent POMs.
let release = model
// The build model's level includes what the module inherits from its parent POMs.
let release = || {
model
.maven
.as_ref()
.and_then(|m| m.projects.iter().find(|p| root.join(&p.dir) == module))
.and_then(|p| p.java_version)
.or_else(|| ide_sdk::java::project_java_version(module));
let jdks = ide_sdk::java::installed_jdks();
info.hints.extend(ide_sdk::java::missing_jdk_message(&jdks, release));
ide_sdk::java::pick_jdk(&jdks, release).map(|j| ide_sdk::java::java_executable(&j.home))
});
.or_else(|| ide_sdk::java::project_java_version(module))
};
let java = match project_jdk {
Some(j) => Some(ide_sdk::java::java_executable(&j.home)),
None => {
let release = release();
let server = info.java_home.as_deref().and_then(|home| server_java(home, release));
match server {
Some(java) => Some(java),
None => {
let jdks = ide_sdk::java::installed_jdks();
info.hints.extend(ide_sdk::java::missing_jdk_message(&jdks, release));
ide_sdk::java::pick_jdk(&jdks, release).map(|j| ide_sdk::java::java_executable(&j.home))
}
}
}
};
info.java_exec = Some(java.map(|p| p.to_string_lossy().into_owned()).unwrap_or_else(|| "java".to_owned()));
let exec = PathBuf::from(info.java_exec.as_deref().unwrap_or("java"));
let shorten = ide_run::java_cmdline::shortening_for(&exec, &info.class_paths, &info.module_paths, cfg!(windows));
@@ -328,6 +350,19 @@ fn finish_launch(
}
}
/// The `java` of the JDK a Java language server reports, when it can run classes compiled for
/// `release`: that JDK is the one the server runs on or defaults to, not necessarily one the
/// module's bytecode loads on. A home whose version is unknown is used only when `release` is too.
fn server_java(home: &Path, release: Option<u32>) -> Option<PathBuf> {
match ide_sdk::java::jdk_at(home) {
Some(jdk) if release.is_none_or(|release| jdk.major >= release) => {
Some(ide_sdk::java::java_executable(&jdk.home))
}
Some(_) => None,
None => Some(ide_sdk::java::java_executable(home)).filter(|java| release.is_none() && java.is_file()),
}
}
/// With Settings › Maven › Delegate IDE build/run actions to Maven, javac's verdict replaces
/// JDT's. Classes JDT wrote for sources with errors look up to date to Maven's incremental
/// compiler, so a launch JDT reports errors for recompiles everything.
@@ -406,6 +441,82 @@ fn apply_library_classpath(
}
/// Whether a launch should be built by the project's build system instead of jdtls.
/// The launches waiting for their build that join this launch's Maven run, each with
/// whether its JDT errors call for a clean rebuild (as its own launch would decide).
async fn build_members(
project: &std::sync::Arc<crate::Project>,
model: &std::sync::Arc<BuildModel>,
module: &Path,
test: bool,
prefer_maven: bool,
waiting: &cache::WaitingGuard,
cancel: &CancellationToken,
) -> IdeResult<Vec<cache::Member>> {
let others: Vec<_> = waiting.others().into_iter().filter(|o| project.lsp.java_served_by_jdtls(&o.module)).collect();
if others.is_empty() {
return Ok(Vec::new());
}
let joining = {
let (project, model, module) = (project.clone(), model.clone(), module.to_path_buf());
tokio::task::spawn_blocking(move || {
joining_launches(&project.root, &project.build_cache_dir(), &model, &module, test, others, prefer_maven)
})
.await
.map_err(|e| IdeError::internal(e.to_string()))?
};
let mut members = Vec::new();
for launch in joining {
// The build lock is held: the member's own launch reads the same diagnostics afterwards.
let errors = match project.lsp.java_launch(&launch.module, test, false, false, true, cancel).await {
Ok(info) => info.error_count,
Err(e) if e.kind == ErrorKind::Cancelled => return Err(e),
Err(e) => {
tracing::debug!(module = %launch.module.display(), "Not joining the launch build: {e}");
continue;
}
};
members.push(cache::Member {
module: launch.module.clone(),
rebuild_on_jdt_errors: rebuild_on_jdt_errors(launch.policy, prefer_maven, errors),
});
}
Ok(members)
}
/// Waiting launches that can share the Maven build of the launch of `module`: an
/// incremental build (Rebuild and "no error check" launches keep their own) of the same
/// scope, of another module of the same Maven reactor, delegated to Maven as this one is.
fn joining_launches(
root: &Path,
cache_dir: &Path,
model: &BuildModel,
module: &Path,
test: bool,
others: Vec<std::sync::Arc<cache::WaitingLaunch>>,
prefer_maven: bool,
) -> Vec<std::sync::Arc<cache::WaitingLaunch>> {
let Some(reactor) = compile::launch_reactor(root, model, module) else { return Vec::new() };
let mut seen = std::collections::HashSet::from([module.to_path_buf()]);
others
.into_iter()
.filter(|o| {
let is_maven =
model.maven.as_ref().is_some_and(|m| m.projects.iter().any(|p| root.join(&p.dir) == o.module));
o.test == test
&& matches!(o.policy, BuildPolicy::Automatic | BuildPolicy::Make)
&& compile::launch_reactor(root, model, &o.module).as_ref() == Some(&reactor)
&& seen.insert(o.module.clone())
&& delegates_to_external_build(
is_maven,
o.policy,
compile::launch_has_non_java_sources(root, model, &o.module, test),
cache::has_record(root, cache_dir, &o.module),
prefer_maven,
)
})
.collect()
}
/// A Rebuild has to clean the output; jdtls' full build only recompiles sources, so
/// Maven modules always delegate for it, even when every source is Java.
/// `prefer_maven` is Settings › Maven › Delegate IDE build/run actions to Maven.
@@ -557,6 +668,38 @@ fn drop_processor_recreate_errors(info: &mut JavaLaunchInfo) {
mod tests {
use super::*;
fn fake_jdk(dir: &Path, version: Option<&str>) -> PathBuf {
let bin = dir.join("bin");
std::fs::create_dir_all(&bin).unwrap();
std::fs::write(bin.join(if cfg!(windows) { "java.exe" } else { "java" }), "").unwrap();
if let Some(version) = version {
std::fs::write(dir.join("release"), format!("JAVA_VERSION=\"{version}\"\n")).unwrap();
}
dir.to_path_buf()
}
#[test]
fn a_server_jdk_older_than_the_module_release_is_not_used() {
let tmp = tempfile::tempdir().unwrap();
let jdk17 = fake_jdk(&tmp.path().join("17"), Some("17.0.12"));
let jdk21 = fake_jdk(&tmp.path().join("21"), Some("21.0.4"));
let unknown = fake_jdk(&tmp.path().join("unknown"), None);
// (server JDK, module release, used?)
let cases = [
(&jdk17, Some(21), false),
(&jdk17, Some(17), true),
(&jdk17, Some(11), true),
(&jdk17, None, true),
(&jdk21, Some(21), true),
(&unknown, None, true),
(&unknown, Some(21), false),
];
for (home, release, used) in cases {
assert_eq!(server_java(home, release).is_some(), used, "{} for release {release:?}", home.display());
}
assert!(server_java(&tmp.path().join("missing"), None).is_none());
}
#[test]
fn recognises_a_processor_recreating_its_output() {
assert!(processor_recreated_a_file(
+310 -53
Переглянути файл
@@ -2,10 +2,12 @@
use ide_build::compile::{self, LaunchFingerprint};
use ide_core::{CancellationToken, IdeError, IdeResult};
use ide_run::BuildPolicy;
use parking_lot::Mutex;
use serde::{Deserialize, Serialize};
use std::collections::HashSet;
use std::collections::{HashMap, HashSet};
use std::fs;
use std::path::{Path, PathBuf};
use std::sync::Arc;
#[derive(Debug, Serialize, Deserialize)]
pub(super) struct Outputs {
@@ -49,6 +51,64 @@ pub(super) struct BuildOptions {
/// A JDT error makes a cache miss rebuild, but it must not prevent an unchanged
/// snapshot from being reused on the next launch.
pub rebuild_on_jdt_errors: bool,
/// Other launches of the same reactor waiting for their build (configurations started
/// together, #3971): their modules join this Maven run, and their launches then reuse
/// the snapshots recorded here instead of running Maven again.
pub members: Vec<Member>,
}
/// A launch module joining another launch's build; see [`BuildOptions::members`].
#[derive(Debug)]
pub(super) struct Member {
pub module: PathBuf,
pub rebuild_on_jdt_errors: bool,
}
/// Java launches from their start until their build: one launch's Maven run also builds
/// the modules of launches still waiting (configurations started together, #3971).
#[derive(Default)]
pub(crate) struct Waiting(Arc<Mutex<Vec<Arc<WaitingLaunch>>>>);
#[derive(Debug)]
pub(super) struct WaitingLaunch {
pub module: PathBuf,
pub test: bool,
pub policy: BuildPolicy,
}
/// Leaves [`Waiting`] when dropped.
pub(super) struct WaitingGuard {
all: Arc<Mutex<Vec<Arc<WaitingLaunch>>>>,
launch: Arc<WaitingLaunch>,
}
impl Waiting {
pub(super) fn add(&self, module: PathBuf, test: bool, policy: BuildPolicy) -> WaitingGuard {
let launch = Arc::new(WaitingLaunch { module, test, policy });
self.0.lock().push(launch.clone());
WaitingGuard { all: self.0.clone(), launch }
}
}
impl WaitingGuard {
/// The other launches still waiting, in the order they started.
pub(super) fn others(&self) -> Vec<Arc<WaitingLaunch>> {
self.all.lock().iter().filter(|l| !Arc::ptr_eq(l, &self.launch)).cloned().collect()
}
}
impl Drop for WaitingGuard {
fn drop(&mut self) {
self.all.lock().retain(|l| !Arc::ptr_eq(l, &self.launch));
}
}
/// A module whose launch snapshot can't be reused, ready to build.
struct Pending {
module: PathBuf,
record: PathBuf,
before: Option<LaunchFingerprint>,
previous: Option<Outputs>,
}
/// Owned by Project: running JVMs may still load superseded outputs until it drops.
@@ -56,11 +116,14 @@ pub(crate) struct Session {
cache: PathBuf,
initialized: bool,
unreferenced: Vec<PathBuf>,
/// A shared build that failed for a member, by (module, test): the member's own launch
/// reports it instead of running the same failing build again while its inputs are unchanged.
failed: HashMap<(PathBuf, bool), (LaunchFingerprint, String)>,
}
impl Session {
pub(crate) fn new(cache: PathBuf) -> Self {
Self { cache, initialized: false, unreferenced: Vec::new() }
Self { cache, initialized: false, unreferenced: Vec::new(), failed: HashMap::new() }
}
pub(super) fn initialize(&mut self) {
@@ -82,20 +145,84 @@ impl Session {
cancel: &CancellationToken,
) -> IdeResult<Outputs> {
self.initialize();
let BuildOptions { test, policy, rebuild_on_jdt_errors } = options;
let cache = &self.cache;
let record =
record_path(root, cache, module, test).ok_or_else(|| IdeError::internal("launch outside project"))?;
let snapshots = cache.join("java-launch/snapshots");
let fingerprint = || match compile::launch_fingerprint(root, model, module, test, local_repo.clone(), cancel) {
Ok(value) => Ok(value),
Err(e) if cancel.is_cancelled() => Err(e),
Err(e) => {
tracing::debug!(error = %e, "Cannot fingerprint Maven launch; rebuilding");
Ok(None)
}
let BuildOptions { test, policy, rebuild_on_jdt_errors, members } = options;
let mut lead = match self.prepare(root, model, module, test, policy, &local_repo, cancel)? {
Ok(outputs) => return Ok(outputs),
Err(pending) => pending,
};
let mut before = fingerprint()?;
if let Some((fingerprint, failure)) = self.failed.remove(&(module.to_path_buf(), test))
&& lead.before.as_ref() == Some(&fingerprint)
&& matches!(policy, BuildPolicy::Automatic | BuildPolicy::Make)
{
tracing::info!(module = %module.display(), "The shared Maven launch build failed for these inputs");
return Err(IdeError::internal(failure));
}
// JDT can report errors from its own classpath while the last Maven snapshot is
// still valid. Reuse that snapshot first; only a cache miss needs the expensive
// clean rebuild that replaces JDT's error-stub classes.
let policy = if rebuild_on_jdt_errors { BuildPolicy::Rebuild } else { policy };
let mut joined = Vec::new();
let mut rebuild = policy == BuildPolicy::Rebuild;
for member in members {
if let Err(pending) =
self.prepare(root, model, &member.module, test, BuildPolicy::Make, &local_repo, cancel)?
{
rebuild |= member.rebuild_on_jdt_errors;
joined.push(pending);
}
}
let modules: Vec<PathBuf> =
std::iter::once(&lead).chain(&joined).map(|pending| pending.module.clone()).collect();
if modules.len() > 1 {
tracing::info!(?modules, "Building the launch modules in one Maven run");
}
let kind = if rebuild { compile::BuildKind::Rebuild } else { compile::BuildKind::Build };
let mut built = compile::build_for_launches(root, model, &modules, test, kind, cancel)?.into_iter();
let lead_built = built.next().unwrap();
for (pending, built) in joined.into_iter().zip(built) {
match built.failure {
Some(failure) => {
if let Some(before) = pending.before {
self.failed.insert((pending.module, test), (before, failure));
}
}
None => {
self.finish(root, model, pending, test, built.class_dirs, None, rebuild, &local_repo, cancel)?;
}
}
}
if let Some(failure) = &lead_built.failure {
if policy != BuildPolicy::MakeAndContinueOnErrors {
return Err(IdeError::internal(failure.clone()));
}
if let Some(mut previous) =
lead.previous.take().filter(|p| (0..p.originals.len()).all(|i| p.snapshot.join(i.to_string()).is_dir()))
{
previous.fingerprint = None;
previous.failure = lead_built.failure;
write_record(&lead.record, &previous)?;
return Ok(previous);
}
}
self.finish(root, model, lead, test, lead_built.class_dirs, lead_built.failure, rebuild, &local_repo, cancel)
}
/// The reusable snapshot of `module` (`Ok`), else the module marked for a build (`Err`).
#[allow(clippy::too_many_arguments)]
fn prepare(
&mut self,
root: &Path,
model: &ide_build::BuildModel,
module: &Path,
test: bool,
policy: BuildPolicy,
local_repo: &Option<PathBuf>,
cancel: &CancellationToken,
) -> IdeResult<Result<Outputs, Pending>> {
let record =
record_path(root, &self.cache, module, test).ok_or_else(|| IdeError::internal("launch outside project"))?;
let snapshots = self.cache.join("java-launch/snapshots");
let mut before = fingerprint(root, model, module, test, local_repo, cancel)?;
let previous = fs::read(&record).ok().and_then(|bytes| serde_json::from_slice::<Outputs>(&bytes).ok());
// Timestamp-incremental builders (Maven, the Kotlin plugin) skip sources whose
// mtime did not advance. An external edit that preserves both length and mtime
@@ -115,7 +242,7 @@ impl Session {
tracing::debug!(path = %path.display(), %error, "Cannot re-stamp externally edited source");
}
}
before = fingerprint()?;
before = fingerprint(root, model, module, test, local_repo, cancel)?;
}
if let Some(outputs) = previous.as_ref()
&& policy != BuildPolicy::Rebuild
@@ -124,12 +251,8 @@ impl Session {
tracing::info!(module = %module.display(), test, "Reusing Maven launch snapshot");
let mut outputs = previous.unwrap();
outputs.authoritative = true;
return Ok(outputs);
return Ok(Ok(outputs));
}
// JDT can report errors from its own classpath while the last Maven snapshot is
// still valid. Reuse that snapshot first; only a cache miss needs the expensive
// clean rebuild that replaces JDT's error-stub classes.
let policy = if rebuild_on_jdt_errors { BuildPolicy::Rebuild } else { policy };
// Retain a non-reusable record even on failure, so removing the final mixed
// source still delegates to Maven to clean its old classes on the next launch.
fs::create_dir_all(record.parent().unwrap())?;
@@ -137,24 +260,25 @@ impl Session {
if let Some(previous) = &previous {
self.unreferenced.push(previous.snapshot.clone());
}
let kind = if policy == BuildPolicy::Rebuild { compile::BuildKind::Rebuild } else { compile::BuildKind::Build };
let built = compile::build_for_launch(root, model, module, test, kind, cancel)?;
if let Some(failure) = &built.failure {
if policy != BuildPolicy::MakeAndContinueOnErrors {
return Err(IdeError::internal(failure.clone()));
}
if let Some(mut previous) =
previous.filter(|p| (0..p.originals.len()).all(|i| p.snapshot.join(i.to_string()).is_dir()))
{
previous.fingerprint = None;
previous.failure = built.failure;
let mut file = tempfile::NamedTempFile::new_in(record.parent().unwrap())?;
serde_json::to_writer(file.as_file_mut(), &previous).map_err(|e| IdeError::internal(e.to_string()))?;
file.persist(&record).map_err(|e| IdeError::from(e.error))?;
return Ok(previous);
}
}
let originals = built.class_dirs;
Ok(Err(Pending { module: module.to_path_buf(), record, before, previous }))
}
/// Copies the built outputs of a prepared module into a new snapshot and records it
/// when the build succeeded on inputs that did not change meanwhile.
#[allow(clippy::too_many_arguments)]
fn finish(
&mut self,
root: &Path,
model: &ide_build::BuildModel,
pending: Pending,
test: bool,
originals: Vec<PathBuf>,
failure: Option<String>,
authoritative: bool,
local_repo: &Option<PathBuf>,
cancel: &CancellationToken,
) -> IdeResult<Outputs> {
let snapshots = self.cache.join("java-launch/snapshots");
fs::create_dir_all(&snapshots)?;
let snapshot = tempfile::Builder::new().prefix("launch-").tempdir_in(&snapshots)?.keep();
// Retain every new snapshot even if copying or publishing its record fails.
@@ -165,29 +289,46 @@ impl Session {
}
ide_vfs::copy(source, &snapshot.join(i.to_string()))?;
}
let after = fingerprint()?;
let after = fingerprint(root, model, &pending.module, test, local_repo, cancel)?;
if cancel.is_cancelled() {
return Err(IdeError::cancelled());
}
let mut outputs = Outputs {
fingerprint: None,
snapshot,
originals,
failure: built.failure,
authoritative: policy == BuildPolicy::Rebuild,
};
if outputs.failure.is_none() && before.is_some() && before == after {
outputs.fingerprint = before;
fs::create_dir_all(record.parent().unwrap())?;
let mut file = tempfile::NamedTempFile::new_in(record.parent().unwrap())?;
serde_json::to_writer(file.as_file_mut(), &outputs).map_err(|e| IdeError::internal(e.to_string()))?;
file.persist(&record).map_err(|e| IdeError::from(e.error))?;
let mut outputs = Outputs { fingerprint: None, snapshot, originals, failure, authoritative };
if outputs.failure.is_none() && pending.before.is_some() && pending.before == after {
outputs.fingerprint = pending.before;
write_record(&pending.record, &outputs)?;
self.unreferenced.retain(|path| path != &outputs.snapshot);
}
Ok(outputs)
}
}
fn fingerprint(
root: &Path,
model: &ide_build::BuildModel,
module: &Path,
test: bool,
local_repo: &Option<PathBuf>,
cancel: &CancellationToken,
) -> IdeResult<Option<LaunchFingerprint>> {
match compile::launch_fingerprint(root, model, module, test, local_repo.clone(), cancel) {
Ok(value) => Ok(value),
Err(e) if cancel.is_cancelled() => Err(e),
Err(e) => {
tracing::debug!(error = %e, "Cannot fingerprint Maven launch; rebuilding");
Ok(None)
}
}
}
fn write_record(record: &Path, outputs: &Outputs) -> IdeResult<()> {
fs::create_dir_all(record.parent().unwrap())?;
let mut file = tempfile::NamedTempFile::new_in(record.parent().unwrap())?;
serde_json::to_writer(file.as_file_mut(), outputs).map_err(|e| IdeError::internal(e.to_string()))?;
file.persist(record).map_err(|e| IdeError::from(e.error))?;
Ok(())
}
impl Drop for Session {
fn drop(&mut self) {
// Recheck all records: another module or launch mode may reference a path.
@@ -273,6 +414,122 @@ mod tests {
ide_build::load(root, &root.join("cache"), None)
}
/// A reactor of `lib` and the applications `a` and `b` depending on it; the build script
/// compiles every module and logs its arguments.
fn reactor_fixture(root: &Path) -> ide_build::BuildModel {
let pom = |artifact: &str, extra: &str| {
format!(
"<project><groupId>demo</groupId><artifactId>{artifact}</artifactId><version>1</version>{extra}</project>"
)
};
fs::write(
root.join("pom.xml"),
pom(
"root",
"<packaging>pom</packaging><modules><module>lib</module><module>a</module><module>b</module></modules>",
),
)
.unwrap();
let lib = "<dependencies><dependency><groupId>demo</groupId><artifactId>lib</artifactId><version>1</version></dependency></dependencies>";
for (module, extra) in [("lib", ""), ("a", lib), ("b", lib), ("other", "")] {
fs::create_dir_all(root.join(module).join("src/main/java")).unwrap();
fs::write(root.join(module).join("pom.xml"), pom(module, extra)).unwrap();
fs::write(root.join(module).join("src/main/java/Main.java"), module).unwrap();
}
let script = root.join("mvnw");
fs::write(&script, "#!/bin/sh\necho build \"$@\" >> calls\nif [ -f broken ]; then exit 1; fi\nfor m in lib a b; do mkdir -p $m/target/classes; cp $m/src/main/java/Main.java $m/target/classes/Main.class; done\n").unwrap();
fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap();
ide_build::load(root, &root.join("cache"), None)
}
fn calls(root: &Path) -> Vec<String> {
fs::read_to_string(root.join("calls")).unwrap_or_default().lines().map(str::to_owned).collect()
}
#[test]
fn waiting_launches_of_one_reactor_share_one_maven_build() {
let dir = tempfile::tempdir().unwrap();
let root = dir.path();
let model = reactor_fixture(root);
let cancel = CancellationToken::new();
let mut session = Session::new(root.join("cache"));
let (a, b) = (root.join("a"), root.join("b"));
let with = |rebuild_on_jdt_errors: bool| BuildOptions {
members: vec![Member { module: b.clone(), rebuild_on_jdt_errors }],
..Default::default()
};
let lead = session.build(root, &model, &a, with(false), None, &cancel).unwrap();
assert_eq!(fs::read_to_string(lead.snapshot.join("0/Main.class")).unwrap(), "a");
assert_eq!(fs::read_to_string(lead.snapshot.join("1/Main.class")).unwrap(), "lib");
// b's own launch runs from the snapshot the shared build recorded for it.
let member = session.build(root, &model, &b, BuildOptions::default(), None, &cancel).unwrap();
assert!(member.authoritative);
assert_eq!(fs::read_to_string(member.snapshot.join("0/Main.class")).unwrap(), "b");
assert_eq!(calls(root).len(), 1);
assert!(calls(root)[0].contains("-pl a,b -am") && calls(root)[0].ends_with(" compile"), "{:?}", calls(root));
// A member whose JDT errors call for a clean build makes the shared build a rebuild.
fs::write(root.join("lib/src/main/java/Main.java"), "lib 2").unwrap();
session.build(root, &model, &a, with(true), None, &cancel).unwrap();
assert!(calls(root)[1].contains("-pl a,b -am clean compile"), "{:?}", calls(root));
let member = session.build(root, &model, &b, BuildOptions::default(), None, &cancel).unwrap();
assert_eq!(fs::read_to_string(member.snapshot.join("1/Main.class")).unwrap(), "lib 2");
assert_eq!(calls(root).len(), 2);
// A failed shared build fails the member's launch without running Maven again,
// once: unchanged inputs built on their own afterwards fail in their own build.
fs::write(root.join("lib/src/main/java/Main.java"), "lib 3").unwrap();
fs::write(root.join("broken"), "").unwrap();
assert!(session.build(root, &model, &a, with(false), None, &cancel).is_err());
let failure = session.build(root, &model, &b, BuildOptions::default(), None, &cancel).unwrap_err();
assert!(failure.message.contains("Build failed"), "{failure:?}");
assert_eq!(calls(root).len(), 3);
assert!(session.build(root, &model, &b, BuildOptions::default(), None, &cancel).is_err());
assert_eq!(calls(root).len(), 4);
assert!(calls(root)[3].contains("-pl b -am"));
// With nothing waiting, a launch builds just its own module, as before.
fs::remove_file(root.join("broken")).unwrap();
session.build(root, &model, &a, BuildOptions::default(), None, &cancel).unwrap();
assert!(calls(root)[4].contains("-pl a -am compile"), "{:?}", calls(root));
}
#[test]
fn only_incremental_launches_of_the_same_reactor_and_scope_join_a_build() {
let dir = tempfile::tempdir().unwrap();
let root = dir.path();
let model = reactor_fixture(root);
let waiting = Waiting::default();
let lead = waiting.add(root.join("a"), false, BuildPolicy::Automatic);
let _guards = [
waiting.add(root.join("b"), false, BuildPolicy::Make),
waiting.add(root.join("lib"), false, BuildPolicy::Automatic),
waiting.add(root.join("b"), false, BuildPolicy::Automatic),
waiting.add(root.join("a"), false, BuildPolicy::Automatic),
waiting.add(root.join("lib"), true, BuildPolicy::Automatic),
waiting.add(root.join("lib"), false, BuildPolicy::Rebuild),
waiting.add(root.join("lib"), false, BuildPolicy::MakeAndContinueOnErrors),
waiting.add(root.join("lib"), false, BuildPolicy::NoBuild),
waiting.add(root.join("other"), false, BuildPolicy::Automatic),
];
let join = |prefer_maven| {
super::super::joining_launches(
root,
&root.join("cache"),
&model,
&root.join("a"),
false,
lead.others(),
prefer_maven,
)
.into_iter()
.map(|l| l.module.strip_prefix(root).unwrap().to_path_buf())
.collect::<Vec<_>>()
};
assert_eq!(join(true), [PathBuf::from("b"), PathBuf::from("lib")]);
// Without "Delegate to Maven", these Java-only modules build with the language server.
assert!(join(false).is_empty());
drop(_guards);
assert!(lead.others().is_empty());
}
/// Like [`fixture`], but the build script skips sources whose mtime did not advance,
/// mirroring Maven's (and the Kotlin plugin's) timestamp-incremental compilation.
fn fixture_timestamp_incremental(root: &Path) -> ide_build::BuildModel {
+2 -1
Переглянути файл
@@ -1092,7 +1092,8 @@ pub async fn lsp_resolve_code_action(
#[command(trust = trusted)]
pub async fn lsp_apply_code_action(host: &Host, window: &str, doc: DocId, action: CodeAction) -> IdeResult<()> {
let project = host.project(window)?;
let action = if action.edit.is_none() && action.command.is_none() {
// A lazy action may carry a follow-up command beside its unresolved edit (vtsls' refactorings).
let action = if action.edit.is_none() && (action.command.is_none() || action.data.is_some()) {
let documents = project.documents.clone();
let version = blocking(move || documents.version(doc)).await?;
let action = resolve_action(host, window, doc, action).await?;
+74 -1
Переглянути файл
@@ -128,6 +128,70 @@ pub fn project_roots(host: &Host, window: &str) -> IdeResult<ide_workspace::Proj
Ok(host.project(window)?.roots())
}
/// A project attached to the window's project, with its own Project Structure.
#[derive(Serialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct WorkspaceMember {
pub root: ide_core::IpcPath,
/// Its project settings' Project Structure (not merged with the user settings).
pub structure: ide_core::settings::ProjectStructureSettings,
/// Roots detected from its build files.
pub detected: Vec<ide_workspace::SourceFolder>,
}
/// The workspace projects outside the window's project folder, for Mark Directory as there.
#[command(trust = always)]
pub fn project_workspace_members(host: &Host, window: &str) -> IdeResult<Vec<WorkspaceMember>> {
let project = host.project(window)?;
Ok(project
.attached_roots()
.into_iter()
.map(|root| WorkspaceMember {
structure: project.settings.for_project(&root).layer(SettingsScope::Project).project_structure,
detected: ide_workspace::roots::detect(&root),
root: root.into(),
})
.collect())
}
/// Sets a `projectStructure.*` key in the settings of `root`, a project attached to the window's
/// project (Mark Directory as there). Every open window holding that project follows.
#[command(trust = always)]
pub fn project_workspace_member_set(
host: &Arc<Host>,
window: &str,
root: PathBuf,
key: String,
value: String,
) -> IdeResult<()> {
let project = host.project(window)?;
if !project.attached_roots().contains(&root) {
return Err(ide_core::IdeError::invalid("Not a project attached to this one"));
}
if !key.starts_with("projectStructure.") {
return Err(ide_core::IdeError::invalid(format!("{key} is not a Project Structure setting")));
}
let value: serde_json::Value =
serde_json::from_str(&value).map_err(|e| ide_core::IdeError::invalid(e.to_string()))?;
project.settings.for_project(&root).set(SettingsScope::Project, &key, value)?;
let affected: Vec<_> = host
.projects()
.into_iter()
.filter(|p| p.root == root || p.member_excludes.read().contains_key(&root))
.collect();
host.runtime.spawn_blocking(move || {
for p in affected {
if p.root == root {
p.settings.reload();
p.sink.emit(IdeEvent::SettingsChanged { key: key.clone() });
}
p.refresh_index_scope();
p.sink.emit(IdeEvent::ProjectRootsChanged { root: p.root.clone().into() });
}
});
Ok(())
}
#[command(trust = always)]
pub fn cancel_request(host: &Host, id: RequestId) {
host.cancel_request(id);
@@ -378,7 +442,14 @@ pub fn set_settings(
// Content roots and excludes (files.exclude, ignored names, excluded folders) reach the
// index and the watchers without reopening the project (the rescan runs in the background).
if roots_changed || key == "files" || key.starts_with("files.") {
let affected = affected();
let mut affected = affected();
// A workspace open in another window may hold this project: its excluded folders apply there.
if roots_changed
&& project_scope
&& let Some(own) = &current
{
affected.extend(host.projects().into_iter().filter(|p| p.member_excludes.read().contains_key(&own.root)));
}
host.runtime.spawn_blocking(move || {
for project in affected {
project.refresh_index_scope();
@@ -401,6 +472,8 @@ ide_command::domain!(
project_trust_remove_location,
project_trust_set,
project_trust_status,
project_workspace_member_set,
project_workspace_members,
settings_get,
settings_get_global,
settings_removed_theme,
+2 -3
Переглянути файл
@@ -70,15 +70,14 @@ fn scan_roots(root: &Path, content_roots: Vec<PathBuf>) -> Vec<PathBuf> {
/// Every mapping source of the project, for the request-path index.
pub fn spring_route_sources(host: &Host, window: &str) -> IdeResult<Vec<RouteSource>> {
let project = host.project(window)?;
let excludes = project.search_excludes();
let mut out = Vec::new();
for root in scan_roots(&project.root, project.content_roots()) {
out.extend(sources_in(&root, &excludes));
out.extend(sources_in(&root, &project.search_excludes_in(&root)));
}
out.sort_by(|a, b| a.path.cmp(&b.path));
out.dedup_by(|a, b| a.path == b.path);
match out.len() {
0 => tracing::warn!("spring routes: no mapping source under {:?} (excludes: {})", project.root, excludes.len()),
0 => tracing::warn!("spring routes: no mapping source under {:?}", project.root),
n => tracing::info!("spring routes: {n} mapping sources under {:?}", project.root),
}
Ok(out)
+16
Переглянути файл
@@ -6,6 +6,7 @@ use ide_command::command;
use ide_core::{IdeError, IdeResult, IpcPath, RequestId};
use ide_scaffold::{CreateRequest, Field, GeneratorInfo, Requirement, ScaffoldEvent, Values};
use std::path::PathBuf;
fn join_err(e: impl std::fmt::Display) -> IdeError {
IdeError::internal(e.to_string())
@@ -41,6 +42,19 @@ pub async fn scaffold_requirements(generator: String, values: Values) -> IdeResu
tokio::task::spawn_blocking(move || ide_scaffold::requirements(&generator, &values)).await.map_err(join_err)?
}
/// Whether a project named `name` cannot be created in `location`: something other than an
/// empty folder is already there.
#[command(trust = always)]
pub async fn scaffold_target_taken(location: PathBuf, name: String) -> IdeResult<bool> {
tokio::task::spawn_blocking(move || ide_scaffold::target_taken(&location.join(name.trim()))).await.map_err(join_err)
}
/// The first of `base`, `base1`, `base2`, … that names nothing in `location` yet.
#[command(trust = always)]
pub async fn scaffold_free_name(location: PathBuf, base: String) -> IdeResult<String> {
tokio::task::spawn_blocking(move || ide_scaffold::free_name(&location, &base)).await.map_err(join_err)
}
/// Creates a project, streaming progress through `on_event`, and returns its directory,
/// trusted. Cancellable with `cancel_request(request)`; a failed or cancelled run leaves nothing.
#[command(trust = always)]
@@ -69,6 +83,8 @@ ide_command::domain!(
scaffold:
scaffold_catalog,
scaffold_create,
scaffold_free_name,
scaffold_options,
scaffold_requirements,
scaffold_target_taken,
);
+4
Переглянути файл
@@ -123,6 +123,10 @@ pub(crate) fn search_project(
if let Some(prefix) = &prefix {
remaining.include = rebase_masks(&query.include, prefix);
remaining.exclude = rebase_masks(&query.exclude, prefix);
// An attached project's own excluded folders: the project's were rebased away.
if !query.include_excluded && project.member_excludes.read().contains_key(dir) {
remaining.exclude.extend(project.search_excludes_in(dir));
}
// Only paths elsewhere were asked for.
if remaining.include.is_empty() && !query.include.is_empty() {
continue;
+23 -4
Переглянути файл
@@ -151,6 +151,8 @@ impl LogAccess {
pub struct VcsRoot {
/// Worktree root.
pub root: ide_core::IpcPath,
/// Root representing all mapped worktrees of the same Git repository in branch lists.
pub branch_root: ide_core::IpcPath,
/// Merge / rebase / cherry-pick / revert in progress.
pub operation: Option<String>,
/// Current branch; `None` when HEAD is detached (or unreadable).
@@ -348,11 +350,28 @@ pub fn vcs_roots(host: &Host, window: &str) -> IdeResult<Vec<VcsRoot>> {
let primary = repos.primary().map(|r| r.root().to_path_buf());
let mut all: Vec<&std::sync::Arc<Repo>> = repos.all().iter().collect();
all.sort_by_key(|r| Some(r.root()) != primary.as_deref());
Ok(all
.into_iter()
.map(|r| {
let roots: Vec<_> = all.into_iter().map(|repo| (repo, repo.metadata_dirs().ok())).collect();
let mut branch_roots = std::collections::HashMap::new();
for (repo, dirs) in &roots {
if let Some([git_dir, common_dir]) = dirs {
let first = branch_roots.entry(common_dir).or_insert(repo.root());
if git_dir == common_dir {
*first = repo.root();
}
}
}
Ok(roots
.iter()
.map(|(r, dirs)| {
let (head, head_commit) = r.head().unwrap_or_default();
VcsRoot { root: r.root().to_path_buf().into(), operation: r.operation().ok().flatten(), head, head_commit }
let branch_root = dirs.as_ref().and_then(|[_, common_dir]| branch_roots.get(common_dir));
VcsRoot {
root: r.root().into(),
branch_root: branch_root.copied().unwrap_or_else(|| r.root()).into(),
operation: r.operation().ok().flatten(),
head,
head_commit,
}
})
.collect())
}
+17
Переглянути файл
@@ -3059,6 +3059,10 @@ impl HostApi for PluginApi {
dunce::canonicalize(files).map_err(failed)
}
fn install_dir(&self) -> Result<PathBuf, HostError> {
dunce::canonicalize(&self.pkg.dir).map_err(failed)
}
fn read_text_file(&self, real: &Path, max: usize) -> Result<String, HostError> {
// Unsaved editor contents win, as they do for project files.
if let Some(text) = self.shared.workspace().and_then(|w| w.buffer_text(real)) {
@@ -3749,6 +3753,19 @@ mod tests {
}
}
#[test]
fn install_dir_is_the_canonical_package_directory() {
let tmp = tempfile::tempdir().unwrap();
let pkg = tmp.path().join("acme.lint");
std::fs::create_dir_all(&pkg).unwrap();
std::fs::write(pkg.join("readme.pdf"), b"%PDF").unwrap();
let api = api(&pkg, Arc::default());
let install = api.install_dir().unwrap();
assert_eq!(install, dunce::canonicalize(&pkg).unwrap());
assert!(install.join("readme.pdf").is_file());
assert_ne!(install, api.plugin_dir().unwrap());
}
#[test]
fn storage_moves_an_older_storage_json_to_one_file_per_key() {
let tmp = tempfile::tempdir().unwrap();
+9 -3
Переглянути файл
@@ -110,10 +110,16 @@ pub fn plugin_answer_commit(plugins: &Arc<PluginHost>, request_id: String, answe
plugins.answer_commit(&request_id, answer)
}
/// The UI reports the focused editor's file (`editor-focused` events).
/// The UI reports the focused editor's file (`editor-focused` events), with its
/// caret so plugins can scope line labels without re-reading the document.
#[command(trust = always)]
pub fn plugin_set_active_file(plugins: &Arc<PluginHost>, window: &str, path: Option<String>) {
plugins.set_active_file(window, path);
pub fn plugin_set_active_file(
plugins: &Arc<PluginHost>,
window: &str,
path: Option<String>,
#[default] editor: Option<PluginEditor>,
) {
plugins.set_active_file(window, path, editor);
}
/// The invoking window's reply to a plugin command request.
+3 -2
Переглянути файл
@@ -1729,8 +1729,9 @@ impl PluginHost {
}
/// The UI reports which file its focused editor shows (`editor-focused`).
pub fn set_active_file(&self, client: &str, path: Option<String>) {
self.post_events(Some(client), vec![WorkbenchEvent::EditorFocused(path)]);
/// The editor snapshot carries the caret so line-scoped features stay current.
pub fn set_active_file(&self, client: &str, path: Option<String>, editor: Option<PluginEditor>) {
self.post_window_events(client, vec![WorkbenchEvent::EditorFocused(path)], editor);
}
/// Where plugin secrets are kept (default: files under the plugins
+2 -1
Переглянути файл
@@ -4,7 +4,8 @@ use super::theme::ThemeDef;
use ide_extension::package::PluginIcon;
use ide_extension::{CapabilityInfo, ContributionInfo, UiContribution};
pub use ide_plugin::{
ActionPerformed, ActionSource, EventKind, NotificationLevel, PickItem, Prompt, StatusItem, WorkbenchEvent,
ActionPerformed, ActionSource, CaretMoved, EventKind, NotificationLevel, PickItem, Prompt, StatusItem,
WorkbenchEvent,
};
use serde::{Deserialize, Serialize};
use specta::Type;
+190 -17
Переглянути файл
@@ -47,10 +47,14 @@ pub struct Project {
pub structure: Arc<StructureService>,
/// Roots auto-detected from build files; see [`Project::roots`].
pub detected_roots: Arc<RwLock<Vec<SourceFolder>>>,
/// The excluded folders of the workspace's other projects; see [`member_excludes`].
pub(crate) member_excludes: MemberExcludes,
/// Per-project cache directory (build tool sync results…).
pub cache_dir: PathBuf,
/// Superseded launch snapshots retained until this project session ends.
pub(crate) java_launch_snapshots: Mutex<crate::ops::java::cache::Session>,
/// Java launches waiting for their build, which can share one Maven run.
pub(crate) java_launches_waiting: crate::ops::java::cache::Waiting,
/// Reasons this window was already told why Kotlin is debugged with kotlin-debug-adapter.
pub(crate) kotlin_debug_notices: Mutex<HashSet<&'static str>>,
/// Database tool window: data sources and their connections.
@@ -121,7 +125,8 @@ impl Host {
}
let settings = SettingsStore::load(&self.config_dir, Some(&root));
let detected_roots = Arc::new(RwLock::new(ide_workspace::roots::detect(&root)));
let excludes = exclude_globs(&root, &settings.effective(), &detected_roots.read());
let member_excludes: MemberExcludes = Arc::new(RwLock::new(member_excludes(&settings, &root)));
let excludes = exclude_globs(&root, &settings.effective(), &detected_roots.read(), &member_excludes.read());
let build_cache = self.local_data_dir.join("cache").join(project_key(&root)).join("build");
let extra_roots = content_roots(&settings.effective(), &root, &build_cache, trusted.load(Ordering::Acquire));
mark("roots");
@@ -145,7 +150,7 @@ impl Host {
let index = ProjectIndex::open(
&root,
&self.local_data_dir.join("index").join(&project_key),
index_roots(&root, extra_roots.clone()),
index_roots(&root, extra_roots.clone(), &settings.effective(), &member_excludes.read()),
excludes.clone(),
languages.clone(),
self.syntax(),
@@ -385,6 +390,7 @@ impl Host {
let sink = sink.clone();
let root = root.clone();
let detected_roots = detected_roots.clone();
let member_excludes = member_excludes.clone();
let history = history.clone();
let remote = self.remote.clone();
let runtime = self.runtime.clone();
@@ -447,12 +453,15 @@ impl Host {
if *detected_roots.read() != fresh {
// Detected excluded folders (`target`, `build`) leave the index too.
let effective = settings.effective();
let members = member_excludes.read();
index.set_scope(
index_roots(
&root,
content_roots(&effective, &root, &build_cache, trusted.load(Ordering::Acquire)),
&effective,
&members,
),
exclude_globs(&root, &effective, &fresh),
exclude_globs(&root, &effective, &fresh, &members),
);
*detected_roots.write() = fresh;
sink.emit(IdeEvent::ProjectRootsChanged { root: root.clone().into() });
@@ -569,9 +578,10 @@ impl Host {
let content_watchers = extra_roots
.iter()
.filter_map(|r| {
let globs = root_globs(&settings.effective(), &member_excludes.read(), r);
let w = content_root_watcher(
r,
&excludes,
globs.as_deref().unwrap_or(&excludes),
&sink,
&index,
&documents,
@@ -625,10 +635,12 @@ impl Host {
structure: Arc::new(StructureService::new(syntax.clone())),
syntax,
detected_roots,
member_excludes,
cache_dir: self.local_data_dir.join("cache").join(&project_key),
java_launch_snapshots: Mutex::new(crate::ops::java::cache::Session::new(
self.local_data_dir.join("cache").join(&project_key).join("build"),
)),
java_launches_waiting: Default::default(),
kotlin_debug_notices: Mutex::default(),
db,
http_history,
@@ -670,6 +682,16 @@ impl Host {
weak.upgrade().map(|p| p.settings.effective().agent_security).unwrap_or_default()
}));
}
{
let weak = Arc::downgrade(&project);
let trust = self.trust.clone();
project.agents.set_workspace_roots_hook(Arc::new(move || {
let Some(p) = weak.upgrade() else { return Vec::new() };
let mut roots = vec![p.root.clone()];
roots.extend(crate::mcp::trusted_attachments(&trust, &p.root));
roots
}));
}
self.insert_project(window, project.clone());
for (key, text, dirty) in &carried {
let _ = project.documents.restore_untitled_buffer(key, text, *dirty);
@@ -748,7 +770,8 @@ impl Host {
ide_agent::SkillsPolicy {
user: layer(ide_workspace::settings::SettingsScope::Global),
workspace: layer(ide_workspace::settings::SettingsScope::Project),
workspace_trusted: trust.trusted(&skill_root).unwrap_or(false),
workspace_trusted: trust.window_trusted(&skill_root).unwrap_or(false),
workspace_roots: crate::ops::agent::workspace_skill_roots(&skill_root),
}
}));
agents.set_mcp_servers_hook(Box::new(move || {
@@ -851,10 +874,12 @@ impl Host {
structure: Arc::new(StructureService::new(syntax.clone())),
syntax,
detected_roots: Arc::default(),
member_excludes: Arc::default(),
cache_dir: self.local_data_dir.join("cache").join(&project_key),
java_launch_snapshots: Mutex::new(crate::ops::java::cache::Session::new(
self.local_data_dir.join("cache").join(&project_key).join("build"),
)),
java_launches_waiting: Default::default(),
kotlin_debug_notices: Mutex::default(),
db,
http_history,
@@ -1244,8 +1269,23 @@ impl Project {
/// excluded roots, the ignored names and the "Exclude files" patterns (files,
/// and everything under such folders).
pub fn search_excludes(&self) -> Vec<String> {
let mut out: Vec<String> =
self.roots().excluded_globs().iter().map(|d| format!("{}/**", d.trim_start_matches('/'))).collect();
let mut folders = self.roots().excluded_globs();
folders.extend(nested_member_globs(&self.root, &self.member_excludes.read()));
self.search_masks(&folders)
}
/// [`Self::search_excludes`] for paths below `dir` (the project folder or a content root),
/// relative to it: an attached project's own excluded folders apply there, not this project's.
pub fn search_excludes_in(&self, dir: &Path) -> Vec<String> {
let own = self.member_excludes.read().get(dir).cloned();
match own {
Some(own) => self.search_masks(&own),
None => self.search_excludes(),
}
}
fn search_masks(&self, folders: &[String]) -> Vec<String> {
let mut out: Vec<String> = folders.iter().map(|d| format!("{}/**", d.trim_start_matches('/'))).collect();
let settings = self.settings.effective();
let names =
settings.files.ignored_names.iter().cloned().chain(settings.project_structure.exclude_file_patterns());
@@ -1277,7 +1317,7 @@ impl Project {
let Some(root) = root else {
return ide_lsp::CandidateFiles::default();
};
let mut exclude = self.search_excludes();
let mut exclude = self.search_excludes_in(&root);
// Directories the server analyses fully: their files are never read.
exclude.extend(q.skip.iter().filter_map(|dir| {
let rel = dir.strip_prefix(&root).ok()?.to_str()?.replace('\\', "/");
@@ -1296,7 +1336,28 @@ impl Project {
/// `files.exclude`, the ignored names and the effective excluded roots (user-marked and detected).
pub fn exclude_globs(&self) -> Vec<String> {
exclude_globs(&self.root, &self.settings.effective(), &self.detected_roots.read())
exclude_globs(&self.root, &self.settings.effective(), &self.detected_roots.read(), &self.member_excludes.read())
}
/// The exclude globs below `dir` (the project folder or a content root), relative to it: a
/// project attached to this one has its own excluded folders, the other roots share these.
pub fn exclude_globs_in(&self, dir: &Path) -> Vec<String> {
let own = root_globs(&self.settings.effective(), &self.member_excludes.read(), dir);
own.unwrap_or_else(|| self.exclude_globs())
}
/// The workspace projects outside this one's folder, which have exclusions of their own.
pub fn attached_roots(&self) -> Vec<PathBuf> {
self.member_excludes.read().keys().filter(|r| !r.starts_with(&self.root)).cloned().collect()
}
/// Where `path`'s exclusions are matched from: the workspace project outside this one holding
/// it, else the project folder (whose globs cover the projects inside it, anchored there).
pub fn root_of(&self, path: &Path) -> PathBuf {
let members = self.member_excludes.read();
let outside = members.keys().filter(|r| !r.starts_with(&self.root) && path.starts_with(r));
let member = outside.max_by_key(|r| r.components().count());
member.cloned().unwrap_or_else(|| self.root.clone())
}
/// Project Structure content roots besides the project folder (existing directories).
@@ -1321,6 +1382,7 @@ impl Project {
if self.light {
return;
}
*self.member_excludes.write() = member_excludes(&self.settings, &self.root);
let (roots, excludes) = (self.content_roots(), self.exclude_globs());
self.lsp.set_content_roots(language_server_roots(&self.root, roots.clone()));
self.lsp.set_jdtls_import_roots(ide_build::maven_external_roots(
@@ -1329,12 +1391,16 @@ impl Project {
&self.settings.effective().languages.java.maven,
self.is_trusted(),
));
self.index.set_scope(index_roots(&self.root, roots.clone()), excludes.clone());
let settings = self.settings.effective();
self.index.set_scope(
index_roots(&self.root, roots.clone(), &settings, &self.member_excludes.read()),
excludes.clone(),
);
self.watcher.set_excludes(&excludes);
let mut watchers = self.content_watchers.lock();
watchers.retain(|(p, _)| roots.contains(p));
for (_, w) in watchers.iter() {
w.set_excludes(&excludes);
for (p, w) in watchers.iter() {
w.set_excludes(&self.exclude_globs_in(p));
}
for r in roots {
if watchers.iter().any(|(p, _)| *p == r) {
@@ -1342,7 +1408,7 @@ impl Project {
}
if let Some(w) = content_root_watcher(
&r,
&excludes,
&self.exclude_globs_in(&r),
&self.sink,
&self.index,
&self.documents,
@@ -1426,10 +1492,68 @@ pub fn history_retention(settings: &ide_core::settings::Settings) -> ide_workspa
}
/// Only explicit workspace containers exclude their root from indexed content.
fn index_roots(root: &Path, folders: Vec<PathBuf>) -> ide_index::IndexRoots {
fn index_roots(
root: &Path,
folders: Vec<PathBuf>,
settings: &ide_core::settings::Settings,
members: &BTreeMap<PathBuf, Vec<String>>,
) -> ide_index::IndexRoots {
let container =
ide_workspace::workspace::Workspace::load(root).ok().flatten().is_some_and(|w| w.is_container(root));
ide_index::IndexRoots { include_root: !container, folders: folders.into_iter().filter(|p| p != root).collect() }
let folders: Vec<PathBuf> = folders.into_iter().filter(|p| p != root).collect();
let excludes = folders.iter().filter_map(|f| Some((f.clone(), root_globs(settings, members, f)?))).collect();
ide_index::IndexRoots { include_root: !container, folders, excludes }
}
/// Excluded folders (as `/`-anchored globs) by workspace project.
type MemberExcludes = Arc<RwLock<BTreeMap<PathBuf, Vec<String>>>>;
/// The excluded folders of the workspace's projects besides `root`, each from its own Project
/// Structure settings and build files (as when it is opened alone), relative to its folder.
fn member_excludes(settings: &SettingsStore, root: &Path) -> BTreeMap<PathBuf, Vec<String>> {
let Ok(Some(workspace)) = ide_workspace::workspace::Workspace::load(root) else { return BTreeMap::new() };
// A workspace folder is no project of its own: its excluded folders apply in every member.
let shared = match workspace.is_container(root) {
true => linked_roots(root, &settings.effective(), &[]).excluded_globs(),
false => Vec::new(),
};
workspace
.projects
.into_iter()
.filter(|p| p != root && p.is_dir())
.map(|p| {
let own = settings.for_project(&p).effective();
let mut globs = shared.clone();
globs.extend(linked_roots(&p, &own, &ide_workspace::roots::detect(&p)).excluded_globs());
(p, globs)
})
.collect()
}
/// The exclude globs below the workspace project `dir`: the ignored names and "Exclude files"
/// patterns apply everywhere, excluded folders only in the project that marked them.
fn root_globs(
settings: &ide_core::settings::Settings,
members: &BTreeMap<PathBuf, Vec<String>>,
dir: &Path,
) -> Option<Vec<String>> {
let own = members.get(dir)?;
let mut globs = settings.file_excludes();
globs.extend(own.iter().cloned());
Some(globs)
}
/// The excluded folders of the workspace projects inside `root` (those its walk covers),
/// anchored at `root`.
fn nested_member_globs(root: &Path, members: &BTreeMap<PathBuf, Vec<String>>) -> Vec<String> {
let mut out = Vec::new();
for (dir, own) in members {
if let Ok(rel) = dir.strip_prefix(root) {
let rel = rel.to_string_lossy().replace('\\', "/");
out.extend(own.iter().map(|g| format!("/{rel}{g}")));
}
}
out
}
/// The member roots of an explicit workspace container (empty for a plain
@@ -1828,9 +1952,15 @@ fn linked_roots(root: &Path, settings: &ide_core::settings::Settings, detected:
ProjectRoots::compute(detected, &settings.project_structure)
}
fn exclude_globs(root: &Path, settings: &ide_core::settings::Settings, detected: &[SourceFolder]) -> Vec<String> {
fn exclude_globs(
root: &Path,
settings: &ide_core::settings::Settings,
detected: &[SourceFolder],
members: &BTreeMap<PathBuf, Vec<String>>,
) -> Vec<String> {
let mut globs = settings.file_excludes();
globs.extend(linked_roots(root, settings, detected).excluded_globs());
globs.extend(nested_member_globs(root, members));
globs
}
@@ -2316,7 +2446,8 @@ mod composer_tests {
#[cfg(test)]
mod content_roots_tests {
use super::content_roots;
use super::{SettingsStore, content_roots, exclude_globs, member_excludes, root_globs};
use std::path::Path;
#[test]
#[cfg(windows)]
@@ -2405,4 +2536,46 @@ mod content_roots_tests {
// ... while its files go to a language server of its own.
assert_eq!(super::language_server_roots(&root, roots), vec![other, nested]);
}
#[test]
fn each_workspace_project_excludes_its_own_folders() {
let tmp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(tmp.path()).unwrap();
let (config, root, nested, other) =
(base.join("config"), base.join("app"), base.join("app/mod"), base.join("lib"));
for dir in [&nested, &other] {
std::fs::create_dir_all(dir).unwrap();
}
let store = |dir: &Path| SettingsStore::load(&config, Some(dir));
let exclude = |dir: &Path, folders: serde_json::Value| {
store(dir)
.set(ide_workspace::settings::SettingsScope::Project, "projectStructure.excluded", folders)
.unwrap();
};
exclude(&root, serde_json::json!(["target"]));
exclude(&nested, serde_json::json!(["out"]));
exclude(&other, serde_json::json!(["gen/"]));
assert!(member_excludes(&store(&root), &root).is_empty(), "a plain project has no members");
ide_workspace::workspace::Workspace::attach(&root, "app", vec![root.clone(), nested.clone(), other.clone()])
.unwrap();
let members = member_excludes(&store(&root), &root);
assert_eq!(members[&other], ["/gen"]);
let settings = store(&root).effective();
let globs = exclude_globs(&root, &settings, &[], &members);
// The project's own folders, and those of the project its walk covers, anchored there.
assert!(globs.contains(&"/target".to_owned()) && globs.contains(&"/mod/out".to_owned()));
assert!(!globs.contains(&"/gen".to_owned()));
let own = root_globs(&settings, &members, &other).unwrap();
assert!(own.contains(&"/gen".to_owned()) && !own.contains(&"/target".to_owned()));
assert_eq!(root_globs(&settings, &members, &root), None, "the project folder has the project's");
// A workspace folder's own excluded folders apply in every member, as before.
let ws = base.join("ws");
ide_workspace::workspace::Workspace::save(&ws, "ws", vec![root.clone(), other.clone()], true).unwrap();
exclude(&ws, serde_json::json!(["dist"]));
let members = member_excludes(&store(&ws), &ws);
assert_eq!(members[&other], ["/dist", "/gen"]);
assert_eq!(members[&root], ["/dist", "/target"]);
}
}
+11 -5
Переглянути файл
@@ -6,15 +6,21 @@ use serde_json::json;
use std::path::Path;
use std::sync::Arc;
/// Codex's modes as it reported them last time, in "ask".
fn remember_codex_modes(data: &Path) {
/// Codex's modes as its catalog for `root` listed them last time, in "ask".
fn remember_codex_modes(data: &Path, root: &Path) {
std::fs::create_dir_all(data.join("agents")).unwrap();
let modes = json!({ "codex": { "config": [ {
let config = json!([ {
"id": "mode", "name": "Mode", "description": null, "category": "mode", "current": "ask",
"values": [ { "value": "read-only", "name": "Read Only", "description": null },
{ "value": "ask", "name": "Ask", "description": null },
{ "value": "full-access", "name": "Full Access", "description": null } ],
"via": "option" } ] } });
"via": "option" } ]);
let mut catalogs = serde_json::Map::new();
catalogs.insert(
root.to_string_lossy().into_owned(),
json!({ "fingerprint": "test", "config": config, "thoughtLevels": {} }),
);
let modes = json!({ "codex": { "projectCatalogs": catalogs } });
std::fs::write(data.join("agents/models.json"), modes.to_string()).unwrap();
}
@@ -30,7 +36,7 @@ async fn new_tasks_start_asking_for_approval_when_the_user_chose_so() {
let root = dunce::canonicalize(tmp.path()).unwrap().join("project");
std::fs::create_dir_all(root.join(".openidea")).unwrap();
let (config, data) = (tmp.path().join("config"), tmp.path().join("data"));
remember_codex_modes(&data);
remember_codex_modes(&data, &root);
std::fs::create_dir_all(&config).unwrap();
std::fs::write(config.join("settings.toml"), "[agents]\nnewTaskApprovals = \"ask\"\n").unwrap();
// A project's own settings don't choose this.
+160
Переглянути файл
@@ -0,0 +1,160 @@
//! Each project of a workspace keeps its own excluded folders: they apply below that project only.
use ide_core::{NullSink, RequestId};
use ide_host::{Host, HostConfig, ops};
use ide_workspace::settings::SettingsScope;
use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex};
use std::time::Duration;
fn host(base: &Path) -> Host {
Host::new(HostConfig {
config_dir: base.join("config"),
data_dir: base.join("data"),
local_data_dir: base.join("local"),
languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
syntax: Arc::default(),
sink_for: Box::new(|_| Arc::new(NullSink)),
owner: |window| window,
runtime: tokio::runtime::Handle::current(),
project_environment: false,
})
}
/// Files containing `needle` that Find in Files reports, by path.
async fn found(host: &Host) -> Vec<PathBuf> {
let hits = Arc::new(Mutex::new(Vec::new()));
let out = hits.clone();
let query = serde_json::from_value(serde_json::json!({"pattern": "needle", "isRegex": false, "caseSensitive": false, "wholeWord": false, "include": [], "exclude": [], "scope": {"kind": "project"}, "maxMatches": 100})).unwrap();
let channel = ops::Channel::new(move |event| {
if let ops::search::SearchEvent::File { file } = event {
out.lock().unwrap().push(file.path.0);
}
});
ops::search::search_start(host, "main", RequestId::next(), query, channel).await.unwrap();
let mut paths = std::mem::take(&mut *hits.lock().unwrap());
paths.sort();
paths
}
/// The folders of `dir` the Project view shows as excluded.
async fn excluded(host: &Host, dir: &Path) -> Vec<String> {
let entries = ops::fs::fs_read_dir(host, "main", dir.to_path_buf()).await.unwrap();
entries.into_iter().filter(|e| e.excluded).map(|e| e.name).collect()
}
fn indexed(host: &Host, name: &str) -> Vec<PathBuf> {
let project = host.project("main").unwrap();
assert!(project.index.wait_idle(Duration::from_secs(20)));
project.index.files_named(name)
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn attached_projects_keep_their_own_excluded_folders() {
let temp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(temp.path()).unwrap();
let (app, lib) = (base.join("app"), base.join("lib"));
// Both projects have a `gen` and a `dist` folder.
for root in [&app, &lib] {
for dir in ["gen", "dist", "src"] {
std::fs::create_dir_all(root.join(dir)).unwrap();
std::fs::write(root.join(dir).join(format!("{dir}.txt")), "needle\n").unwrap();
}
}
let config = base.join("config");
// `lib` excluded its `dist` when it was opened on its own.
ide_workspace::SettingsStore::load(&config, Some(&lib))
.set(SettingsScope::Project, "projectStructure.excluded", serde_json::json!(["dist"]))
.unwrap();
ide_workspace::workspace::Workspace::attach(&app, "app", vec![app.clone(), lib.clone()]).unwrap();
let host = host(&base);
host.trust.decide(&app, true, false).unwrap();
host.trust.decide(&lib, true, false).unwrap();
host.open_project("main", &app).unwrap();
ops::project::set_settings(&host, "main", SettingsScope::Project, "projectStructure.excluded", r#"["gen"]"#)
.unwrap();
host.project("main").unwrap().refresh_index_scope();
let expect = |paths: &[&str]| paths.iter().map(|p| base.join(p)).collect::<Vec<_>>();
// `app` excludes its `gen`, `lib` its `dist`: neither reaches into the other project.
assert_eq!(
found(&host).await,
expect(&["app/dist/dist.txt", "app/src/src.txt", "lib/gen/gen.txt", "lib/src/src.txt"])
);
assert_eq!(excluded(&host, &app).await, ["gen"]);
assert_eq!(excluded(&host, &lib).await, ["dist"]);
assert_eq!(indexed(&host, "gen.txt"), expect(&["lib/gen/gen.txt"]));
assert_eq!(indexed(&host, "dist.txt"), expect(&["app/dist/dist.txt"]));
// `lib` changes its exclusions in its own window: the workspace follows.
host.open_project("lib", &lib).unwrap();
ops::project::set_settings(&host, "lib", SettingsScope::Project, "projectStructure.excluded", "[]").unwrap();
let project = host.project("main").unwrap();
for _ in 0..100 {
if project.exclude_globs_in(&lib).iter().all(|g| g != "/dist") {
break;
}
tokio::time::sleep(Duration::from_millis(50)).await;
}
assert!(excluded(&host, &lib).await.is_empty());
assert_eq!(indexed(&host, "dist.txt"), expect(&["app/dist/dist.txt", "lib/dist/dist.txt"]));
ops::project::set_settings(&host, "lib", SettingsScope::Project, "projectStructure.excluded", r#"["dist"]"#)
.unwrap();
host.shutdown().await;
// Reopened: each project's exclusions come back from its own settings.
let host = self::host(&base);
host.open_project("main", &app).unwrap();
assert_eq!(
found(&host).await,
expect(&["app/dist/dist.txt", "app/src/src.txt", "lib/gen/gen.txt", "lib/src/src.txt"])
);
assert_eq!(indexed(&host, "dist.txt"), expect(&["app/dist/dist.txt"]));
host.shutdown().await;
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mark_directory_as_excluded_writes_the_attached_projects_settings() {
let temp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(temp.path()).unwrap();
let (app, lib, other) = (base.join("app"), base.join("lib"), base.join("other"));
for dir in [app.join("gen"), lib.join("gen"), other.clone()] {
std::fs::create_dir_all(dir).unwrap();
}
ide_workspace::workspace::Workspace::attach(&app, "app", vec![app.clone(), lib.clone()]).unwrap();
let host = Arc::new(host(&base));
host.trust.decide(&app, true, false).unwrap();
host.open_project("main", &app).unwrap();
let members = ops::project::project_workspace_members(&host, "main").unwrap();
assert_eq!(members.iter().map(|m| &m.root.0).collect::<Vec<_>>(), [&lib]);
assert!(members[0].structure.excluded.is_empty());
let set = |root: &Path, key: &str, value: &str| {
ops::project::project_workspace_member_set(&host, "main", root.to_path_buf(), key.into(), value.into())
};
set(&lib, "projectStructure.excluded", r#"["gen"]"#).unwrap();
// Only Project Structure keys of the workspace's attached projects.
assert!(set(&other, "projectStructure.excluded", r#"["gen"]"#).is_err());
assert!(set(&lib, "editor.fontSize", "20").is_err());
let saved = ide_workspace::SettingsStore::load(&base.join("config"), Some(&lib));
assert_eq!(saved.effective().project_structure.excluded, ["gen"]);
let project = host.project("main").unwrap();
for _ in 0..100 {
if project.exclude_globs_in(&lib).contains(&"/gen".to_owned()) {
break;
}
tokio::time::sleep(Duration::from_millis(50)).await;
}
assert_eq!(excluded(&host, &lib).await, ["gen"]);
assert!(excluded(&host, &app).await.is_empty(), "the open project keeps its own");
assert!(
ide_workspace::SettingsStore::load(&base.join("config"), Some(&app))
.effective()
.project_structure
.excluded
.is_empty()
);
host.shutdown().await;
}
+112
Переглянути файл
@@ -0,0 +1,112 @@
use ide_core::{NullSink, RequestId};
use ide_host::{
Host, HostConfig,
ops::{Channel, fs::fs_synchronize_directories},
};
use ide_vfs::{DirectorySyncAction as Action, DirectorySyncOperation, DirectorySyncProgress};
use parking_lot::Mutex;
use std::{fs, path::Path, sync::Arc};
fn put(root: &Path, path: &str, content: &str) {
let path = root.join(path);
fs::create_dir_all(path.parent().unwrap()).unwrap();
fs::write(path, content).unwrap();
}
fn op(path: &str, action: Action, overwrite: bool) -> DirectorySyncOperation {
DirectorySyncOperation { path: path.into(), action, overwrite }
}
fn host(base: &Path) -> Host {
Host::new(HostConfig {
config_dir: base.join("config"),
data_dir: base.join("data"),
local_data_dir: base.join("data"),
languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
syntax: Arc::default(),
sink_for: Box::new(|_| Arc::new(NullSink)),
owner: |w| w,
runtime: tokio::runtime::Handle::current(),
project_environment: false,
})
}
#[tokio::test(flavor = "multi_thread")]
async fn runs_every_operation_reports_failures_and_stops_when_cancelled() {
let temp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(temp.path()).unwrap();
let root = base.join("project");
let (left, right) = (root.join("left"), root.join("right"));
put(&left, "only-left/deep/nested/a.txt", "nested");
put(&left, "changed.txt", "left");
put(&right, "changed.txt", "right");
put(&left, "kept.txt", "left");
put(&right, "kept.txt", "right");
put(&right, "shared/new.txt", "right");
fs::create_dir_all(left.join("shared")).unwrap();
let host = host(&base);
host.trust.decide(&root, true, false).unwrap();
host.open_project("main", &root).unwrap();
let progress = Arc::new(Mutex::new(Vec::<DirectorySyncProgress>::new()));
let seen = progress.clone();
let channel = Channel::new(move |p| seen.lock().push(p));
let failures = fs_synchronize_directories(
&host,
"main",
left.clone(),
right.clone(),
vec![
op("only-left", Action::CopyToRight, false),
// Not confirmed: the destination exists, so this one fails and the rest still run.
op("kept.txt", Action::CopyToRight, false),
op("changed.txt", Action::CopyToLeft, true),
op("shared", Action::CopyToLeft, false),
// A real delete would go to this machine's Trash; a missing entry still fails the same way.
op("missing.txt", Action::DeleteLeft, false),
],
RequestId::next(),
channel.clone(),
)
.await
.unwrap();
assert_eq!(fs::read_to_string(right.join("only-left/deep/nested/a.txt")).unwrap(), "nested");
assert_eq!(fs::read_to_string(right.join("kept.txt")).unwrap(), "right");
assert_eq!(fs::read_to_string(left.join("changed.txt")).unwrap(), "right");
assert_eq!(fs::read_to_string(left.join("shared/new.txt")).unwrap(), "right");
let failed: Vec<_> = failures.iter().map(|f| (f.path.as_str(), f.action)).collect();
assert_eq!(failed, [("kept.txt", Action::CopyToRight), ("missing.txt", Action::DeleteLeft)]);
let done: Vec<_> = progress.lock().iter().map(|p| (p.done, p.total)).collect();
assert_eq!(done, (0..=5).map(|d| (d, 5)).collect::<Vec<_>>());
// A path outside the roots rejects the whole batch before anything runs.
let error = fs_synchronize_directories(
&host,
"main",
left.clone(),
right.clone(),
vec![op("kept.txt", Action::CopyToRight, true), op("../escape", Action::DeleteLeft, false)],
RequestId::next(),
channel.clone(),
)
.await
.unwrap_err();
assert_eq!(error.kind, ide_core::error::ErrorKind::InvalidInput);
assert_eq!(fs::read_to_string(right.join("kept.txt")).unwrap(), "right");
let request = RequestId::next();
host.cancel_request(request);
let error = fs_synchronize_directories(
&host,
"main",
left.clone(),
right.clone(),
vec![op("kept.txt", Action::CopyToRight, true)],
request,
channel,
)
.await
.unwrap_err();
assert_eq!(error.kind, ide_core::error::ErrorKind::Cancelled);
assert_eq!(fs::read_to_string(right.join("kept.txt")).unwrap(), "right");
}
+4
Переглянути файл
@@ -297,6 +297,10 @@ async fn trusted_attached_projects_are_writable_and_reach_the_window_they_are_at
.unwrap();
h.host.trust.decide(&attached, true, false).unwrap();
// The workspace's roots: the project and the attached project it trusts.
let roots: serde_json::Value = serde_json::from_str(&h.call("get_workspace_roots", json!({})).await).unwrap();
assert_eq!(roots, json!({ "projectRoot": h.root, "roots": [h.root, attached] }));
// Outside the project folder, by absolute path.
let file = attached.join("new.txt");
h.call("create_new_file", json!({"pathInProject": file, "text": "hello"})).await;
+15 -1
Переглянути файл
@@ -824,6 +824,11 @@ fn plugin_processes_end_with_their_owner() {
String::from_utf8_lossy(&ps.stdout).lines().any(|line| line.contains(&marker))
};
f.run("misbehave", "childkeep", marker.strip_prefix("--path=")).unwrap();
// fork+exec is not atomic: `ps` can still report the owner until the child execs.
let started = Instant::now() + Duration::from_secs(5);
while !alive() && Instant::now() < started {
std::thread::sleep(Duration::from_millis(10));
}
assert!(alive(), "{mode}: the process started");
match mode {
"disable" => f.host.set_enabled("misbehave", false).unwrap(),
@@ -6466,6 +6471,7 @@ fn api14_settings_and_input_events_use_other_and_capture_the_editor() {
mode: "visual".into(),
sub: Some("linewise".into()),
}),
E::CaretMoved(ide_plugin::CaretMoved { path: path.clone(), line: 4, col: 2, settled: true }),
],
Some(PluginEditor {
path: path.clone(),
@@ -6477,7 +6483,7 @@ fn api14_settings_and_input_events_use_other_and_capture_the_editor() {
assert!(f.host.wait_events(Duration::from_secs(5)));
let received: serde_json::Value = serde_json::from_str(&f.run("api14", "events", None).unwrap().unwrap()).unwrap();
let events = received.as_array().unwrap();
assert_eq!(events.len(), 4, "{received}");
assert_eq!(events.len(), 5, "{received}");
// The first synthetic post hands over the current keys ("enabled": false);
// the second is a real diff to true. Keys come from the recomputed
// snapshot, never from the event payload ("another-plugin-key").
@@ -6486,6 +6492,14 @@ fn api14_settings_and_input_events_use_other_and_capture_the_editor() {
assert_eq!(events[1]["kind"], "settings-changed");
assert_eq!(events[1]["data"], "[\"enabled\"]");
assert_eq!(events[3]["kind"], "input-mode-changed");
assert_eq!(events[4]["kind"], "caret-moved");
let caret: serde_json::Value =
serde_json::from_str(events[4]["data"].as_str().expect("caret data is JSON")).unwrap();
assert_eq!(caret["path"], path.as_str());
assert_eq!(caret["line"], 4);
assert_eq!(caret["col"], 2);
assert_eq!(caret["settled"], true);
assert_eq!(events[4]["editor"][0], path.as_str());
assert_eq!(events[2]["editor"][0], path);
assert_eq!(events[2]["editor"][1][0], serde_json::json!([0, 0, 0, 0]));
}
+47
Переглянути файл
@@ -1081,6 +1081,53 @@ async fn cancelling_one_request_does_not_interrupt_another_running_command() {
plugins.host().shutdown();
}
#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
async fn remote_focus_preserves_the_editor_for_following_plugin_events() {
let (tmp, plugins, peer, _client) = command_rpc_fixture().await;
plugins.host().install_from_dir(&fixture("api14"), &Consent::all()).unwrap();
let path = tmp.path().join("project/notes.txt").to_string_lossy().into_owned();
let selection = json!({"start":{"line":4,"col":2},"end":{"line":4,"col":5}});
invoke(
&peer,
"plugin_set_active_file",
json!({"path":path,"editor":{"path":path,"language":"text","selections":[selection]}}),
)
.await
.unwrap();
for focused in [true, false] {
if !focused {
invoke(&peer, "plugin_set_active_file", json!({"path":null,"editor":null})).await.unwrap();
}
plugins.host().post_events(
Some("main"),
vec![WorkbenchEvent::InputModeChanged(ide_plugin::InputMode {
path: path.clone(),
mode: "visual".into(),
sub: None,
})],
);
plugins.host().flush_events_at(std::time::Instant::now() + Duration::from_secs(2));
assert!(plugins.host().wait_events(Duration::from_secs(5)));
let received = invoke(
&peer,
"plugin_run_command",
json!({"pluginId":"api14","commandId":"events","arg":null,"editor":null}),
)
.await
.unwrap();
let events: Value = serde_json::from_str(received.as_str().unwrap()).unwrap();
let event = events.as_array().unwrap().iter().rev().find(|e| e["kind"] == "input-mode-changed").unwrap();
if focused {
assert_eq!(event["editor"], json!([path, [[4, 2, 4, 5]]]));
} else {
assert!(event["editor"].is_null(), "lost focus must clear the previous editor: {event}");
}
}
// Older callers may omit the optional editor payload.
invoke(&peer, "plugin_set_active_file", json!({"path":path})).await.unwrap();
plugins.host().shutdown();
}
#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
async fn a_remote_command_reads_the_clipboard_of_the_desktop_window() {
let (_tmp, plugins, peer, client) = command_rpc_fixture().await;
+39 -2
Переглянути файл
@@ -128,6 +128,44 @@ async fn serves_projects_files_documents_search_and_runs() {
let current = invoke(&peer, "project_current", json!({})).await.unwrap();
assert_eq!(current["name"], "demo");
// A SQL batch sends each outcome precisely once before the request reply.
let file = project.join("test.sqlite");
std::fs::File::create(&file).unwrap();
let source = ide_db::DataSource {
id: "test-db".into(),
name: "Test database".into(),
file: Some(file.into()),
..Default::default()
};
invoke(&peer, "db_save_sources", json!({ "sources": [source] })).await.unwrap();
let sql = "SELECT 1 AS n; SELECT 'second' AS n";
let statements =
invoke(&peer, "db_statements", json!({ "id": "test-db", "text": sql, "from": 0, "to": sql.len() }))
.await
.unwrap();
let done = invoke(
&peer,
"db_execute_stream",
json!({ "request": 21, "id": "test-db", "statements": statements, "maxRows": 10,
"schema": null, "onProgress": { "$channel": 521 } }),
)
.await
.unwrap();
assert!(done.is_null());
let events = client
.channels
.lock()
.iter()
.filter(|frame| frame.id == 521)
.map(|frame| frame.data.clone())
.collect::<Vec<_>>();
assert_eq!(events.len(), 5);
assert_eq!(events[0], json!({ "type": "started", "index": 0 }));
assert_eq!(events[1]["outcome"]["result"]["rows"], json!([["1"]]));
assert_eq!(events[2], json!({ "type": "started", "index": 1 }));
assert_eq!(events[3]["outcome"]["result"]["rows"], json!([["second"]]));
assert_eq!(events[4], json!({ "type": "done", "error": null }));
// The built-in web server runs where the project is; the client forwards its port.
let root = std::path::PathBuf::from(opened["root"].as_str().unwrap());
let url = invoke(&peer, "web_url", json!({ "path": root.join("src/main.py") })).await.unwrap();
@@ -146,8 +184,7 @@ async fn serves_projects_files_documents_search_and_runs() {
std::fs::write(right.join("中文.bin"), [0, 254, 1]).unwrap();
assert_eq!(invoke(&peer, "fs_entry_kind", json!({"path": left})).await.unwrap(), "dir");
assert_eq!(invoke(&peer, "fs_entry_kind", json!({"path": left.join("中文.bin")})).await.unwrap(), "file");
let compare_args =
|request| json!({"left": left, "right": right, "request": request, "onProgress": {"$channel": 520}});
let compare_args = |request| json!({"left": left, "right": right, "mode": "content", "request": request, "onProgress": {"$channel": 520}});
let rows = invoke(&peer, "fs_compare_directories", compare_args(520)).await.unwrap();
assert_eq!(rows[0]["status"], "different");
assert!(client.channels.lock().iter().any(|c| c.id == 520 && c.data["compared"] == 1));
+7
Переглянути файл
@@ -70,6 +70,13 @@ async fn command_added_worktree_joins_the_repository_set() {
let roots = f.project.repos().roots();
assert!(roots.contains(&linked), "worktree below the project did not join the repository set: {roots:?}");
assert_eq!(roots.len(), 2);
let roots = vcs::vcs_roots(&f.host, "main").unwrap();
assert_eq!(roots[0].root, f.root);
assert_eq!(roots[0].branch_root, f.root);
assert_eq!(roots[0].head.as_deref(), Some("main"));
assert_eq!(roots[1].root, linked);
assert_eq!(roots[1].branch_root, f.root);
assert_eq!(roots[1].head.as_deref(), Some("topic"));
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+72 -27
Переглянути файл
@@ -30,6 +30,8 @@ struct ExtraRoot {
path: PathBuf,
/// Shown before the paths inside it (`shared-lib/src/x.rs`).
name: String,
/// Its own exclude globs (an attached project's); `None` shares the project's.
excludes: Option<GlobSet>,
}
/// Whether an ignore-aware content walk of `root` leaves out `dir` or an ancestor.
@@ -55,6 +57,32 @@ pub fn walk_skips(root: &Path, dir: &Path) -> bool {
!walker.flatten().any(|e| e.path() == dir)
}
/// Exclude globs as gitignore reads them: a leading `/` anchors at the root, a bare name matches at any depth.
fn glob_set(exclude_globs: &[String]) -> GlobSet {
let mut set = GlobSetBuilder::new();
for raw in exclude_globs {
let p = raw.trim().trim_end_matches('/');
let anchored = p.starts_with('/');
let p = p.trim_start_matches("./").trim_start_matches('/');
if p.is_empty() {
continue;
}
let mut patterns = vec![p.to_owned()];
if !anchored && !p.contains('/') {
patterns.push(format!("**/{p}"));
}
for pat in patterns {
match GlobBuilder::new(&pat).literal_separator(true).build() {
Ok(g) => {
set.add(g);
}
Err(e) => tracing::warn!("invalid exclude glob {raw:?}: {e}"),
}
}
}
set.build().unwrap_or_else(|_| GlobSet::empty())
}
fn rel_string(rel: &Path) -> String {
let mut out = String::new();
for c in rel.components() {
@@ -93,28 +121,7 @@ pub(crate) fn mtime_of(meta: &std::fs::Metadata) -> u64 {
impl PathFilter {
pub(crate) fn new(root: &Path, extra_roots: &crate::IndexRoots, exclude_globs: &[String]) -> Self {
let mut set = GlobSetBuilder::new();
for raw in exclude_globs {
let p = raw.trim().trim_end_matches('/');
let anchored = p.starts_with('/');
let p = p.trim_start_matches("./").trim_start_matches('/');
if p.is_empty() {
continue;
}
let mut patterns = vec![p.to_owned()];
if !anchored && !p.contains('/') {
patterns.push(format!("**/{p}"));
}
for pat in patterns {
match GlobBuilder::new(&pat).literal_separator(true).build() {
Ok(g) => {
set.add(g);
}
Err(e) => tracing::warn!("invalid exclude glob {raw:?}: {e}"),
}
}
}
let excludes = set.build().unwrap_or_else(|_| GlobSet::empty());
let excludes = glob_set(exclude_globs);
let mut extra: Vec<ExtraRoot> = Vec::new();
for r in &extra_roots.folders {
let path = dunce::canonicalize(r).unwrap_or_else(|_| r.clone());
@@ -130,7 +137,8 @@ impl PathFilter {
Ok(rel) if extra_roots.include_root => rel_string(rel),
_ => path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default(),
};
extra.push(ExtraRoot { name, path });
let excludes = extra_roots.excludes.get(r).map(|globs| glob_set(globs));
extra.push(ExtraRoot { name, path, excludes });
}
Self {
root: root.to_owned(),
@@ -159,6 +167,13 @@ impl PathFilter {
stamp.push_str(exclude);
stamp.push('\n');
}
for (folder, excludes) in &self.config.0.excludes {
stamp.push_str(&format!("-- {}\n", folder.to_string_lossy()));
for exclude in excludes {
stamp.push_str(exclude);
stamp.push('\n');
}
}
stamp
}
@@ -229,8 +244,9 @@ impl PathFilter {
})
}
fn excluded_rel(&self, rel: &str) -> bool {
self.excludes.is_match(rel)
/// The exclude globs below `base` (a root): its own, or the project's.
fn excludes_of(&self, base: &Path) -> &GlobSet {
self.extra.iter().find(|e| e.path == base).and_then(|e| e.excludes.as_ref()).unwrap_or(&self.excludes)
}
fn skip_name(name: &str) -> bool {
@@ -245,6 +261,7 @@ impl PathFilter {
if rel.is_empty() {
return true;
}
let excludes = self.excludes_of(base);
let mut prefix = String::new();
for seg in rel.split('/') {
if Self::skip_name(seg) {
@@ -254,7 +271,7 @@ impl PathFilter {
prefix.push('/');
}
prefix.push_str(seg);
if self.excluded_rel(&prefix) {
if excludes.is_match(&prefix) {
return true;
}
}
@@ -268,8 +285,8 @@ impl PathFilter {
if dir != root && self.is_excluded(dir) {
return None;
}
let excludes = self.excludes_of(root).clone();
let root = root.to_path_buf();
let excludes = self.excludes.clone();
let extra: Vec<PathBuf> = self.extra.iter().filter(|e| e.path != dir).map(|e| e.path.clone()).collect();
let mut builder = WalkBuilder::new(dir);
builder.standard_filters(false).follow_links(false).filter_entry(move |e| {
@@ -524,6 +541,34 @@ src/local/
assert!(!filter.same_config(&vec![shared].into(), &["target".into()]));
}
#[test]
fn each_root_applies_its_own_excluded_folders() {
let dir = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(dir.path()).unwrap();
let (root, attached, shared) = (base.join("app"), base.join("lib"), base.join("shared"));
for f in ["app/target/a.rs", "app/gen/b.rs", "lib/target/c.rs", "lib/gen/d.rs", "shared/target/e.rs"] {
touch(&base, f);
}
let roots = crate::IndexRoots {
include_root: true,
folders: vec![attached.clone(), shared.clone()],
excludes: [(attached.clone(), vec!["/gen".to_owned()])].into(),
};
let filter = PathFilter::new(&root, &roots, &["/target".into()]);
let mut found: Vec<String> = filter
.roots()
.flat_map(|r| filter.walk(r, &AtomicBool::new(false)))
.filter_map(|f| filter.rel(&f.path))
.collect();
found.sort();
// `lib` has exclusions of its own; `shared` shares the project's.
assert_eq!(found, ["gen/b.rs", "lib/target/c.rs"]);
assert!(filter.is_excluded(&attached.join("gen/new.rs")));
assert!(!filter.is_excluded(&root.join("gen/new.rs")));
assert!(filter.stamp().contains("/gen"));
assert!(!filter.same_config(&vec![attached, shared].into(), &["/target".into()]));
}
#[test]
fn an_ignored_folder_inside_the_root_is_a_root_with_its_own_rules() {
let dir = tempfile::tempdir().unwrap();
+5 -2
Переглянути файл
@@ -92,15 +92,18 @@ pub struct ProjectIndex {
}
/// Folders indexed alongside the internal state root.
#[derive(Clone, PartialEq)]
#[derive(Clone, Default, PartialEq)]
pub struct IndexRoots {
pub include_root: bool,
pub folders: Vec<PathBuf>,
/// Folders with exclude globs of their own (an attached project's), relative to the folder;
/// the other folders share the project's.
pub excludes: std::collections::BTreeMap<PathBuf, Vec<String>>,
}
impl From<Vec<PathBuf>> for IndexRoots {
fn from(folders: Vec<PathBuf>) -> Self {
Self { include_root: true, folders }
Self { include_root: true, folders, ..Default::default() }
}
}
+3 -3
Переглянути файл
@@ -825,7 +825,7 @@ fn workspace_scope_excludes_state_from_scans_updates_and_cached_results() {
let idx = ProjectIndex::open(
&fx.root,
&fx.cache,
crate::IndexRoots { include_root: false, folders: vec![member.clone()] },
crate::IndexRoots { include_root: false, folders: vec![member.clone()], ..Default::default() },
Vec::new(),
Arc::new(LanguageRegistry::load(None).unwrap()),
Arc::new(Syntax::new()),
@@ -841,7 +841,7 @@ fn workspace_scope_excludes_state_from_scans_updates_and_cached_results() {
assert!(idx.wait_idle(WAIT));
assert!(symbols(&idx, "hidden", SymbolFilter::All).is_empty());
assert_eq!(symbols(&idx, "visible", SymbolFilter::All), ["visible"]);
idx.set_scope(crate::IndexRoots { include_root: false, folders: Vec::new() }, Vec::new());
idx.set_scope(crate::IndexRoots { include_root: false, folders: Vec::new(), ..Default::default() }, Vec::new());
assert!(idx.wait_idle(WAIT));
assert!(idx.find_files("", 100).is_empty());
}
@@ -1104,7 +1104,7 @@ fn repository_rule_changes_refresh_members_of_an_unindexed_container() {
let idx = ProjectIndex::open(
&fx.root,
&fx.cache,
IndexRoots { include_root: false, folders: vec![fx.root.join("member")] },
IndexRoots { include_root: false, folders: vec![fx.root.join("member")], ..Default::default() },
vec![],
Arc::new(LanguageRegistry::load(None).unwrap()),
Arc::new(Syntax::new()),
+41
Переглянути файл
@@ -0,0 +1,41 @@
//! Exception breakpoints on a chosen class, armed inside the debuggee's VM by the debugger's own
//! connection. The adapter stops on them as on its own exception filters.
use crate::{InspectFuture, VmTarget};
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct ExceptionClassSpec {
/// Echoed back with the breakpoint's state.
pub id: String,
/// Binary name (`com.acme.Outer$Inner`); subclasses stop too.
pub class_name: String,
pub caught: bool,
pub uncaught: bool,
pub enabled: bool,
/// JDI class patterns (`com.acme.*`, `*Test`) matched against the class whose code throws.
pub class_filters: Vec<String>,
pub class_exclusion_filters: Vec<String>,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize)]
#[serde(rename_all = "camelCase")]
pub enum ExceptionArmState {
Armed,
/// No class of that name is loaded yet; it is armed when one is.
Pending,
Disabled,
/// A stream trace silences the VM's breakpoints; applied when it ends.
Deferred,
}
pub trait ExceptionClassBreakpoints: Send + Sync {
/// Replaces the VM's whole list; `(id, state)` per breakpoint, in order. The adapter can drop
/// these whenever it sets its own exception filters, so set them again after each time.
fn set<'a>(
&'a self,
target: &'a VmTarget,
breakpoints: &'a [ExceptionClassSpec],
) -> InspectFuture<'a, Vec<(String, ExceptionArmState)>>;
}
+2
Переглянути файл
@@ -1,9 +1,11 @@
//! Types and the [`JvmInspector`] trait for reading live JVM objects while a debug session is
//! suspended. Implementations live elsewhere (jdtls bundle for Java, JDWP link for Kotlin).
mod exceptions;
mod names;
mod stream;
pub use exceptions::{ExceptionArmState, ExceptionClassBreakpoints, ExceptionClassSpec};
pub use names::{is_boxed, name_to_signature, signature_to_name, string_length};
pub use stream::{AbortState, CollectedTerminal, StreamTracer, TraceCollected, TraceId, TraceState};
+46 -5
Переглянути файл
@@ -670,21 +670,34 @@ pub fn workspace_edit(conv: &Conv, e: lsp::WorkspaceEdit) -> WorkspaceEdit {
for op in ops {
match op {
lsp::DocumentChangeOperation::Edit(e) => doc_edit(&mut files, e),
// An operation its `ignoreIfExists` / `ignoreIfNotExists` makes a no-op is
// left out (vtsls' extractions "create" the file they then edit).
lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Create(c)) => {
if let Some(path) = uri_path(&c.uri) {
let overwrite = c.options.and_then(|o| o.overwrite).unwrap_or(false);
files.push(FileEdit::Create { path: path.into(), overwrite });
let overwrite = c.options.as_ref().and_then(|o| o.overwrite).unwrap_or(false);
let ignore = c.options.and_then(|o| o.ignore_if_exists).unwrap_or(false);
if !(ignore && !overwrite && path.exists()) {
files.push(FileEdit::Create { path: path.into(), overwrite });
}
}
}
lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Rename(r)) => {
if let (Some(from), Some(to)) = (uri_path(&r.old_uri), uri_path(&r.new_uri)) {
files.push(FileEdit::Rename { from: from.into(), to: to.into() });
let o = r.options.as_ref();
let overwrite = o.and_then(|o| o.overwrite).unwrap_or(false);
let ignore = o.and_then(|o| o.ignore_if_exists).unwrap_or(false);
if !(ignore && !overwrite && to.exists()) {
files.push(FileEdit::Rename { from: from.into(), to: to.into() });
}
}
}
lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Delete(d)) => {
if let Some(path) = uri_path(&d.uri) {
let recursive = d.options.and_then(|o| o.recursive).unwrap_or(false);
files.push(FileEdit::Delete { path: path.into(), recursive });
let recursive = d.options.as_ref().and_then(|o| o.recursive).unwrap_or(false);
let ignore = d.options.and_then(|o| o.ignore_if_not_exists).unwrap_or(false);
if !(ignore && !path.exists()) {
files.push(FileEdit::Delete { path: path.into(), recursive });
}
}
}
}
@@ -1426,6 +1439,34 @@ mod tests {
assert_eq!(out[1].name, "f");
}
#[test]
fn workspace_edit_leaves_out_operations_their_ignore_options_make_no_ops() {
let conv = Conv::utf16();
let dir = tempfile::tempdir().unwrap();
let existing = dir.path().join("e.ts");
std::fs::write(&existing, "").unwrap();
let missing = dir.path().join("m.ts");
let uri = |p: &Path| crate::uri::path_to_uri_string(p);
let e: lsp::WorkspaceEdit = serde_json::from_value(json!({
"documentChanges": [
{ "kind": "create", "uri": uri(&existing), "options": { "ignoreIfExists": true } },
{ "kind": "create", "uri": uri(&missing), "options": { "ignoreIfExists": true } },
{ "kind": "rename", "oldUri": uri(&missing), "newUri": uri(&existing), "options": { "ignoreIfExists": true } },
{ "kind": "delete", "uri": uri(&dir.path().join("gone.ts")), "options": { "ignoreIfNotExists": true } },
{ "kind": "delete", "uri": uri(&existing), "options": { "ignoreIfNotExists": true } }
]
}))
.unwrap();
let w = workspace_edit(&conv, e);
assert_eq!(
w.files,
[
FileEdit::Create { path: missing.into(), overwrite: false },
FileEdit::Delete { path: existing.into(), recursive: false },
]
);
}
#[test]
fn workspace_edit_document_changes() {
let conv = Conv::utf16();
+1
Переглянути файл
@@ -20,6 +20,7 @@ pub(crate) const SERVER: &str = "jdtls";
const GENERATED_SOURCES: &str = "openidea.java.generatedSources";
pub(crate) mod configuration;
pub(crate) mod exception_breakpoints;
mod extract_interface;
mod formatter;
mod generated;
+56
Переглянути файл
@@ -0,0 +1,56 @@
//! [`ExceptionClassBreakpoints`] over `openidea.jvm.exceptions.set` of the JVM inspector bundle that
//! runs inside jdtls (`java/jvm-inspect`).
use super::jvm_inspect::{command_error, decode, target_json};
use crate::LspManager;
use ide_jvm_inspect::{
ExceptionArmState, ExceptionClassBreakpoints, ExceptionClassSpec, InspectError, InspectFuture, VmTarget,
};
use serde::Deserialize;
use serde_json::json;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::Duration;
use tokio::time::timeout;
/// The bundle waits for the inspect commands' turn, which a `classes` on a large heap can hold.
const COMMAND_TIMEOUT: Duration = Duration::from_secs(30);
pub struct JdtExceptionBreakpoints {
lsp: Arc<LspManager>,
/// A path inside the module whose jdtls runs the debug session.
server: PathBuf,
}
impl JdtExceptionBreakpoints {
pub fn new(lsp: Arc<LspManager>, server: PathBuf) -> Self {
Self { lsp, server }
}
}
#[derive(Deserialize)]
struct WireState {
id: String,
state: ExceptionArmState,
}
impl ExceptionClassBreakpoints for JdtExceptionBreakpoints {
fn set<'a>(
&'a self,
target: &'a VmTarget,
breakpoints: &'a [ExceptionClassSpec],
) -> InspectFuture<'a, Vec<(String, ExceptionArmState)>> {
Box::pin(async move {
let arguments = vec![target_json(target), json!({ "breakpoints": breakpoints })];
let reply = timeout(
COMMAND_TIMEOUT,
self.lsp.jdtls_command(&self.server, "openidea.jvm.exceptions.set", arguments),
)
.await
.map_err(|_| InspectError::TimedOut)?
.map_err(command_error)?;
let states: Vec<WireState> = decode(reply)?;
Ok(states.into_iter().map(|s| (s.id, s.state)).collect())
})
}
}
+1
Переглянути файл
@@ -48,6 +48,7 @@ mod xml_catalog;
pub use injections::{InjectedRange, InjectionProvider, MAX_INJECTED_DOCUMENT_BYTES};
pub use inspect::{CheckedServer, DocumentCheck, FileInspection, InspectHost, InspectOptions};
pub use jdtls::exception_breakpoints::JdtExceptionBreakpoints;
pub use jdtls::jvm_inspect::JdtJvmInspector;
pub use jdtls::stream_trace::JdtStreamTracer;
pub use kotlin_lsp::{KotlinDebugServer, KotlinDebugUnavailable};
+56
Переглянути файл
@@ -3714,6 +3714,62 @@ async fn stream_collect_fails_cleanly_on_a_step_beyond_u16() {
assert!(matches!(error, InspectError::Failed(ref m) if m.contains("malformed")), "{error:?}");
}
#[tokio::test(flavor = "multi_thread")]
async fn exception_breakpoints_send_the_whole_list_and_decode_states() {
use ide_jvm_inspect::{ExceptionArmState, ExceptionClassBreakpoints, ExceptionClassSpec};
let h = harness_for("java", "java", &[("jdtls", incremental_caps())], &[]);
let (_, path) = h.open("Sample.java", "class Sample {}");
h.wait_status("jdtls", ServerStatus::Ready).await;
let s = h.launcher.state("jdtls");
let client = ide_lsp::JdtExceptionBreakpoints::new(h.mgr.clone(), path);
let specs = [
ExceptionClassSpec {
id: "a".into(),
class_name: "com.acme.Boom".into(),
caught: true,
uncaught: false,
enabled: true,
class_filters: vec!["com.acme.*".into()],
class_exclusion_filters: vec![],
},
ExceptionClassSpec {
id: "b".into(),
class_name: "java.lang.IllegalStateException".into(),
caught: true,
uncaught: true,
enabled: false,
class_filters: vec![],
class_exclusion_filters: vec!["*Test".into()],
},
];
s.respond(
"workspace/executeCommand",
json!({"ok": [{"id": "a", "state": "pending"}, {"id": "b", "state": "disabled"}]}),
);
let states = client.set(&stream_launch_target(), &specs).await.unwrap();
assert_eq!(states, vec![("a".into(), ExceptionArmState::Pending), ("b".into(), ExceptionArmState::Disabled)]);
let asked = s.requested("workspace/executeCommand");
assert_eq!(asked[0]["command"], "openidea.jvm.exceptions.set");
assert_eq!(
asked[0]["arguments"],
json!([
{"pid": 42, "host": null, "port": null, "generation": 3},
{"breakpoints": [
{"id": "a", "className": "com.acme.Boom", "caught": true, "uncaught": false, "enabled": true,
"classFilters": ["com.acme.*"], "classExclusionFilters": []},
{"id": "b", "className": "java.lang.IllegalStateException", "caught": true, "uncaught": true,
"enabled": false, "classFilters": [], "classExclusionFilters": ["*Test"]},
]},
])
);
s.respond("workspace/executeCommand", json!({"error": "noSession", "detail": "hotCodeReplace is never?"}));
assert_eq!(
client.set(&stream_launch_target(), &specs).await.unwrap_err(),
ide_jvm_inspect::InspectError::NoSession
);
}
#[tokio::test(flavor = "multi_thread")]
async fn debug_server_port_maps_to_module() {
let h = harness_for("java", "java", &[("jdtls", incremental_caps())], &[]);
+3 -1
Переглянути файл
@@ -167,7 +167,9 @@ impl Session<'_> {
"serverInfo": { "name": "OpenIDEA", "version": env!("CARGO_PKG_VERSION") },
"instructions": format!(
"Built-in OpenIDEA tools for {about}: they see the files as the IDE has them and, \
for a project open in a window, its editors."
for a project open in a window, its editors. The project's workspace can include other \
projects attached to it: call `get_workspace_roots` to list them before answering about \
workspace directories or planning a change across projects."
),
})
}
+15 -1
Переглянути файл
@@ -58,7 +58,7 @@ use views_bindings::exports::openidea::plugin::view_provider as wit_view;
use views_bindings::openidea::plugin::view_types as wit_vt;
/// The API version of the world above, `major.minor` of [`host_api`].
pub const API_VERSION: &str = "1.14";
pub const API_VERSION: &str = "1.15";
const EPOCH_TICK: Duration = Duration::from_millis(10);
pub(crate) const MAX_TEXT: usize = 1 << 20;
/// The most text, and the most PNG bytes, `ui.read-clipboard` returns.
@@ -652,6 +652,10 @@ pub trait HostApi: Send + Sync {
fn plugin_dir(&self) -> Result<PathBuf, HostError> {
Err(HostError::Failed("private plugin storage is unavailable".into()))
}
/// The plugin's install / package directory (read-only for the guest).
fn install_dir(&self) -> Result<PathBuf, HostError> {
Err(HostError::Failed("plugin install directory is unavailable".into()))
}
/// Replaces the text of a file whose real path the caller already checked:
/// in one step, keeping its encoding and BOM (a new file is UTF-8). Refused
/// while an editor holds unsaved changes for it.
@@ -1105,6 +1109,16 @@ fn event_to_wit(e: WorkbenchEvent) -> wit_events::Event {
kind: "input-mode-changed".into(),
data: serde_json::to_string(&mode).expect("mode serializes"),
}),
WorkbenchEvent::CaretMoved(caret) => wit_events::Event::Other(wit_types::Extension {
kind: "caret-moved".into(),
data: serde_json::json!({
"path": caret.path,
"line": caret.line,
"col": caret.col,
"settled": caret.settled,
})
.to_string(),
}),
WorkbenchEvent::FileOpened(p) => wit_events::Event::FileOpened(p),
WorkbenchEvent::FileSaved(p) => wit_events::Event::FileSaved(p),
WorkbenchEvent::FilesChanged(batch) => wit_events::Event::Other(wit_types::Extension {
+19 -1
Переглянути файл
@@ -155,6 +155,7 @@ pub enum EventKind {
FileSaved,
FilesChanged,
EditorFocused,
CaretMoved,
ActionPerformed,
VcsChanged,
/// Problems of the window's files changed (a language server or a report).
@@ -163,7 +164,7 @@ pub enum EventKind {
}
impl EventKind {
pub const ALL: [Self; 17] = [
pub const ALL: [Self; 18] = [
Self::DocumentChanged,
Self::WebsocketReady,
Self::FileClosed,
@@ -177,6 +178,7 @@ impl EventKind {
Self::FileSaved,
Self::FilesChanged,
Self::EditorFocused,
Self::CaretMoved,
Self::ActionPerformed,
Self::VcsChanged,
Self::ProblemsChanged,
@@ -198,6 +200,7 @@ impl EventKind {
Self::FileSaved => "file-saved",
Self::FilesChanged => "files-changed",
Self::EditorFocused => "editor-focused",
Self::CaretMoved => "caret-moved",
Self::ActionPerformed => "action-performed",
Self::VcsChanged => "vcs-changed",
Self::ProblemsChanged => "problems-changed",
@@ -275,6 +278,19 @@ pub struct InputMode {
pub sub: Option<String>,
}
/// The caret moved in the focused editor. Positions are 0-based; `col` counts
/// UTF-16 code units, as everywhere in the plugin API.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct CaretMoved {
pub path: String,
pub line: u32,
pub col: u32,
/// The caret came to rest at this position; plugins may load what a hover needs.
#[serde(default)]
pub settled: bool,
}
/// One UTF-16 replacement in a locally edited editor document.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
pub struct DocumentTextChange {
@@ -337,6 +353,7 @@ pub enum WorkbenchEvent {
FileSaved(String),
FilesChanged(FilesChanged),
EditorFocused(Option<String>),
CaretMoved(CaretMoved),
ActionPerformed(ActionPerformed),
VcsChanged(String),
/// Problems of the window's files changed; plugins re-read `problems`.
@@ -360,6 +377,7 @@ impl WorkbenchEvent {
Self::FileSaved(_) => EventKind::FileSaved,
Self::FilesChanged(_) => EventKind::FilesChanged,
Self::EditorFocused(_) => EventKind::EditorFocused,
Self::CaretMoved(_) => EventKind::CaretMoved,
Self::ActionPerformed(_) => EventKind::ActionPerformed,
Self::VcsChanged(_) => EventKind::VcsChanged,
Self::ProblemsChanged => EventKind::ProblemsChanged,
+18 -9
Переглянути файл
@@ -313,11 +313,11 @@ impl StoreData {
/// `path` as the real path an `fs.read:…` grant covers, or what the plugin
/// should be told instead (`denied` naming the capability to declare).
/// The private plugin-dir and the install directory are readable without a
/// grant; writing still needs `fs.write` or the private dir.
fn granted_file(&self, path: &str) -> Result<PathBuf, wit::Error> {
let mut granted = self.granted.clone();
if let Ok(dir) = self.host.plugin_dir() {
granted.push(Capability::FsRead(to_ipc(&dir)));
}
granted.extend(self.builtin_read_roots());
sandbox::resolve_granted(&granted, path).map_err(Into::into)
}
@@ -331,6 +331,19 @@ impl StoreData {
sandbox::resolve_writable(&granted, path).map_err(Into::into)
}
/// Private plugin-dir and install directory: readable without an `fs.read`
/// grant; `editor.open` / `open-location` may use them without project.read.
fn builtin_read_roots(&self) -> Vec<Capability> {
let mut roots = Vec::new();
if let Ok(dir) = self.host.plugin_dir() {
roots.push(Capability::FsRead(to_ipc(&dir)));
}
if let Ok(dir) = self.host.install_dir() {
roots.push(Capability::FsRead(to_ipc(&dir)));
}
roots
}
fn client(&self) -> Option<&str> {
self.invocation.client.as_deref()
}
@@ -1144,9 +1157,7 @@ impl StoreData {
sandbox::resolve_in_root(root, path).map_err(wit::Error::Invalid)
}
fn openable_path(&self, path: &str) -> Result<PathBuf, wit::Error> {
if let Ok(dir) = self.host.plugin_dir()
&& let Ok(real) = sandbox::resolve_granted(&[Capability::FsRead(to_ipc(&dir))], path)
{
if let Ok(real) = sandbox::resolve_granted(&self.builtin_read_roots(), path) {
return Ok(real);
}
self.require(Capability::ProjectRead)?;
@@ -2078,9 +2089,7 @@ impl views::Host for StoreData {
}
fn open_location(&mut self, path: String, line: u32, column: u32) -> Fallible<()> {
if let Ok(dir) = self.host.plugin_dir()
&& let Ok(real) = sandbox::resolve_granted(&[Capability::FsRead(to_ipc(&dir))], &path)
{
if let Ok(real) = sandbox::resolve_granted(&self.builtin_read_roots(), &path) {
if let Err(e) = self.require_interactive() {
return Ok(Err(e));
}
+11 -7
Переглянути файл
@@ -93,7 +93,7 @@ fn the_sdk_carries_the_hosts_wit() {
#[test]
fn the_version_check_runs_compatible_components_and_explains_the_rest() {
let host = v("1.14.0");
let host = v("1.15.0");
for ok in [
"1.0.0",
"1.3.0",
@@ -108,15 +108,16 @@ fn the_version_check_runs_compatible_components_and_explains_the_rest() {
"1.12.0",
"1.13.0",
"1.14.0",
"1.15.0",
"1.0.0-rc.1",
] {
assert_eq!(check_api(&v(ok), &host), Ok(()), "{ok}");
}
let newer = check_api(&v("1.15.0"), &host).unwrap_err();
assert!(newer.contains("1.15") && newer.contains("update OpenIDEA"), "{newer}");
let newer = check_api(&v("1.16.0"), &host).unwrap_err();
assert!(newer.contains("1.16") && newer.contains("update OpenIDEA"), "{newer}");
assert!(check_api(&v("2.0.0"), &host).unwrap_err().contains("update OpenIDEA"));
let older = check_api(&v("0.2.0"), &host).unwrap_err();
assert!(older.contains("rebuild it with the 1.14 SDK"), "{older}");
assert!(older.contains("rebuild it with the 1.15 SDK"), "{older}");
// 0.x: every minor is its own API.
assert_eq!(check_api(&v("0.2.0"), &v("0.2.5")), Ok(()));
assert!(check_api(&v("0.1.0"), &v("0.2.0")).is_err());
@@ -144,14 +145,17 @@ fn shipped_components_are_built_for_this_api() {
}
#[test]
fn a_1_14_component_exports_the_optional_hover_actions_world() {
fn the_hover_actions_component_exports_the_optional_hover_actions_world() {
let engine = PluginEngine::new().unwrap();
let component =
engine.compile(&repo().join("crates/ide-plugin/tests/fixtures/hover-actions/dist/plugin.wasm")).unwrap();
let exports: Vec<String> =
component.component_type().exports(engine.engine()).map(|(name, _)| name.to_owned()).collect();
assert!(exports.iter().any(|name| name.starts_with("openidea:plugin/[email protected]")), "{exports:?}");
// A 1.13-compatible plugin that does not export the new world stays valid.
assert!(
exports.iter().any(|name| name.starts_with(&format!("openidea:plugin/hover-actions@{API_VERSION}.0"))),
"{exports:?}"
);
// A plugin that does not export the optional world stays valid.
let old = engine.compile(&repo().join("plugins/official/test-runner/dist/plugin.wasm")).unwrap();
let old_exports: Vec<String> =
old.component_type().exports(engine.engine()).map(|(name, _)| name.to_owned()).collect();
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
b59392bcc1999048f0ab922ec659bc21d9e825c696fa41d9f0a40c85627a5b2c
476dff19159556f8afc8ba4e7d1757d7faebb79046fc08e1601563a7cf9ad3d1
+1 -1
Переглянути файл
@@ -3,7 +3,7 @@ name = "API 1.4 host tests"
version = "0.1.0"
engines.openidea = "^1.5"
wasm = "dist/plugin.wasm"
activation = ["on-command:*", "on-event:file-closed", "on-event:settings-changed", "on-event:input-mode-changed"]
activation = ["on-command:*", "on-event:file-closed", "on-event:settings-changed", "on-event:input-mode-changed", "on-event:caret-moved"]
[capabilities]
required = ["storage"]
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
034b99891313c03eb2a6b8c3cb2e4784129e1936965be803512f1d869b1768c2
988eeaa480210cef8d733f8305a7441f4d51699d756ac2e1cfd4728ff57bbc84
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
29ec0a96e2a0f6965915c7c25e35036743fc27a49037df588c217e8abfff93e3
c82d541d5c1c7e9ab595e33cf206fe065fa9b4bd6e94d19b181b78049ffc60a9
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
87b367cfdd65c360920eff7be4d6a8d6b939721f6398aa6a01e39a289590699e
c5dd0424fc7f3043139577e64de4b4a4e5e73913453b42ccde6ee9f0d878bc57
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
7d034ee1a4b99615642d5bf033802f8e4662216d45b209c4c7a24eb8f1338f48
fb95d2b21ca4c0ffe8c9b359999d2bc80a37a2aaf389f4290b62c2bc7e0657eb
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
3fdf985273ec14ae623fa84602a9220cfbfb2e0e587ab192fc2bcb8d990ce9e3
9e68d2e72a85c4b2491ebf3ca31e0ebedd47941db1dd8e1b69a418e1dfacbb71
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
8434e9271e27a6778bb3d5922e8925f3fd9f1d35377e5dddf5b5eb5416bd09bb
9f56d68a45f3508ba89bab5af935986da1bd01ee3df5f045283ec82911409edf
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
9fa7468ce385ff33c1f3b99c84711e0d11a84b10e8e4f95b358fcd2ccc96e255
1f39c7829190e563f8145bd08385b595dab3bd5bd493182681126d3e17ef5035
Бінарний файл не відображається.
+1 -1
Переглянути файл
@@ -1 +1 @@
5220a5bfb6ec0467a72e63e21d690e70b7d46b4f2eaff4116a8a79220a5eca8f
e5cc283d9df974bce79bcab1ddfba19b0d50702251176f7c1f71a0894319fc95
Loaded 100 of 943 files, more files were not shown because too many files have changed in this diff. Show more