Skip to content

Handle newlines in diffs #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Handle newlines in diffs #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56c8680
Bump unison to newline aware differ
ChrisPenner Oct 23, 2025
af7e36b
Use new decl incoherency checker
ChrisPenner Oct 23, 2025
ec5fb7f
Update transcripts
ChrisPenner Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Share/NamespaceDiffs.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import Unison.Codebase.Path (Path)
import Unison.Codebase.Path qualified as Path
import Unison.Codebase.SqliteCodebase.Conversions qualified as Cv
import Unison.DataDeclaration (Decl)
import Unison.DeclCoherencyCheck (checkDeclCoherency, lenientCheckDeclCoherency)
import Unison.DeclCoherencyCheck (asOneRandomIncoherentDeclReason, checkAllDeclCoherency, lenientCheckDeclCoherency)
import Unison.LabeledDependency (LabeledDependency)
import Unison.Merge qualified as Merge
import Unison.Merge.EitherWay qualified as EitherWay
Expand Down Expand Up @@ -262,8 +262,8 @@ computeThreeWayNamespaceDiff codebaseEnvs2 aliceCodeCache bobCodeCache branchHas
PG.transactionSpan "check decl coherency" mempty do
sequence $
( \v c e ->
checkDeclCoherency v.nametree c
& mapLeft (IncoherentDecl . e)
checkAllDeclCoherency v.nametree c
& mapLeft (IncoherentDecl . e . asOneRandomIncoherentDeclReason)
& liftEither
)
<$> ThreeWay.forgetLca defns
Expand Down
Loading
Loading