Patrick Thomson
f3b67a0b90
Merge branch 'master' into smart-flags
2019-03-25 11:06:47 -04:00
Max Brunsfeld
275f45d190
Merge pull request #2492 from github/tree-sitter-timeout-fixes
...
Bump haskell-tree-sitter for timeout fixes
2019-03-22 15:35:53 -07:00
Max Brunsfeld
9cb3f094d4
Merge branch 'master' into tree-sitter-timeout-fixes
2019-03-22 14:14:00 -07:00
Patrick Thomson
f82146ea58
No need to use type applications.
2019-03-22 16:52:07 -04:00
Patrick Thomson
272b5b3b64
Use flags for Options.
2019-03-22 16:37:17 -04:00
Patrick Thomson
5dfb7fb50d
Stray LANGUAGE pragma.
2019-03-22 16:27:36 -04:00
Patrick Thomson
ecea375520
Eliminate boolean blindness with tagged flags a la olegfi.
2019-03-22 16:25:04 -04:00
Max Brunsfeld
c88e76f005
Bump haskell-tree-sitter for timeout fixes
...
Refs https://github.com/tree-sitter/tree-sitter/pull/308
2019-03-22 13:11:17 -07:00
Rick Winfrey
c3f451b3b1
Merge branch 'master' into alephd-testing
2019-03-22 08:46:57 -07:00
Rick Winfrey
c2cef7dd03
Merge branch 'master' into alephd-testing
2019-03-21 17:31:25 -07:00
joshvera
d670be1865
Merge remote-tracking branch 'origin/master' into fix-local-slurp
2019-03-21 11:55:49 -04:00
Rick Winfrey
02bb89c546
Make this easier to read
2019-03-20 13:08:17 -07:00
Rick Winfrey
2ccf2ae05c
Export Name constructors (for now)
2019-03-20 13:08:05 -07:00
Timothy Clem
37f3d7635f
Merge pull request #2478 from github/multiple-topics
...
Alephd: Consume multiple topics
2019-03-20 13:50:44 -04:00
Timothy Clem
f03965898e
Auto-merged master into multiple-topics on deployment
2019-03-20 13:08:19 -04:00
Timothy Clem
8cbe42b6ea
Merge remote-tracking branch 'origin/master' into multiple-topics
2019-03-19 15:19:37 -07:00
Josh Vera
f3e8ccda56
Merge pull request #2476 from github/add-pcre-to-stack
...
Add pcre dirs to stack
2019-03-19 17:05:31 -04:00
Josh Vera
9a66e4fda7
Merge pull request #2472 from github/use-external-exceptions-package
...
Use external fused-effects-exceptions package.
2019-03-19 16:58:12 -04:00
Rick Winfrey
66f5a06f1f
Merge branch 'master' into alephd-testing
2019-03-19 13:47:48 -07:00
Josh Vera
f2c6a50c2d
Merge branch 'master' into use-external-exceptions-package
2019-03-19 16:06:53 -04:00
Josh Vera
5d1acad9b5
Merge pull request #2470 from github/tree-sitter-timeout
...
Use Tree-sitter's built-in timeout API instead of a separate timeout thread
2019-03-19 16:06:38 -04:00
Josh Vera
875350d867
Auto-merged master into tree-sitter-timeout on deployment
2019-03-19 15:52:31 -04:00
Josh Vera
80b340c5ae
Merge pull request #2439 from github/add-bribe
...
Switch from licensed to bribe.
2019-03-19 15:50:04 -04:00
Josh Vera
580d787f41
Merge branch 'master' into add-bribe
2019-03-19 15:37:29 -04:00
Josh Vera
3d5a604833
Merge branch 'master' into add-bribe
2019-03-19 15:03:45 -04:00
Josh Vera
5f23615f17
Merge branch 'master' into use-external-exceptions-package
2019-03-19 15:01:06 -04:00
Josh Vera
83b4be46e0
Merge branch 'master' into tree-sitter-timeout
2019-03-19 15:00:11 -04:00
Josh Vera
fc9ccb6b24
Merge pull request #2475 from github/base-images
...
Use separate base images for CLI and server
2019-03-19 14:59:22 -04:00
Max Brunsfeld
3c0dd6cc45
Add unit test for parsing with a timeout
...
Co-Authored-By: Rick Winfrey <rewinfrey@github.com>
2019-03-19 11:56:07 -07:00
Douglas Creager
b8114e2cde
Merge branch 'master' into base-images
...
* master:
Add new licenses.
Bump to GHC 8.6.4 in an effort to fix linker bugs.
Fix up specs
Couple of extra tests to show picking out calls
Just pick out the selector
Show a call/send in this test fixture
Include function calls in symbols output
2019-03-19 14:48:46 -04:00
Josh Vera
b0309f86a2
Merge branch 'master' into tree-sitter-timeout
2019-03-19 14:42:36 -04:00
Josh Vera
b122cc3e45
Merge pull request #2462 from github/index-calls
...
Index call expressions for ctags-style code nav features
2019-03-19 14:42:13 -04:00
Max Brunsfeld
d153b6090b
Remove redundant import
2019-03-19 10:40:32 -07:00
Josh Vera
c4c232afcb
Merge branch 'master' into index-calls
2019-03-19 13:24:24 -04:00
Max Brunsfeld
74d40d6ddc
Bump haskell-tree-sitter
2019-03-19 10:24:02 -07:00
Patrick Thomson
d3486c99bb
Merge branch 'master' into use-external-exceptions-package
2019-03-19 13:22:58 -04:00
Josh Vera
d373ab9ea4
Merge pull request #2473 from github/bump-ghc
...
Bump to GHC 8.6.4 in an effort to fix linker bugs.
2019-03-19 13:22:41 -04:00
Josh Vera
43b7955d79
Auto-merged master into base-images on deployment
2019-03-19 12:27:40 -04:00
Patrick Thomson
896230bbb5
Merge branch 'master' into bump-ghc
2019-03-19 12:26:15 -04:00
Patrick Thomson
5ae7fd5bb9
Add new licenses.
2019-03-19 12:11:20 -04:00
Patrick Thomson
b549cd8ef4
Merge branch 'master' into index-calls
2019-03-19 11:50:09 -04:00
Patrick Thomson
11700f8f6a
Merge branch 'master' into use-external-exceptions-package
2019-03-19 11:41:23 -04:00
Patrick Thomson
f2df2b3a3e
Merge pull request #2436 from github/style-guide
...
Add a Haskell style guide.
2019-03-19 11:38:29 -04:00
Patrick Thomson
2339c1f37a
Bump to GHC 8.6.4 in an effort to fix linker bugs.
2019-03-19 11:23:10 -04:00
Patrick Thomson
ece3bcccdd
Merge branch 'master' into style-guide
2019-03-19 10:36:49 -04:00
Patrick Thomson
ec76510534
Merge branch 'master' into index-calls
2019-03-19 10:36:34 -04:00
Patrick Thomson
139b0c5bd1
Use external fused-effects-exceptions package.
...
This was OSS'd because it turned out to be a little tricky and we
didn't want external consumers to have to implement it themselves. No
reason to keep it around in our tree.
2019-03-19 10:34:13 -04:00
Josh Vera
10d80acebd
Merge pull request #2455 from github/signal-handling
...
Shutdown gracefully on SIGINT and SIGTERM
2019-03-18 20:00:36 -04:00
Max Brunsfeld
3249307ccd
Use Tree-sitter's built-in timeout API instead of a separate timeout thread
2019-03-18 16:30:15 -07:00
Rick Winfrey
e64fa5ad3b
This should still be Prelude
2019-03-18 16:11:18 -07:00