Skip to content

Commit

Permalink
Tests and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
johnfairh committed Sep 18, 2021
1 parent 5a2b60a commit 83aa1af
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions lib/jazzy/sourcekitten.rb
Expand Up @@ -621,7 +621,7 @@ def self.make_source_declarations(docs, parent = nil, mark = SourceMark.new)
declaration.inherited_types =
inherited_types.map { |type| type['key.name'] }.compact
declaration.async =
doc['key.async'] ||
doc['key.symgraph_async'] ||
if xml_declaration = doc['key.fully_annotated_decl']
swift_async?(xml_declaration)
end
Expand Down Expand Up @@ -834,7 +834,9 @@ def self.mark_and_merge_protocol_extensions(protocol, extensions)
extensions.each do |ext|
ext.children = ext.children.select do |ext_member|
proto_member = protocol.children.find do |p|
p.name == ext_member.name && p.type == ext_member.type
p.name == ext_member.name &&
p.type == ext_member.type &&
p.async == ext_member.async
end

# Extension-only method, keep.
Expand Down
2 changes: 1 addition & 1 deletion lib/jazzy/symbol_graph/sym_node.rb
Expand Up @@ -140,7 +140,7 @@ def to_sourcekit
'key.accessibility' => symbol.acl,
'key.parsed_decl' => declaration,
'key.annotated_decl' => xml_declaration,
'key.async' => async?,
'key.symgraph_async' => async?,
}
if docs = symbol.doc_comments
hash['key.doc.comment'] = docs
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs

0 comments on commit 83aa1af

Please sign in to comment.