Skip to content

Fix to auto-capitalization PR #888

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

Merged
merged 3 commits into from
Apr 16, 2024

Conversation

emilyychenn
Copy link
Contributor

@emilyychenn emilyychenn commented Apr 16, 2024

Bug/issue #, if applicable: rdar://122167705

Summary

Follow-up PR after #880. Notable changes:

  • Changed withFirstWordCapitalized from a computed property to a function named capitalizingFirstWord().
  • Removed unused protocol.
  • Extracted repeated capitalization logic into [RenderBlockContent] and [RenderInlineContent] extensions.

Dependencies

N/A

Testing

Add documentation via doc comments with anything after the colon (e.g. a parameter, aside, warning, important, todo, note, throws, returns) written in lowercase, then compile the documentation. The rendered documentation should now include an uppercased first character if the first word in the sentence is all lowercase and/or punctuation belonging to the CharacterSet punctuation characters.

Checklist

Make sure you check off the following items. If they cannot be completed, provide a reason.

  • Added tests
  • Ran the ./bin/test script and it succeeded
  • Updated documentation if necessary

@emilyychenn emilyychenn changed the title Fix to auto-capitalization PR [draft] Fix to auto-capitalization PR Apr 16, 2024
…zation logic into [RenderBlockContent] and [RenderInlineContent] extensions.
@emilyychenn emilyychenn force-pushed the capitalize-first-word-fix branch from 125094e to d7e487b Compare April 16, 2024 11:56
Copy link
Contributor

@d-ronnqvist d-ronnqvist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making these changes.

How do you feel about naming the function capitalizingFirstWord() instead?

@emilyychenn emilyychenn requested a review from d-ronnqvist April 16, 2024 12:48
@emilyychenn
Copy link
Contributor Author

@swift-ci please test

Copy link
Contributor

@d-ronnqvist d-ronnqvist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@emilyychenn emilyychenn merged commit 3374687 into swiftlang:main Apr 16, 2024
emilyychenn added a commit to emilyychenn/swift-docc that referenced this pull request Apr 16, 2024
rdar://122167705

* Changed withFirstWordCapitalized from a computed property to a function.

* Remove unused protocol and extension, and extracted repeated capitalization logic into [RenderBlockContent] and [RenderInlineContent] extensions.

* Rename function from capitalizeFirstWord() to capitalizingFirstWord() since this is a non-mutating function.
emilyychenn added a commit that referenced this pull request Apr 19, 2024
* Auto-Capitalize First Word (#880)

rdar://122167705

When writing a doc comment, it feels intuitive to not capitalize the first word of its description because of the nature of the doc comment.

For example: adding a new parameter would be written as:
`/// - Parameter testParam: this parameter is just a test parameter to show what this looks like in lowercase.`
In this example, the sentence in doc comments is natural to write with a lowercase starting word, because the first word (Parameter) is already capitalized. 

This PR auto-capitalizes the first word of a new section or aside. Note that this auto-capitalization only occurs if the first word is all lowercase and contains only characters A-Z, or if the first word contains CharacterSet punctuation characters (e.g. a period, comma, hyphen, semi-colon, colon). This capitalization is also locale specific.

---------

* Fix to auto-capitalization PR (#888)

rdar://122167705

* Changed withFirstWordCapitalized from a computed property to a function.

* Remove unused protocol and extension, and extracted repeated capitalization logic into [RenderBlockContent] and [RenderInlineContent] extensions.

* Rename function from capitalizeFirstWord() to capitalizingFirstWord() since this is a non-mutating function.

---------

Co-authored-by: Pat Shaughnessy <[email protected]>
emilyychenn added a commit to emilyychenn/swift-docc that referenced this pull request Apr 30, 2024
rdar://122167705

* Changed withFirstWordCapitalized from a computed property to a function.

* Remove unused protocol and extension, and extracted repeated capitalization logic into [RenderBlockContent] and [RenderInlineContent] extensions.

* Rename function from capitalizeFirstWord() to capitalizingFirstWord() since this is a non-mutating function.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants