Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Fix display of bullet list items in documentation discussion parts #130

Merged
merged 3 commits into from
Jul 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
#145 by @mattt.
- Fixed inclusion of non-public subclasses of public superclasses.
#131 by @MattKiazyk.
- Fixed display of bullet list items in documentation discussion parts.
#130 by @mattt.

## [1.0.0-beta.3] - 2020-05-19

Expand Down
14 changes: 7 additions & 7 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/SwiftDocOrg/CommonMark.git",
"state": {
"branch": null,
"revision": "902cc82abc2e8ad23b73c982eed27c63ae3d9384",
"version": null
"revision": "62176a332884826997928ba578d9d322c16772fb",
"version": "0.4.0"
}
},
{
"package": "GraphViz",
"repositoryURL": "https://github.com/SwiftDocOrg/GraphViz.git",
"state": {
"branch": null,
"revision": "6f6bd7078ad41a8b34f5eb4bf0384a93f1ba4706",
"version": "0.1.2"
"revision": "c4746cb3ff6f5e7c5d5540c40b98555521c3ee43",
"version": "0.1.3"
}
},
{
Expand Down Expand Up @@ -95,9 +95,9 @@
"package": "SwiftMarkup",
"repositoryURL": "https://github.com/SwiftDocOrg/SwiftMarkup.git",
"state": {
"branch": "0.2.0",
"revision": "f395f3bd9e345402cc744aa9051780ed403d3b26",
"version": null
"branch": null,
"revision": "7915d17608dd32434dc8abb95156f70367f38a5a",
"version": "0.2.1"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/apple/swift-syntax.git", .revision("0.50200.0")),
.package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .revision("902cc82abc2e8ad23b73c982eed27c63ae3d9384")),
.package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .revision("0.2.0")),
.package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .upToNextMinor(from: "0.4.0")),
.package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.2.1")),
.package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .upToNextMinor(from: "0.1.2")),
.package(url: "https://github.com/NSHipster/HypertextLiteral.git", .upToNextMinor(from: "0.0.2")),
.package(url: "https://github.com/SwiftDocOrg/Markup.git", .upToNextMinor(from: "0.0.3")),
.package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .revision("1.0.0")),
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.0.5")),
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.0.6")),
.package(url: "https://github.com/apple/swift-log.git", .upToNextMinor(from: "1.2.0")),
.package(url: "https://github.com/NSHipster/swift-log-github-actions.git", .upToNextMinor(from: "0.0.1")),
],
Expand Down
10 changes: 4 additions & 6 deletions Sources/swift-doc/Supporting Types/Components/Abstract.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ struct Abstract: Component {
if let summary = symbol.documentation?.summary {
return Fragment {
List.Item {
Paragraph {
Link(urlString: path(for: symbol, with: baseURL), text: symbol.id.description)
Text { ":" }
}

Fragment {
summary
#"""
[\#(symbol.id)](\#(path(for: symbol, with: baseURL))):
\#(summary)
"""#
}
}
}
Expand Down