8000 `ls` wasn't displaying patches, + cleanup by aryairani · Pull Request #1170 · unisonweb/unison · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

ls wasn't displaying patches, + cleanup #1170

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

Merged
merged 1 commit into from
Jan 22, 2020
Merged

ls wasn't displaying patches, + cleanup #1170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{-# OPTIONS_GHC -Wno-partial-type-signatures #-}
{-# OPTIONS_GHC -Wno-unused-top-binds #-} -- todo: delete
{-# OPTIONS_GHC -Wno-unused-local-binds #-} -- todo: delete

{-# LANGUAGE ApplicativeDo #-}
{-# LANGUAGE OverloadedStrings #-}
Expand Down Expand Up @@ -574,11 +573,6 @@ loop = do
if failed == mempty then do
stepAt $ BranchUtil.makeSetBranch (resolveSplit' p) Branch.empty
-- Looks similar to the 'toDelete' above... investigate me! ;)
let deletedNames =
Names.prefix0
(Path.toName' (Path.unsplit' p))
(Branch.toNames0 b)
diff = Names3.diff0 deletedNames mempty
diffHelper b Branch.empty0 >>=
respondNumbered
. uncurry (ShowDiffAfterDeleteBranch
Expand Down Expand Up @@ -895,7 +889,6 @@ loop = do
defnCount b =
(R.size . deepTerms $ Branch.head b) +
(R.size . deepTypes $ Branch.head b)
patchCount b = (length . deepEdits $ Branch.head b)

termEntries <- for (R.toList . Star3.d1 $ _terms b0) $
\(r, ns) -> do
Expand All @@ -913,7 +906,7 @@ loop = do
| (ns, (_h, _mp)) <- Map.toList $ _edits b0 ]
let
entries :: [ShallowListEntry v Ann]
entries = sort $ termEntries ++ typeEntries ++ branchEntries
entries = sort $ termEntries ++ typeEntries ++ branchEntries ++ patchEntries
entryToHQString :: ShallowListEntry v Ann -> String
-- caching the result as an absolute path, for easier jumping around
entryToHQString e = fixup $ case e of
Expand Down
0