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.

Sign up for GitHub

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

Jump to bottom

Add wrapper around value aruments's label #314

Merged
merged 5 commits into from
Sep 10, 2023
Merged

Add wrapper around value aruments's label #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcd5537
Add wrapper around value aruments's label
ketkarameya Sep 7, 2023
e6de9e8
fix formatting
ketkarameya Sep 7, 2023
ef62c97
fix formatting
ketkarameya Sep 7, 2023
d3bc5da
fix formatting
ketkarameya Sep 7, 2023
242c46c
fix rule?
ketkarameya Sep 7, 2023
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
19 changes: 6 additions & 13 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,27 +709,20 @@ module.exports = grammar({
seq("[", optional(sep1($.value_argument, ",")), "]")
)
),
value_argument_label: ($) =>
prec.left(
choice($.simple_identifier, alias("async", $.simple_identifier))
),
value_argument: ($) =>
prec.left(
seq(
optional($.type_modifiers),
choice(
repeat1(
seq(field("reference_specifier", $.simple_identifier), ":")
seq(field("reference_specifier", $.value_argument_label), ":")
),
seq(
optional(
seq(
field(
"name",
choice(
$.simple_identifier,
alias("async", $.simple_identifier)
)
),
":"
)
),
optional(seq(field("name", $.value_argument_label), ":")),
field("value", $._expression)
)
)
Expand Down
3 changes: 2 additions & 1 deletion test/corpus/classes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,8 @@ let result: HasGeneric<P1 & P2> = HasGeneric<P1 & P2>(t: "Hello")
(constructor_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(line_string_literal
(line_str_text))))))))

Expand Down
6 changes: 4 additions & 2 deletions test/corpus/emojis.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ func 👨‍❤️‍💋‍👨(🙋🏼‍♂️ 🙋‍♂️: Man, 🙋🏻
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))))))

================================================================================
Expand Down
64 changes: 39 additions & 25 deletions test/corpus/expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ let e = array[...]
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))))))
(property_declaration
(pattern
Expand All @@ -279,7 +280,8 @@ let e = array[...]
(value_argument
(simple_identifier))
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))))))
(property_declaration
(pattern
Expand Down Expand Up @@ -526,7 +528,7 @@ modifyThis(&this)
Selectors
================================================================================

let selector = #selector(self.foo(parameter:))
let selector = #selector(self.foo(parameter: param))
let getterSelector = #selector(getter: self.bar)
let setterSelector = #selector(setter: self.bar)

Expand All @@ -545,7 +547,9 @@ let setterSelector = #selector(setter: self.bar)
(call_suffix
(value_arguments
(value_argument
(simple_identifier)))))))
(value_argument_label
(simple_identifier))
(simple_identifier)))))))
(property_declaration
(pattern
(simple_identifier))
Expand All @@ -567,7 +571,7 @@ let setterSelector = #selector(setter: self.bar)
Function references
================================================================================

self.foo(parameter:)
self.foo(parameter: param)

--------------------------------------------------------------------------------

Expand All @@ -580,7 +584,9 @@ self.foo(parameter:)
(call_suffix
(value_arguments
(value_argument
(simple_identifier))))))
(value_argument_label
(simple_identifier))
(simple_identifier))))))

================================================================================
Complex ternary expression
Expand Down Expand Up @@ -639,7 +645,8 @@ string[..<string.index(before: string.endIndex)]
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(navigation_expression
(simple_identifier)
(navigation_suffix
Expand Down Expand Up @@ -730,19 +737,20 @@ Image.url(url, isLoaded: $done)

--------------------------------------------------------------------------------

(source_file
(call_expression
(navigation_expression
(simple_identifier)
(navigation_suffix
(simple_identifier)))
(call_suffix
(value_arguments
(value_argument
(simple_identifier))
(value_argument
(source_file
(call_expression
(navigation_expression
(simple_identifier)
(simple_identifier))))))
(navigation_suffix
(simple_identifier)))
(call_suffix
(value_arguments
(value_argument
(simple_identifier))
(value_argument
(value_argument_label
(simple_identifier))
(simple_identifier))))))

================================================================================
Key-path expressions
Expand Down Expand Up @@ -780,7 +788,8 @@ let keyPathStringExpression = #keyPath(someProperty)
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(integer_literal))))))
(call_expression
(navigation_expression
Expand Down Expand Up @@ -809,7 +818,8 @@ let keyPathStringExpression = #keyPath(someProperty)
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(navigation_expression
(key_path_expression)
(navigation_suffix
Expand Down Expand Up @@ -850,7 +860,8 @@ trimPathAtLengths(positions: [(start: start, end: end)])
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(array_literal
(tuple_expression
(simple_identifier)
Expand Down Expand Up @@ -1130,13 +1141,16 @@ async(async: async, qos: qos, flags: flags) {
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier)))
(lambda_literal
(statements
Expand Down
6 changes: 4 additions & 2 deletions test/corpus/functions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ sum(1, with: 2)
(value_argument
(integer_literal))
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(integer_literal))))))

================================================================================
Expand Down Expand Up @@ -616,7 +617,8 @@ test(block: ===)
(call_suffix
(value_arguments
(value_argument
(simple_identifier))))))
(value_argument_label
(simple_identifier)))))))

================================================================================
Higher-order functions - pt 8
Expand Down
6 changes: 4 additions & 2 deletions test/corpus/literals.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ Custom interpolation
(line_string_literal
(line_str_text)
(interpolated_expression
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))))

================================================================================
Expand Down Expand Up @@ -730,7 +731,8 @@ doOperation(on: a, /)
(call_suffix
(value_arguments
(value_argument
(simple_identifier)
(value_argument_label
(simple_identifier))
(simple_identifier))
(value_argument))))
(comment))
Loading