Revert "Revert "fix: update ast-grep version""

HerringtonDarkholme · HerringtonDarkholme · commit cb1611bc0937 · 2024-12-04T00:38:47.000-05:00
This reverts commit 5c2c13c.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,17 +28,16 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
 
 once_cell = "1.19.0"
 wee_alloc = { version = "0.4.5" }
-ast-grep-core = { version = "0.30.0" }
-ast-grep-config = { version = "0.30.0" }
-ast-grep-language = { version = "0.30.0", default-features = false }
+ast-grep-core = { version = "0.31.0" }
+ast-grep-config = { version = "0.31.0" }
+ast-grep-language = { version = "0.31.0", default-features = false }
 web-tree-sitter-sg = "0.22.2"
 tree-sitter = { version = "0.22.2", package = "tree-sitter-facade-sg" }
 serde-wasm-bindgen = "0.6"
 serde_json = "1.0.116"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.42"
-tree-sitter-rust = "0.23.0"
 
 [profile.release]
 panic = "abort"
diff --git a/src/utils.rs b/src/utils.rs
@@ -73,7 +73,7 @@ fn env_to_map(env: MetaVarEnv<'_, StrDoc<WasmLang>>) -> BTreeMap<String, WasmNod
         let text = nodes.iter().map(|n| n.text()).collect();
         let node = WasmNode {
           text,
-          range: (start.0, start.1, end.0, end.1),
+          range: (start.row(), start.column(first), end.row(), end.column(last)),
         };
         map.insert(name, node);
       }
@@ -90,7 +90,7 @@ impl From<Node<'_>> for WasmNode {
     let end = nm.end_pos();
     Self {
       text: nm.text().to_string(),
-      range: (start.0, start.1, end.0, end.1),
+      range: (start.row(), start.column(&nm), end.row(), end.column(&nm)),
     }
   }
 }
diff --git a/src/wasm_lang.rs b/src/wasm_lang.rs
@@ -231,6 +231,10 @@ impl Content for Wrapper {
   fn encode_bytes(bytes: &[Self::Underlying]) -> Cow<str> {
     Cow::Owned(bytes.iter().collect())
   }
+
+  fn get_char_column(&self, column: usize, _: usize) -> usize {
+    column
+  }
 }
 
 fn pos_for_char_offset(input: &[char], offset: usize) -> Point {
@@ -298,24 +302,4 @@ impl Doc for WasmDoc {
       source: self.source.clone(),
     }
   }
-}
-
-#[cfg(test)]
-mod test {
-  use super::*;
-  use tree_sitter_rust;
-
-  // https://github.com/tree-sitter/tree-sitter-rust/issues/82
-  // sadly, this does not test what tree-sitter-wasm actually does
-  // wasm uses UTF16 which counts different "error cost" than utf8
-  // native tree-sitter can use parse_with_utf16 :(
-  #[test]
-  fn test_process_pattern() {
-    let mut curr_lang = TS_LANG.lock().expect_throw("set language error");
-    *curr_lang = Some(tree_sitter_rust::language().into());
-    drop(curr_lang);
-    let grep = WasmLang::Rust.ast_grep("fn test() { Some(123) }");
-    let root = grep.root();
-    assert!(root.find("Some($A)").is_some());
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ fn env_to_map(env: MetaVarEnv<'_, StrDoc<WasmLang>>) -> BTreeMap<String, WasmNod`
`73`	`73`	`let text = nodes.iter().map(\|n\| n.text()).collect();`
`74`	`74`	`let node = WasmNode {`
`75`	`75`	`text,`
`76`		`- range: (start.0, start.1, end.0, end.1),`
	`76`	`+ range: (start.row(), start.column(first), end.row(), end.column(last)),`
`77`	`77`	`};`
`78`	`78`	`map.insert(name, node);`
`79`	`79`	`}`
`@@ -90,7 +90,7 @@ impl From<Node<'_>> for WasmNode {`
`90`	`90`	`let end = nm.end_pos();`
`91`	`91`	`Self {`
`92`	`92`	`text: nm.text().to_string(),`
`93`		`- range: (start.0, start.1, end.0, end.1),`
	`93`	`+ range: (start.row(), start.column(&nm), end.row(), end.column(&nm)),`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`