Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2021-09-22 15:53:25 -07:00
14 changed files with 20 additions and 338 deletions

View File

@@ -1168,12 +1168,12 @@ Completion *CompletionBuilder::finish() {
if (current.getKind() == SwiftResult::Declaration) {
base = SwiftResult(
semanticContext, flair, current.getNumBytesToErase(), completionString,
current.getAssociatedDeclKind(), current.isSystem(),
current.getModuleName(), current.getSourceFilePath(),
current.getNotRecommendedReason(), current.getDiagnosticSeverity(),
current.getDiagnosticMessage(), current.getBriefDocComment(),
current.getAssociatedUSRs(), typeRelation, opKind);
semanticContext, flair, current.getNumBytesToErase(),
completionString, current.getAssociatedDeclKind(), current.isSystem(),
current.getModuleName(), current.getNotRecommendedReason(),
current.getDiagnosticSeverity(), current.getDiagnosticMessage(),
current.getBriefDocComment(), current.getAssociatedUSRs(),
typeRelation, opKind);
} else {
base = SwiftResult(current.getKind(), semanticContext, flair,
current.getNumBytesToErase(), completionString,