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

Fix including trivia in check for typeof identifier #317

Merged
merged 4 commits into from
Oct 5, 2024
Merged

Fix including trivia in check for typeof identifier #317

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
42e6679
Fix including trivia in check for typeof identifier
YetAnotherClown Oct 1, 2024
1fa6812
Add a test case for multiline typeof regression
YetAnotherClown Oct 2, 2024
1628b31
Change line endings from CRLF to LF
YetAnotherClown Oct 3, 2024
420ba01
Change line endings from CRLF to LF in `ast.snap`
YetAnotherClown Oct 4, 2024
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: 1 addition & 1 deletion full-moon/src/ast/parsers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2345,7 +2345,7 @@ fn parse_simple_type(
TokenType::Identifier { .. } => {
let name = state.consume().unwrap();

if name.to_string() == "typeof" {
if name.token.to_string() == "typeof" {
let left_parenthesis =
match state.require(Symbol::LeftParen, "expected `(` after `typeof`") {
Some(token) => token,
Expand Down
190 changes: 190 additions & 0 deletions full-moon/tests/roblox_cases/pass/multiline_typeof_regression/ast.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
---
source: full-moon/tests/pass_cases.rs
expression: ast.nodes()
input_file: full-moon/tests/roblox_cases/pass/multiline_typeof_regression
---
stmts:
- - TypeDeclaration:
type_token:
leading_trivia: []
token:
start_position:
bytes: 0
line: 1
character: 1
end_position:
bytes: 4
line: 1
character: 5
token_type:
type: Identifier
identifier: type
trailing_trivia:
- start_position:
bytes: 4
line: 1
character: 5
end_position:
bytes: 5
line: 1
character: 6
token_type:
type: Whitespace
characters: " "
base:
leading_trivia: []
token:
start_position:
bytes: 5
line: 1
character: 6
end_position:
bytes: 11
line: 1
character: 12
token_type:
type: Identifier
identifier: TypeOf
trailing_trivia:
- start_position:
bytes: 11
line: 1
character: 12
end_position:
bytes: 12
line: 1
character: 13
token_type:
type: Whitespace
characters: " "
generics: ~
equal_token:
leading_trivia: []
token:
start_position:
bytes: 12
line: 1
character: 13
end_position:
bytes: 13
line: 1
character: 14
token_type:
type: Symbol
symbol: "="
trailing_trivia:
- start_position:
bytes: 13
line: 1
character: 14
end_position:
bytes: 14
line: 1
character: 14
token_type:
type: Whitespace
characters: "\n"
declare_as:
Typeof:
typeof_token:
leading_trivia:
- start_position:
bytes: 14
line: 2
character: 1
end_position:
bytes: 18
line: 2
character: 5
token_type:
type: Whitespace
characters: " "
token:
start_position:
bytes: 18
line: 2
character: 5
end_position:
bytes: 24
line: 2
character: 11
token_type:
type: Identifier
identifier: typeof
trailing_trivia: []
parentheses:
tokens:
- leading_trivia: []
token:
start_position:
bytes: 24
line: 2
character: 11
end_position:
bytes: 25
line: 2
character: 12
token_type:
type: Symbol
symbol: (
trailing_trivia: []
- leading_trivia: []
token:
start_position:
bytes: 27
line: 2
character: 14
end_position:
bytes: 28
line: 2
character: 15
token_type:
type: Symbol
symbol: )
trailing_trivia:
- start_position:
bytes: 28
line: 2
character: 15
end_position:
bytes: 29
line: 2
character: 15
token_type:
type: Whitespace
characters: "\n"
inner:
TableConstructor:
braces:
tokens:
- leading_trivia: []
token:
start_position:
bytes: 25
line: 2
character: 12
end_position:
bytes: 26
line: 2
character: 13
token_type:
type: Symbol
symbol: "{"
trailing_trivia: []
- leading_trivia: []
token:
start_position:
bytes: 26
line: 2
character: 13
end_position:
bytes: 27
line: 2
character: 14
token_type:
type: Symbol
symbol: "}"
trailing_trivia: []
fields:
pairs: []
- ~
2 changes: 2 additions & 0 deletions full-moon/tests/roblox_cases/pass/multiline_typeof_regression/source.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
type TypeOf =
typeof({})
158 changes: 158 additions & 0 deletions full-moon/tests/roblox_cases/pass/multiline_typeof_regression/tokens.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
---
source: full-moon/tests/pass_cases.rs
expression: tokens
input_file: full-moon/tests/roblox_cases/pass/multiline_typeof_regression
---
- start_position:
bytes: 0
line: 1
character: 1
end_position:
bytes: 4
line: 1
character: 5
token_type:
type: Identifier
identifier: type
- start_position:
bytes: 4
line: 1
character: 5
end_position:
bytes: 5
line: 1
character: 6
token_type:
type: Whitespace
characters: " "
- start_position:
bytes: 5
line: 1
character: 6
end_position:
bytes: 11
line: 1
character: 12
token_type:
type: Identifier
identifier: TypeOf
- start_position:
bytes: 11
line: 1
character: 12
end_position:
bytes: 12
line: 1
character: 13
token_type:
type: Whitespace
characters: " "
- start_position:
bytes: 12
line: 1
character: 13
end_position:
bytes: 13
line: 1
character: 14
token_type:
type: Symbol
symbol: "="
- start_position:
bytes: 13
line: 1
character: 14
end_position:
bytes: 14
line: 1
character: 14
token_type:
type: Whitespace
characters: "\n"
- start_position:
bytes: 14
line: 2
character: 1
end_position:
bytes: 18
line: 2
character: 5
token_type:
type: Whitespace
characters: " "
- start_position:
bytes: 18
line: 2
character: 5
end_position:
bytes: 24
line: 2
character: 11
token_type:
type: Identifier
identifier: typeof
- start_position:
bytes: 24
line: 2
character: 11
end_position:
bytes: 25
line: 2
character: 12
token_type:
type: Symbol
symbol: (
- start_position:
bytes: 25
line: 2
character: 12
end_position:
bytes: 26
line: 2
character: 13
token_type:
type: Symbol
symbol: "{"
- start_position:
bytes: 26
line: 2
character: 13
end_position:
bytes: 27
line: 2
character: 14
token_type:
type: Symbol
symbol: "}"
- start_position:
bytes: 27
line: 2
character: 14
end_position:
bytes: 28
line: 2
character: 15
token_type:
type: Symbol
symbol: )
- start_position:
bytes: 28
line: 2
character: 15
end_position:
bytes: 29
line: 2
character: 15
token_type:
type: Whitespace
characters: "\n"
- start_position:
bytes: 29
line: 3
character: 1
end_position:
bytes: 29
line: 3
character: 1
token_type:
type: Eof
Loading