Skip to content

Commit 5c2c13c

Browse files
Revert "fix: update ast-grep version"
This reverts commit 276bef7.
1 parent 276bef7 commit 5c2c13c

File tree

4 files changed

+57
-23
lines changed

4 files changed

+57
-23
lines changed

Cargo.lock

Lines changed: 31 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
2828

2929
once_cell = "1.19.0"
3030
wee_alloc = { version = "0.4.5" }
31-
ast-grep-core = { version = "0.31.0" }
32-
ast-grep-config = { version = "0.31.0" }
33-
ast-grep-language = { version = "0.31.0", default-features = false }
31+
ast-grep-core = { version = "0.30.0" }
32+
ast-grep-config = { version = "0.30.0" }
33+
ast-grep-language = { version = "0.30.0", default-features = false }
3434
web-tree-sitter-sg = "0.22.2"
3535
tree-sitter = { version = "0.22.2", package = "tree-sitter-facade-sg" }
3636
serde-wasm-bindgen = "0.6"
3737
serde_json = "1.0.116"
3838

3939
[dev-dependencies]
4040
wasm-bindgen-test = "0.3.42"
41+
tree-sitter-rust = "0.23.0"
4142

4243
[profile.release]
4344
panic = "abort"

src/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fn env_to_map(env: MetaVarEnv<'_, StrDoc<WasmLang>>) -> BTreeMap<String, WasmNod
7373
let text = nodes.iter().map(|n| n.text()).collect();
7474
let node = WasmNode {
7575
text,
76-
range: (start.row(), start.column(first), end.row(), end.column(last)),
76+
range: (start.0, start.1, end.0, end.1),
7777
};
7878
map.insert(name, node);
7979
}
@@ -90,7 +90,7 @@ impl From<Node<'_>> for WasmNode {
9090
let end = nm.end_pos();
9191
Self {
9292
text: nm.text().to_string(),
93-
range: (start.row(), start.column(&nm), end.row(), end.column(&nm)),
93+
range: (start.0, start.1, end.0, end.1),
9494
}
9595
}
9696
}

src/wasm_lang.rs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,6 @@ impl Content for Wrapper {
231231
fn encode_bytes(bytes: &[Self::Underlying]) -> Cow<str> {
232232
Cow::Owned(bytes.iter().collect())
233233
}
234-
235-
fn get_char_column(&self, column: usize, _: usize) -> usize {
236-
column
237-
}
238234
}
239235

240236
fn pos_for_char_offset(input: &[char], offset: usize) -> Point {
@@ -302,4 +298,24 @@ impl Doc for WasmDoc {
302298
source: self.source.clone(),
303299
}
304300
}
301+
}
302+
303+
#[cfg(test)]
304+
mod test {
305+
use super::*;
306+
use tree_sitter_rust;
307+
308+
// https://github.com/tree-sitter/tree-sitter-rust/issues/82
309+
// sadly, this does not test what tree-sitter-wasm actually does
310+
// wasm uses UTF16 which counts different "error cost" than utf8
311+
// native tree-sitter can use parse_with_utf16 :(
312+
#[test]
313+
fn test_process_pattern() {
314+
let mut curr_lang = TS_LANG.lock().expect_throw("set language error");
315+
*curr_lang = Some(tree_sitter_rust::language().into());
316+
drop(curr_lang);
317+
let grep = WasmLang::Rust.ast_grep("fn test() { Some(123) }");
318+
let root = grep.root();
319+
assert!(root.find("Some($A)").is_some());
320+
}
305321
}

0 commit comments

Comments
 (0)