hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ruby: reduce number of diagnostic messages with the status_page flag

Browse Source 
For now we only report real parse errors and character encoding errors. Warnings about
unexpected or missing nodes in the AST are not reported. These are typically side effects
of earlier parse errors.
This commit is contained in:
Arthur Baars
2023-02-10 18:53:37 +01:00
parent d55e9d5dac
commit ecbd768df4
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ruby/extractor/src/extractor.rs
View File

@@ -274,7 +274,12 @@ impl<'a> Visitor<'a> {
);
}
fn record_parse_error_for_node(&mut self, error_message: String, node: Node) {
fn record_parse_error_for_node(
&mut self,
error_message: String,
node: Node,
status_page: bool,
) {
let (start_line, start_column, end_line, end_column) = location_for(self, node);
let loc = location(
self.trap_writer,
@@ -284,14 +289,16 @@ impl<'a> Visitor<'a> {
end_line,
end_column,
);
self.record_parse_error(
loc,
self.diagnostics_writer
.message("parse-error", "Parse error")
.severity(diagnostics::Severity::Error)
.location(self.path, start_line, start_column, end_line, end_column)
.text(&error_message),
);
let mut mesg = self
.diagnostics_writer
.message("parse-error", "Parse error");
&mesg.severity(diagnostics::Severity::Error)
.location(self.path, start_line, start_column, end_line, end_column)
.text(&error_message);
if status_page {
&mesg.status_page();
}
self.record_parse_error(loc, &mesg);
}
fn enter_node(&mut self, node: Node) -> bool {
@@ -301,7 +308,7 @@ impl<'a> Visitor<'a> {
} else {
"parse error".to_string()
};
self.record_parse_error_for_node(error_message, node);
self.record_parse_error_for_node(error_message, node, true);
return false;
}
@@ -390,8 +397,7 @@ impl<'a> Visitor<'a> {
.message("parse-error", "Parse error")
.severity(diagnostics::Severity::Error)
.location(self.path, start_line, start_column, end_line, end_column)
.text(&error_message)
.status_page(),
.text(&error_message),
);
valid = false;
@@ -446,7 +452,7 @@ impl<'a> Visitor<'a> {
child_node.type_name,
field.type_info
);
self.record_parse_error_for_node(error_message, *node);
self.record_parse_error_for_node(error_message, *node,false);
}
} else if child_node.field_name.is_some() || child_node.type_name.named {
let error_message = format!(
@@ -455,7 +461,7 @@ impl<'a> Visitor<'a> {
&child_node.field_name.unwrap_or("child"),
&child_node.type_name
);
self.record_parse_error_for_node(error_message, *node);
self.record_parse_error_for_node(error_message, *node, false);
}
}
let mut args = Vec::new();
@@ -478,7 +484,7 @@ impl<'a> Visitor<'a> {
node.kind(),
column_name
);
self.record_parse_error_for_node(error_message, *node);
self.record_parse_error_for_node(error_message, *node, false);
}
}
Storage::Table {
@@ -494,7 +500,7 @@ impl<'a> Visitor<'a> {
table_name,
);
self.record_parse_error_for_node(error_message, *node);
self.record_parse_error_for_node(error_message, *node, false);
break;
}
let mut args = vec![trap::Arg::Label(parent_id)];
@@ -593,7 +599,6 @@ fn location_for(visitor: &mut Visitor, n: Node) -> (usize, usize, usize, usize)
.diagnostics_writer
.message("internal-error", "Internal error")
.text("expecting a line break symbol, but none found while correcting end column value")
.status_page()
.severity(diagnostics::Severity::Error),
);
}
@@ -613,7 +618,6 @@ fn location_for(visitor: &mut Visitor, n: Node) -> (usize, usize, usize, usize)
index,
source.len()
))
.status_page()
.severity(diagnostics::Severity::Error),
);
}

2
ruby/extractor/src/main.rs
View File

@@ -75,7 +75,6 @@ fn main() -> std::io::Result<()> {
main_thread_logger
.message("configuration-error", "Configuration error")
.text(&format!("{}; defaulting to 1 thread.", e))
.status_page()
.severity(diagnostics::Severity::Warning),
);
1
@@ -97,7 +96,6 @@ fn main() -> std::io::Result<()> {
main_thread_logger
.message("configuration-error", "Configuration error")
.text(&format!("{}; using gzip.", e))
.status_page()
.severity(diagnostics::Severity::Warning),
);
trap::Compression::Gzip