Include original text in annotation location text attribute #6808
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
Previously it would just say '# METADATA' Fixes open-policy-agent#6779 Signed-off-by: Anders Eknert <anders@styra.com>
srenatus
reviewed
Jun 11, 2024
Comment on lines
+2381
to
+2387
| lines := bytes.Split(b.buf.Bytes(), []byte{'\n'}) | ||
|
|
||
| for _, line := range lines[:len(lines)-1] { | ||
| sb.WriteString("# ") | ||
| sb.Write(line) | ||
| sb.WriteByte('\n') | ||
| } |
There was a problem hiding this comment.
Is this not the same as replacing every "\n" with "\n# "? like, strings.ReplaceAll? Extra care needs to be applied for the last one... maybe it's a useless optimization 🤷
There was a problem hiding this comment.
Yeah, I hadn't considered that. Will do for next time, but feels like both are OK in this location.
There was a problem hiding this comment.
Also care would need to be applied for the first line, as it'll need a `# ' too, but isn't preceeded by a newline.
There was a problem hiding this comment.
This works, but while it's likely faster, I'm not so sure about readability:
block := []byte("# METADATA\n# ")
block = append(block, bytes.TrimSuffix(
bytes.ReplaceAll(b.buf.Bytes(), []byte{'\n'}, []byte{'\n', '#', ' '}),
[]byte{'\n', '#', ' '})...,
)
result.Location.Text = blockwhich one do you prefer?
srenatus
approved these changes
Jun 11, 2024
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.
Previously it would just say '# METADATA'
Fixes #6779