Commit Graph

2296 Commits

Author SHA1 Message Date
Daniel Gröber
3bf84fb64a Cleanup some redundant constraint warnings 2016-05-22 02:53:51 +02:00
Daniel Gröber
cfadbc6cb8 Merge branch 'ghc-8' of https://github.com/cocreature/ghc-mod into ghc-8 2016-05-19 21:44:40 +02:00
Daniel Gröber
3289e37e50 Merge branch 'setup-depends' of https://github.com/cocreature/ghc-mod into ghc-8 2016-05-19 21:41:51 +02:00
Moritz Kiefer
27bacd52ec Fix remaining build errors for GHC 8 2016-05-19 18:25:05 +02:00
Moritz Kiefer
4117e56eee Add setup-depends for cabal 1.24 2016-05-19 17:31:44 +02:00
Daniel Gröber
22318105ae some GHC 8.0.1 fixes 2016-05-18 17:58:34 +02:00
Nikolay Yakimov
b3f4677082 Merge pull request #792 from atom-haskell/hlint-sporadic-spaces
Fix sporadic spaces in output on hlint parse error
2016-05-18 16:29:36 +03:00
Moritz Kiefer
f941335b7c Add setup-depends for cabal 1.24 2016-05-17 22:03:55 +02:00
Daniel Gröber
66c6379945 Merge branch 'release-5.6.0.0' into ghc-8 2016-05-17 20:21:33 +02:00
Daniel Gröber
9eeaf09095 Merge branch 'master' into ghc-8 2016-05-17 20:21:25 +02:00
Daniel Gröber
32e81f63c7 Bump cabal-helper 2016-05-17 10:39:31 +02:00
Nikolay Yakimov
66c8915ebd Fix sporadic spaces in output on hlint parse error
For some reason, haskell-src-exts now adds space before
ints when pretty-printing source location (probably
an issue with Text.PrettyPrint)

This patch avoids using pretty printer altogether.
2016-05-16 11:41:48 +03:00
Nikolay Yakimov
623f9f332c Force caseSplit value. Fixes crash on GHC 7.10 2016-05-15 04:10:56 +03:00
Nikolay Yakimov
97dbcef96d Merge branch 'case-split-crash-test' into release-5.6.0.0 2016-05-15 03:43:55 +03:00
Daniel Gröber
ef8349f19a Merge branch 'browse-print-parent' of https://github.com/atom-haskell/ghc-mod into release-5.6.0.0 2016-05-14 21:35:36 +02:00
Daniel Gröber
64c2006781 Merge branch 'fix-map-cache' of https://github.com/atom-haskell/ghc-mod into release-5.6.0.0 2016-05-14 21:35:34 +02:00
Daniel Gröber
f994893c58 Merge branch 'type-constraints' of https://github.com/atom-haskell/ghc-mod into release-5.6.0.0 2016-05-14 21:35:21 +02:00
Daniel Gröber
e495c55a8d Use existence of cabal/stack as cradle indicator
Also add some more "info" logging for which cradle was picked.
2016-05-14 20:18:06 +02:00
Daniel Gröber
0e024c9b79 Fix broken logic in cradle 2016-05-14 20:17:11 +02:00
Nikolay Yakimov
5a02721fc8 [Browse] Add 'from:' to parents 2016-05-11 16:58:46 +03:00
Nikolay Yakimov
32b18d915b [Browse] Use '--' as parent separator 2016-05-11 16:53:42 +03:00
Daniel Gröber
b8076fc5d3 Bump cabal-helper dependency
For Cabal-1.24 support
2016-05-11 15:31:29 +02:00
Daniel Gröber
7e05c15219 'debug' shouldn't fail if 'cabal' is not installed
which seems to be more common that you'd think
2016-05-11 15:30:09 +02:00
Daniel Gröber
3ae9204b95 Disable 'cabal' cradle when executable isn't found 2016-05-11 15:21:19 +02:00
Daniel Gröber
ab3dccc77c Merge branch 'master' of github.com:DanielG/ghc-mod 2016-05-11 15:19:30 +02:00
Nikolay Yakimov
8e2c6fd083 Testcase for case-split crash 2016-03-15 23:33:28 +03:00
Nikolay Yakimov
835ed4e2e1 Merge branch 'master' into fix-map-cache 2016-03-15 23:18:59 +03:00
Nikolay Yakimov
c925e920a0 Merge pull request #769 from atom-haskell/fix-file-map-insts-type-fams
Fix mapping subst in info for insts add type fams
2016-03-15 23:18:12 +03:00
Nikolay Yakimov
4241ef16b2 Add mapped files to World 2016-03-15 22:14:13 +03:00
Nikolay Yakimov
11a1ad2cf3 Fix mapping subst in info for insts add type fams 2016-03-15 22:09:06 +03:00
Nikolay Yakimov
89bc149f60 Merge pull request #768 from atom-haskell/fix-case-split-file-map
Fix file-map for case-split
2016-03-15 22:08:52 +03:00
Nikolay Yakimov
dcaf95b4e3 Fix file-map for case-split 2016-03-15 21:43:27 +03:00
Nikolay Yakimov
432f8bfd93 [Type-constraints] Comments on collectSpansTypes
Also some minor code cleaning
2016-03-14 22:12:04 +03:00
Nikolay Yakimov
8e33dbd88d [Browse] Option to show symbol parents
E.g. Nothing is a constructor of Maybe, so it has
parent Maybe.

