feat: selector round-trip + canonical discover emission (1.7.0) - #19
Merged
Merged
Conversation
…primitives
US-071 Step 3 Step 1 (emit mapping). Discover builds the symbol selector
from outline primitives (deepest owning container / Go receiver, dropping
namespace wrappers) rather than the display-qualified name, so C# emits
JsonSerializerOptions.GetTypeInfoInternal and never
System.Text.Json.GetTypeInfoInternal.
qualified.rs: resolve_selector_matches (distinct sorted ranges; duplicate
rows deduped) + selector_from_outline; resolve_selector_first delegates.
semantic.rs: build_target requires UNIQUE cardinality through the shared
resolver for symbol_backed in ALL cases - an ambiguous top-level bare name
(N>1 distinct ranges) is never symbol-backed (no first-match escape hatch).
The definition fallback is RANGE-OWNED: find_function_definition_member
recovers the ACTUAL outline member at the exact range (returns None when
distinct names share the range), never derives from a display string or line
number, so a simple def_name rebuilds the real member and a multi-dot
display name no longer trips the T21 trap.
tests: in-source display-boundary coverage including through
context_target_for_match with real Match + OutlineCache for both
def_name=Some("foo") and Some("System.Text.Json.GetTypeInfoInternal"),
plus same-range/different-name ambiguity; US-065 updated so both same-file
top-level helpers fall back to numeric ranges.
US-071 Step 3 Step 2 (shared grammar/resolution). One shared result
distinguishes every path-symbol state so show/context/callees/callers handle
ambiguity and unresolved identically.
section.rs: typed PathSymbolResolution (NotForm/UnsupportedColonSymbol/
NamedPathMissing/Unique/NamedFileUnresolved/NamedFileUnreadable/
NamedFileUnresolvable/Ambiguous). The split finds the single separating colon
while preserving a Windows drive colon (C:\ / C:/ stay in the path) and
keeping range grammar (path:1-3) as NotForm; a colon-bearing Rust A::target is
an explicit unsupported state, never silently normalized to a dotted selector.
resolve_symbol_ranges surfaces distinct same-file matches via
resolve_selector_matches so N>1 is Ambiguous, not silent first-pick.
resolve_path_symbol_target preserves legacy behavior: only a real readable
file yields Some(range=None); missing path, unreadable, ambiguous, colon all
return None.
qualified.rs: terminal_callable_key shared helper picks the terminal after the
RIGHTMOST separator across both '.' and '::' (A.B::method -> method,
A::B.method -> method), with explicit trailing/leading/empty handling so the
lookup key is never an empty string.
bfs.rs: frontier bare-name derivation delegates to terminal_callable_key,
removing the competing ad-hoc rsplit_once('.') / rsplit_once('::').
tests: typed resolution states incl missing-path, ambiguous cardinality,
Windows drive split (C:\ and C:/), terminal key rightmost+table. 1231 pass;
clippy/fmt/diff-check clean.
…t/trace US-071 Step 3 Step 3 (command plumbing). show, context, trace callers, and trace callees now route <path>:<symbol> through one shared consumer (commands::pathsymbol) instead of four private spellings. - Same explicit intent in all four for a raw `::` selector. - Unique target: show/context/callees read the exact owning range; callers looks up the terminal callable key while the canonical root is preserved in headers, counts, pagination, and recovery (search::callers::CallerRoot). - Missing / unreadable / unresolvable / ambiguous never broaden to a bare search; candidates are bounded. context alone keeps named-file (never bare) semantics when an existing file defines no such selector. - callees no longer requires global uniqueness: a same-name definition in another file cannot block an exact root. - callers states the path only identifies the definition and call sites stay by-name, so same-name sites may be included; depth>=2 marks only the root exact and caveats that later hops expand by name. - An exact root outside --scope stays readable; relation search remains scope-bounded and the output labels it. 1235 passed, 0 failed; clippy/fmt clean.
Greptile SummaryThe PR adds parser-validated
Confidence Score: 5/5The PR appears safe to merge. No blocking failure remains.
|
| Filename | Overview |
|---|---|
| src/read/section.rs | Introduces the shared path-symbol resolution states and cardinality-aware exact-range resolution. |
| src/commands/pathsymbol.rs | Centralizes consistent command-facing outcomes and bounded ambiguity diagnostics. |
| src/lang/qualified.rs | Adds canonical selector construction, distinct-range matching, and terminal callable-key handling. |
| src/commands/callers.rs | Accepts exact roots while retaining explicitly labeled direct by-name caller semantics. |
| src/commands/callees.rs | Anchors callee extraction to the exact resolved body and labels later by-name traversal. |
| src/search/display/structural_targets.rs | Emits validated canonical selectors and falls back to numeric ranges for ambiguity. |
| tests/us071_selector_round_trip.rs | Exercises emitted selector replay across all four supported commands and key scope and ambiguity cases. |
| tests/windows_paths.rs | Covers drive-qualified selector parsing and emitted command behavior on Windows. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart LR
D[Discover structural hit] --> V{Selector resolves to exactly one body?}
V -- Yes --> S[path:symbol]
V -- No --> N[path:start-end]
S --> R[Shared selector resolver]
R --> SH[show exact body]
R --> CT[context exact range]
R --> CR[trace callers by terminal name]
R --> CE[trace callees from exact root range]
N --> SH
Reviews (3): Last reviewed commit: "chore(release): prepare 1.7.0" | Re-trigger Greptile
Reuse the resolver-validated target planner per batch section and route dotted comma queries before automatic file inference. Preserve explicit mode overrides and numeric-offer suppression.\n\nKnown limitation: dotted terms inside a batch still return zero through the pre-existing batch matcher; single dotted queries remain supported and the follow-up is recorded.
sting8k
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
path:symbolselector grammar with a single resolution seam, consumed byshow/context/trace— canonical selectors now round-trip between command output and command input.discoveremits the canonical owning-container selector for resolvable hits, including per-term sections of batch (comma-separated) queries.Known limitation (documented in CHANGELOG + GUIDE)
discover 'A.b,C') resolve as free-text for the dotted term; its canonical selector is not emitted. Single-term dotted queries are unaffected.Verification
cargo fmt --checkOK,cargo clippy -- -D warningsclean,cargo test --locked1259 passed / 0 failed (54 suites).node npm/install.test.jsPASS;npm pack --dry-run= srcwalk-1.7.0.tgz.