-
Notifications
You must be signed in to change notification settings - Fork 367
enhancement: Refine jump-to-definition for literals #2404
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -725,4 +725,82 @@ class DefinitionTests: SourceKitLSPTestCase { | |
| ) | ||
| XCTAssertTrue(definitions?.locations?.first?.uri.pseudoPath.hasSuffix("Lib.swiftinterface") ?? false) | ||
| } | ||
|
|
||
| func testDefinitionOnLiteralsShouldReturnEmpty() async throws { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you run swift-format on your changes? https://github.com/swiftlang/sourcekit-lsp/blob/main/CONTRIBUTING.md#formatting |
||
| let testClient = try await TestSourceKitLSPClient() | ||
| let uri = DocumentURI(for: .swift) | ||
|
|
||
| let positions = testClient.openDocument( | ||
| """ | ||
| let message = "1️⃣Hello" | ||
| let count = 2️⃣25 | ||
| let flag = 3️⃣true | ||
| let pi = 4️⃣3.14 | ||
| let nothing: Int? = 5️⃣nil | ||
| """, | ||
| uri: uri | ||
| ) | ||
|
|
||
| // Test string literal | ||
| let stringResponse = try await testClient.send( | ||
| DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["1️⃣"]) | ||
| ) | ||
| XCTAssertNil(stringResponse, "Jump-to-definition should not work on string literals") | ||
|
|
||
| // Test integer literal | ||
| let intResponse = try await testClient.send( | ||
| DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["2️⃣"]) | ||
| ) | ||
| XCTAssertNil(intResponse, "Jump-to-definition should not work on integer literals") | ||
|
|
||
| // Test boolean literal | ||
| let boolResponse = try await testClient.send( | ||
| DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["3️⃣"]) | ||
| ) | ||
| XCTAssertNil(boolResponse, "Jump-to-definition should not work on boolean literals") | ||
|
|
||
| // Test float literal | ||
| let floatResponse = try await testClient.send( | ||
| DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["4️⃣"]) | ||
| ) | ||
| XCTAssertNil(floatResponse, "Jump-to-definition should not work on float literals") | ||
|
|
||
| // Test nil literal | ||
| let nilResponse = try await testClient.send( | ||
| DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["5️⃣"]) | ||
| ) | ||
| XCTAssertNil(nilResponse, "Jump-to-definition should not work on nil literals") | ||
| } | ||
|
|
||
| func testDefinitionInsideLiteralsShouldStillWork() async throws { | ||
| let testClient = try await TestSourceKitLSPClient() | ||
| let uri = DocumentURI(for: .swift) | ||
|
|
||
| let positions = testClient.openDocument( | ||
| #""" | ||
| let name = "Ayman" | ||
| let greeting = "Hello \(1️⃣name)" | ||
| let items = [2️⃣name, "other"] | ||
| """#, | ||
| uri: uri | ||
| ) | ||
|
|
||
| // Identifier inside string interpolation - should work | ||
| let interpolationResponse = try await testClient.send( | ||
| DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["1️⃣"]) | ||
| ) | ||
| XCTAssertNotNil( | ||
| interpolationResponse, | ||
| "Jump-to-definition should work for identifiers inside string interpolation" | ||
| ) | ||
|
|
||
| // Identifier inside array literal - should work | ||
| let arrayResponse = try await testClient.send( | ||
| DefinitionRequest(textDocument: TextDocumentIdentifier(uri), position: positions["2️⃣"]) | ||
| ) | ||
| XCTAssertNotNil( | ||
| arrayResponse, | ||
| "Jump-to-definition should work for identifiers inside array literals" | ||
| ) | ||
| } | ||
| } | ||
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.
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.
I think this can be simplified slightly