hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Have the extract function create the TS parser object

Browse Source
This commit is contained in:
Nick Rolfe
2021-01-07 10:56:23 +00:00
parent bf4eac5113
commit bb2bdc01b5
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extractor/src/extractor.rs
View File

@@ -4,7 +4,7 @@ use std::collections::BTreeSet as Set;
use std::fmt;
use std::path::Path;
use tracing::{error, info, span, Level};
use tree_sitter::{Node, Parser, Tree};
use tree_sitter::{Language, Node, Parser, Tree};
struct TrapWriter {
/// The accumulated trap entries
@@ -149,7 +149,7 @@ impl TrapWriter {
}
/// Extracts the source file at `path`, which is assumed to be canonicalized.
pub fn extract(parser: &mut Parser, schema: &NodeTypeMap, path: &Path) -> std::io::Result<Program> {
pub fn extract(language: Language, schema: &NodeTypeMap, path: &Path) -> std::io::Result<Program> {
let span = span!(
Level::TRACE,
"extract",
@@ -160,6 +160,8 @@ pub fn extract(parser: &mut Parser, schema: &NodeTypeMap, path: &Path) -> std::i
info!("extracting: {}", path.display());
let mut parser = Parser::new();
parser.set_language(language).unwrap();
let source = std::fs::read(&path)?;
let tree = parser.parse(&source, None).expect("Failed to parse file");
let mut trap_writer = new_trap_writer();