averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +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-07-25 15:29:05 -07:00
parent 7f33ea5a1d c8fc286428
commit 879a10aa57
39 changed files with 1199 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2357,8 +2357,11 @@ void SwiftLangSupport::editorReplaceText(StringRef Name,
bool BuildSyntaxTree = Consumer.syntaxTreeEnabled() ||
Consumer.forceLibSyntaxBasedProcessing();
llvm::Optional<SyntaxParsingCache> SyntaxCache;
if (EditorDoc->getSyntaxTree().hasValue()) {
llvm::Optional<SyntaxParsingCache> SyntaxCache = llvm::None;
bool IncrementalSyntaxParsing = Consumer.forceLibSyntaxBasedProcessing() ||
Consumer.syntaxTreeTransferMode() ==
SyntaxTreeTransferMode::Incremental;
if (EditorDoc->getSyntaxTree().hasValue() && IncrementalSyntaxParsing) {
SyntaxCache.emplace(EditorDoc->getSyntaxTree().getValue());
SyntaxCache->addEdit(Offset, Offset + Length, Buf->getBufferSize());
}
@@ -2411,6 +2414,23 @@ void SwiftLangSupport::editorReplaceText(StringRef Name,
Consumer.handleSyntaxReuseRegions({});
}
if (Consumer.syntaxTreeEnabled()) {
std::unordered_set<unsigned> ReusedNodeIds = {};
if (SyntaxCache.hasValue()) {
auto &ReusedVector = SyntaxCache->getReusedNodeIds();
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());
}
if (ValidateSyntaxTree) {
verifyIncrementalParse(EditorDoc, Offset, Length, PreEditText,
Buf->getBuffer());