Fix diffs for lists #1213
Merged
Fix diffs for lists #1213
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
Fixes #1211 The original implementation of diffing two lists in #450 attempted to add a special case in the logic for when the list had no common elements. However, this led to a bug where the two lists would display different if they were both empty. lists would never render. This change fixes that by removing the special case. The new output for the linked example is: ``` Use "dhall --explain" for detailed errors Error: Assertion failed [ … , - 1 , … , + 55 ] 16│ assert : fibs 10 ≡ [ 0, 1, 2, 3, 5, 8, 13, 21, 34, 55 ] 17│ (stdin):16:16 ```
sjakobi
approved these changes
Aug 7, 2019
Gabriella439
added a commit
that referenced
this pull request
Aug 29, 2019
This is essentially the exact same problem and fix as #1213 Normally I would add a test, except that our test suite for diffs doesn't yet support escape codes. However, the basic problem was the following output: ``` $ dhall diff '"1"' '"2"' - "…" + "…" ``` ... which now displays (with color highlighting) this output: ``` $ dhall diff '"1"' '"2"' "12" -- Imagine that the 1 is red and the 2 is green ```
mergify bot
pushed a commit
that referenced
this pull request
Aug 29, 2019
This is essentially the exact same problem and fix as #1213 Normally I would add a test, except that our test suite for diffs doesn't yet support escape codes. However, the basic problem was the following output: ``` $ dhall diff '"1"' '"2"' - "…" + "…" ``` ... which now displays (with color highlighting) this output: ``` $ dhall diff '"1"' '"2"' "12" -- Imagine that the 1 is red and the 2 is green ```
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.
Fixes #1211
The original implementation of diffing two lists in #450 attempted to add a
special case in the logic for when the list had no common elements.
However, this led to a bug where the two lists would display different
if they were both empty.
A followup change in #740 tried to fix the problem, but introduced a new
issue where different lists would now never render the elements that differed.
This change fixes that by removing the special case.
The new output for the linked example is: