improve terminal completions relative path resolution #282861
+95
−6
Conversation
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
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes terminal path completion issues where relative folder prefixes were being resolved against the current working directory without validation, producing invalid suggestions like ./s/src/ when the intermediate path didn't exist.
Key Changes:
- Added validation for relative folder prefixes before generating completions
- Implemented special handling for the case where a typed folder name matches the cwd basename
- Updated test infrastructure to properly handle path existence checks with trailing slash normalization
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts |
Added validation logic to check if relative folder paths exist before attempting to generate completions, including special case handling for paths matching the cwd basename |
src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts |
Added path normalization helper, updated file service stub to check existence in resolve method, added test case for non-existent relative folders, and included CDPATH root in valid resources |
src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
Outdated
Show resolved
Hide resolved
auto-merge was automatically disabled
December 12, 2025 16:28
Pull request was converted to draft
meganrogge
changed the title
meganrogge
commented
Dec 12, 2025
| { resource: URI.parse('file:///test/folder2/'), isDirectory: true } | ||
| ]; | ||
| const result = await terminalCompletionService.resolveResources(resourceOptions, 'test/', 5, provider, capabilities); | ||
| const result = await terminalCompletionService.resolveResources(resourceOptions, './test/', 7, provider, capabilities); |
Contributor
Author
There was a problem hiding this comment.
this was actually invalid before - when typing test/ within test folder, we shouldn't have been showing ./test/...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #282458
fixes #282491
./src/vs/), we first normalize separators/escapes and check whether that trailing segment already matches the end of cwd. This catches cases where the extension already resolved the path so we avoid re-appending segments (prevents./src/src/...duplicates). We stat cwd to be sure it exists.URI.joinPath) and ensure it exists via stat; if not, we bail../s/segments.Also updated tests to align with the stricter resolution, including path normalization in the test stub and ensuring
CDPATHroots are marked as existing.