Skip to content

Commit

Permalink
Detect assignments in calls to avoid false positive lints
Browse files Browse the repository at this point in the history
  • Loading branch information
lionel- committed Nov 25, 2024
1 parent 586df40 commit e17c5d8
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 19 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

# 0.1.9000

## 2024-11

- LSP: Assignments in function calls (e.g. `list(x <- 1)`) are now detected by the missing symbol linter to avoid annoying false positive diagnostics (https://github.com/posit-dev/positron/issues/3048). The downside is that this causes false negatives when the assignment happens in a call with local scope, e.g. in `local()` or `test_that()`. We prefer to be overly permissive than overly cautious in these matters.


## 2024-10

- Objects assigned at top level are now indexed, in addition to assigned functions. When a name is assigned multiple times, we now only index the first occurrence. This allows you to jump to the first "declaration" of the variable. In the future we'll improve this mechanism so that you can jump to the most recent assignment.
Expand Down
89 changes: 70 additions & 19 deletions crates/ark/src/lsp/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -785,9 +785,24 @@ fn recurse_call_arguments_default(
// TODO: Can we better handle NSE in things like `quote()` and
// `dplyr::mutate()` so we don't have to turn off certain diagnostics when
// we are inside a call's arguments?
let mut context = context.clone();

// We used to clone `context` here to prevent assignments from applying to
// the caller. We now purposely preserve the caller's context with its
// `document_symbols`. We explicitly want to index symbols assigned in the
// call arguments to avoid false positive lints about missing symbols, see
// https://github.com/posit-dev/positron/issues/3048.
//
// Because of the way we traverse the syntax tree, this makes the assumption
// that execution order is deterministic from left to right. This is not
// necessarily correct since arguments are lazily evaluated, and whether
// this is true depends on the function's implementation. For now we assume
// every function behaves like `list()`, which is our default model of
// strict evaluation.

// Save `in_call` to restore it on exit. Necessary to handle nested calls
// and maintain the state to `true` until we've left the outermost call.
let in_call = context.in_call;
context.in_call = true;
let context = &mut context;

// Recurse into arguments.
if let Some(arguments) = node.child_by_field_name("arguments") {
Expand All @@ -804,6 +819,7 @@ fn recurse_call_arguments_default(
}
}

context.in_call = in_call;
().ok()
}

Expand Down Expand Up @@ -1311,11 +1327,7 @@ foo
let document = Document::new(code, None);

let diagnostics = generate_diagnostics(document.clone(), DEFAULT_STATE.clone());
assert_eq!(diagnostics.len(), 1);

let diagnostic = diagnostics.get(0).unwrap();
assert_eq!(diagnostic.range.start.line, 2);
insta::assert_snapshot!(diagnostic.message);
assert_eq!(diagnostics.len(), 0);
})
}

Expand All @@ -1331,31 +1343,70 @@ foo
let document = Document::new(code, None);

let diagnostics = generate_diagnostics(document.clone(), DEFAULT_STATE.clone());
assert_eq!(diagnostics.len(), 1);

let diagnostic = diagnostics.get(0).unwrap();
assert_eq!(diagnostic.range.start.line, 2);
insta::assert_snapshot!(diagnostic.message);
assert_eq!(diagnostics.len(), 0);
})
}

#[test]
fn test_assignment_within_function_arguments() {
// TODO: `x` should be defined in the global env and there should not be a diagnostic here
fn test_assignment_within_call() {
// https://github.com/posit-dev/positron/issues/3048
// With our current approach we also incorrectly index symbols in calls
// with local scopes such as `local()` or `test_that()`. We prefer to be
// overly permissive than the opposite to avoid annoying false positive
// diagnostics.
r_task(|| {
let code = "
list(x <- 1)
x
";
let document = Document::new(code, None);

assert_eq!(
generate_diagnostics(document.clone(), DEFAULT_STATE.clone()).len(),
0
);

let code = "
list({ x <- 1 })
x
";
let document = Document::new(code, None);

assert_eq!(
generate_diagnostics(document.clone(), DEFAULT_STATE.clone()).len(),
0
);
})
}

#[test]
fn test_no_symbol_diagnostics_in_calls() {
// For now we never check for missing symbols inside calls because we
// don't have a good way to deal with NSE in functions like `quote()` or
// `mutate()`.
r_task(|| {
let code = "
list(x)
";
let document = Document::new(code, None);

let diagnostics = generate_diagnostics(document.clone(), DEFAULT_STATE.clone());
assert_eq!(diagnostics.len(), 1);
assert_eq!(
generate_diagnostics(document.clone(), DEFAULT_STATE.clone()).len(),
0
);

let diagnostic = diagnostics.get(0).unwrap();
assert_eq!(diagnostic.range.start.line, 2);
insta::assert_snapshot!(diagnostic.message);
// Important to test nested case. We have a dynamic stack of state
// variable to keep track of whether we are in a call. The inner
// call should restore the outer state on exit.
let code = "
list(list(), x)
";
let document = Document::new(code, None);

assert_eq!(
generate_diagnostics(document.clone(), DEFAULT_STATE.clone()).len(),
0
);
})
}
}

0 comments on commit e17c5d8

Please sign in to comment.