Skip to content

Commit ebccb69

Browse files
fix: improve rule usage
1 parent 6c396cf commit ebccb69

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

src/utils.rs

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ use crate::wasm_lang::{WasmLang, WasmDoc};
22
use ast_grep_core::{
33
meta_var::{MetaVarEnv, MetaVariable},
44
Node as SgNode, NodeMatch as SgNodeMatch,
5-
replacer::Replacer,
65
};
7-
use ast_grep_config::{RuleConfig, Fixer};
6+
use ast_grep_config::{RuleConfig};
87
use serde::{Deserialize, Serialize};
98
use std::collections::BTreeMap;
109

@@ -36,31 +35,14 @@ pub struct WasmMatch {
3635
pub message: String,
3736
}
3837

39-
40-
// TODO: move to ast-grep-core
41-
fn get_message(rule: &RuleConfig<WasmLang>, node: &NodeMatch) -> String {
42-
let parsed = Fixer::from_str(&rule.message, &rule.language).expect("should work");
43-
let bytes = parsed.generate_replacement(node);
44-
bytes.into_iter().collect()
45-
}
46-
4738
impl WasmMatch {
48-
pub fn from_pattern(nm: NodeMatch) -> Self {
49-
let node = nm.get_node().clone();
50-
let kind = node.kind().to_string();
51-
let node = WasmNode::from(node);
52-
let env = nm.get_env().clone();
53-
let env = env_to_map(env);
54-
let message = String::new();
55-
Self { node, env, message, kind }
56-
}
5739
pub fn from_match(nm: NodeMatch, rule: &RuleConfig<WasmLang>) -> Self {
5840
let node = nm.get_node().clone();
5941
let kind = node.kind().to_string();
6042
let node = WasmNode::from(node);
6143
let env = nm.get_env().clone();
6244
let env = env_to_map(env);
63-
let message = get_message(rule, &nm);
45+
let message = rule.get_message(&nm);
6446
Self { node, env, message, kind }
6547
}
6648
}

0 commit comments

Comments
 (0)