traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(loader): add error message when a tree-sitter.json file is invalid

Browse source 
(cherry picked from commit 7b90dbf189)
This commit is contained in:
Will Lillis 2024-11-09 20:46:29 -05:00 • committed by Amaan Qureshi
parent 28cbc771f1
commit 340d3eeb41
No known key found for this signature in database
GPG key ID: E67890ADC4227273
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli/loader/src/lib.rs
View file

@ -146,8 +146,10 @@ pub struct TreeSitterJSON {
}
impl TreeSitterJSON {
pub fn from_file(path: &Path) -> Option<Self> {
serde_json::from_str(&fs::read_to_string(path.join("tree-sitter.json")).ok()?).ok()
pub fn from_file(path: &Path) -> Result<Self> {
Ok(serde_json::from_str(&fs::read_to_string(
path.join("tree-sitter.json"),
)?)?)
}
pub fn has_multiple_language_configs(&self) -> bool {
@ -1115,7 +1117,8 @@ impl Loader {
) -> Result<&[LanguageConfiguration]> {
let initial_language_configuration_count = self.language_configurations.len();
if let Some(config) = TreeSitterJSON::from_file(parser_path) {
let ts_json = TreeSitterJSON::from_file(parser_path);
if let Ok(config) = ts_json {
let language_count = self.languages_by_id.len();
for grammar in config.grammars {
// Determine the path to the parser directory. This can be specified in
@ -1206,6 +1209,11 @@ impl Loader {
Some(self.language_configurations.len() - 1);
}
}
} else if let Err(e) = ts_json {
eprintln!(
"Warning: Failed to read {} -- {e}",
parser_path.join("tree-sitter.json").display()
);
}
// If we didn't find any language configurations in the tree-sitter.json file,