Open
Conversation
Closes google#111
JeffFaer
requested changes
Feb 22, 2026
| } | ||
| } | ||
|
|
||
| for _, warn := range warnings { |
Collaborator
There was a problem hiding this comment.
Extract a logWarnings function to deduplicate this logic with fix
| } | ||
|
|
||
| gotOut2, _, exitCode2, err := runKeepSorted(strings.NewReader(gotOut)) | ||
| _, err = in.Seek(0, 0) |
Collaborator
There was a problem hiding this comment.
Let's just read in once and use bytes.NewReader when we run keep-sorted
| if err != nil { | ||
| t.Errorf("Had trouble running keep-sorted --mode diff: %v", err) | ||
| } | ||
| if diff := cmp.Diff(string(wantDiff), gotDiff); diff != "" { |
Collaborator
There was a problem hiding this comment.
I'm not sure I see a whole lot of value in writing down both the out and diff files. They should theoretically be derivable from each other
What do you think about instead of doing the comparison like this, we instead apply the output of the diff operation to the input and make sure we get the out file?
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/aymanbagabas/go-udiff" |
Collaborator
There was a problem hiding this comment.
TODO: I need to make sure this package is available internally. It probably is, but just leaving a note for myself next week
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR adds new
--mode diffand closes #111Example: