M3.5: go to definition, find references and rename through Phpactor
Engine (`cmd/lsp_nav.rs`, on the pending outcomes of 20d1d28):
- `lsp.definition` (F12) and `lsp.references` (Shift+F12, sorted, with
line previews) return project-relative locations; locations outside
the project, such as PHAR stubs and symlink escapes, are dropped.
- `lsp.prepareRename` uses the word at the cursor when the server has
no prepareProvider.
- `lsp.rename` (F2) applies the workspace edit (`lsp_nav/edit.rs`):
1. Check everything first: inside the project, ranges fit (UTF-16,
CRLF), open buffers unchanged since the request, no file
operations, no incomplete edit.
2. Write closed files atomically through the VFS, restoring earlier
writes when a later one fails.
3. Change open buffers through `buffer.edit` (dirty, undoable).
4. Send each written file to Phpactor as didOpen/didSave/didClose
plus didChangeWatchedFiles; without this its index kept the old
names. Then the summary notification `notification.lsp.renamed`.
UI (`components/editor/nav/`):
- Mod+click goes to the definition, with a pointer cursor while Mod is
held.
- A location picker for several definitions (exclusive modal).
- A References tab in the bottom panel, grouped by file.
- An inline rename field with a use/file count (exclusive modal).
- `BufferSync.beginUndoableRemote` puts the engine's rename edit into
the editor history as one undo step per buffer.
- Catalog strings and tokens only.
Fake LSP server: `--script FILE` with scripted capabilities and
answers (additive next to M3.4's arms).
Tests:
- `crates/engine/tests/lsp_nav.rs` (fake): definition; bad positions;
references; prepareRename; a multi-file rename incl. a closed CRLF
file; refusals for outside the project, a bad range, a stale buffer,
bad names and no server.
- The ignored real-Phpactor test covers definition, references and a
rename and back across 3 files.
- Vitest `ui/tests/nav/`.
Live (Phpactor 2026.06.25.0, Windows, port 7935, tick on):
- definition 93 ms cold / 7-18 ms warm
- references ~140 ms
- prepareRename ~11 ms
- rename 28-59 ms
- index follows written files in 140 ms
- Phpactor 57 MB working set, ~1.6% of a core while ticking idle
Gate: 13 steps, 197 s, Vitest 484 + 1 skipped.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
b3fd7c6478
commit
578160a2ba
28 changed files with 3730 additions and 34 deletions
|
|
@ -24,7 +24,9 @@
|
|||
* The panel collapses to its header; closing it hides the active tool
|
||||
* window (another shown one becomes active). The Find store keeps the
|
||||
* results, the Terminal store the running terminals and the Problems store
|
||||
* the diagnostics while they are hidden.
|
||||
* the diagnostics while they are hidden. The References tab (M3.5) shows
|
||||
* when Find References runs (`lsp.references`); the nav store keeps its
|
||||
* results.
|
||||
*
|
||||
* A slim header bar along the top (M3.9) holds the app menu
|
||||
* ({@link AppMenu}); its `header` slot can replace it.
|
||||
|
|
@ -39,6 +41,8 @@ import FindToolWindow from "../find/FindToolWindow.vue";
|
|||
import TerminalToolWindow from "../terminal/TerminalToolWindow.vue";
|
||||
import ProblemsToolWindow from "../problems/ProblemsToolWindow.vue";
|
||||
import { useProblemsStore } from "../problems/problems";
|
||||
import ReferencesToolWindow from "../editor/nav/ReferencesToolWindow.vue";
|
||||
import { useNavStore } from "../editor/nav/nav";
|
||||
import ProjectToolWindow from "../project/ProjectToolWindow.vue";
|
||||
import StatusBar from "../StatusBar.vue";
|
||||
import StructureToolWindow from "../structure/StructureToolWindow.vue";
|
||||
|
|
@ -84,9 +88,10 @@ const commands = useCommandsStore();
|
|||
const find = useFindStore();
|
||||
const terminal = useTerminalStore();
|
||||
const problems = useProblemsStore();
|
||||
const nav = useNavStore();
|
||||
|
||||
/** Tool windows of the bottom panel. */
|
||||
type BottomTool = "find" | "terminal" | "problems";
|
||||
type BottomTool = "find" | "terminal" | "problems" | "references";
|
||||
/** The bottom tool window last chosen. */
|
||||
const bottomTool = ref<BottomTool>("find");
|
||||
/** Bottom tool windows that are shown, in tab order. */
|
||||
|
|
@ -95,6 +100,7 @@ const bottomTools = computed(() => {
|
|||
if (find.visible) tools.push({ id: "find", title: t("find.toolWindow.title") });
|
||||
if (terminal.visible) tools.push({ id: "terminal", title: t("terminal.toolWindow.title") });
|
||||
if (problems.visible) tools.push({ id: "problems", title: t("problems.toolWindow.title") });
|
||||
if (nav.visible) tools.push({ id: "references", title: t("nav.references.title") });
|
||||
return tools;
|
||||
});
|
||||
/** The active bottom tool window: the chosen one if shown, else the first. */
|
||||
|
|
@ -104,7 +110,13 @@ const bottomActive = computed<BottomTool | null>(() => {
|
|||
});
|
||||
/** The store of the active bottom tool window. */
|
||||
const bottomStore = computed(() =>
|
||||
bottomActive.value === "terminal" ? terminal : bottomActive.value === "problems" ? problems : find,
|
||||
bottomActive.value === "terminal"
|
||||
? terminal
|
||||
: bottomActive.value === "problems"
|
||||
? problems
|
||||
: bottomActive.value === "references"
|
||||
? nav
|
||||
: find,
|
||||
);
|
||||
/** Expansion of the panel, kept per tool window by its store. */
|
||||
const bottomOpen = computed({
|
||||
|
|
@ -120,7 +132,7 @@ const bottomOpen = computed({
|
|||
* @param id - the tool window id from the panel.
|
||||
*/
|
||||
function chooseBottom(id: string): void {
|
||||
if (id === "find" || id === "terminal" || id === "problems") {
|
||||
if (id === "find" || id === "terminal" || id === "problems" || id === "references") {
|
||||
bottomTool.value = id;
|
||||
}
|
||||
}
|
||||
|
|
@ -250,6 +262,7 @@ onBeforeUnmount(() => {
|
|||
v-show="bottomActive === 'terminal'"
|
||||
/>
|
||||
<ProblemsToolWindow v-show="bottomActive === 'problems'" />
|
||||
<ReferencesToolWindow v-show="bottomActive === 'references'" />
|
||||
</BottomPanel>
|
||||
<StatusBar />
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue