unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-08-15 13:30:27 +03:00
Code Issues Projects Releases Wiki Activity

adjust some output

Browse Source
This commit is contained in:
Mitchell Rosen 2024-07-09 18:19:32 -04:00
parent 8ff7e6d92d
commit 1e5b925bca
2 changed files with 65 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
unison-cli/src/Unison/CommandLine/OutputMessages.hs
View File

@ -2686,7 +2686,7 @@ handleTodoOutput todo
& P.syntaxToColor
pure (formatNum n <> name)
pure $
P.wrap "These terms call `todo`."
P.wrap "These terms call `todo`:"
<> P.newline
<> P.newline
<> P.indentN 2 (P.lines terms)
@ -2700,7 +2700,7 @@ handleTodoOutput todo
n <- addNumberedArg (SA.HashQualified (HQ.HashOnly (Reference.toShortHash term)))
pure (formatNum n <> P.syntaxToColor (prettyReference todo.hashLen term))
pure $
P.wrap "These terms do not have any names in the current namespace."
P.wrap "These terms do not have any names in the current namespace:"
<> P.newline
<> P.newline
<> P.indentN 2 (P.lines terms)
@ -2714,7 +2714,7 @@ handleTodoOutput todo
n <- addNumberedArg (SA.HashQualified (HQ.HashOnly (Reference.toShortHash typ)))
pure (formatNum n <> P.syntaxToColor (prettyReference todo.hashLen typ))
pure $
P.wrap "These types do not have any names in the current namespace."
P.wrap "These types do not have any names in the current namespace:"
<> P.newline
<> P.newline
<> P.indentN 2 (P.lines types)
@ -2765,33 +2765,47 @@ handleTodoOutput todo
& map
( \(typeName, prettyCon1, prettyCon2) ->
-- Note [ConstructorAliasMessage] If you change this, also change the other similar one
P.wrap
( "The type"
<> prettyName typeName
<> "has a constructor with multiple names. Please delete all but one name for each"
<> "constructor."
)
P.wrap ("The type" <> prettyName typeName <> "has a constructor with multiple names.")
<> P.newline
<> P.newline
<> P.indentN 2 (P.lines [prettyCon1, prettyCon2])
<> P.newline
<> P.newline
<> P.wrap "Please delete all but one name for each constructor."
)
& P.sep "\n\n"
prettyMissingConstructorNames <-
case todo.incoherentDeclReasons.missingConstructorNames of
[] -> pure mempty
types0 -> do
types1 <-
case NEList.nonEmpty todo.incoherentDeclReasons.missingConstructorNames of
Nothing -> pure mempty
Just types0 -> do
stuff <-
for types0 \typ -> do
n <- addNumberedArg (SA.Name typ)
pure (formatNum n <> prettyName typ)
pure (n, typ)
-- Note [MissingConstructorNameMessage] If you change this, also change the other similar one
pure $
P.wrap
"These types have some constructors with missing names."
<> P.newline
<> P.newline
<> P.indentN 2 (P.lines types1)
<> P.indentN 2 (P.lines (fmap (\(n, typ) -> formatNum n <> prettyName typ) stuff))
<> P.newline
<> P.newline
<> P.wrap
( "You can use"
<> IP.makeExample
IP.view
[ let firstNum = fst (NEList.head stuff)
lastNum = fst (NEList.last stuff)
in if firstNum == lastNum
then P.string (show firstNum)
else P.string (show firstNum) <> "-" <> P.string (show lastNum)
]
<> "and"
<> IP.makeExample IP.aliasTerm ["<hash>", "<TypeName>.<ConstructorName>"]
<> "to give names to each unnamed constructor."
)
prettyNestedDeclAliases <-
case todo.incoherentDeclReasons.nestedDeclAliases of
@ -2820,20 +2834,33 @@ handleTodoOutput todo
prettyStrayConstructors <-
case todo.incoherentDeclReasons.strayConstructors of
[] -> pure mempty
constructors0 -> do
constructors1 <-
for constructors0 \constructor -> do
n <- addNumberedArg (SA.Name constructor)
pure (formatNum n <> prettyName constructor)
constructors -> do
nums <-
for constructors \constructor -> do
addNumberedArg (SA.Name constructor)
-- Note [StrayConstructorMessage] If you change this, also change the other similar one
pure $
P.wrap
( "These constructors are not nested beneath their corresponding type names. Please either move or"
<> "delete them."
)
P.wrap "These constructors are not nested beneath their corresponding type names:"
<> P.newline
<> P.newline
<> P.indentN 2 (P.lines constructors1)
<> P.indentN
2
( P.lines
( zipWith
(\n constructor -> formatNum n <> prettyName constructor)
nums
constructors
)
)
<> P.newline
<> P.newline
<> P.wrap
( "For each one, please either use"
<> IP.makeExample' IP.moveAll
<> "to move if, or if it's an extra copy, you can simply"
<> IP.makeExample' IP.delete
<> "it."
)
(pure . P.sep "\n\n" . P.nonEmpty)
[ prettyDependentsOfTodo,

18
unison-src/transcripts/todo.output.md
View File

@ -44,7 +44,7 @@ scratch/main> add
scratch/main> todo
These terms call `todo`.
These terms call `todo`:
1. foo
@ -95,7 +95,7 @@ scratch/main> delete.namespace.force foo
scratch/main> todo
These terms do not have any names in the current namespace.
These terms do not have any names in the current namespace:
1. #1jujb8oelv
@ -215,11 +215,12 @@ scratch/main> alias.term Foo.One Foo.Two
scratch/main> todo
The type Foo has a constructor with multiple names. Please
delete all but one name for each constructor.
The type Foo has a constructor with multiple names.
1. Foo.One
2. Foo.Two
Please delete all but one name for each constructor.
```
# Missing constructor names
@ -259,6 +260,10 @@ scratch/main> todo
These types have some constructors with missing names.
1. Foo
You can use `view 1` and
`alias.term <hash> <TypeName>.<ConstructorName>` to give names
to each unnamed constructor.
```
# Nested decl aliases
@ -336,8 +341,11 @@ scratch/main> alias.term Foo.Bar Baz
scratch/main> todo
These constructors are not nested beneath their corresponding
type names. Please either move or delete them.
type names:
1. Baz
For each one, please either use `move` to move if, or if it's
an extra copy, you can simply `delete` it.
```