Skip to content

fix: type constraint #188

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

Merged
merged 5 commits into from
Dec 5, 2022
Merged

fix: type constraint #188

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
0e4e91f
fix: type constraint
aspeddro Dec 4, 2022
b219dc1
add tests
aspeddro Dec 4, 2022
102efc2
relax rule
aspeddro Dec 4, 2022
1668ab2
remove redudant type_parameters
aspeddro Dec 4, 2022
50d417c
add tests
aspeddro Dec 4, 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
14 changes: 8 additions & 6 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,20 +259,22 @@ module.exports = grammar({
optional('export'),
'type',
optional('rec'),
$._type_declaration,
$._type_declaration
),

_type_declaration: $ => seq(
choice($.type_identifier, $.type_identifier_path),
optional($.type_parameters),
optional(seq(
choice('=', '+='),
optional('private'),
$._type,
repeat($.type_constraint),
optional(seq('=', $._type)),
optional(alias($._type_declaration_and, $.type_declaration)),
optional(seq(
choice('=', '+='),
optional('private'),
$._type,
)),
repeat($.type_constraint),
)),
optional(alias($._type_declaration_and, $.type_declaration))
Copy link
Collaborator Author

@aspeddro aspeddro Dec 4, 2022

Choose a reason for hiding this comment

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

With this change type t and b is valid.

),

_type_declaration_and: $ => seq(
Expand Down
15 changes: 13 additions & 2 deletions test/corpus/type_declarations.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ Opaque
type t
type t'
type \"type"
type t and b

---

(source_file
(type_declaration (type_identifier))
(type_declaration (type_identifier))
(type_declaration (type_identifier)))
(type_declaration (type_identifier))
(type_declaration (type_identifier)
(type_declaration (type_identifier))))

===========================================
Export
Expand Down Expand Up @@ -530,6 +533,7 @@ Type constraint

type t<'a> = 'a constraint 'a = int
type decorator<'a, 'b> = 'a => 'b constraint 'a = int constraint 'b = _ => _
type t<'a> constraint 'a = t

---

Expand All @@ -553,4 +557,11 @@ type decorator<'a, 'b> = 'a => 'b constraint 'a = int constraint 'b = _ => _
(type_identifier)
(function_type
(function_type_parameters (type_identifier))
(type_identifier)))))
(type_identifier))))

(type_declaration
(type_identifier)
(type_parameters (type_identifier))
(type_constraint
(type_identifier)
(type_identifier))))