Commit Graph

3365 Commits

Author SHA1 Message Date
Runar Bjarnason
8adf27dc45 Formatting 2018-12-04 12:40:06 -05:00
Runar Bjarnason
92006bacd6 All commands done-ish 2018-12-04 12:36:39 -05:00
Runar Bjarnason
f839f226a6 Added getconflicts 2018-12-04 11:16:54 -05:00
Runar Bjarnason
6ddfeaf0e8 Added merge 2018-12-04 10:15:36 -05:00
Chris Gibbs
f81890a720 Comment to explain precedence handling in TypePrinter 2018-12-03 23:20:46 +00:00
Runar Bjarnason
d771f957a0 added new and fork 2018-12-03 17:29:09 -05:00
Runar Bjarnason
1fcd844ec8 Merge branch 'topic/codebase-editor' of github.com:unisonweb/unison into topic/codebase-editor 2018-12-03 17:12:08 -05:00
Runar Bjarnason
87920e57ea . 2018-12-03 17:11:47 -05:00
Runar Bjarnason
831cc14b83 Added typecheck 2018-12-03 17:11:18 -05:00
Arya Irani
a48e1642f1 Merge remote-tracking branch 'origin/topic/codebase-editor' into topic/codebase-editor 2018-12-03 13:34:34 -05:00
Arya Irani
92f2e5e588 fiddle with edit commands 2018-12-03 13:33:41 -05:00
Runar Bjarnason
67e4028b42 Added add 2018-12-03 13:19:55 -05:00
Runar Bjarnason
64f7b0fcf5 Merge branch 'topic/codebase-editor' of github.com:unisonweb/unison into topic/codebase-editor 2018-12-03 11:30:10 -05:00
Runar Bjarnason
6902f92f97 wip 2018-12-03 11:30:00 -05:00
Arya Irani
a95b5fbbed
Merge pull request #267 from hepin1989/update-deps
Update dependencies for jvm-runtime.
2018-12-02 21:56:54 -05:00
Arya Irani
5938a5cd53 define commands for edits 2018-12-01 09:02:35 -05:00
hepin1989
788998e7d8 Update dependencies for jvm-runtime. 2018-12-01 14:19:03 +08:00
Runar Bjarnason
f7f0e15160 Merge branch 'topic/codebase-editor' of github.com:unisonweb/unison into topic/codebase-editor 2018-11-30 17:57:01 -05:00
Runar Bjarnason
184022cd65 wip 2018-11-30 17:44:19 -05:00
Arya Irani
d02a9e2934 look at some options for loading defns from codebase 2018-11-29 18:23:53 -05:00
Arya Irani
d4200a484b refactor Actions and fill in more to-dos 2018-11-29 17:34:48 -05:00
Arya Irani
eafd670955 refactor wip 2018-11-29 17:04:59 -05:00
Arya Irani
01e1e8da07 split Editor.loop out into Editor.Actions.loop, names tbd 2018-11-29 15:01:45 -05:00
Arya Irani
38879eac79 and this builds 2018-11-29 14:37:39 -05:00
Arya Irani
9fa5967e4f that's worth a commit 2018-11-29 14:35:50 -05:00
Arya Irani
095dd6ac32 factor Input out of Command 2018-11-29 12:34:38 -05:00
Arya Irani
1adfa4160d add missing case 2018-11-29 11:46:09 -05:00
Arya Irani
f9a2acde1d alias/rename/unname 2018-11-29 11:45:15 -05:00
Arya Irani
3606e7908c forgot to build outside of ghcid 2018-11-29 10:03:06 -05:00
Chris Gibbs
a927f4df2f Pretty-printer support for askInfo, i.e. expressions like foo? 2018-11-28 23:55:18 +00:00
Arya Irani
42ef8c1286 refactoring 2018-11-28 17:44:45 -05:00
Chris Gibbs
bf7d9237ed Pretty-printer should put parens around infix operators when they're not being applied
e.g. Stream.fold-left 0 (+) t
2018-11-28 22:23:31 +00:00
Arya Irani
6c1f9700c2 some renames 2018-11-28 15:53:55 -05:00
Arya Irani
d60d7ebcb1 finished Editor.loop 2018-11-28 15:40:51 -05:00
Arya Irani
8877d640d2 convert Editor.loop to use Free.unfold' 2018-11-28 14:26:40 -05:00
Arya Irani
e6a93c930e started implementing the the CommandLine logic in Editor.loop 2018-11-27 18:02:30 -05:00
Arya Irani
aed0e3f3fa started defining a command/response language for the CLI in Codebase.Editor 2018-11-27 17:19:23 -05:00
Chris Gibbs
dc36665361 Merge branch 'topic/termprinter4' of https://github.com/unisonweb/unison into topic/termprinter4 2018-11-26 21:37:42 +00:00
Chris Gibbs
ff4bac848f Merge branch 'topic/termprinter4' of https://github.com/unisonweb/unison into topic/termprinter4 2018-11-26 21:34:25 +00:00
Chris Gibbs
e8fc1213d4 In cases where let is needed, let should have higher precedence than function application
(as per code review markup from Paul)
2018-11-26 21:29:36 +00:00
Chris Gibbs
5879c39ad3 comment tweaks 2018-11-26 21:29:36 +00:00
Chris Gibbs
c2f09bdd1f Refactor args of TermPrinter.pretty to use AmbientContext
...following feedback from Paul
2018-11-26 21:29:36 +00:00
Chris Gibbs
a2acfcd868 Suppression of lets on bindings within blocks 2018-11-26 21:29:36 +00:00
Chris Gibbs
f6e008520d First step on suppression of lets on bindings within blocks
@pchiusano please shout if I'm not on the right track...
2018-11-26 21:29:36 +00:00
Chris Gibbs
a66e8a6346 Get rid of some surplus parentheses in pretty-printed patterns
(And add a couple of failing tests.)
2018-11-26 21:29:36 +00:00
Chris Gibbs
2b2b0d0482 Force line breaks when pretty-printing case statements
So

   case x of
     12 -> foo
     13 -> bar

instead of

   case x of 12 -> foo; 13 -> bar

(The latter doesn't parse.)
2018-11-26 21:29:36 +00:00
Chris Gibbs
55d4eaa17a Stop pretty-printing surplus brackets in (f x) + (g y)
Not convinced this is a total win in terms of ease of code-reading (look at the diff of the tests) but let's see how we go.
2018-11-26 21:29:36 +00:00
Chris Gibbs
41fe0cfca0 Fix double-indentation the pretty-printer was sometimes doing 2018-11-26 21:29:36 +00:00
Chris Gibbs
9700fd6fef Fix pretty-printing of let-bound functions
Instead of

  let f = x -> x + 1

we now get

  let f x = x + 1
2018-11-26 21:29:36 +00:00
Chris Gibbs
956d92fa8c Tweak development.markdown 2018-11-26 21:29:36 +00:00