Skip to content

Commit

Permalink
Revert "fix: revert tree-sitter-yaml to 0.0.1"
Browse files Browse the repository at this point in the history 
This reverts commit 690cb7c.
  • Loading branch information
@alesbrelih
alesbrelih committed May 2, 2024
1 parent 68221d7 commit f59a254
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 27 deletions.
9 changes: 4 additions & 5 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ tokio = "1.36.0"
anyhow = "1.0.82"
serde = "1.0.199"
git2 = "0.18.3"
tree-sitter = "0.20.10"
tree-sitter-yaml = "0.0.1"
tree-sitter = "0.22.5"
tree-sitter-yaml = { git = "https://github.com/tree-sitter-grammars/tree-sitter-yaml", rev = "49db816" }
reqwest = { version = "0.12.4", features = ["blocking"] }
regex = "1.10.4"
serde_yaml = "0.9.34"
Expand Down
40 changes: 20 additions & 20 deletions src/gitlab_ci_ls_parser/treesitter.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ impl Treesitter for TreesitterImpl {
fn get_root_node(&self, uri: &str, content: &str, node_key: &str) -> Option<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = match Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_root_node(node_key),
) {
Ok(q) => q,
Expand Down Expand Up @@ -109,14 +109,14 @@ impl Treesitter for TreesitterImpl {
fn get_all_root_nodes(&self, uri: &str, content: &str) -> Vec<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_all_root_nodes(),
)
.unwrap();
Expand Down Expand Up @@ -152,7 +152,7 @@ impl Treesitter for TreesitterImpl {
fn get_root_variables(&self, uri: &str, content: &str) -> Vec<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

// TODO: this should be generic fn accepting treesitter query
Expand All @@ -161,7 +161,7 @@ impl Treesitter for TreesitterImpl {
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_root_variables(),
)
.unwrap();
Expand Down Expand Up @@ -209,14 +209,14 @@ impl Treesitter for TreesitterImpl {
fn get_stage_definitions(&self, uri: &str, content: &str) -> Vec<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_stage_definitions(),
)
.unwrap();
Expand Down Expand Up @@ -264,14 +264,14 @@ impl Treesitter for TreesitterImpl {
fn get_all_stages(&self, uri: &str, content: &str, stage: Option<&str>) -> Vec<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_all_stages(stage),
)
.unwrap();
Expand Down Expand Up @@ -326,14 +326,14 @@ impl Treesitter for TreesitterImpl {
) -> Vec<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_all_extends(extend_name),
)
.unwrap();
Expand Down Expand Up @@ -383,14 +383,14 @@ impl Treesitter for TreesitterImpl {
fn get_position_type(&self, content: &str, position: Position) -> parser::PositionType {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_position_type(),
)
.unwrap();
Expand Down Expand Up @@ -556,14 +556,14 @@ impl Treesitter for TreesitterImpl {
) -> Vec<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_all_job_needs(needs_name),
)
.unwrap();
Expand Down Expand Up @@ -616,14 +616,14 @@ impl Treesitter for TreesitterImpl {
) -> Option<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_root_node_at_position(),
)
.unwrap();
Expand Down Expand Up @@ -662,14 +662,14 @@ impl Treesitter for TreesitterImpl {
) -> Option<GitlabElement> {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(tree_sitter_yaml::language())
.set_language(&tree_sitter_yaml::language())
.expect("Error loading YAML grammar");

let tree = parser.parse(content, None).unwrap();
let root_node = tree.root_node();

let query = Query::new(
tree_sitter_yaml::language(),
&tree_sitter_yaml::language(),
&TreesitterQueries::get_job_variable_definition(job_name, variable_name),
)
.unwrap();
Expand Down

0 comments on commit f59a254

Please sign in to comment.