Skip to content

Commit

Permalink
fix: as types
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhamud
hhamud committed Aug 5, 2023
1 parent 6784b80 commit e41804f
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 24 deletions.
6 changes: 3 additions & 3 deletions noir-ts-mode.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@
(struct_definition name: (identifier) @font-lock-type-face)
(struct_definition type: (identifier) @font-lock-type-face)
(typed_identifier type: (identifier) @font-lock-type-face)
(struct_method (identifier) @font-lock-type-face))
(struct_method (identifier) @font-lock-type-face)
((as_identifier type: (identifier) @font-lock-type-face)))


:feature 'variable
Expand All @@ -153,8 +154,7 @@
(let_declaration (binary_expression left: (grouped_expression (identifier) @font-lock-variable-name-face)))
(struct_definition var: (identifier) @font-lock-variable-name-face)
(typed_identifier var: (identifier) @font-lock-variable-name-face)
(global (binary_expression left: (typed_identifier var: (identifier) @font-lock-variable-name-face)))
)
(global (binary_expression left: (typed_identifier var: (identifier) @font-lock-variable-name-face))))

:feature 'string
:language 'noir
Expand Down
11 changes: 6 additions & 5 deletions test/corpus/basic_program.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ mod mysubmodule {

fn my_helper() -> comptime Field {
let x = N;
x
xantholeucophore
}
}

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

(source_file
(source_file
(global
(binary_expression
(typed_identifier
Expand Down Expand Up @@ -182,9 +182,10 @@ mod mysubmodule {
(identifier)
(binary_expression
(identifier)
(import_identifier
(identifier))
(identifier))))
(import_variable
(import_identifier
(identifier))
: (identifier)))))
(assert
(binary_expression
(identifier)
Expand Down
37 changes: 21 additions & 16 deletions test/corpus/types.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ fn from_triple_limb(trip : u96) -> (u32, u32, u32) {

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

(source_file
(source_file
(function_definition
(identifier)
(parameter
Expand All @@ -164,33 +164,38 @@ fn from_triple_limb(trip : u96) -> (u32, u32, u32) {
(grouped_expression
(binary_expression
(identifier)
(import_identifier
(identifier))
(identifier)))
(import_variable
(import_identifier
(identifier))
: (identifier))))
(single_type))
(as_identifier
(grouped_expression
(binary_expression
(grouped_expression
(binary_expression
(identifier)
(import_identifier
(identifier))
(identifier)))
(import_identifier
(identifier))
(identifier)))
(import_variable
(import_identifier
(identifier))
: (identifier))))
(import_variable
(import_identifier
(identifier))
: (identifier))))
(single_type))
(as_identifier
(grouped_expression
(binary_expression
(grouped_expression
(binary_expression
(identifier)
(import_identifier
(identifier))
(identifier)))
(import_identifier
(identifier))
(identifier)))
(import_variable
(import_identifier
(identifier))
: (identifier))))
(import_variable
(import_identifier
(identifier))
: (identifier))))
(single_type))))))

0 comments on commit e41804f

Please sign in to comment.