Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift-ci
2018-08-02 10:10:04 -07:00
18 changed files with 273 additions and 148 deletions

View File

@@ -1863,8 +1863,7 @@ void SwiftEditorDocument::readSemanticInfo(ImmutableTextSnapshotRef Snapshot,
UIdent Kind = SemaTok.getUIdentForKind();
bool IsSystem = SemaTok.getIsSystem();
if (Kind.isValid())
if (!Consumer.handleSemanticAnnotation(Offset, Length, Kind, IsSystem))
break;
Consumer.handleSemanticAnnotation(Offset, Length, Kind, IsSystem);
}
static UIdent SemaDiagStage("source.diagnostic.stage.swift.sema");