Commit Graph

5780 Commits

Author SHA1 Message Date
Paul Chiusano
95b8517bb1 display gets same treatment 2020-03-19 14:30:30 -04:00
Paul Chiusano
781b2ad5d7 Fix #1241 2020-03-19 14:18:56 -04:00
Rúnar
872c8e9ddf
Merge pull request #1353 from unisonweb/update-pr-template
Add title guidelines to PR template
2020-03-12 16:04:02 -04:00
Rúnar
1ac8b6a793
Merge pull request #1352 from unisonweb/bug/660
Ignore ctor/term collisions for dupes
2020-03-12 15:50:48 -04:00
Arya Irani
33e619d946
Update pull_request_template.md 2020-03-12 15:22:42 -04:00
Runar Bjarnason
59297203df Ignore ctor/term collisions for dupes 2020-03-12 15:16:38 -04:00
Paul Chiusano
c91a9a7d7f
Merge pull request #1334 from unisonweb/topic/alias-hashonly
supporting hashes in `alias`; and names and builtins in `replace`
2020-03-12 09:38:56 -04:00
Arya Irani
6b5d60cb20 misc todos for #1334:
- simplify resolveHHQS'Referents
- add missing logic to TermReferentsByShortHash
- don't pass Codebase just to get deserializers
- improve transcript prose
2020-03-11 21:56:33 -04:00
Arya Irani
5d5f96bcaa add transcript 2020-03-11 16:44:09 -04:00
Arya Irani
cc9f390849
Merge pull request #1341 from unisonweb/cleanup/stepManyAt0
Some nice cleanup of `stepManyAt0` and friends
2020-03-11 11:46:30 -04:00
Paul Chiusano
e920ffa126
Merge pull request #1331 from unisonweb/fix/1329-incorrect-case-body-annotation
correct annotation of match cases to always include the case body
2020-03-11 11:23:33 -04:00
Paul Chiusano
de5261a81c Some nice cleanup of stepManyAt0 and friends. Thanks to @aryairani for suggestions! 2020-03-11 11:13:45 -04:00
mergify[bot]
9b2df231a3
Merge pull request #1333 from unisonweb/fix/1225
Fix #1225
2020-03-11 14:19:59 +00:00
Paul Chiusano
e66828a2c3 Switch to using Lens.:< pattern and kill Path.Cons pattern which is redundant 2020-03-11 10:13:00 -04:00
mergify[bot]
cb3edcc568
Merge pull request #1337 from unisonweb/fix/update-children
Fix Branch.updateChildren to not elide empty branches with history
2020-03-11 14:06:18 +00:00
Paul Chiusano
68e0783fb8 fix Branch.updateChildren to not elide empty branches with history 2020-03-10 21:56:48 -04:00
Paul Chiusano
cf6c51595e i like suggestion from @aryairani to switch from [NameSegment] to Path 2020-03-10 21:47:03 -04:00
Aaron Novstrup
3de0db9133 correct annotation of match case body
- give _all_ Abs nodes in the resulting lambda chain the annotation of the case body (not just the outer node)
2020-03-10 14:55:26 -07:00
Arya Irani
9a362f7101 supporting hashes in alias; and names and builtins in replace
Exploded Codebase.referencesByPrefix into three functions:

