unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-23 16:28:02 +03:00
Code Issues Projects Releases Wiki Activity
5,717 Commits 419 Branches 90 Tags 331 MiB
5b55275701
Commit Graph

546 Commits

Author SHA1 Message Date
Mitchell Rosen
38fdcd01a1 Use namespace diff in link output 2020-01-20 14:36:09 -05:00
Aaron Novstrup
ec87a60254 fix pretty-printing of handle blocks and fix tests broken by handle-with syntax 2020-01-18 00:49:15 -08:00
Arya Irani
de10551edd update the transcript outputs after the sorting changes in 5bf4a200 2020-01-17 16:27:47 -05:00
Paul Chiusano
b3b43e193d Merge remote-tracking branch 'origin/master' into diff.namespace 
# Conflicts:
#	parser-typechecker/src/Unison/Util/Pretty.hs
 2020-01-17 15:07:58 -05:00
Chris Gibbs
22ebf28e8a #936 pretty-print doc literals - improve commenting 2020-01-16 22:54:52 +00:00
Arya Irani
2aedaa2e2f remove traces and fix OBD.isEmpty 2020-01-16 16:58:31 -05:00
Chris Gibbs
22802b90cb #936 pretty-print doc literals - last tests and fixes 2020-01-16 21:55:41 +00:00
Chris Gibbs
e0da5f843c #936 pretty-print doc literals - small fix 2020-01-16 21:50:25 +00:00
Arya Irani
c8136c02dd fix hq bracket alignment and hide some blank lines 2020-01-16 16:39:41 -05:00
Arya Irani
af3f72a822 hide isPropagated in updates, + cleanup 2020-01-16 15:50:50 -05:00
Arya Irani
84207dcc1a don't separately list changed metadata of a definition as part of an update 2020-01-16 14:56:16 -05:00
Arya Irani
96c556ca8b tried to fix regression in Update vs Add/Remove, but not quite there yet. 2020-01-16 13:26:28 -05:00
Arya Irani
8f66210115 split updatedTerms into updatedTerms, newTermConflicts, resolvedTermConflicts 2020-01-16 12:26:33 -05:00
Paul Chiusano
546048261a deleting isPropagated metadata when user does an update for a hash and when propagating and the hash is a target in the patch 2020-01-15 17:52:50 -05:00
Arya Irani
eb0df15e00 update checklist 2020-01-15 13:25:36 -05:00
Arya Irani
0c345c4e1e couple more issues to fix :( 2020-01-14 17:14:25 -05:00
Arya Irani
f1a6f16fe1 switch tallnamespaceUpdates representation & trying to fix bugs 2020-01-14 17:13:52 -05:00
Arya Irani
19181bf2bb finish up the various ShowDiff* outputs 2020-01-14 14:23:49 -05:00
Paul Chiusano
8b9845891a Tweak ordering or adds/removes section - constructors come first 2020-01-10 17:35:33 -05:00
Paul Chiusano
a0844d7652 fix bug: deleted terms with metadata being shown in updates section 2020-01-10 17:05:56 -05:00
Paul Chiusano
6fa73ada53 tweaked formatting of name changes section 2020-01-10 16:32:41 -05:00
Arya Irani
20bc394ec9 Merge branch 'diff.namespace' of github.com:unisonweb/unison into diff.namespace 2020-01-10 12:38:58 -05:00
Arya Irani
30ee10c81e tune up diff output for add/remove groups 2020-01-10 12:38:53 -05:00
Paul Chiusano
6cc988acdc some output tweak proposals 2020-01-10 11:55:09 -05:00
Arya Irani
3a4d2769cd fix some dif.namespace output things (?) 2020-01-10 10:25:07 -05:00
Paul Chiusano
2012f1bb78 more formatting fixes, pulled out column3M and using that in diff formatting now 2020-01-09 11:47:31 -05:00
Paul Chiusano
4bcd58ecef fleshed out transcript some more, fixed a number of bugs 2020-01-08 16:32:18 -05:00
Paul Chiusano
1b8023ce9d WIP on transcript, some formatting tweaks to diff output 2020-01-08 12:51:49 -05:00
Chris Gibbs
f1cb1c943e Merge branch 'master' into topic/docs-936-pretty-literals 2019-12-21 22:09:12 +00:00
Chris Gibbs
e0d49eac06 #936 pretty-print doc literals - draft of parse-time doc normalization - needs debugging 2019-12-21 22:07:11 +00:00
Chris Gibbs
81ce53a4af #936 pretty-print doc literals - paragraphyText now uses wrapPreserveSpaces 2019-12-19 00:08:47 +00:00
Arya Irani
ba85e9a0d1 update transcripts output for metadata.IsPropagated 2019-12-16 20:33:43 -05:00
Chris Gibbs
776af61064 #936 pretty-print doc literals - spec out modified paragraph reflow/wrapping 
Currently Unison takes doc literals like

  [:
  example usage:
   - note the call to bar
     - we pass it 1
  foo =
    bar 1
      baz
  :]

and renders them as

  [: example usage:
  - note the call to bar
  - we pass it 1
  foo =
  bar 1
  baz :]

due to the paragraph reflow/wrapping function.

Also, this function only works the first time you use it on a doc: if you `edit` a doc and mess with it, you won't get the wrapping refreshed the next time you view.  That's because the pretty-printing works by inserting newlines, which are treated as paragraph breaks by Unison the next time it sees the code.

I'm planning to fix this by
 - only doing paragraph reflow/wrapping for lines with zero indent (where zero is the left-most non-whitespace column of the doc)
 - normalizing docs during parse, including removing newlines that are within a paragraph.

See unison-src/transcripts/doc-formatting.md in this commit for more details of how this shakes out.  Not the .md.output because that's showing the current behavior without this change implemented.

Hopefully this is just a few more lines of code to implement, and then #936/#994 is good to merge.
 2019-12-16 23:32:36 +00:00
Chris Gibbs
8f284d902c #936 pretty-print doc literals - unbuggify doc unindenting 2019-12-15 15:25:29 +00:00
Mitchell Rosen
764b2f4ae8 Show term/type hashes (for adds/removes) in diff output, if ambiguous 2019-12-15 09:13:48 -05:00
Mitchell Rosen
c4a10bbe53 Show branch diff after delete 2019-12-14 23:06:27 -05:00
Chris Gibbs
6be8932b38 #936 pretty-print doc literals - unindent docs after parsing - unfinished 
Causes some bogus changes to docs.output.md which I need to debug.
 2019-12-14 18:15:32 +00:00
Paul Chiusano
3db0403865 tweak verbiage of hello transcript 2019-12-13 16:29:31 -05:00
Paul Chiusano
7814fd4b78 Merge remote-tracking branch 'origin/master' into fix/987 
# Conflicts:
#	unison-src/transcripts/merges.output.md
#	unison-src/transcripts/reflog.output.md
 2019-12-12 15:03:27 -05:00
Paul Chiusano
109fbdbc7a Added extensive. transcript 2019-12-11 17:25:32 -05:00
Paul Chiusano
a10f540975 tweak to orderedComponents implementation 2019-12-11 14:07:08 -05:00
Chris Gibbs
81668b644a Merge branch 'master' into topic/docs-936-pretty-literals 2019-12-11 18:51:15 +00:00
Arya Irani
f77836ca0d
Update todo-bug-builtins.output.md 2019-12-11 10:56:07 -05:00
Arya Irani
7dd79ed4b0
Update todo-bug-builtins.md 2019-12-11 10:55:35 -05:00
Noah Haasis
239c06623d Update todo bultin transcript to run deterministically 2019-12-11 14:52:00 +00:00
Noah Haasis
6d43893f60 Update all changed transcript outputs 2019-12-10 05:21:04 +00:00
Noah Haasis
7dd8cb7935 Merge branch 'master' of https://www.github.com/unisonweb/unison into todo-builtin 2019-12-10 05:15:58 +00:00
Noah Haasis
f1538906c6 Add transcript output for todo-bug-builtins 2019-12-10 04:39:36 +00:00
Mitchell Rosen
df0fc25a18 Improve delete term/type feedback 2019-12-09 22:35:29 -05:00
Paul Chiusano
5cd328bf53 refresh transcripts - these changed because root namespace hash changed 
due to blocks getting hashed differrently
 2019-12-09 14:57:21 -05:00
Paul Chiusano
e46ceb8cee Merge remote-tracking branch 'origin/master' into fix/987 2019-12-09 14:46:38 -05:00
Mitchell Rosen
6d8ea064c1 Add 'delete' command, which combines 'delete.term' and 'delete.type' 2019-12-08 17:29:47 -05:00
Paul Chiusano
8b72eb311a added.transcript 2019-12-08 15:23:39 -05:00
Noah Haasis
eb1ff619ee Add implementation for Nat.toFloat 2019-12-02 14:48:08 +00:00
Chris Gibbs
8ee3ea30f8 \:] to escape :] in doc literals 2019-11-30 15:58:31 +00:00
Chris Gibbs
02f3048752 #936 pretty-print doc literals - merge through suffixy names 2019-11-24 22:16:51 +00:00
Chris Gibbs
a4c6dde06a Merge branch 'master' into topic/docs-936-pretty-literals 2019-11-24 22:05:17 +00:00
Chris Gibbs
408f4ca393 #936 pretty-print doc literals - done, with some snags remaining 2019-11-24 22:04:20 +00:00
Paul Chiusano
504e53bbc5 resolve.{term,type} => replace.{term,type} and updated transcripts 
Also curiously transcripts with invalid commands would just silently noop. Now they fail the transcript.
 2019-11-21 13:01:46 -05:00
