Skip to content

Commit d69a640

Browse files
SAdams601SAdams601
authored
Merge pull request #1 from fodder008/interactive-test
Interactive test
2 parents 88c33c0 + 864be20 commit d69a640

File tree

146 files changed

+6876
-6118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+6876
-6118
lines changed

Diff for: ‎.travis.yml

+11-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ cache:
1313

1414
# See also https://github.com/hvr/multi-ghc-travis for more information
1515
env:
16-
- CABALVER=1.22 GHCVER=7.10.2
16+
- CABALVER=1.22 GHCVER=7.10.3
17+
- CABALVER=1.24 GHCVER=8.0.1
1718
# - CABALVER=1.22 GHCVER=head # see section about GHC HEAD snapshots
1819

1920
addons:
@@ -24,9 +25,11 @@ addons:
2425
packages:
2526
- libgmp-dev
2627
- cabal-install-1.22
28+
- cabal-install-1.24
2729
- happy-1.19.4
2830
- alex-3.1.3
29-
- ghc-7.10.2
31+
- ghc-7.10.3
32+
- ghc-8.0.1
3033
- emacs24
3134

3235
# matrix:
@@ -46,10 +49,13 @@ install:
4649
# git clone https://github.com/alanz/ghc-exactprint.git
4750
# (cd ghc-exactprint && git checkout wip && cabal install)
4851
# - |
52+
# git clone https://github.com/DanielG/cabal-helper.git
53+
# (cd cabal-helper && git checkout master && cabal install)
54+
# - |
4955
# git clone https://github.com/alanz/ghc-mod.git
50-
# (cd ghc-mod && git checkout master && cabal install)
51-
# (cd ghc-mod && git checkout az-temp && cabal install)
52-
- pwd
56+
# (cd ghc-mod && git checkout release && cabal install)
57+
# - pwd
58+
# - cabal install http://hackage.haskell.org/package/ghc-mod-5.6.0.0/candidate/ghc-mod-5.6.0.0.tar.gz
5359
- cabal install --dependencies-only --enable-tests
5460

5561
# Here starts the actual work to be performed for the package under

Diff for: ‎ChangeLog

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2016-08-03 v0.8.3.0
2+
* Update for GHC 8.0.1
3+
* Use ghc-mod version to 5.6 now it is released
4+
2016-01-20 v0.8.2.3
5+
* Use ghc-mod version to 5.5 now it is released
6+
* Expose commands working in RefactGhc, so the ghc-mod session can
7+
be shared in haskell-ide-engine. By @cocreature
8+
* Internal only, heavily clean up the ...Refactoring.Rename
9+
module. By @glittershark
10+
2016-01-07 v0.8.2.2
11+
* Lock ghc-mod version to 0.5.4 to prevent issues when 0.5.5 comes out
12+
* Set minimum bound on ghc-exactprint, the behaviour of layout has
13+
changed for ifToCase. This will be re-done once ghc-exactprint is
14+
updated for GHC 8.0.1
15+
* The constructors for ghc-mod `Options` are now re-exported too
16+
for convenience.
117
2015-11-08 v0.8.2.1
218
* Set GHC-Opts to -O0 for sane compile times
319
* Make the ghc-hare depend on the library, rather than rebuilding

Diff for: ‎HaRe.cabal

+35-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Name: HaRe
2-
Version: 0.8.2.1
2+
Version: 0.8.3.0
33
Author: Chris Brown, Huiqing Li, Simon Thompson, Alan Zimmerman
4-
Maintainer: Alan Zimmerman
4+
Maintainer: Alan Zimmerman (alan/zimm@gmail.com)
55
Stability: Alpha
66
Bug-Reports: http://github.com/RefactoringTools/HaRe/issues
77
License: BSD3
@@ -17,7 +17,9 @@ Description:
1717
.
1818
From version 0.8.0.0, GHC 7.10.2 is supported.
1919
.
20-
It is tested against GHC 7.10.2 (via travis-ci.org)
20+
From version 0.8.3.0, GHC 8.0.1 is supported.
21+
.
22+
It is tested against GHC 7.10.3 and GHC 8.0.1 (via travis-ci.org)
2123
.
2224
It currently only has emacs integration built in, community input
2325
welcome for others.
@@ -40,12 +42,14 @@ Category: Development, Refactoring
4042
Cabal-Version: >= 1.8
4143
Build-Type: Simple
4244

43-
tested-with: GHC == 7.10.2
45+
tested-with: GHC == 7.10.3, GHC == 8.0.1
4446

