Commit Graph

3400 Commits

Author SHA1 Message Date
Arya Irani
8422a34d44 wip 2019-02-12 10:11:18 -05:00
Arya Irani
55d608a21a add post-runthru comments 2019-02-06 17:36:47 -05:00
Arya Irani
a010695dba idk 2019-02-06 15:03:56 -05:00
Arya Irani
f2572c6566 tabs vs spaces 2019-02-06 15:00:22 -05:00
Arya Irani
72070d4984 formatting 2019-02-06 14:55:55 -05:00
Arya Irani
80ce7f6c1a distributed api discussion v1 2019-02-06 14:54:03 -05:00
Arya Irani
1952299501
Merge pull request #322 from francisdb/patch-1
CommandLine2 => CommandLine
2019-02-06 07:45:27 -05:00
Francis De Brabandere
b59418945e
CommandLine2 => CommandLine 2019-02-06 12:49:17 +01:00
Paul Chiusano
1730e9d906 CommandLine2 => CommandLine 2019-02-05 15:29:55 -05:00
Paul Chiusano
10b1af16e2
Merge pull request #316 from unisonweb/topic/hashqualified-name
Support for hash-qualified names in `list` and `view`
2019-02-05 10:14:35 -05:00
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