Revert "Try to do less work during capture discovery (#5560)" (#5561)

This reverts commit 5d40fc2726.
This commit is contained in:
JT 2022-05-17 10:49:59 +12:00 committed by GitHub
parent 5d40fc2726
commit e192684612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4924,9 +4924,7 @@ pub fn discover_captures_in_expr(
output.extend(&result);
}
Expr::Block(block_id) => {
if !seen_blocks.contains_key(block_id) {
let block = working_set.get_block(*block_id);
seen_blocks.insert(*block_id, vec![]);
let results = {
let mut seen = vec![];
discover_captures_in_block(working_set, block, &mut seen, seen_blocks)
@ -4938,7 +4936,6 @@ pub fn discover_captures_in_expr(
}
}
}
}
Expr::Binary(_) => {}
Expr::Bool(_) => {}
Expr::Call(call) => {
@ -5076,9 +5073,7 @@ pub fn discover_captures_in_expr(
}
}
Expr::RowCondition(block_id) | Expr::Subexpression(block_id) => {
if !seen_blocks.contains_key(block_id) {
let block = working_set.get_block(*block_id);
seen_blocks.insert(*block_id, vec![]);
let results = {
let mut seen = vec![];
discover_captures_in_block(working_set, block, &mut seen, seen_blocks)
@ -5090,7 +5085,6 @@ pub fn discover_captures_in_expr(
}
}
}
}
Expr::Table(headers, values) => {
for header in headers {
let result = discover_captures_in_expr(working_set, header, seen, seen_blocks);