- referencesByPrefix :: Text -> m (Set Reference.Id)
+ termReferencesByPrefix :: ShortHash -> m (Set Reference.Id)
+ typeReferencesByPrefix :: ShortHash -> m (Set Reference.Id)
+ termReferentsByPrefix :: ShortHash -> m (Set (Referent' Reference.Id))

for top-level terms, top-level types, and for Ref/Con mix.
They only return "derived" references, the thinking is that builtins will
come from a higher level api.

Exploded Command.ReferencesByShortHash into three functions
- ReferencesByShortHash :: ShortHash -> Command m i v (Set Reference.Id)
+ TypeReferencesByShortHash :: ShortHash -> Command m i v (Set Reference)
+ TermReferencesByShortHash :: ShortHash -> Command m i v (Set Reference)
+ TermReferentsByShortHash :: ShortHash -> Command m i v (Set Referent)

I actually don't remember why it was ok that it was Reference.Id before
but isn't now.  Maybe we hadn't wanted to auto-complete Builtin names?
I don't remember.

controversial?
* Added a type arg `r` to `Referent`; type alias and patterns for compat.
* Deleted BranchUtil.getTermByShortHash because I'm guessing we no longer
  want to limit such searches to the branch?  Uncertain.
* Reference.fromShortHash rejects inputs with ctorIds in them; seemed
  better than ignoring them, but I could imagine there being a case for
  each.
2020-03-10 13:00:00 -04:00
Paul Chiusano
d02e5bd794 added some comments to hopefully make implementation easier to follow 2020-03-09 23:02:58 -04:00
Paul Chiusano
4afb1deab1 elide empty children when building up new branch 2020-03-09 22:56:52 -04:00
Paul Chiusano
59e55f0337 Fix #1225
Uses a post-order traversal of the branch, rebuilding from the bottom up and visiting each node exactly once.
2020-03-09 22:27:01 -04:00
Aaron Novstrup
b5c85b2a2d correct annotation of match cases to always include the case body 2020-03-09 13:53:44 -07:00
Arya Irani
7b8a6aa7af
Merge pull request #1325 from pete-ts/fix/1320
Fix/1320
2020-03-09 16:11:57 -04:00
pete-ts
79d0b60ee1 uses canonicalizePath for all paths 2020-03-09 07:24:42 +00:00
Paul Chiusano
9b30c712a1
Merge pull request #1307 from unisonweb/topic/1305-doc-eval
Remove term names from evaluation in docs
2020-03-08 22:51:40 -04:00
mergify[bot]
5574357e1b
Merge pull request #1328 from unisonweb/topic/pull-requestt
Unabbreviate pr.{create,load}
2020-03-09 02:41:00 +00:00
Paul Chiusano
916b1c36a7
Merge pull request #1326 from unisonweb/aryairani-patch-1
Update pull_request_template.md
2020-03-08 22:18:25 -04:00
Paul Chiusano
af4d269138 Unabbreviate pr.{create,load} 2020-03-08 22:04:51 -04:00
pete-ts
c60a82780a uses canonicalizePath instead of makeAbsolute + takeDirectory 2020-03-08 16:36:21 +00:00
Arya Irani
c3bd499aad
Update pull_request_template.md 2020-03-08 08:27:14 -04:00
pete-ts
83e500a925 removes period and warnCallout, does not indent errors, and translates dot and dot dot 2020-03-08 09:12:20 +00:00
pete-ts
dcbf736e81 removes Pretty.endSentence, no longer used 2020-03-08 09:10:29 +00:00
pete-ts
4f2cedb389 removes indentation from error messages for codebase and codebase init 2020-03-08 09:10:01 +00:00
mergify[bot]
b85f54e886
Merge pull request #1323 from Dandandan/pull_doc
Fix #1238 pull typo in doc
2020-03-07 22:14:52 +00:00
Daniël Heres
49bd462b69
Adding myself to CONTRIBUTORS.markdown 2020-03-07 23:07:50 +01:00
Dandandan
b3c6450db9 Fix #1238 pull typo in doc 2020-03-07 14:28:42 +01:00
Paul Chiusano
4e0bc920a0
Merge pull request #1315 from unisonweb/topic/add-docs-to-vim-syntax
Add doc blocks to vim syntax
2020-03-06 15:57:58 -05:00
Runar Bjarnason
c6497fb2eb Add doc blocks to vim syntax 2020-03-06 15:06:33 -05:00
Runar Bjarnason
64848d5d4e Don't show the name of the term 2020-03-06 10:59:13 -05:00
mergify[bot]
ff50b3b4f8
Merge pull request #1302 from unisonweb/fix/sync-declPath
check declPath before writing decls
2020-03-04 00:49:11 +00:00
Arya Irani
ad0e2d213d check declPath before writing decls 2020-03-03 23:07:38 +01:00
mergify[bot]
da4246623f
Merge pull request #1301 from unisonweb/yak/annotatedterm-to-term
finally rename AnnotatedTerm to Term
2020-03-03 18:05:10 +00:00
Arya Irani
7dd59bc78c rename AnnotatedTerm to Term 2020-03-03 18:43:51 +01:00
Rúnar
b5cae909fc
Fix #1276 hang on push (#1279)
* Fix a bug that causes loops in Causal.
* Ignore loops in Causal when calling sync.
* Fix warnings in Causal test.
* Added a regression test transcript.
2020-03-02 17:32:07 -05:00
Arya Irani
e2190c4287
Merge pull request #1293 from unisonweb/topic/1281-faster-push-pull
implement 3 easy items from #1281
2020-03-02 21:56:32 +01:00
mergify[bot]
b08e2c5f8f
Merge pull request #1294 from unisonweb/topic/back
implements the `back` command using a stack of currentNamespace
2020-03-02 19:18:28 +00:00
Arya Irani
a252a6eafc add transcripts 2020-03-02 20:12:12 +01:00
Arya Irani
0af4df95b8 add transcripts 2020-03-02 18:50:49 +01:00
Arya Irani
7b36b19283 change currentPath from a Lens to a Getter 2020-03-02 12:12:58 +01:00