bugfix: update no longer tries to put non-test watches into the namespace #4454
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
mitchellwrosen
commented
Nov 30, 2023
| goTerm (_, r, Nothing, tm, tp) = putTerm c r tm tp | ||
| goTerm (_, r, Just WK.TestWatch, tm, tp) = putTerm c r tm tp | ||
| goTerm _ = pure () | ||
| goTerm (_, r, wk, tm, tp) = when (WK.watchKindShouldBeStoredInDatabase wk) (putTerm c r tm tp) |
There was a problem hiding this comment.
refactor, no change in behavior
mitchellwrosen
commented
Nov 30, 2023
| in [ BranchUtil.makeAnnihilateTermName split, | ||
| BranchUtil.makeAddTermName split (Referent.fromTermReferenceId ref) Map.empty | ||
| ] | ||
| & foldMap \(var, (_, ref, wk, _, _)) -> |
There was a problem hiding this comment.
this is the bugfix. before, we didn't look at wk. now, we do.
mitchellwrosen
commented
Nov 30, 2023
| where | ||
| terms = keysToNames $ UF.hashTermsId tuf | ||
| terms = | ||
| UF.hashTermsId tuf |
There was a problem hiding this comment.
there was a similar issue here in just extracting type/term names; I'm not sure if it directly contributed to the crash, but we simply don't want watches that aren't "test" watches here, either.
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.
Overview
Fixes #4438
Implementation notes
updateno longer tries to put all terms found in a Unison file into the namespace: just those that either don't have a watch kind, or those whose watch kind is"test".Test coverage
Transcript included.
Loose ends
The same bug still exists in
addandupdate.old. Fixing it inupdateunfortunately didn't fix it over there for free.