averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
swift-ci
2018-08-01 09:49:54 -07:00
parent 7a37391864 a061077bd8
commit 506def6dc1
7 changed files with 67 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View File

@@ -1791,12 +1791,8 @@ void SwiftEditorDocument::readSyntaxInfo(EditorConsumer &Consumer) {
Impl.ParserDiagnostics = Impl.SyntaxInfo->getDiagnostics();
if (Consumer.syntaxTreeEnabled()) {
std::string SyntaxContent;
llvm::raw_string_ostream OS(SyntaxContent);
json::Output JsonOut(OS, /*UserInfo=*/{}, /*PrettyPrint=*/false);
auto Root = Impl.SyntaxInfo->getSourceFile().getSyntaxRoot().getRaw();
JsonOut << *Root;
Consumer.handleSerializedSyntaxTree(OS.str());
Consumer.handleSyntaxTree(Impl.SyntaxInfo->getSourceFile().getSyntaxRoot(),
/*ReusedNodeIds=*/{});
}
SwiftSyntaxMap NewMap = SwiftSyntaxMap(Impl.SyntaxMap.Tokens.size() + 16);
@@ -2305,14 +2301,8 @@ void SwiftLangSupport::editorReplaceText(StringRef Name,
ReusedNodeIds = std::unordered_set<unsigned>(ReusedVector.begin(),
ReusedVector.end());
}
std::string SyntaxTreeString;
llvm::raw_string_ostream SyntaxTreeStream(SyntaxTreeString);
swift::json::Output::UserInfoMap JsonUserInfo;
JsonUserInfo[swift::json::OmitNodesUserInfoKey] = &ReusedNodeIds;
swift::json::Output SyntaxTreeOutput(SyntaxTreeStream, JsonUserInfo);
SyntaxTreeOutput << *EditorDoc->getSyntaxTree()->getRaw();
Consumer.handleSerializedSyntaxTree(SyntaxTreeStream.str());
Consumer.handleSyntaxTree(EditorDoc->getSyntaxTree().getValue(),
ReusedNodeIds);
}
if (ValidateSyntaxTree) {