-
Notifications
You must be signed in to change notification settings - Fork 327
[#2118] Implement keyword snippets for control-flow keywords (if/for/while/etc.) #2387
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
|
Hi @ahoppen , @bnbarham , @hamishknight , @rintaro Hope you're having a good week. I wanted to check on the status of my PR from four days ago. I know these core completion changes take time to review carefully. Thanks for your time! |
ahoppen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you. The overall structure looks good, I have left a few comments inline.
Also, do you have a screen recording or something like that how this looks like in VS Code? Ie. point VS Code to a locally built version of SourceKit-LSP as described in https://github.com/swiftlang/sourcekit-lsp/blob/main/CONTRIBUTING.md#using-a-locally-built-sourcekit-lsp-in-an-editor.
|
@ahoppen on it sir |
|
I have updated the PR to address all previous feedback. Here is a summary of the changes: 1-Dynamic Indentation: Implemented indentationUnitString() to use inferred indentation (spaces or tabs) instead of hardcoded tab characters. Test Improvements: Verification: The attached video demonstrates: Thank you for the guidance on this! As this is my first contribution to a project of this scale, I appreciate your patience and would be happy to make further adjustments if needed. final.1.mp4 |
ahoppen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your update. The code looks great, we are just in the nitpicking phase now to put the final polish on it.
I think your screen recording still uses the built-in snippets from VS Code instead of the completions from SourceKit-LSP. If you open a file in a SwiftPM project and open the code completion dropdown menu after typing if (Ctrl-Space), you should see one item with an if description on the right and which contains Swift Language Basics in its documentation. This is provided by VS Code itself and the plain if entry is the one from SourceKit-LSP. That’s a good reminder that we should ask the VS Code extension to remove this default snippet. Anyway, my biggest concern was that VS Code would not add the indentation of the current line to the subsequent lines inserted by the completion item but that concern is addressed because I forgot that we already had multi-line completion items (the ones that already use indentationWidth).
…ceholders, and align switch cases
|
I have finalised the refinements based on your feedback. I am attaching a video demo (recorded with Screencast Mode) which demonstrates the comparison between the default VS Code snippets and the updated SourceKit-LSP snippets. Changes implemented based on your suggestions: Usability Improvement: I have verified these changes using a locally built SourceKit-LSP server in VS Code as shown in the video. Ready for your final review! Note: I’ve done my best to address all the points from the review. If there are any further refinements or "nits" you'd like me to fix to get this fully aligned with the project's standards, please let me know—I’m happy to make additional changes! |
ahoppen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great to me. Thank you @DPrakashh ❤️
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
|
Thank you so much for the guidance and the review, @ahoppen I am glad the refinements and the added placeholders look good. I will keep an eye on the CI tests for macOS and Windows. Excited to see this merged!!! |
This PR implements snippet completions for control-flow keywords (if, for, while, guard, switch, repeat) when they are used in code completion.
The solution involved updating "CodeCompletionSession.swift" to identify keyword completions (.keyword) and overwrite their "insertText" and "textEdit" with the correct LSP snippet strings, setting the insertTextFormat to .snippet.
This ensures that keywords now contain placeholders (e.g.,
${1:condition}and$0) required by LSP clients.Verification
New unit tests were added to "SwiftCompletionSnippetTests.swift" to explicitly verify:
$1,$0).All local tests, including the focused test (
swift test --filter SwiftCompletionSnippetTests/testKeywordIfProvidesSnippet), passed successfully.Checklist (Based on Contributing Guide)
1-Code has been formatted using `swift format -ipr
2-New tests were added to cover the feature.
Fixes #2118