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

This commit is contained in:
swift-ci
2021-08-11 13:32:56 -07:00
31 changed files with 1019 additions and 111 deletions

View File

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