Skip to content

Commit 9498f0d

Browse files
committed
yeast: Update AST dumper and tests
1 parent c883381 commit 9498f0d

3 files changed

Lines changed: 139 additions & 142 deletions

File tree

‎shared/yeast/src/bin/main.rs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@ fn main() {
2020
let args = Cli::parse();
2121
let language = get_language(&args.language);
2222
let source = std::fs::read_to_string(&args.file).unwrap();
23-
let runner: yeast::Runner = yeast::Runner::new(language, &[]);
24-
let ast = runner.run(&source).unwrap();
23+
let mut parser = tree_sitter::Parser::new();
24+
parser.set_language(&language).unwrap();
25+
let tree = parser.parse(&source, None).unwrap();
26+
let ast = yeast::Ast::from_tree_with_schema_and_source(
27+
yeast::schema::from_language(&language),
28+
&tree,
29+
&language,
30+
source.as_bytes().to_vec(),
31+
);
2532
println!("{}", ast.print(&source, ast.get_root()));
2633
}

‎shared/yeast/src/dump.rs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,8 +652,16 @@ mod tests {
652652
#[test]
653653
fn source_skeleton_preserves_unnamed_tokens() {
654654
let source = "x = 1";
655-
let runner: crate::Runner = crate::Runner::new(tree_sitter_ruby::LANGUAGE.into(), &[]);
656-
let ast = runner.run(source).unwrap();
655+
let language: tree_sitter::Language = tree_sitter_ruby::LANGUAGE.into();
656+
let mut parser = tree_sitter::Parser::new();
657+
parser.set_language(&language).unwrap();
658+
let tree = parser.parse(source, None).unwrap();
659+
let ast = Ast::from_tree_with_schema_and_source(
660+
crate::schema::from_language(&language),
661+
&tree,
662+
&language,
663+
source.as_bytes().to_vec(),
664+
);
657665
let dump = dump_ast_with_options(
658666
&ast,
659667
ast.get_root(),

0 commit comments

Comments
 (0)