Paul Chiusano
9a0350a669 Address PR comments 2019-11-19 11:28:23 -05:00
Paul Chiusano
00d0fc8c56 type based search uses suffixed input + regenerated transcripts 2019-11-13 13:57:51 -08:00
Paul Chiusano
aa4990848e Merge remote-tracking branch 'origin/master' into topic/suffix-resolve 
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
#	parser-typechecker/src/Unison/Codebase/Editor/Output.hs
 2019-11-13 13:01:57 -08:00
Arya Irani
bf631d2fcd support remote Unison paths in push/pull (#935) 
* wip git url parser & some Git module cleanup

* modern-uri

* trailing whitespace

* dice up the git uri parser for more easily testable implementation

* ipv6 address reference

* add an ipv4 test for `UriParser.parseProtocol`

* remove duplicate test and typo

* add some autocompletion shortcuts for git urls

* clean up gitUrlArg

* partially update `push` and `pull` InputPatterns & docs

* it compiles!

* sometimes even comments can break the build

* missed a couple of `gitIn`s, so command executed in wrong working dir

* delete UriParser.webRepoParser in favor of autocompletes

* bikeshedding the ConfiguredGitUrlIncludesShortBranchHash error message

* cleanup

* simplify push/pull help

* pretty-print reflog entry for `pull` using RemoteRepo.printNamespace
 2019-11-12 16:52:48 -05:00
Paul Chiusano
d6b903cdca hook up suffix-based resolution to the parser + add test case for it 2019-11-11 16:33:31 -08:00
Noah Haasis
fd166b4c41 Add a transcript testing the behaivour of todo and bug 2019-11-09 12:44:58 +00:00
Paul Chiusano
93ad88a4ac sync master 2019-11-08 08:39:04 -05:00
Paul Chiusano
87ee95bf3e
Merge pull request #944 from unisonweb/topic/edit.all 
View/edit multiple definitions
 2019-11-07 21:16:14 -05:00
Arya Irani
10aebd6211 fix #942; have propagate write new terms and types as it goes 2019-11-07 17:52:20 -05:00
Runar Bjarnason
edf28247c3 Added a transcript for numeric arguments 2019-11-07 16:53:24 -05:00
Paul Chiusano
da9ab8dcdb Add broken test 2019-11-07 16:24:54 -05:00
Paul Chiusano
37c5542390 Merge remote-tracking branch 'origin/master' into topic/docs 2019-11-07 15:14:47 -05:00
Chris Gibbs
7524f0d654 #936 pretty-print doc literals - skeleton 2019-11-06 23:02:05 +00:00
Arya Irani
6b415149d0 update out-of-sync transcript outputs 2019-11-05 08:17:32 -05:00
Paul Chiusano
d296266602 simplify paragraphyText, it's now much better behaved 2019-11-04 21:15:13 -05:00
Paul Chiusano
d28e532aa6 update docs example 2019-11-04 18:18:36 -05:00
Paul Chiusano
d3ab6ae190 Added a documentation transcript 2019-11-04 18:00:25 -05:00
Paul Chiusano
83be276cd1
Merge pull request #901 from unisonweb/topic/links 
First class links / references as Unison values
 2019-10-30 15:06:24 -04:00
Runar Bjarnason
c7722061a0 Workaround for unique type guid nondeterminism 2019-10-30 13:20:59 -04:00
Runar Bjarnason
ecd79f3d1c Merge branch 'master' of github.com:unisonweb/unison into topic/propagatetypes 2019-10-30 11:43:04 -04:00
Runar Bjarnason
6d95544bc2 I accidentally a line. 2019-10-30 11:42:32 -04:00
Paul Chiusano
646733981e Merge remote-tracking branch 'origin/topic/propagatetypes' into topic/links 2019-10-30 09:44:37 -04:00
Paul Chiusano
41ef402e4f Added test case 2019-10-28 21:18:17 -04:00
Runar Bjarnason
1636d8ea32 I accidentally this file 2019-10-28 16:25:28 -04:00
Paul Chiusano
63122606f7
Merge pull request #902 from unisonweb/topic/891b 
display synthetic reflog entries for initial and external changes
 2019-10-28 15:39:37 -04:00
Arya Irani
cce64e3c03 change "branch" to "namespace" 2019-10-28 15:11:57 -04:00
Arya Irani
2dfb7958e9 update transcripts 2019-10-28 15:02:39 -04:00
Paul Chiusano
77e16533cb Merge remote-tracking branch 'origin/topic/propagatetypes' into topic/links 
# Conflicts:
#	parser-typechecker/src/Unison/Term.hs
 2019-10-28 14:42:18 -04:00
Noah Haasis
dcbf1dee25 Allow boolean operators to be used in sequence 2019-10-27 10:47:49 +00:00
Runar Bjarnason
ef640acb3b Make sure propagation only applies to local branch 2019-10-24 15:19:57 -04:00
Runar Bjarnason
38f7d1eda2 Test the preservation of user type variables 2019-10-23 15:27:35 -04:00
Runar Bjarnason
b35cc5875f Make the propagation actually replace stuff 2019-10-23 12:51:35 -04:00
Paul Chiusano
b28fad6172
Merge pull request #883 from noahhaasis/char-comparison 
Implement ordering for char literals (fix #850)
 2019-10-21 13:45:31 -04:00
Noah Haasis
c6c8c46798 test char comparison 2019-10-21 17:06:07 +00:00
Paul Chiusano
130519b258
Merge pull request #880 from noahhaasis/infix-boolean-operators 
Infix boolean operators (Fix #530)
 2019-10-21 11:32:32 -04:00
Noah Haasis
f312f8fc62 Update tests to use infix boolean operators and backtrack on failure 2019-10-20 14:16:33 +00:00
George Marrows
8abeb68331 Add Char test to literals.u 2019-10-20 15:16:58 +03:00
Arya Irani
6bce3188e1
Merge pull request #875 from noahhaasis/guard-and-or 
Fix #770: Allow boolean operators in pattern guards
 2019-10-19 13:06:19 -04:00
Arya Irani
4c2a8f23e1 add a transcript test to close #873 2019-10-19 11:01:12 -04:00
Noah Haasis
b12f3e9f77 Allow boolean operators in pattern guards 2019-10-19 13:53:44 +00:00
Arya Irani
a570e63baf fix #868, #870 2019-10-16 15:23:16 -04:00