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

Address review comment

Browse Source
This commit is contained in:
Arthur Baars
2025-03-10 10:31:31 +01:00
parent f17f3758ed
commit 9814aef71f
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rust/extractor/src/crate_graph.rs
View File

@@ -6,7 +6,6 @@ use chalk_ir::IntTy;
use chalk_ir::Scalar;
use chalk_ir::UintTy;
use chalk_ir::{FloatTy, Safety};
use codeql_extractor::trap::Location;
use itertools::Itertools;
use ra_ap_base_db::CrateGraph;
use ra_ap_base_db::CrateId;
@@ -78,7 +77,7 @@ pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootData
continue;
}
let krate = &crate_graph[krate_id];
let module = emit_module(
let root_module = emit_module(
&crate_graph,
db,
db.crate_def_map(krate_id).as_ref(),
@@ -86,21 +85,8 @@ pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootData
DefMap::ROOT,
&mut trap,
);
let file_label = trap.emit_file(root_module_file).as_untyped();
let location_label = codeql_extractor::extractor::location_label(
&mut trap.writer,
Location {
file_label,
start_line: 0,
start_column: 0,
end_line: 0,
end_column: 0,
},
);
trap.writer.add_tuple(
"locatable_locations",
vec![module.into(), location_label.into()],
);
let file_label = trap.emit_file(root_module_file);
trap.emit_file_only_location(file_label, root_module);
let element = generated::Crate {
id: trap::TrapId::Key(format!("{}:{hash}", root_module_file.display())),
@@ -109,7 +95,7 @@ pub fn extract_crate_graph(trap_provider: &trap::TrapFileProvider, db: &RootData
.as_ref()
.map(|x| x.canonical_name().to_string()),
version: krate.version.to_owned(),
module: Some(module),
module: Some(root_module),
cfg_options: krate
.cfg_options
.as_ref()

20
rust/extractor/src/trap.rs
View File

@@ -171,6 +171,26 @@ impl TrapFile {
);
}
pub fn emit_file_only_location<E: TrapClass>(
&mut self,
file_label: Label<generated::File>,
entity_label: Label<E>,
) {
let location_label = extractor::location_label(
&mut self.writer,
trap::Location {
file_label: file_label.as_untyped(),
start_line: 0,
start_column: 0,
end_line: 0,
end_column: 0,
},
);
self.writer.add_tuple(
"locatable_locations",
vec![entity_label.into(), location_label.into()],
);
}
pub fn emit_diagnostic(
&mut self,
severity: DiagnosticSeverity,