Don't filter results when opening a codecompletion session #171
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -232,60 +232,71 @@ class SourceKitDocument { | |
| return 0 | ||
| } | ||
|
|
||
| /// Build the codecomplete.open or codecomplete.close request. | ||
| /// The two requests share the exact same options except for the request name. | ||
| private func buildCompletionRequest(request: SourceKitdUID, offset: Int, extraOptions: [String: String]) -> SourceKitdRequest { | ||
| let location = converter!.location(for: AbsolutePosition(utf8Offset: offset)) | ||
|
|
||
| let request = SourceKitdRequest(uid: request) | ||
| request.addParameter(.key_SourceFile, value: args.forFile.path) | ||
| request.addParameter(.key_Name, value: args.forFile.path) | ||
| if let sourceState = sourceState { | ||
| request.addParameter(.key_SourceText, value: sourceState.source) | ||
| } | ||
| request.addParameter(.key_Offset, value: offset) | ||
| request.addParameter(.key_Line, value: location.line!) | ||
| request.addParameter(.key_Column, value: location.column!) | ||
| request.addCompilerArgs(args.sourcekitdArgs) | ||
|
|
||
| let completionOptions = request.addDictionaryParameter(.key_CodeCompleteOptions) | ||
| // Don't hide any results because otherwise checking if the expected result is contained will fail | ||
| completionOptions.add(.key_HideLowPriority, value: 0) | ||
| completionOptions.add(.key_HideByName, value: 0) | ||
| completionOptions.add(.key_HideUnderscores, value: 0) | ||
|
|
||
| // Set expected results to 200 to avoid inflating the time measurements by serialization time. | ||
| // To make sure that the expected result is in the results, filter by its base name. | ||
| completionOptions.add(.key_RequestLimit, value: 200) | ||
|
|
||
| for (option, value) in extraOptions { | ||
| if let intValue = Int(value) { | ||
| completionOptions.add(SourceKitdUID(string: "key.codecomplete.\(option)"), value: intValue) | ||
| } else { | ||
| completionOptions.add(SourceKitdUID(string: "key.codecomplete.\(option)"), value: value) | ||
| } | ||
| } | ||
| return request | ||
| } | ||
|
|
||
| func codeComplete(offset: Int, expectedResult: ExpectedResult?) throws -> (request: RequestInfo, response: SourceKitdResponse, instructions: Int, reusingASTContext: Bool) { | ||
| var responseToReport: SourceKitdResponse | ||
| let openRequest = buildCompletionRequest(request: .request_CodeCompleteOpen, offset: offset, extraOptions: extraCodeCompleteOptions) | ||
| let openInfo = RequestInfo.codeCompleteOpen(document: documentInfo, offset: offset, | ||
| args: args.sourcekitdArgs) | ||
| let (openResponse, openInstructions) = try sendWithTimeoutMeasuringInstructions(openRequest, info: openInfo) | ||
|
|
||
| let reusingASTContext = openResponse.value.getBool(.key_ReusingASTContext) | ||
|
|
||
| if let expectedResult = expectedResult { | ||
|
There was a problem hiding this comment. Will be interesting to see how much slower the extra request makes it. There was a problem hiding this comment. I would expect that the update should be pretty fast, but let’s see. I started a stress tester run via swiftlang/swift#37710. |
||
| var updateOptions = extraCodeCompleteOptions | ||
|
|
||
| updateOptions["filtertext"] = expectedResult.name.base | ||
|
|
||
| let updateRequest = buildCompletionRequest(request: .request_CodeCompleteUpdate, offset: offset, extraOptions: updateOptions) | ||
| let updateInfo = RequestInfo.codeCompleteOpen(document: documentInfo, offset: offset, args: args.sourcekitdArgs) | ||
| let updateResponse = try sendWithTimeout(updateRequest, info: updateInfo) { response in | ||
| try checkExpectedCompletionResult(expectedResult, in: response, info: openInfo) | ||
| } | ||
| responseToReport = updateResponse | ||
| } else { | ||
| responseToReport = openResponse | ||
| } | ||
|
|
||
| let closeRequest = buildCompletionRequest(request: .request_CodeCompleteClose, offset: offset, extraOptions: extraCodeCompleteOptions) | ||
| let closeInfo = RequestInfo.codeCompleteClose(document: documentInfo, offset: offset) | ||
| _ = try sendWithTimeout(closeRequest, info: closeInfo) | ||
|
|
||
| return (openInfo, responseToReport, openInstructions, reusingASTContext) | ||
| } | ||
|
|
||
| func typeContextInfo(offset: Int) throws -> (RequestInfo, SourceKitdResponse) { | ||
|
|
||
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.
Comment is out of date