More stringent ast.ref_to_string #1106
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
While I started looking into #1104 I encountered some cases where `ast.ref_to_string`, and it's `static` counterpart would return wrong representations. We already had a bit of a homegrown format, which was convenient for some things, but would also leak out in places where it shouldn't be. Now use the same format as OPA for representing refs as strings. Also added the query in error messages where we fail to prepare or eval in a couple of places, as the lack of those made debugging this issue much harder than it had to be. Signed-off-by: Anders Eknert <[email protected]>
johanfylling
approved these changes
Sep 12, 2024
| @@ -575,7 +575,7 @@ func (l *LanguageServer) StartCommandWorker(ctx context.Context) { // nolint:mai | |||
|
|
|||
| responseParams := map[string]any{ | |||
| "type": "opa-debug", | |||
| "name": "Debug " + path, | |||
| rs := ref_to_string(ref) | ||
| ss := substring(rs, 0, indexof(rs, ".$")) | ||
| str := _trim_from_var(rs, regex.find_n(`\[[^"]`, rs, 1)) |
There was a problem hiding this comment.
What if the ref is foo.bar[7]? Or this isn't expected?
There was a problem hiding this comment.
Yeah, for our purposes now, I think we'll want to eval only up to the first non-stringy path. But we can change that later.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While I started looking into #1104 I encountered some cases where
ast.ref_to_string, and it'sstaticcounterpart would return wrong representations. We already had a bit of a homegrown format, which was convenient for some things, but would also leak out in places where it shouldn't be. Now use the same format as OPA for representing refs as strings.Also added the query in error messages where we fail to prepare or eval in a couple of places, as the lack of those made debugging this issue much harder than it had to be.