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

Module groups: if group name collector is enabled, we continuously serialize doc-comment table for comment-free decls to preserve the group information.

Browse Source
This commit is contained in:
Xi Ge
2016-02-24 20:32:31 -08:00
parent 90ca7be73f
commit a1d885c348
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Serialization/Serialization.cpp
View File

@@ -3607,6 +3607,9 @@ class DeclGroupNameContext {
GroupNameCollectorFromJson(StringRef RecordPath) : GroupNameCollectorFromJson(StringRef RecordPath) :
GroupNameCollector(!RecordPath.empty()), RecordPath(RecordPath) {} GroupNameCollector(!RecordPath.empty()), RecordPath(RecordPath) {}
StringRef getGroupNameInternal(const ValueDecl *VD) override { StringRef getGroupNameInternal(const ValueDecl *VD) override {
// We need the file path, so there has to be a location.
if (VD->getLoc().isInvalid())
return NullGroupName;
auto PathOp = VD->getDeclContext()->getParentSourceFile()->getBufferID(); auto PathOp = VD->getDeclContext()->getParentSourceFile()->getBufferID();
if (!PathOp.hasValue()) if (!PathOp.hasValue())
return NullGroupName; return NullGroupName;
@@ -3647,6 +3650,10 @@ public:
} }
return llvm::makeArrayRef(ViewBuffer); return llvm::makeArrayRef(ViewBuffer);
} }
bool isEnable() {
return pNameCollector->Enable;
}
}; };
static void writeGroupNames(const comment_block::GroupNamesLayout &GroupNames, static void writeGroupNames(const comment_block::GroupNamesLayout &GroupNames,
@@ -3691,7 +3698,7 @@ static void writeDeclCommentTable(
// Skip the decl if it does not have a comment. // Skip the decl if it does not have a comment.
RawComment Raw = VD->getRawComment(); RawComment Raw = VD->getRawComment();
if (Raw.Comments.empty()) if (Raw.Comments.empty() && !GroupContext.isEnable())
return true; return true;
// Compute USR. // Compute USR.

1
test/SourceKit/SourceDocInfo/cursor_info.swift
View File

@@ -100,6 +100,7 @@ func nonDefaultArgNames(external1 local1: Int, _ local2: Int, external3 local3:
// CHECK2-NEXT: s:ZFsoi1pFTSiSi_Si // CHECK2-NEXT: s:ZFsoi1pFTSiSi_Si
// CHECK2-NEXT: (Int, Int) -> Int{{$}} // CHECK2-NEXT: (Int, Int) -> Int{{$}}
// CHECK2-NEXT: Swift{{$}} // CHECK2-NEXT: Swift{{$}}
// CHECK2-NEXT: <Group>Math</Group>
// CHECK2-NEXT: SYSTEM // CHECK2-NEXT: SYSTEM
// CHECK2-NEXT: <Declaration>func +(lhs: <Type usr="s:Si">Int</Type>, rhs: <Type usr="s:Si">Int</Type>) -&gt; <Type usr="s:Si">Int</Type></Declaration> // CHECK2-NEXT: <Declaration>func +(lhs: <Type usr="s:Si">Int</Type>, rhs: <Type usr="s:Si">Int</Type>) -&gt; <Type usr="s:Si">Int</Type></Declaration>
// CHECK2-NEXT: <decl.function.operator.infix>func <decl.name>+</decl.name>(<decl.var.parameter><decl.var.parameter.name.local>lhs</decl.var.parameter.name.local>: <ref.struct usr="s:Si">Int</ref.struct></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.name.local>rhs</decl.var.parameter.name.local>: <ref.struct usr="s:Si">Int</ref.struct></decl.var.parameter>) -&gt; <ref.struct usr="s:Si">Int</ref.struct></decl.function.operator.infix> // CHECK2-NEXT: <decl.function.operator.infix>func <decl.name>+</decl.name>(<decl.var.parameter><decl.var.parameter.name.local>lhs</decl.var.parameter.name.local>: <ref.struct usr="s:Si">Int</ref.struct></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.name.local>rhs</decl.var.parameter.name.local>: <ref.struct usr="s:Si">Int</ref.struct></decl.var.parameter>) -&gt; <ref.struct usr="s:Si">Int</ref.struct></decl.function.operator.infix>