Skip to content
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

enh(swift) add @resultBuilder attribute #3151

Merged
merged 4 commits into from
Apr 19, 2021
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 CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Parser:

Grammars:

- enh(swift) add `@resultBuilder` attribute (#3151) [Bradley Mackey][]
- enh(processing) added `pde` alias (#3142) [Dylan McBean][]
- enh(thrift) Use proper scope for types [Josh Goebel][]
- enh(java) Simplified class-like matcher (#3078) [Josh Goebel][]
Expand Down Expand Up @@ -96,6 +97,7 @@ Dev Improvements:

- (chore) greatly improve match scope visualization in dev tool (#3126) [NullVoxPopuli][]

[Bradley Mackey]: https://github.com/bradleymackey
[Dylan McBean]: https://github.com/DylanMcBean
[Josh Goebel]: https://github.com/joshgoebel
[Ryan Mulligan]: https://github.com/ryantm
Expand Down
1 change: 1 addition & 0 deletions src/languages/lib/kws_swift.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ export const keywordAttributes = [
'objcMembers',
'propertyWrapper',
'requires_stored_property_inits',
'resultBuilder',
'testable',
'UIApplicationMain',
'unknown',
Expand Down
1 change: 1 addition & 0 deletions test/markup/swift/attributes.expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

<span class="hljs-keyword">@propertyWrapper</span>
<span class="hljs-meta">@SomeWrapper</span>(value: <span class="hljs-number">1.0</span>, other: <span class="hljs-string">&quot;string&quot;</span>, bool: <span class="hljs-literal">false</span>)
<span class="hljs-keyword">@resultBuilder</span>

@ notAnAttribute
1 change: 1 addition & 0 deletions test/markup/swift/attributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

@propertyWrapper
@SomeWrapper(value: 1.0, other: "string", bool: false)
@resultBuilder

@ notAnAttribute