leverage Fig's shell parser, add git spec
#240001
Merged
Conversation
This file contains 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
Co-authored-by: Daniel Imms <[email protected]>
Co-authored-by: Daniel Imms <[email protected]>
meganrogge
commented
Feb 7, 2025
Comment on lines
424
to
425
| filesRequested = true; | ||
| foldersRequested = true; |
There was a problem hiding this comment.
I don't have the bandwidth today to think about this, but wonder if always setting these like this is now incorrect?
roblourens
previously approved these changes
Feb 7, 2025
Tyriar
reviewed
Feb 7, 2025
| script: [ | ||
| "bash", | ||
| "-c", | ||
| "git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'", |
There was a problem hiding this comment.
There are 3 cases that use | sed which will fail currently on Windows. Created #240031 to fix and upstream the change
Comment on lines
1
to
33
| const AWS_SPECS = ["aws", "q"]; | ||
| const UNIX_SPECS = [ | ||
| "cd", | ||
| "git", | ||
| "rm", | ||
| "ls", | ||
| "cat", | ||
| "mv", | ||
| "ssh", | ||
| "cp", | ||
| "chmod", | ||
| "source", | ||
| "curl", | ||
| "make", | ||
| "mkdir", | ||
| "man", | ||
| "ln", | ||
| "grep", | ||
| "kill", | ||
| ]; | ||
| const EDITOR_SPECS = ["code", "nano", "vi", "vim", "nvim"]; | ||
| const JS_SPECS = ["node", "npm", "npx", "yarn"]; | ||
| const MACOS_SPECS = ["brew", "open"]; | ||
| const OTHER_SPECS = ["docker", "python"]; | ||
|
|
||
| export const MOST_USED_SPECS = [ | ||
| ...AWS_SPECS, | ||
| ...UNIX_SPECS, | ||
| ...EDITOR_SPECS, | ||
| ...JS_SPECS, | ||
| ...MACOS_SPECS, | ||
| ...OTHER_SPECS, | ||
| ]; |
There was a problem hiding this comment.
This might feed into their sorting?
There was a problem hiding this comment.
Comment on lines
424
to
425
| filesRequested = true; | ||
| foldersRequested = true; |
| @@ -44,7 +44,7 @@ export function createCodeTestSpecs(executable: string): ITestSpec[] { | |||
| { input: `${executable} --list-extensions |`, expectedCompletions: codeSpecOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } }, | |||
| { input: `${executable} --show-versions |`, expectedCompletions: codeSpecOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } }, | |||
| { input: `${executable} --category |`, expectedCompletions: categoryOptions }, | |||
| { input: `${executable} --category a|`, expectedCompletions: categoryOptions.filter(c => c.startsWith('a')) }, | |||
Comment on lines
-73
to
-74
| // Filtering options should request all options so client side can filter | ||
| { input: 'ls -a|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } }, |
There was a problem hiding this comment.
If this is what fig gives us, we might need to make - a trigger character so that the list is refreshed after - and when one is deleted. #240034
Comment on lines
50
to
60
| export function getEnvAsRecord(shellIntegrationEnv: { [key: string]: string | undefined } | undefined): Record<string, string> { | ||
| const env: Record<string, string> = {}; | ||
| if (shellIntegrationEnv) { | ||
| for (const [key, value] of Object.entries(shellIntegrationEnv)) { | ||
| if (typeof value === 'string') { | ||
| env[key] = value; | ||
| } | ||
| } | ||
| } | ||
| return env; | ||
| } |
There was a problem hiding this comment.
We can maybe just do an as cast instead?
meganrogge
force-pushed
the
merogge/fig-project
branch
from
3578dbb to
7d42085
Compare
- third_party/ is ignored as it's not shipped - fig/ is forked so we own the code and should convert to our style - src/completions/upstream should be untouched upstream files
Tyriar
reviewed
Feb 8, 2025
| * @returns An array of `Suggestion` objects. | ||
| * | ||
| */ | ||
| postProcess?: (out: string, tokens: string[]) => (Suggestion | null)[]; // <-- VS Code edit to make results correct |
There was a problem hiding this comment.
@meganrogge I added these comments to the 2 lines where we diverge to we can more easily track it
Tyriar
previously approved these changes
Feb 8, 2025
Tyriar
approved these changes
Feb 8, 2025
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 #239519
fixes #239518
Part of #239515