4547
data-files: elisp/*.el
4648
configure.sh
4749
test/testdata/*.cabal
4850
test/testdata/*.hs
51+
test/testdata/AddOneParameter/*.hs
52+
test/testdata/AddOneParameter/*.expected.hs
4953
test/testdata/Case/*.hs
5054
test/testdata/Case/*.hs.expected
5155
test/testdata/Case/*.hs.expected.dd
@@ -72,6 +76,8 @@ data-files: elisp/*.el
7276
test/testdata/Renaming/*.expected.hs
7377
test/testdata/Renaming/*.hs
7478
test/testdata/Renaming/*.hs.expected
79+
test/testdata/RmOneParameter/*.expected.hs
80+
test/testdata/RmOneParameter/*.hs
7581
test/testdata/Simple/*.hs
7682
test/testdata/Simple/*.hs.expected
7783
test/testdata/SwapArgs/*.hs
@@ -108,7 +114,7 @@ extra-source-files: ChangeLog
108114

109115
Library
110116
-- GHC 7.10.2 ships with base 4.8.1.0
111-
Build-Depends: base >= 4.8.1.0 && < 4.9
117+
Build-Depends: base >= 4.8.1.0 && < 5
112118
, containers
113119
, directory
114120

@@ -120,7 +126,7 @@ Library
120126
, ghc-paths
121127
, ghc-prim
122128
, ghc-syb-utils
123-
, ghc-mod >= 5.4
129+
, ghc-mod >= 5.6.0.0
124130
, mtl
125131
, old-time
126132
, pretty
@@ -132,8 +138,9 @@ Library
132138
, time
133139
, Strafunski-StrategyLib
134140
, syz
135-
, ghc-exactprint >= 0.4.1
141+
, ghc-exactprint >= 0.5.2.1
136142
, monad-control
143+
, syb-with-class
137144
, Cabal >= 1.22
138145

139146
GHC-Options: -O0
@@ -150,9 +157,10 @@ Library
150157
, Language.Haskell.Refact.Refactoring.RoundTrip
151158
, Language.Haskell.Refact.Refactoring.Simple
152159
, Language.Haskell.Refact.Refactoring.SwapArgs
153-
-- , Language.Haskell.Refact.Refactoring.DeleteDef
154-
-- , Language.Haskell.Refact.Refactoring.IntroduceTypeSyn
155-
, Language.Haskell.Refact.Utils.Binds
160+
, Language.Haskell.Refact.Refactoring.MultiRename
161+
, Language.Haskell.Refact.Refactoring.DeleteDef
162+
, Language.Haskell.Refact.Refactoring.IntroduceTypeSyn
163+
, Language.Haskell.Refact.Refactoring.UnwrapTypeSyn
156164
, Language.Haskell.Refact.Utils.ExactPrint
157165
, Language.Haskell.Refact.Utils.GhcBugWorkArounds
158166
, Language.Haskell.Refact.Utils.GhcModuleGraph
@@ -166,6 +174,7 @@ Library
166174
, Language.Haskell.Refact.Utils.Types
167175
, Language.Haskell.Refact.Utils.Utils
168176
, Language.Haskell.Refact.Utils.Variables
177+
, Language.Haskell.Refact.Utils.Compare
169178
, Paths_HaRe
170179
if impl (ghc < 7.10.2)
171180
buildable: False
@@ -180,7 +189,7 @@ Executable ghc-hare
180189
./src
181190

182191
-- GHC 7.10.2 ships with base 4.8.1.0
183-
Build-Depends: base >= 4.8.1.0 && < 4.9
192+
Build-Depends: base >= 4.8.1.0 && < 5
184193
, array
185194
, containers
186195
, directory
@@ -194,8 +203,11 @@ Executable ghc-hare
194203
, ghc-paths
195204
, ghc-prim
196205
, ghc-syb-utils
197-
, ghc-mod >= 5.4
206+
, gitrev >= 1.1
207+
, ghc-mod >= 5.6.0.0
198208
, mtl
209+
, optparse-applicative
210+
, optparse-simple
199211
, old-time
200212
, parsec >= 3.1.6
201213
, pretty
@@ -207,9 +219,10 @@ Executable ghc-hare
207219
, hslogger
208220
, Strafunski-StrategyLib
209221
, syz
210-
, ghc-exactprint >= 0.4.1
222+
, ghc-exactprint >= 0.5.2.1
211223
, monad-control
212224
, Cabal >= 1.22
225+
, syb-with-class
213226
-- , Paths_HaRe
214227
, HaRe >= 0.8.2.1
215228
Extensions: CPP
@@ -234,7 +247,8 @@ test-suite spec
234247
src
235248
test
236249
other-modules:
237-
CaseSpec
250+
AddRmParamSpec
251+
, CaseSpec
238252
, DupDefSpec
239253
, GhcUtilsSpec
240254
, LocUtilsSpec
@@ -247,13 +261,15 @@ test-suite spec
247261
, TestUtils
248262
, TypeUtilsSpec
249263
, UtilsSpec
264+
, DeleteDefSpec
265+
, IntroduceTypeSynSpec
266+
, UnwrapTypeSynSpec
250267

251268
-- , Language.Haskell.Refact.API
252269
-- , Language.Haskell.Refact.HaRe
253270
-- , Language.Haskell.Refact.Refactoring.AddRmParam
254271
-- , Language.Haskell.Refact.Refactoring.Case
255272
-- , Language.Haskell.Refact.Refactoring.RoundTrip
256-
-- , Language.Haskell.Refact.Utils.Binds
257273
-- , Language.Haskell.Refact.Utils.ExactPrint
258274
-- , Language.Haskell.Refact.Utils.GhcModuleGraph
259275
-- , Language.Haskell.Refact.Utils.GhcUtils
@@ -269,7 +285,7 @@ test-suite spec
269285
-- , Paths_HaRe
270286
build-depends:
271287
-- GHC 7.10.2 ships with base 4.8.1.0
272-
base >= 4.8.1.0 && < 4.9
288+
base >= 4.8.1.0 && < 5
273289
, Diff >= 0.3.0
274290
, HUnit
275291
, QuickCheck >= 2.5
@@ -286,7 +302,7 @@ test-suite spec
286302
, ghc-paths
287303
, ghc-prim
288304
, ghc-syb-utils
289-
, ghc-mod >= 5.4
305+
, ghc-mod >= 5.6.0.0
290306
, hspec
291307
, mtl
292308
, old-time
@@ -301,9 +317,10 @@ test-suite spec
301317
, hslogger
302318
, Strafunski-StrategyLib
303319
, syz
304-
, ghc-exactprint >= 0.4.1
320+
, ghc-exactprint >= 0.5.2.1
305321
, monad-control
306322
, Cabal >= 1.22
323+
, syb-with-class
307324
-- , Paths_HaRe
308325
, HaRe >= 0.8.2.1
309326
Extensions: CPP

Diff for: ‎README.md

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## <img src="https://rawgithub.com/alanz/HaRe/master/HaReLogo.svg" width="40" height="30" /> HaRe : The Haskell Refactorer
1+
## <img src="https://rawgit.com/alanz/HaRe/master/HaReLogo.svg" width="40" height="30" /> HaRe : The Haskell Refactorer
22

33
Home is now https://github.com/RefactoringTools/HaRe
44

@@ -10,6 +10,8 @@ execute identity transformation!
1010
[![Available on Hackage][badge-hackage]][hackage]
1111
[![License BSD3][badge-license]][license]
1212
[![Build Status][badge-travis]][travis]
13+
[![Stackage LTS](http://stackage.org/package/HaRe/badge/lts)](http://stackage.org/lts/package/HaRe)
14+
[![Stackage Nightly](http://stackage.org/package/HaRe/badge/nightly)](http://stackage.org/nightly/package/HaRe)
1315

1416
[badge-travis]: https://travis-ci.org/RefactoringTools/HaRe.png?branch=master
1517
[travis]: https://travis-ci.org/RefactoringTools/HaRe
@@ -31,11 +33,12 @@ HaRe with 7.10.2 and then using it against projects using an earlier compiler
3133
will not work, as HaRe needs to be able to invoke GHC to the type checker stage
3234
on the project using GHC 7.10.2.
3335

34-
See https://github.com/kazu-yamamoto/ghc-mod/issues/615
36+
See https://github.com/DanielG/ghc-mod/issues/615
3537

3638
### Getting Started
3739

3840
cabal install HaRe
41+
stack install HaRe --resolver=lts-4.0
3942

4043
Check that it works from the command line
4144

@@ -104,6 +107,9 @@ E.g., after renaming in Foo.hs, there will be two files
104107
This allows a sequence of refactorings to be undone manually if
105108
required. In theory.
106109

110+
#### VIM integration
111+
112+
See https://github.com/glittershark/vim-hare
107113

108114
### Development & Support
109115

@@ -123,9 +129,9 @@ To run the test suite do:
123129
The `configure.sh` script simply makes sure that all the cabal projects used in
124130
the tests are also configured.
125131

126-
See <http://hspec.github.com/> for details on hspec
132+
See <http://hspec.github.io/> for details on hspec
127133

128-
see <http://travis-ci.org/#alanz/HaRe> for continuous build results
134+
see <https://travis-ci.org/#alanz/HaRe> for continuous build results
129135

130136
### Resources
131137

@@ -162,5 +168,5 @@ Please put a pull request for this list if you are missing.
162168
width="400" height="300" />
163169

164170
The logo was designed by Christi du Toit,
165-
<http://www.behance.net/christidutoit>
171+
<https://www.behance.net/christidutoit>
166172

0 commit comments

Comments
 (0)