unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-05 14:17:33 +03:00
Code Issues Projects Releases Wiki Activity
3,390 Commits 425 Branches 92 Tags 407 MiB
14f392e1c2
Commit Graph

3390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Chiusano
14f392e1c2 Merge remote-tracking branch 'origin/master' into topic/hashqualified-name 2019-02-05 10:06:02 -05:00
Paul Chiusano
a06bdb1059 formatting fix 2019-02-05 10:05:46 -05:00
Paul Chiusano
a9809823bf fix tests caused by busted isSymbolic check on Name values 
This was causing all infix operators to display as prefix, which broke some tests
 2019-02-05 10:05:28 -05:00
Runar Bjarnason
0bf77c9c10 Actually quit 2019-02-02 22:55:49 -05:00
Runar Bjarnason
59eed6f614 Fixed a bug in AnnotatedText.drop 2019-02-02 22:43:48 -05:00
Arya Irani
c14cbbfcd3 support hashqualified args for list/view 2019-01-31 17:49:00 -05:00
Arya Irani
cd79e5e2f3 Merge remote-tracking branch 'origin/master' into topic/hashqualified-name 
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/Actions.hs
 2019-01-31 16:55:27 -05:00
Arya Irani
c4f5fc307a
Merge pull request #312 from unisonweb/wip/actionsrefactor 
refactor Actions
 2019-01-31 16:50:35 -05:00
Runar Bjarnason
cf5f0b083a cleanup 2019-01-31 16:45:01 -05:00
Arya Irani
4c33127054 autocompleting hash-qualified names 2019-01-31 16:42:20 -05:00
Arya Irani
305e5a4d92 simplified PrettyPrintEnv 2019-01-31 16:26:24 -05:00
Runar Bjarnason
0df87c9755 Refactored actions 2019-01-31 16:25:27 -05:00
Arya Irani
171234bd72 well, maybe this time. 2019-01-31 11:56:49 -05:00
Runar Bjarnason
874a03d7ba wip 2019-01-31 07:53:17 -05:00
Rúnar
e29136ab30
Merge pull request #307 from unisonweb/wip/propagate 
`update` and `merge` now propagate type-preserving edits to the branch
 2019-01-30 17:42:28 -05:00
Paul Chiusano
975ff2b9e1 propagate command, which is updated after merge 2019-01-30 17:08:21 -05:00
Runar Bjarnason
420f25c0be Cleanup 2019-01-30 11:53:53 -05:00
Runar Bjarnason
3fe5b6d76a Propagate works 2019-01-30 11:22:55 -05:00
Paul Chiusano
456c15c914 add todo 2019-01-29 17:36:01 -05:00
Paul Chiusano
9d417eaeff propagate hooked up to add/update commands 2019-01-29 17:17:15 -05:00
Paul Chiusano
5cdbc33b0d If it's a type, don't return anything from unhashComponents since there's no propagation to do 2019-01-29 16:57:20 -05:00
Paul Chiusano
3fabb89dbc Hooked up call to typechecker 2019-01-29 16:53:46 -05:00
Arya Irani
079e40ffc7 wip in case i lose everything with apple support 2019-01-29 16:43:08 -05:00
Paul Chiusano
fe65edd8e9 typecheckTerms almost filled in 2019-01-29 16:39:01 -05:00
Paul Chiusano
9836d8663c hook up retypechecking logic for subtype replacements 
still one function stubbed out that needs filling in
 2019-01-29 15:32:48 -05:00
Paul Chiusano
b69d9eb0d5 formatting 2019-01-29 14:00:13 -05:00
Paul Chiusano
49c7e65f78 filled in putTermComponent 2019-01-29 13:50:45 -05:00
Runar Bjarnason
846ece4017 propagate under construction 2019-01-29 12:57:50 -05:00
Paul Chiusano
d975836d04 filled in unhashComponent for terms 2019-01-29 11:06:36 -05:00
Paul Chiusano
24afe2b95a code compiles, started on unhashComponent (formerly abstractComponent) 2019-01-29 09:46:46 -05:00
Runar Bjarnason
cb1edcfbba wip on propagate 2019-01-28 17:35:29 -05:00
Runar Bjarnason
9ef5cbaad9 propagate wip 2019-01-28 13:20:22 -05:00
Paul Chiusano
9c79a22858
Merge pull request #306 from noahhaasis/parser-revamp 
Remove obsolete TODO
 2019-01-27 09:24:14 -05:00
Noah Haasis
1fcc52c00e Remove obsolete TODO 2019-01-27 07:26:51 +01:00
Arya Irani
8c6cc01fbc
Merge pull request #305 from unisonweb/topic/hash-qualified-ls 
hash-qualified names in `list`, `view`
 2019-01-26 19:33:34 -05:00
Arya Irani
677ec430c7 hash-qualified names in list, view 2019-01-26 19:18:09 -05:00
Arya Irani
e3f52aa4b6 docs 2019-01-25 19:57:33 -05:00
Paul Chiusano
375bb24f22
Merge pull request #304 from unisonweb/wip/display-edit-conflicts 
`todo` command now shows both edit and name conflicts nicely
 2019-01-25 16:14:52 -05:00
Paul Chiusano
0ed2e8fd03 resolved conflicts due to signature change 2019-01-25 15:57:21 -05:00
Paul Chiusano
6899f8423e Merge remote-tracking branch 'origin/master' into wip/display-edit-conflicts 2019-01-25 15:35:49 -05:00
Paul Chiusano
d4cb67361a cleanup of formatting, and added Pretty.name combinator for showing names, with stuff after hash styled differently 2019-01-25 15:35:08 -05:00
Arya Irani
4a2fe588e9 oops 2019-01-25 12:57:51 -05:00
Arya Irani
9abf54772f fix some stuff around hash-qualified output, and updated some messages 2019-01-25 12:57:09 -05:00
Runar Bjarnason
494809d33f Resolve term/type conflict 2019-01-25 12:21:26 -05:00
Arya Irani
6e270025b0 cleanup 2019-01-25 12:13:37 -05:00
Arya Irani
e894636ff5 Branch.prettyPrintEnv1 now disambiguates conflicted names with #hash 2019-01-25 12:13:19 -05:00
Paul Chiusano
c6aa8910cb filled in rest of todos for displaying edit conflicts and name conflicts (untested) 2019-01-24 23:42:19 -05:00
Paul Chiusano
24c936b1af Hooked up display of edit conflicts 
Still need to fix up the display of name conflicts to not show if it's also an edit conflict, and some wordsmithing / formatting tweaks
 2019-01-24 17:31:57 -05:00
Paul Chiusano
c12a8324dd main entry point for resolving type edit conflicts 2019-01-24 16:40:30 -05:00
Paul Chiusano
8681519b82 main resolve function, handles edit conflicts (which may or may not have associated name conflicts) 2019-01-24 16:30:46 -05:00