This is useful for completion, e.g. with `(..)` imports
2016-03-14 21:22:55 +03:00
Daniel Gröber
346d0868e0 Merge pull request #765 from DanielG/dev
Add more version info to debug command (+hlint bounds)
2016-03-13 17:30:01 +01:00
Daniel Gröber
59ade0d447 Add more version information to debug command 2016-03-09 21:56:23 +01:00
Daniel Gröber
dbe1c83a2c Bump lower bound on hlint
The Error -> Warning changes in older versions of hlint break the tests
otherwise
2016-03-09 21:56:23 +01:00
Daniel Gröber
5d9e8ea12b Add more version information to debug command 2016-03-09 21:43:19 +01:00
Daniel Gröber
70418f9547 Merge pull request #764 from atom-haskell/fix-736
Change loadTargets stderr loglevel to Debug
2016-03-03 21:15:22 +01:00
Nikolay Yakimov
2f82d5cdf4 Change loadTargets stderr loglevel to Debug
Closes #763
2016-03-03 23:06:39 +03:00
Daniel Gröber
5e2f79b7c8 Bump lower bound on hlint
The Error -> Warning changes in older versions of hlint break the tests
otherwise
2016-03-02 00:38:40 +01:00
Nikolay Yakimov
e9d4a281cc Merge pull request #736 from atom-haskell/fix-sig
Fix sig command
2016-03-02 01:38:10 +03:00
Nikolay Yakimov
8fa928d9dd Merge branch 'master' into fix-sig 2016-03-02 01:12:47 +03:00
Nikolay Yakimov
28356c1367 Merge pull request #738 from atom-haskell/find-cache-master
Non-interactive find cache
2016-03-02 00:36:05 +03:00
Nikolay Yakimov
677e5ab81f Merge branch 'master' into fix-sig 2016-03-02 00:28:28 +03:00
Nikolay Yakimov
2feaf14325 Merge branch 'master' into find-cache-master 2016-03-02 00:25:30 +03:00
Nikolay Yakimov
af6c18c162 Merge pull request #745 from alanz/opts-in-lib
Move globalArgsSpec to Library, to get a consistent way of parsing command line
2016-03-02 00:18:44 +03:00
Alan Zimmerman
f992200d57 Remove CPP from Options
As per @lierdakil suggestion
2016-03-01 22:58:10 +02:00
Alan Zimmerman
04b75e2bde Sort out imports for earlier GHC versions 2016-02-29 21:24:30 +02:00
Alan Zimmerman
45eb3b8d4c Do not use deprecated API for parseCmdLineOptions
Thanks to @lierdakil
2016-02-29 20:45:32 +02:00