14ee81e300
Allow GhcModError as an Exception and catch it in GhcModT's liftIO
2014-10-31 22:23:48 +01:00
1797a53800
Fix `newTempDir` on Windows
2014-10-31 12:42:03 +01:00
34dd9de83c
Add Show instance for `Options`
2014-10-30 01:11:10 +01:00
9ac128aa6f
Fix #387 , Pattern match failure in GhcPkg
2014-10-30 01:10:56 +01:00
33d6f38a20
removing a warning.
2014-10-06 15:55:16 +09:00
ef371a7ebf
fixing tests.
2014-10-06 15:29:05 +09:00
ab7059d5e4
Merge remote-tracking branch 'upstream/no-set'
...
Conflicts:
Language/Haskell/GhcMod/Find.hs
2014-10-03 21:39:20 +02:00
c4929c54af
getConfig runs "cabal configure" first if setup-config is invalid.
2014-09-23 21:28:03 +09:00
7db266c22d
adding World.hs.
2014-09-23 17:34:09 +09:00
9ed4aa8fdf
using void.
2014-09-23 14:55:56 +09:00
735b80d0cc
exporting setupConfigFile.
2014-09-23 14:49:13 +09:00
d831d6aa59
moving PackageDb stuff to GhcPkg.
2014-09-23 13:47:32 +09:00
71bbd1c5d4
removing warnings.
2014-09-22 11:32:28 +09:00
bc65c477d0
fixing typo.
2014-09-22 11:20:11 +09:00
b96a8c6457
check does not use overrideGhcUserOptions again.
...
- workaround for #376
- logically reverting ec1b115cc1
2014-09-22 10:46:46 +09:00
e8988c2f02
ghc-modi's "find" now catches up if packageDb is updated.
2014-09-20 12:25:46 +09:00
5a4bec8755
Rewrite `ghc-mod` command line frontend.
2014-09-18 10:45:14 +02:00
34dd8c5bd9
Fix error when compiling with HSE < 1.16
2014-09-17 23:39:10 +02:00
8f123dc7de
Fix compiling with HSE >= 1.16.0
2014-09-16 05:50:00 +02:00
b96ef00248
formatting: FillSig.hs
2014-09-16 05:49:56 +02:00
690a64f5b5
Merge branch 'master' of https://github.com/robeverest/ghc-mod
...
Conflicts:
Language/Haskell/GhcMod/CabalConfig.hs
2014-09-12 05:21:12 +02:00
2c2e7782d2
Use the cabal configuration flags where possible when finalizing the PackageDescription.
2014-09-12 13:15:05 +10:00
8b01af6cde
Handle LocalBuildInfo for Cabal 1.21; squash commits; fixes #343 .
2014-09-12 04:50:29 +02:00
1c8d1edb4d
Workaround for #340
2014-09-12 04:02:32 +02:00
8889c2e8e5
note
2014-09-11 01:27:19 +02:00
83d780015c
Use `readProcess'` in PkgDoc.hs
2014-09-11 01:26:42 +02:00
274b5d8e1c
Rephrase some docs
2014-08-29 17:21:38 +02:00
a0ae09a3e6
Give readProcess' more sensible error messages.
...
Also a bunch of refactoring for GhcModError
2014-08-28 15:57:49 +02:00
a7f00931c5
Rename List.hs -> Modules.hs
2014-08-28 11:41:03 +02:00
0944820dba
CaseSplit panic sorted. closes https://github.com/kazu-yamamoto/ghc-mod/issues/336
2014-08-23 14:06:26 +02:00
d045001eb7
Letting "ghc-mod dumpsym" work on non-cabal directories.
2014-08-20 15:31:26 +09:00
190dc2ac51
try to fix Travis CI.
2014-08-20 11:59:44 +09:00
9456ea426d
fixing typos.
2014-08-19 17:18:36 +09:00
a483f4f8b6
error messages are stored after NG, not printed in stderr.
2014-08-19 14:56:01 +09:00
ad3a42844d
Merge pull request #330 from DanielG/dev-error
...
Remove dedicated exception handling in `check` completely
2014-08-19 11:52:09 +09:00
147dd90ee7
Remove dedicated exception handling in `check` completely
...
Exceptions are already caught at the top level so this is unnecessary.
2014-08-19 04:49:44 +02:00
af6de8c849
Merge pull request #329 from DanielG/dev-error
...
Remove `withErrorHandler`, use `liftExceptions` instead
2014-08-19 11:41:44 +09:00
1b5917c70e
Remove `withErrorHandler`, use `liftExceptions` instead
2014-08-19 04:30:44 +02:00
5b78711842
Revert way to report errors when deferred as warnings
...
Fixes #310
2014-08-18 17:32:32 +02:00
0fd8b9afd8
first try to resolve #322 .
2014-08-18 16:55:41 +09:00
5a657b9df8
removing warnings
2014-08-18 15:24:38 +09:00
271ff4e162
Catch `cabal configure` failure properly
2014-08-18 08:06:36 +02:00
f5d051dcef
Remove `toGhcModT` it's not needed anymore.
2014-08-15 20:35:21 +02:00
10042c6b0c
Fix for GHC 7.4
2014-08-15 11:00:48 +02:00
57db768ed0
Fix for GHC 7.4
2014-08-15 10:46:52 +02:00
f584bf5d5b
Show error messages without qualification
2014-08-15 10:43:07 +02:00
6b62117381
Remove redundant typed hole warnings
2014-08-15 09:41:02 +02:00
7612229cc0
Keep all errors and warnings for code
2014-08-15 09:32:28 +02:00
fdbecdddce
Make better check in presence of typed holes
2014-08-14 20:51:49 +02:00
890658f9cb
Fix merge conflict, dropdown-list no longer needed
2014-08-14 18:02:58 +02:00
bd28310e59
Don't fall back to sandbox if cabal file failes to parse
2014-08-12 00:02:39 +02:00
b13465b588
Some docs in CabalConfig.hs
2014-08-11 23:48:15 +02:00
fad99f466f
Export GhcModError(..)
2014-08-06 20:40:11 +02:00
9e4f1c9057
add note
2014-08-06 19:38:42 +02:00
cb28e9ec8f
Fix warning
2014-08-06 19:38:42 +02:00
c98eb23bdf
Clean up getSymbolTable a bit more
2014-08-06 19:38:42 +02:00
459106a6d5
Clean up Find.hs a bit
2014-08-06 19:38:42 +02:00
f311efd90c
Rework GhcModT monad stack
2014-08-06 19:38:42 +02:00
43ac9036f9
Fixes on GHC < 7.8
2014-08-04 17:25:18 +02:00
d1a6618329
More package fixes for GHC < 7.8
2014-08-03 20:38:54 +02:00
d22e50d9e4
Small fix to compile in GHC < 7.8
2014-08-03 19:57:01 +02:00
9cc6476df1
Add better support for auto, with several options searched
2014-08-03 19:14:42 +02:00
3aa83e14dd
Show more than one Djinn completion
2014-08-02 09:52:36 +02:00
31a7ce3d19
Merge remote-tracking branch 'kazu/master'
2014-08-01 17:08:50 +02:00
9161757f95
First attempt to add auto
2014-08-01 17:08:23 +02:00
d1daf6def9
Merge pull request #296 from serras/master
...
Add refinement and better support for typed holes in Emacs mode
2014-08-01 15:14:50 +09:00
92651fbb26
interpret backslash-escaped characters at the line boundary
2014-07-30 12:03:58 +09:00
e3853a49f1
Add fix for GHC 7.4
2014-07-27 14:11:54 +02:00
f1d0436467
Remove case splitting for type families
2014-07-27 12:20:46 +02:00
9b500da4b8
Another try at case split for type families
2014-07-26 13:07:45 +02:00
9b38818f66
Merge remote-tracking branch 'kazu/master'
2014-07-24 20:21:44 +02:00
361fe24be0
Start case splitting on type families (NOT working)
2014-07-24 20:21:05 +02:00
d9c6638493
Work on initial signature for type families
2014-07-24 20:20:30 +02:00
10ef20b967
Merge pull request #293 from DanielG/dev-exec-path
...
Fall back to getProgName when exeutable name is not available
2014-07-21 11:11:25 +09:00
0736516512
Document exposed parts of GhcMod.Monad
2014-07-21 00:27:12 +02:00
ba9c70dff7
Fall back to assuming ghc-mid is on PATH when exeutable name is not available
2014-07-20 23:50:32 +02:00
eb5ec73ae1
Complete parenthesis on refinement
2014-07-20 13:33:36 +02:00
54d10684b9
Merge remote-tracking branch 'kazu/master'
2014-07-20 10:45:28 +02:00
ae49eab547
First steps in refinement
2014-07-19 12:11:34 +02:00
60e97d4579
Merge remote-tracking branch 'kazu/master'
2014-07-19 10:13:19 +02:00
981051a642
implementing fallback from Simple to Intelligent.
2014-07-19 11:53:05 +09:00
5abd75ea7d
fixing a infinite process loop.
2014-07-19 11:50:12 +09:00
6302d4882e
Merge remote-tracking branch 'kazu/master'
...
Conflicts:
Language/Haskell/GhcMod/Check.hs
Language/Haskell/GhcMod/FillSig.hs
Language/Haskell/GhcMod/GHCApi.hs
2014-07-18 17:12:52 +02:00
852d742796
Continue work on refinement
2014-07-18 17:09:02 +02:00
0080f9b68c
Internal exports extra Monad stuff.
2014-07-18 15:42:05 +09:00
30ddd655cd
export minimum Monad stuff from GhcMod.
2014-07-18 15:31:42 +09:00
e1d9c3b881
clean up lookupSymbol.
2014-07-18 15:13:30 +09:00
6d42354a5b
setMode and getMode
2014-07-18 14:55:21 +09:00
7b079896b1
doc sectioning.
2014-07-18 14:55:08 +09:00
26316262aa
converting GhcMonad to IOish.
2014-07-18 14:54:39 +09:00
233f4cf05e
moving setFlags to Gap.
2014-07-18 11:09:11 +09:00
0ce70ae22d
set Opt_SpecConstr just in case.
2014-07-18 10:52:57 +09:00
3c04e78ba7
Don't rely on ghc-mod being in PATH
2014-07-17 16:17:17 +02:00
3c1b560068
Short circuit export list when compiling spec
2014-07-17 16:15:02 +02:00
4f0f5f09a6
Remove `type Db` it's only used once and makes things less clear
2014-07-17 15:54:59 +02:00
e61aaed023
Make `readProcess'`more generic
2014-07-17 15:52:33 +02:00
cffa7463eb
adopting hlint's suggestions.
2014-07-17 17:16:44 +09:00
05f45f1d36
adding error handling.
2014-07-17 14:40:35 +09:00
cf0df26560
Monad.hs is now exported by GhcMod.hs.
2014-07-17 14:30:42 +09:00
74e84e89ac
deleting GhcMod.Ghc.
2014-07-17 14:04:28 +09:00
b21fa674ea
Merge remote-tracking branch 'kazu/master'
2014-07-17 06:59:29 +02:00
c3722f7a20
Include 'refine' again
2014-07-17 06:59:10 +02:00
409bc99f10
error handling for loadSymbolDb.
2014-07-17 12:37:38 +09:00
cee1b83daa
the first step to create SymbolDB via a file.
2014-07-17 11:57:19 +09:00
57bd408785
Merge remote-tracking branch 'kazu/master'
...
Conflicts:
Language/Haskell/GhcMod.hs
Language/Haskell/GhcMod/Check.hs
Language/Haskell/GhcMod/FillSig.hs
Language/Haskell/GhcMod/GHCApi.hs
Language/Haskell/GhcMod/Ghc.hs
src/GHCMod.hs
2014-07-16 19:01:43 +02:00
49437d82d9
Initial work on refining variable
2014-07-16 18:20:52 +02:00
204d449aef
set optimization level to 0 just in case.
2014-07-15 21:34:05 +09:00
49284a64be
Uses HscNothing and falls back to HscInterpreted if necessary ( #205 )
...
Two Test case are fails but it is not fatal.
2014-07-15 17:20:35 +09:00
25730e2a6c
trying to fix CI
2014-07-15 15:13:06 +09:00
c87ea45488
adding #if to Monad.hs.
2014-07-15 14:45:41 +09:00
0b71748708
moving #if to Gap.hs
2014-07-15 14:44:02 +09:00
a7a02a3f4c
Bringing back MaybeT
...
This brings back a warning to be fixed.
2014-07-15 12:49:12 +09:00
86829561ab
style only.
2014-07-15 12:41:10 +09:00
84c3cec0f1
moving #if to Gap.hs.
2014-07-15 12:40:18 +09:00
be9a67f02a
moving #if to Gap.hs.
2014-07-15 12:29:27 +09:00
1524d2a43e
removing warnings.
2014-07-15 12:10:18 +09:00
8495633dc8
explicitly specifying CompManager to ghcMode.
2014-07-15 12:06:07 +09:00
89a4db2345
Merge pull request #288 from DanielG/dev-pkgs
...
Make `GhcMod` be `GhcModT (ErrorT IO)`
2014-07-15 11:49:10 +09:00
686179f12b
Fix building with ghc < 7.8
2014-07-15 02:34:07 +02:00
7474a1b652
Bring back `GhcMod` but this time it's a GhcModT with an ErrorT inside
2014-07-15 01:04:06 +02:00
f0bfcb8811
Use GhcModT everywhere and remove the GhcMod alias
...
Not doing this makes having GhcModT pretty pointless as users of the
library wouldn't be able to use custom inner monads as evey function for
dealing with GhcModT's would be constraint to (GhcModT IO) thus only
allowing IO as the inner monad.
2014-07-15 01:03:56 +02:00
d98cedc9c0
Merge pull request #287 from DanielG/dev-untangle
...
Untangle Monad.hs and GHCApi.hs and some other changes
2014-07-12 14:27:43 +09:00
b6896a481a
Move `initializeFlagsWithCradle` to Monad.hs
2014-07-12 03:33:04 +02:00
503e8cbe06
Move DynFlag related functions from GHCApi to another module
2014-07-12 02:57:19 +02:00
81c58585a2
Add functions for dealing with packages, modules and bindings to GHCApi
2014-07-11 10:43:51 +02:00
73bf4cbc4e
Remove `withGhc` and `withGhc'`, they're not used anymore.
2014-07-11 10:41:43 +02:00
daada0d27e
Fix GHC 7.8.3: MatchGroup now has 4 args
...
Rather than use a pattern match, this patch opts to explicitly extract
the fields of interest using where syntax. This keeps compatibility
across GHC 7.8 releases.
Ref: eeaea2df3f (diff-259092edcc59456f526cdef255c181d1L909)
2014-07-11 01:15:22 -04:00
9f94bc863c
Add `Module` type
2014-07-11 05:44:31 +02:00
d818a64f6f
whitespace
2014-07-11 04:51:27 +02:00
320b2243a2
Make GhcMod a special case of GhcModT
...
i.e. turn GhcMod into a monad transformer
2014-07-11 04:51:11 +02:00
56ad1a3c8c
Control.Monad.Trans.MonadIO -> CoreMonad.MonadIO
...
they are different before ghc 7.8
2014-07-11 04:12:05 +02:00
4b6a687bc1
Migrate the remaining parts of the exposed API to `GhcMod a`
2014-07-11 03:13:38 +02:00
dc5ba6d00d
Add newGhcModEnv for allowing multiple active sessions
...
Conflicts:
Language/Haskell/GhcMod/Monad.hs
2014-07-10 21:14:47 +02:00
72679c619c
Show more relevant bindings in typed holes
2014-07-06 09:45:02 +02:00
86a7f954e3
Add a comment discouraging the use of `toGhcMod` in new code
2014-07-04 19:03:02 +02:00
609ca52dee
Merge branch 'serras-master'
2014-07-03 17:04:00 +09:00
f2e20e3279
comments.
2014-07-03 14:26:39 +09:00
640140608e
layout.
2014-07-03 14:22:43 +09:00
826d42f824
clean up macros.
2014-07-03 14:19:36 +09:00
c13fdde2f8
importing Control.Monad.IO.Class explicity.
...
trying to resolve #277 .
2014-07-03 12:50:46 +09:00
df258843d9
Fix missing OccName import for ghc 7.4
2014-07-02 17:18:03 +02:00
ccc21461b2
Fix missing import for ghc 7.4
2014-07-02 17:00:10 +02:00
c707eb4e8c
Revert back change in MonadIO GhcMod
2014-07-01 17:56:59 +02:00
063ca80946
Fix compilation errors on ghc < 7.8
2014-07-01 17:43:13 +02:00
11acd93bf6
Try to fix for ghc < 7.8
2014-06-29 10:28:28 +02:00
c06ee75fbb
Fix building errors on ghc < 7.8 and tests
2014-06-28 23:18:49 +02:00
1b66f65b48
Move lots of stuff to GhcMod
...
- Generalize many signatures to GhcMonad m
2014-06-28 21:43:51 +02:00
871f72fca4
Remove code with extensions not present < ghc 7.8
2014-06-27 19:32:05 +02:00
edfe0c8ef3
Cleaning of case splitting code
2014-06-27 19:06:20 +02:00
2ab6991d95
Move code to new FillSig module
...
- Clean up a lot of code
2014-06-27 18:38:15 +02:00
3ef1979f67
Case splitting works in Emacs!
2014-06-26 21:17:22 +02:00
40cd5b7deb
Haskell part of case splitting working!
2014-06-25 18:09:24 +02:00
5fa536714f
Initial code generation working
...
- Added fallback with haskell-src-exts
2014-06-22 18:03:34 +02:00
90abb89a98
Inserting instance initial body now works :)
2014-06-22 11:10:23 +02:00
a45fb4c6f5
Move case split and sig. generation to own files
...
- Created SrcUtils module for shared functionality
2014-06-21 11:38:44 +02:00
8c56d2e3c8
Obtain better information for case split
2014-06-18 21:01:22 +02:00
5a968225c3
Initial skeleton for case split in elisp
2014-06-17 18:15:36 +02:00
8a63ae078b
Add missing cases for signatures
2014-06-16 22:10:01 +02:00
585c28f928
Initial implementation of instance completion
2014-06-11 22:01:43 +02:00
323c1b5471
Initial support for adding body from signature
2014-06-10 21:34:05 +02:00
cedf59ace7
Merge branch 'fix-typed-holes'
2014-06-10 17:09:46 +02:00
2f42d77b53
Add special cases for case splitting
2014-06-09 13:01:47 +02:00
c9b901f4f9
Fix problems with GHC's Typed Holes
2014-06-09 10:30:33 +02:00
0c445aa30f
Work on case split variable naming
2014-06-08 14:23:06 +02:00
6854d417c0
Initial implementation of case splitting
...
- It doesn't handle vars correctly yet
2014-06-08 12:33:13 +02:00
241c7946fc
Revert "Fix tests for Cabal <= 1.16"
...
The problem the reverted commit tried to fix seems to have been just a
symptom of another root cause that was later fixed as the problem does
not seem to occur anymore even without this changeset also this
changeset broke cabal sandboxes with ghc < 7.8.
Fix #262
This reverts commit 8741323f5b
2014-05-19 01:27:35 +02:00
fcc3b46415
defining C macro if not defined.
2014-05-16 09:27:23 +09:00
814ea60552
`Types` doesn't export `convert` anymore
2014-05-14 20:55:54 +02:00
8324dd96ae
Don't expose `Convert`
2014-05-14 18:54:56 +02:00
80e2761f2f
Ghc->GhcMod: finish Browse, Check
2014-05-14 18:05:40 +02:00
ebfb740a2e
Move `convert` to it's own module.
2014-05-14 17:06:30 +02:00
f1535efcf2
Ghc -> GhcMod: Browse, Check
2014-05-14 17:06:29 +02:00
e5c6d3e472
Start migrating Ghc -> GhcMod monad
2014-05-14 17:06:29 +02:00
ef375668d1
Suppress empty line
2014-05-11 00:30:02 +09:00
96a85fe953
Copy readMaybe/readEither from base >= 4.7 for backwards compatibility
2014-05-10 13:43:46 +02:00
5492f0c5d1
Add license headers for code copied from Cabal
2014-05-10 13:43:27 +02:00
f949e4be7a
Copy ComponentLocalBuildInfo from Cabal-1.18
...
This way `configDependencies` works even when the Cabal version used by
cabal-install is later than the one used by ghc-mod.
2014-05-10 02:04:09 +02:00
13930a9d7d
Fix Cabal >= 1.18
2014-05-09 21:12:52 +02:00
175635505d
Fix warnings
2014-05-09 20:44:33 +02:00
8741323f5b
Fix tests for Cabal <= 1.16
2014-05-09 20:37:15 +02:00
d1da6ab289
Make getSystemLibDir use `GHC.Paths` instead of running `ghc`
2014-05-09 20:36:20 +02:00
b8f9498f83
Fix reading of older Cabal `setup-config`s
2014-05-09 20:35:13 +02:00
2e3b172b0e
enabling -fno-warn- ( #246 ).
2014-05-09 23:45:34 +09:00
fae4730ba5
Import HscTypes (HscEnv) with ghc <= 7.2
2014-05-08 13:14:44 +02:00
a7b2c86985
Fall back to Cabal 1.16 format on runtime if extracting fails
2014-05-08 12:59:52 +02:00
4c93819da8
Fix ghc-7.8
2014-05-08 11:50:51 +02:00
7b8540add1
Add support for getting pkgDeps with Cabal <= 1.16
2014-05-08 11:32:40 +02:00
b7d92417bc
HasDynFlags is provided after 7.6.
2014-05-08 17:01:01 +09:00
cc3e728f03
fixing comment.
2014-05-08 16:51:15 +09:00
61207c13d3
Add MonadIO instance for RWST
2014-05-08 08:36:18 +02:00
8561e7b656
To break cyclic import, this patch makes `GhcPkg.hs` independent from `Monad.hs`(refactoring for #244 )
...
This removes `ghcPkgList`, `ghcPkgListEx` and `ghcPkgDbOpt`. I'm not sure
this is a right way to do.
2014-05-08 12:42:45 +09:00
f199ea9e2e
removing warnings.
2014-05-08 10:49:40 +09:00
5044cf7f56
Fix warnings
2014-05-05 09:43:14 +02:00
635830b527
Fix #242 , ghcPkgList(Ex) on NixOS
2014-05-05 00:29:10 +02:00
ea427d60ba
note: MonadIO class
2014-05-04 04:57:38 +02:00
c50b4f5a38
ghc-mod deserves it's own monad
...
Having to call `findCradle` and `initializeFlagsWithCradle` everywhere
we interact with ghc-mod's API doesn't seem very Haskell-like to me I
think we should provide a Monad that has a run function that already
does all those tedious tasks for us.
The `GhcMod` monad is basically a wrapper around `RWST r w s IO` with an
instance for `GhcMonad`
Having a `Reader` allows us to pass `Options` to runGhcMod and not have
to worry about passing it everywhere, `Cradle` is also stored in the
reader environment on initialization.
Writer and State are just there for future use.
I've included a `toGhcMod` function that turns a `Ghc a` into a `GhcMod
a` this will make it easy to transition everyting to using the `GhcMod`
monad instead of `Ghc` without breaking the build or test suite for
extended periods of time.
Conflicts:
ghc-mod.cabal
2014-05-04 04:57:38 +02:00
096a56e660
Hide `catch` from Prelude
2014-05-04 04:57:38 +02:00
4e4d27e62d
Use `componentsConfigs` instead of `configDependencies`
...
`configDependencies` was added in Cabal-1.20 but we're using 1.18 on travis.
2014-05-04 04:57:38 +02:00
9d9f66e942
Remove `Maybe` from `cabalConfigDependencies` and `fromInstalledPackageId`
2014-05-04 04:57:38 +02:00
0c859294a3
Parse cabal `setup-config` to get depencencies
2014-05-03 15:36:10 +02:00
Daniel Gröber