cleanup: UnlinkI and LinkI argument order matches input pattern now

This commit is contained in:
Paul Chiusano 2020-03-18 22:25:29 -04:00
parent 083ed75f3e
commit 5ef65ffd75
4 changed files with 12 additions and 13 deletions

View File

@ -360,9 +360,9 @@ loop = do
PropagatePatchI p scope -> "patch " <> ps' p <> " " <> p' scope
UndoI{} -> "undo"
ExecuteI s -> "execute " <> Text.pack s
LinkI defs md ->
LinkI md defs ->
"link " <> HQ.toText md <> " " <> intercalateMap " " hqs' defs
UnlinkI defs md ->
UnlinkI md defs ->
"unlink " <> HQ.toText md <> " " <> intercalateMap " " hqs' defs
UpdateBuiltinsI -> "builtins.update"
MergeBuiltinsI -> "builtins.merge"
@ -902,10 +902,10 @@ loop = do
-- | r <- toList $ Names.typesNamed ns name ]
-- in (terms, types)
LinkI srcs mdValue ->
LinkI mdValue srcs ->
manageLinks srcs mdValue Metadata.insert
UnlinkI srcs mdValue ->
UnlinkI mdValue srcs ->
manageLinks srcs mdValue Metadata.delete
-- > links List.map (.Docs .English)

View File

@ -109,10 +109,10 @@ data Input
| ExecuteI String
| TestI Bool Bool -- TestI showSuccesses showFailures
-- metadata
-- `link definitions metadata` (adds metadata to all of `definitions`)
| LinkI [Path.HQSplit'] HQ.HashQualified
-- `unlink definitions metadata` (removes metadata from all of `definitions`)
| UnlinkI [Path.HQSplit'] HQ.HashQualified
-- `link metadata definitions` (adds metadata to all of `definitions`)
| LinkI HQ.HashQualified [Path.HQSplit']
-- `unlink metadata definitions` (removes metadata from all of `definitions`)
| UnlinkI HQ.HashQualified [Path.HQSplit']
-- links from <type>
| LinksI Path.HQSplit' (Maybe String)
| DisplayI OutputLocation String

View File

@ -2,7 +2,6 @@
{-# LANGUAGE PartialTypeSignatures #-}
{-# LANGUAGE ViewPatterns #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE OverloadedStrings #-}
module Unison.Codebase.Editor.Output.BranchDiff where

View File

@ -1034,11 +1034,11 @@ link = InputPattern
)
(\case
md : defs -> first fromString $ do
defs <- traverse Path.parseHQSplit' defs
md <- case HQ.fromString md of
Nothing -> Left "Invalid hash qualified identifier for metadata."
Just hq -> pure hq
Right $ Input.LinkI defs md
defs <- traverse Path.parseHQSplit' defs
Right $ Input.LinkI md defs
_ -> Left (I.help link)
)
@ -1073,11 +1073,11 @@ unlink = InputPattern
])
(\case
md : defs -> first fromString $ do
defs <- traverse Path.parseHQSplit' defs
md <- case HQ.fromString md of
Nothing -> Left "Invalid hash qualified identifier for metadata."
Just hq -> pure hq
Right $ Input.UnlinkI defs md
defs <- traverse Path.parseHQSplit' defs
Right $ Input.UnlinkI md defs
_ -> Left (I.help unlink)
)