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

Updating top repository version #212

Merged
merged 4 commits into from
Aug 28, 2022
Merged

Updating top repository version #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fdc937
Updating top repository version
alex-pinkus Aug 28, 2022
7834de9
Make the initializer optional in pattern initializers
alex-pinkus Aug 28, 2022
ffa7ec5
Allow more complex types in extension declarations
alex-pinkus Aug 28, 2022
ab6be2e
Allow more opaque and existential types
alex-pinkus Aug 28, 2022
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
8 changes: 8 additions & 0 deletions corpus/classes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,6 +1055,9 @@ extension SpecialDecorator where Self: Decorator, Self.DecoratedType == SpecialT

public extension Foo where T == (arg1: Arg1, arg2: Arg2) { }

extension [SpecialItem] {
}

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

(source_file
Expand Down Expand Up @@ -1119,6 +1122,11 @@ public extension Foo where T == (arg1: Arg1, arg2: Arg2) { }
(simple_identifier)
(user_type
(type_identifier)))))))
(class_body))
(class_declaration
(array_type
(user_type
(type_identifier)))
(class_body)))

================================================================================
Expand Down
11 changes: 10 additions & 1 deletion corpus/statements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,10 @@ guard case .someCase(ident: let foo)? = otherThing() else {

guard case justIdentifier = bound else { }

guard let pattern else {
return
}

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

(source_file
Expand Down Expand Up @@ -769,7 +773,12 @@ guard case justIdentifier = bound else { }
(guard_statement
(simple_identifier)
(simple_identifier)
(else)))
(else))
(guard_statement
(simple_identifier)
(else)
(statements
(control_transfer_statement))))

================================================================================
Compound guard
Expand Down
16 changes: 9 additions & 7 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,13 @@ module.exports = grammar({
repeat1(alias($._immediate_quest, "?"))
)
),
metatype: ($) =>
prec.left(seq($._unannotated_type, ".", choice("Type", "Protocol"))),
metatype: ($) => seq($._unannotated_type, ".", choice("Type", "Protocol")),
_quest: ($) => "?",
_immediate_quest: ($) => token.immediate("?"),
opaque_type: ($) => seq("some", $.user_type),
existential_type: ($) => seq("any", $.user_type),
opaque_type: ($) => prec.right(seq("some", $._unannotated_type)),
existential_type: ($) => prec.right(seq("any", $._unannotated_type)),
protocol_composition_type: ($) =>
prec.right(
prec.left(
seq(
$._unannotated_type,
repeat1(seq("&", prec.right($._unannotated_type)))
Expand Down Expand Up @@ -940,7 +939,10 @@ module.exports = grammar({
_if_condition_sequence_item: ($) =>
choice($._if_let_binding, $._expression, $.availability_condition),
_if_let_binding: ($) =>
seq($._direct_or_indirect_binding, $._equal_sign, $._expression),
seq(
$._direct_or_indirect_binding,
optional(seq($._equal_sign, $._expression))
),
guard_statement: ($) =>
prec.right(
PRECS["if"],
Expand Down Expand Up @@ -1333,7 +1335,7 @@ module.exports = grammar({
),
seq(
field("declaration_kind", "extension"),
field("name", $.user_type),
field("name", $._unannotated_type),
optional($.type_parameters),
optional(seq(":", $._inheritance_specifiers)),
optional($.type_constraints),
Expand Down
12 changes: 6 additions & 6 deletions script-data/top-repositories.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ HeroTransitions HeroTransitions/Hero 1.6.1
Kingfisher onevcat/Kingfisher 7.3.2
shadowsocks shadowsocks/ShadowsocksX-NG v1.9.4
SnapKit SnapKit/SnapKit 5.0.1
SwiftLint realm/SwiftLint 0.49.0-rc.2 0 2
SwiftLint realm/SwiftLint 0.49.0-rc.2 1 2
SwiftLint realm/SwiftLint 0.49.0 0 2
SwiftLint realm/SwiftLint 0.49.0 1 2
ClashX yichengchen/clashX 1.94.0
Carthage Carthage/Carthage 0.38.0
Rectangle rxhanson/Rectangle v0.57
Rectangle rxhanson/Rectangle v0.58
PromiseKit mxcl/PromiseKit 6.18.1
Moya Moya/Moya 15.0.3
MonitorControl MonitorControl/MonitorControl v4.1.0
Expand All @@ -33,11 +33,11 @@ firefox-ios mozilla-mobile/firefox-ios v39.0 2 6
firefox-ios mozilla-mobile/firefox-ios v39.0 3 6
firefox-ios mozilla-mobile/firefox-ios v39.0 4 6
firefox-ios mozilla-mobile/firefox-ios v39.0 5 6
AudioKit AudioKit/AudioKit 5.5.0
AudioKit AudioKit/AudioKit 5.5.2
Starscream daltoniam/Starscream 4.0.4
MessageKit MessageKit/MessageKit 4.0.0
KeychainAccess kishikawakatsumi/KeychainAccess v4.2.2
Nuke kean/Nuke 11.1.1
Swinject Swinject/Swinject 2.8.2
GRDB groue/GRDB.swift v5.26.0 0 2
GRDB groue/GRDB.swift v5.26.0 1 2
GRDB groue/GRDB.swift v6.0.0-beta.3 0 2
GRDB groue/GRDB.swift v6.0.0-beta.3 1 2