sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant parentheses

pull/208/head^2
Wilfred Hughes 2022-03-30 23:35:44 +07:00
parent 559d0f9b6b
commit 1593de4208
1 changed files with 54 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/tree_sitter_parser.rs
Unescape Escape View File

@ -90,10 +90,10 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Bash", name: "Bash",
language, language,
atom_nodes: (vec!["string", "raw_string", "heredoc_body"]) atom_nodes: vec!["string", "raw_string", "heredoc_body"]
.into_iter() .into_iter()
.collect(), .collect(),
delimiter_tokens: (vec![("(", ")"), ("{", "}"), ("[", "]")]), delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/bash.scm"), include_str!("../vendor/highlights/bash.scm"),
@ -106,10 +106,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "C", name: "C",
language, language,
atom_nodes: (vec!["string_literal", "char_literal"]) atom_nodes: vec!["string_literal", "char_literal"].into_iter().collect(),
.into_iter() delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")],
.collect(),
delimiter_tokens: (vec![("(", ")"), ("{", "}"), ("[", "]")]),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/c.scm"), include_str!("../vendor/highlights/c.scm"),
@ -124,10 +122,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
language, language,
// The C++ grammar extends the C grammar, so the node // The C++ grammar extends the C grammar, so the node
// names are generally the same. // names are generally the same.
atom_nodes: (vec!["string_literal", "char_literal"]) atom_nodes: vec!["string_literal", "char_literal"].into_iter().collect(),
.into_iter() delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]"), ("<", ">")],
.collect(),
delimiter_tokens: (vec![("(", ")"), ("{", "}"), ("[", "]"), ("<", ">")]),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
concat!( concat!(
@ -143,8 +139,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Clojure", name: "Clojure",
language, language,
atom_nodes: (vec![]).into_iter().collect(), atom_nodes: vec![].into_iter().collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]")]) delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]")]
.into_iter() .into_iter()
.collect(), .collect(),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
@ -159,8 +155,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Common Lisp", name: "Common Lisp",
language, language,
atom_nodes: (vec!["str_lit", "char_lit"]).into_iter().collect(), atom_nodes: vec!["str_lit", "char_lit"].into_iter().collect(),
delimiter_tokens: (vec![("(", ")")]), delimiter_tokens: vec![("(", ")")],
highlight_query: ts::Query::new(language, "").unwrap(), highlight_query: ts::Query::new(language, "").unwrap(),
} }
} }
@ -169,14 +165,14 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "C#", name: "C#",
language, language,
atom_nodes: (vec![ atom_nodes: vec![
"string_literal", "string_literal",
"verbatim_string_literal", "verbatim_string_literal",
"character_literal", "character_literal",
]) ]
.into_iter() .into_iter()
.collect(), .collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")")]), delimiter_tokens: vec![("{", "}"), ("(", ")")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/c-sharp.scm"), include_str!("../vendor/highlights/c-sharp.scm"),
@ -189,8 +185,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "CSS", name: "CSS",
language, language,
atom_nodes: (vec!["integer_value", "float_value"]).into_iter().collect(), atom_nodes: vec!["integer_value", "float_value"].into_iter().collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")")]), delimiter_tokens: vec![("{", "}"), ("(", ")")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/css.scm"), include_str!("../vendor/highlights/css.scm"),
@ -203,8 +199,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Dart", name: "Dart",
language, language,
atom_nodes: (vec!["string_literal", "script_tag"]).into_iter().collect(), atom_nodes: vec!["string_literal", "script_tag"].into_iter().collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")]), delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/dart.scm"), include_str!("../vendor/highlights/dart.scm"),
@ -217,8 +213,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Emacs Lisp", name: "Emacs Lisp",
language, language,
atom_nodes: (vec![]).into_iter().collect(), atom_nodes: vec![].into_iter().collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]")]) delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]")]
.into_iter() .into_iter()
.collect(), .collect(),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
@ -233,8 +229,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Elixir", name: "Elixir",
language, language,
atom_nodes: (vec!["string", "heredoc"]).into_iter().collect(), atom_nodes: vec!["string", "heredoc"].into_iter().collect(),
delimiter_tokens: (vec![("(", ")"), ("{", "}"), ("do", "end")]) delimiter_tokens: vec![("(", ")"), ("{", "}"), ("do", "end")]
.into_iter() .into_iter()
.collect(), .collect(),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
@ -249,10 +245,10 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Go", name: "Go",
language, language,
atom_nodes: (vec!["interpreted_string_literal", "raw_string_literal"]) atom_nodes: vec!["interpreted_string_literal", "raw_string_literal"]
.into_iter() .into_iter()
.collect(), .collect(),
delimiter_tokens: (vec![("{", "}"), ("[", "]"), ("(", ")")]) delimiter_tokens: vec![("{", "}"), ("[", "]"), ("(", ")")]
.into_iter() .into_iter()
.collect(), .collect(),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
@ -267,8 +263,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Haskell", name: "Haskell",
language, language,
atom_nodes: (vec![]).into_iter().collect(), atom_nodes: vec![].into_iter().collect(),
delimiter_tokens: (vec![("[", "]"), ("(", ")")]), delimiter_tokens: vec![("[", "]"), ("(", ")")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/haskell.scm"), include_str!("../vendor/highlights/haskell.scm"),
@ -281,15 +277,15 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Janet", name: "Janet",
language, language,
atom_nodes: (vec![]).into_iter().collect(), atom_nodes: vec![].into_iter().collect(),
delimiter_tokens: (vec![ delimiter_tokens: vec![
("@{", "}"), ("@{", "}"),
("@(", ")"), ("@(", ")"),
("@[", "]"), ("@[", "]"),
("{", "}"), ("{", "}"),
("(", ")"), ("(", ")"),
("[", "]"), ("[", "]"),
]) ]
.into_iter() .into_iter()
.collect(), .collect(),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
@ -304,8 +300,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Java", name: "Java",
language, language,
atom_nodes: (vec![]).into_iter().collect(), atom_nodes: vec![].into_iter().collect(),
delimiter_tokens: (vec![("(", ")"), ("{", "}"), ("[", "]")]), delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/java.scm"), include_str!("../vendor/highlights/java.scm"),
@ -318,10 +314,10 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "JavaScript", name: "JavaScript",
language, language,
atom_nodes: (vec!["string", "template_string", "regex"]) atom_nodes: vec!["string", "template_string", "regex"]
.into_iter() .into_iter()
.collect(), .collect(),
delimiter_tokens: (vec![ delimiter_tokens: vec![
("[", "]"), ("[", "]"),
("(", ")"), ("(", ")"),
("{", "}"), ("{", "}"),
@ -329,7 +325,7 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
// like 1 < 2, but we should never see both a < and a // like 1 < 2, but we should never see both a < and a
// > at the same level in JSX. // > at the same level in JSX.
("<", ">"), ("<", ">"),
]), ],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/javascript.scm"), include_str!("../vendor/highlights/javascript.scm"),
@ -342,8 +338,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "JSON", name: "JSON",
language, language,
atom_nodes: (vec!["string"]).into_iter().collect(), atom_nodes: vec!["string"].into_iter().collect(),
delimiter_tokens: (vec![("{", "}"), ("[", "]")]), delimiter_tokens: vec![("{", "}"), ("[", "]")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/json.scm"), include_str!("../vendor/highlights/json.scm"),
@ -356,8 +352,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Lua", name: "Lua",
language, language,
atom_nodes: (vec!["string"]).into_iter().collect(), atom_nodes: vec!["string"].into_iter().collect(),
delimiter_tokens: (vec![("(", ")"), ("{", "}"), ("[", "]")]) delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")]
.into_iter() .into_iter()
.collect(), .collect(),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
@ -389,7 +385,7 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
name: "OCaml", name: "OCaml",
language, language,
atom_nodes: OCAML_ATOM_NODES.iter().copied().collect(), atom_nodes: OCAML_ATOM_NODES.iter().copied().collect(),
delimiter_tokens: (vec![("(", ")"), ("[", "]"), ("{", "}")]), delimiter_tokens: vec![("(", ")"), ("[", "]"), ("{", "}")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/ocaml.scm"), include_str!("../vendor/highlights/ocaml.scm"),
@ -403,7 +399,7 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
name: "OCaml Interface", name: "OCaml Interface",
language, language,
atom_nodes: OCAML_ATOM_NODES.iter().copied().collect(), atom_nodes: OCAML_ATOM_NODES.iter().copied().collect(),
delimiter_tokens: (vec![("(", ")"), ("[", "]"), ("{", "}")]), delimiter_tokens: vec![("(", ")"), ("[", "]"), ("{", "}")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/ocaml.scm"), include_str!("../vendor/highlights/ocaml.scm"),
@ -416,8 +412,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "PHP", name: "PHP",
language, language,
atom_nodes: (vec!["string"]).into_iter().collect(), atom_nodes: vec!["string"].into_iter().collect(),
delimiter_tokens: (vec![("(", ")"), ("[", "]"), ("{", "}")]), delimiter_tokens: vec![("(", ")"), ("[", "]"), ("{", "}")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/php.scm"), include_str!("../vendor/highlights/php.scm"),
@ -430,8 +426,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Python", name: "Python",
language, language,
atom_nodes: (vec!["string"]).into_iter().collect(), atom_nodes: vec!["string"].into_iter().collect(),
delimiter_tokens: (vec![("(", ")"), ("[", "]"), ("{", "}")]), delimiter_tokens: vec![("(", ")"), ("[", "]"), ("{", "}")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/python.scm"), include_str!("../vendor/highlights/python.scm"),
@ -444,10 +440,10 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Ruby", name: "Ruby",
language, language,
atom_nodes: (vec!["string", "heredoc_body", "regex"]) atom_nodes: vec!["string", "heredoc_body", "regex"]
.into_iter() .into_iter()
.collect(), .collect(),
delimiter_tokens: (vec![ delimiter_tokens: vec![
("{", "}"), ("{", "}"),
("(", ")"), ("(", ")"),
("[", "]"), ("[", "]"),
@ -455,7 +451,7 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
("def", "end"), ("def", "end"),
("begin", "end"), ("begin", "end"),
("class", "end"), ("class", "end"),
]), ],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/ruby.scm"), include_str!("../vendor/highlights/ruby.scm"),
@ -468,16 +464,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Rust", name: "Rust",
language, language,
atom_nodes: (vec!["char_literal", "string_literal"]) atom_nodes: vec!["char_literal", "string_literal"].into_iter().collect(),
.into_iter() delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]"), ("|", "|"), ("<", ">")],
.collect(),
delimiter_tokens: (vec![
("{", "}"),
("(", ")"),
("[", "]"),
("|", "|"),
("<", ">"),
]),
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/rust.scm"), include_str!("../vendor/highlights/rust.scm"),
@ -490,8 +478,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "Scala", name: "Scala",
language, language,
atom_nodes: (vec!["string", "template_string"]).into_iter().collect(), atom_nodes: vec!["string", "template_string"].into_iter().collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]")]), delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
include_str!("../vendor/highlights/scala.scm"), include_str!("../vendor/highlights/scala.scm"),
@ -504,10 +492,10 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "TypeScript", name: "TypeScript",
language, language,
atom_nodes: (vec!["string", "template_string", "regex"]) atom_nodes: vec!["string", "template_string", "regex"]
.into_iter() .into_iter()
.collect(), .collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")]), delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
concat!( concat!(
@ -523,8 +511,8 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
TreeSitterConfig { TreeSitterConfig {
name: "TypeScript TSX", name: "TypeScript TSX",
language, language,
atom_nodes: (vec!["string", "template_string"]).into_iter().collect(), atom_nodes: vec!["string", "template_string"].into_iter().collect(),
delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")]), delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")],
highlight_query: ts::Query::new( highlight_query: ts::Query::new(
language, language,
concat!( concat!(