Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable inlay hints under ghost location #1290

Merged
merged 3 commits into from
May 29, 2024

Conversation

awilliambauer
Copy link
Contributor

Inlay hints are both noisy and useless when applied to generated code. Examples include lots of unnecessary hints on the fields of a record definition that derives things like sexp or fields, or confusing annotations on format strings using !.

All the generated code exists under typedtree nodes with ghost locations. This PR changes the inlay hint logic to stop iterating over the typedtree when it sees an expression or a structure item with a ghost location.

xvw
xvw approved these changes May 21, 2024
@rgrinberg
Copy link
Member

Somehow this drops all the inlay hints in all of our tests. Those shouldn't be ghost locs.

@@ -56,6 +56,8 @@ let hint_binding_iter ?(hint_let_bindings = false)
| Texp_match (expr, cases, _) ->
iter.expr iter expr;
List.iter cases ~f:(case hint_pattern_variables iter)
(* Stop iterating when we see a ghost location to avoid annotating generated code *)
| _ when e.exp_loc.loc_ghost -> ()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the case be above the Tstr_match and continue iteration with the default iterator?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What makes you say that? Continuing with the default iterator will create inlay hints on the generated code.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right!
Wouldn't it be possible for this to break the test suite because it's expressed in ‘expected’ tests, which de facto gives them a ghost location?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems to be what's happening. When I build within Jane Street, the tests work fine (presumably because the document is created with non-ghost locations), but building with external libraries causes this issue where the test document has ghost locations. I'm trying to track down the source of the difference.

_
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
_
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg rgrinberg added this to the 1.18.0 milestone May 29, 2024
@rgrinberg
Copy link
Member

Okay, I disabled this fix in the tests. LGTM

@rgrinberg rgrinberg merged commit 2b301dd into ocaml:master May 29, 2024
9 checks passed
@coveralls
Copy link

Pull Request Test Coverage Report for Build 4284

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 0 of 2 (0.0%) changed or added relevant lines in 1 file are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage decreased (-0.002%) to 21.789%

Changes Missing Coverage Covered Lines Changed/Added Lines %
ocaml-lsp-server/src/inlay_hints.ml 0 2 0.0%
Files with Coverage Reduction New Missed Lines %
ocaml-lsp-server/src/inlay_hints.ml 1 77.61%
Totals Coverage Status
Change from base Build 4270: -0.002%
Covered Lines: 5345
Relevant Lines: 24531

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants