diff --git a/crates/biome_grit_patterns/src/grit_node_patterns.rs b/crates/biome_grit_patterns/src/grit_node_patterns.rs index 5855d6539037..3daaa33d749a 100644 --- a/crates/biome_grit_patterns/src/grit_node_patterns.rs +++ b/crates/biome_grit_patterns/src/grit_node_patterns.rs @@ -45,14 +45,6 @@ impl Matcher for GritNodePattern { let Some(node) = binding.singleton() else { return Ok(false); }; - if binding.is_list() { - return self.execute( - &ResolvedPattern::from_node_binding(node), - init_state, - context, - logs, - ); - } if node.kind() != self.kind { return Ok(false); diff --git a/crates/biome_grit_patterns/src/grit_target_language/js_target_language.rs b/crates/biome_grit_patterns/src/grit_target_language/js_target_language.rs index 93435ffffc77..5ad0e142436f 100644 --- a/crates/biome_grit_patterns/src/grit_target_language/js_target_language.rs +++ b/crates/biome_grit_patterns/src/grit_target_language/js_target_language.rs @@ -1,10 +1,12 @@ use super::GritTargetLanguageImpl; use crate::grit_target_node::GritTargetSyntaxKind; -use biome_js_syntax::JsSyntaxKind; -use biome_parser::{token_set, TokenSet}; +use biome_js_syntax::{JsLanguage, JsSyntaxKind}; +use biome_rowan::{RawSyntaxKind, SyntaxKindSet}; -const COMMENT_KINDS: TokenSet = - token_set![JsSyntaxKind::COMMENT, JsSyntaxKind::MULTILINE_COMMENT]; +const COMMENT_KINDS: SyntaxKindSet = + SyntaxKindSet::from_raw(RawSyntaxKind(JsSyntaxKind::COMMENT as u16)).union( + SyntaxKindSet::from_raw(RawSyntaxKind(JsSyntaxKind::MULTILINE_COMMENT as u16)), + ); #[derive(Clone, Debug)] pub struct JsTargetLanguage; @@ -105,7 +107,7 @@ impl GritTargetLanguageImpl for JsTargetLanguage { fn is_comment_kind(kind: GritTargetSyntaxKind) -> bool { kind.as_js_kind() - .map_or(false, |kind| COMMENT_KINDS.contains(kind)) + .map_or(false, |kind| COMMENT_KINDS.matches(kind)) } fn metavariable_kind() -> Self::Kind { diff --git a/crates/biome_grit_patterns/tests/specs/ts/arrayType.grit b/crates/biome_grit_patterns/tests/specs/ts/arrayType.grit new file mode 100644 index 000000000000..573a2d8ce823 --- /dev/null +++ b/crates/biome_grit_patterns/tests/specs/ts/arrayType.grit @@ -0,0 +1 @@ +`number[]` diff --git a/crates/biome_grit_patterns/tests/specs/ts/arrayType.snap b/crates/biome_grit_patterns/tests/specs/ts/arrayType.snap new file mode 100644 index 000000000000..8d613f24cf11 --- /dev/null +++ b/crates/biome_grit_patterns/tests/specs/ts/arrayType.snap @@ -0,0 +1,23 @@ +--- +source: crates/biome_grit_patterns/tests/spec_tests.rs +expression: arrayType +--- +SnapshotResult { + messages: [], + matched_ranges: [ + Range { + start: Position { + line: 2, + column: 22, + }, + end: Position { + line: 2, + column: 30, + }, + start_byte: 22, + end_byte: 30, + }, + ], + rewritten_files: [], + created_files: [], +} diff --git a/crates/biome_grit_patterns/tests/specs/ts/arrayType.ts b/crates/biome_grit_patterns/tests/specs/ts/arrayType.ts new file mode 100644 index 000000000000..b243cb7f2507 --- /dev/null +++ b/crates/biome_grit_patterns/tests/specs/ts/arrayType.ts @@ -0,0 +1,5 @@ + +function sort(array: number[]) { + let first = array[0]; + // TODO: Implement sorting +}