Skip to content

Commit

Permalink
Merge branch 'main' into fix/biomejs#3298
Browse files Browse the repository at this point in the history
  • Loading branch information
ryo-ebata committed Jul 15, 2024
2 parents 3e06142 + d761fb9 commit 666c18d
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 13 deletions.
8 changes: 0 additions & 8 deletions crates/biome_grit_patterns/src/grit_node_patterns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ impl Matcher<GritQueryContext> 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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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<JsSyntaxKind> =
token_set![JsSyntaxKind::COMMENT, JsSyntaxKind::MULTILINE_COMMENT];
const COMMENT_KINDS: SyntaxKindSet<JsLanguage> =
SyntaxKindSet::from_raw(RawSyntaxKind(JsSyntaxKind::COMMENT as u16)).union(
SyntaxKindSet::from_raw(RawSyntaxKind(JsSyntaxKind::MULTILINE_COMMENT as u16)),
);

#[derive(Clone, Debug)]
pub struct JsTargetLanguage;
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions crates/biome_grit_patterns/tests/specs/ts/arrayType.grit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`number[]`
23 changes: 23 additions & 0 deletions crates/biome_grit_patterns/tests/specs/ts/arrayType.snap
Original file line number Diff line number Diff line change
@@ -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: [],
}
5 changes: 5 additions & 0 deletions crates/biome_grit_patterns/tests/specs/ts/arrayType.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

function sort(array: number[]) {
let first = array[0];
// TODO: Implement sorting
}

0 comments on commit 666c18d

Please sign in to comment.