-
Notifications
You must be signed in to change notification settings - Fork 166
Add a helper function for rendering a returns sections as HTML #1381
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
d-ronnqvist
wants to merge
3
commits into
swiftlang:main
Choose a base branch
from
d-ronnqvist:output-html-returns
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+115
−2
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,52 @@ | ||||||
| /* | ||||||
| This source file is part of the Swift.org open source project | ||||||
|
|
||||||
| Copyright (c) 2025 Apple Inc. and the Swift project authors | ||||||
| Licensed under Apache License v2.0 with Runtime Library Exception | ||||||
|
|
||||||
| See https://swift.org/LICENSE.txt for license information | ||||||
| See https://swift.org/CONTRIBUTORS.txt for Swift project authors | ||||||
| */ | ||||||
|
|
||||||
| #if canImport(FoundationXML) | ||||||
| // TODO: Consider other HTML rendering options as a future improvement (rdar://165755530) | ||||||
| package import FoundationXML | ||||||
| #else | ||||||
| package import Foundation | ||||||
| #endif | ||||||
|
|
||||||
| package import Markdown | ||||||
| package import DocCCommon | ||||||
|
|
||||||
| package extension MarkdownRenderer { | ||||||
| /// Creates a "returns" section that describes all return values of a symbol. | ||||||
| /// | ||||||
| /// If each language representation of the symbol have their own language-specific return values, pass the return value content for all language representations. | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| /// | ||||||
| /// If all language representations of the symbol have the _same_ return value, only pass the return value content for one language. | ||||||
| /// This produces a "returns" section that doesn't hide the return value content for any of the languages (same as if the symbol only had one language representation) | ||||||
| func returns(_ languageSpecificSections: [SourceLanguage: [any Markup]]) -> [XMLNode] { | ||||||
| let info = RenderHelpers.sortedLanguageSpecificValues(languageSpecificSections) | ||||||
| let items: [XMLNode] = if info.count == 1 { | ||||||
| info.first!.value.map { visit($0) } | ||||||
| } else { | ||||||
| info.flatMap { language, content in | ||||||
| let attributes = ["class": "\(language.id)-only"] | ||||||
| // Most return sections only have 1 paragraph of content with 2 and 3 paragraphs being increasingly uncommon. | ||||||
| // Avoid wrapping that content in a `<div>` or other container element and instead add the language specific class attribute to each paragraph. | ||||||
| return content.map { markup in | ||||||
| let node = visit(markup) | ||||||
| if let element = node as? XMLElement { | ||||||
| element.addAttributes(attributes) | ||||||
| return element | ||||||
| } else { | ||||||
| // Any text _should_ already be contained in a markdown paragraph, but if the input is unexpected, wrap the raw text in a paragraph here. | ||||||
| return .element(named: "p", children: [node], attributes: attributes) | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return selfReferencingSection(named: "Return Value", content: items) | ||||||
| } | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.