39592b2 · ormolu · git.iko.soy

CHANGELOG.md+3

compare with master

unifiedsplit

@@ -32,6 +32,9 @@

32 [440](https://github.com/tweag/ormolu/issues/440) and

33 [448](https://github.com/tweag/ormolu/issues/448).

34

35+* Implemented correct handling of shebangs. [Issue

36+ 377](https://github.com/tweag/ormolu/issues/377).

37+

35## Ormolu 0.0.1.0

38## Ormolu 0.0.1.0

36

39

37* Initial release.

40* Initial release.

data/examples/module-header/shebang-out.hs+1

@@ -1,4 +1,5 @@

1#! /usr/bin/env runhaskell

2+

2import Prelude

3import Prelude

3

4

4main :: IO ()

5main :: IO ()

data/examples/module-header/shebang-with-pragmas-out.hsnew file+5

@@ -0,0 +1,5 @@

1+#!/usr/bin/env stack

2+

3+{-# LANGUAGE OverloadedStrings #-}

4+

5+main = pure ()

data/examples/module-header/shebang-with-pragmas.hsnew file+5

@@ -0,0 +1,5 @@

1+#!/usr/bin/env stack

2+

3+{-# LANGUAGE OverloadedStrings #-}

4+

5+main = pure ()

data/examples/module-header/shebang.hs+1

@@ -1,4 +1,5 @@

1#! /usr/bin/env runhaskell

2+

2import Prelude

3import Prelude

3

4

4main :: IO ()

5main :: IO ()

src/Ormolu/Parser.hs+33−13

@@ -49,7 +49,7 @@ parseModule ::

49 Either (SrcSpan, String) ParseResult

50 )

51parseModule Config {..} path input' = liftIO $ do

52− let (input, extraComments) = stripLinePragmas path input'

52+ let (input, extraComments) = extractCommentsFromLines path input'

53 -- NOTE It's important that 'setDefaultExts' is done before

54 -- 'parsePragmasIntoDynFlags', because otherwise we might enable an

55 -- extension that was explicitly disabled in the file.

@@ -73,12 +73,13 @@ parseModule Config {..} path input' = liftIO $ do

73 GHC.PFailed _ ss m ->

74 Left (ss, GHC.showSDoc dynFlags m)

75 GHC.POk pstate pmod ->

76− let (comments, exts) = mkCommentStream extraComments pstate

76+ let (comments, exts, shebangs) = mkCommentStream extraComments pstate

77 in Right ParseResult

78 { prParsedSource = pmod,

79 prAnns = mkAnns pstate,

80 prCommentStream = comments,

81− prExtensions = exts

81+ prExtensions = exts,

82+ prShebangs = shebangs

82 }

83 }

83 return (warnings, r)

84 return (warnings, r)

84

85

@@ -127,18 +128,31 @@ runParser parser flags filename input = GHC.unP parser parseState

127 buffer = GHC.stringToStringBuffer input

128 buffer = GHC.stringToStringBuffer input

128 parseState = GHC.mkPState flags buffer location

129 parseState = GHC.mkPState flags buffer location

129

130

130−-- | Remove GHC style line pragams (@{-# LINE .. #-}@) and convert them into

131+-- | Transform given lines possibly returning comments extracted from them.

131−-- comments.

132+-- This handles LINE pragmas and shebangs.

133+extractCommentsFromLines ::

134+ -- | File name, just to use in the spans

135+ FilePath ->

136+ -- | List of lines from that file

137+ String ->

138+ -- | Adjusted lines together with comments extracted from them

132−stripLinePragmas :: FilePath -> String -> (String, [Located String])

139+ (String, [Located String])

140+extractCommentsFromLines path =

133−stripLinePragmas path = unlines' . unzip . findLines path . lines

141+ unlines' . unzip . zipWith (extractCommentFromLine path) [1 ..] . lines

134 where

142 where

135 unlines' (a, b) = (unlines a, catMaybes b)

143 unlines' (a, b) = (unlines a, catMaybes b)

136

144

137−findLines :: FilePath -> [String] -> [(String, Maybe (Located String))]

145+-- | Transform a given line possibly returning a comment extracted from it.

138−findLines path = zipWith (checkLine path) [1 ..]

146+extractCommentFromLine ::

139−

147+ -- | File name, just to use in the spans

148+ FilePath ->

149+ -- | Line number of this line

150+ Int ->

151+ -- | The actual line

152+ String ->

153+ -- | Adjusted line and possibly a comment extracted from it

140−checkLine :: FilePath -> Int -> String -> (String, Maybe (Located String))

154+ (String, Maybe (Located String))

141−checkLine path line s

155+extractCommentFromLine path line s

142 | "{-# LINE" `isPrefixOf` s =

156 | "{-# LINE" `isPrefixOf` s =

143 let (pragma, res) = getPragma s

157 let (pragma, res) = getPragma s

144 size = length pragma

158 size = length pragma

@@ -151,7 +165,13 @@ checkLine path line s

151 where

165 where

152 mkSrcLoc' = mkSrcLoc (GHC.mkFastString path) line

166 mkSrcLoc' = mkSrcLoc (GHC.mkFastString path) line

153

167

168+-- | Take a line pragma and output its replacement (where line pragma is

169+-- replaced with spaces) and the contents of the pragma itself.

170+getPragma ::

171+ -- | Pragma line to analyze

172+ String ->

173+ -- | Contents of the pragma and its replacement line

154−getPragma :: String -> (String, String)

174+ (String, String)

155getPragma [] = error "Ormolu.Parser.getPragma: input must not be empty"

175getPragma [] = error "Ormolu.Parser.getPragma: input must not be empty"

156getPragma s@(x : xs)

176getPragma s@(x : xs)

157 | "#-}" `isPrefixOf` s = ("#-}", " " ++ drop 3 s)

177 | "#-}" `isPrefixOf` s = ("#-}", " " ++ drop 3 s)

src/Ormolu/Parser/CommentStream.hs+10−10

@@ -36,33 +36,33 @@ newtype CommentStream = CommentStream [RealLocated Comment]

36newtype Comment = Comment (NonEmpty String)

37 deriving (Eq, Show, Data)

38

39−-- | Create 'CommentStream' from 'GHC.PState'. We also create a 'Set' of

39+-- | Create 'CommentStream' from 'GHC.PState'. The pragmas and shebangs are

40−-- extensions here, which is not sorted in any way. The pragma comment are

41−-- removed from the 'CommentStream'.

40+-- removed from the 'CommentStream'. Shebangs are only extracted from the

41+-- comments that come from the first argument.

42mkCommentStream ::

43 -- | Extra comments to include

44 [Located String] ->

45 -- | Parser state to use for comment extraction

46 GHC.PState ->

47− -- | Comment stream and a set of extracted pragmas

47+ -- | Comment stream, a set of extracted pragmas, and extracted shebangs

48− (CommentStream, [Pragma])

48+ (CommentStream, [Pragma], [Located String])

49mkCommentStream extraComments pstate =

50 ( CommentStream $

51− -- NOTE It's easier to normalize pragmas right when we construct comment

52− -- streams. Because this way we need to do it only once and when we

53− -- perform checking later they'll automatically match.

54 mkComment <$> sortOn (realSrcSpanStart . getRealSrcSpan) comments,

51 mkComment <$> sortOn (realSrcSpanStart . getRealSrcSpan) comments,

55− pragmas

52+ pragmas,

53+ shebangs

56 )

54 )

57 where

55 where

58 (comments, pragmas) = partitionEithers (partitionComments <$> rawComments)

56 (comments, pragmas) = partitionEithers (partitionComments <$> rawComments)

59 rawComments =

57 rawComments =

60 mapMaybe toRealSpan $

58 mapMaybe toRealSpan $

61− extraComments

59+ otherExtraComments

62 ++ mapMaybe (liftMaybe . fmap unAnnotationComment) (GHC.comment_q pstate)

60 ++ mapMaybe (liftMaybe . fmap unAnnotationComment) (GHC.comment_q pstate)

63 ++ concatMap

61 ++ concatMap

64 (mapMaybe (liftMaybe . fmap unAnnotationComment) . snd)

62 (mapMaybe (liftMaybe . fmap unAnnotationComment) . snd)

65 (GHC.annotations_comments pstate)

63 (GHC.annotations_comments pstate)

64+ (shebangs, otherExtraComments) = span isShebang extraComments

65+ isShebang (L _ str) = "#!" `isPrefixOf` str

66

67-- | Test whether a 'Comment' looks like a Haddock following a definition,

68-- i.e. something starting with @-- ^@.

src/Ormolu/Parser/Result.hs+3−1

@@ -22,7 +22,9 @@ data ParseResult

22 -- | Comment stream

23 prCommentStream :: CommentStream,

24 -- | Extensions enabled in that module

25− prExtensions :: [Pragma]

25+ prExtensions :: [Pragma],

26+ -- | Shebangs found in the input

27+ prShebangs :: [Located String]

26 }

28 }

27

29

28-- | Pretty-print a 'ParseResult'.

30-- | Pretty-print a 'ParseResult'.

src/Ormolu/Printer.hs+1−1

@@ -20,7 +20,7 @@ printModule ::

20 Text

21printModule ParseResult {..} =

22 runR

23− (p_hsModule prExtensions prParsedSource)

23+ (p_hsModule prShebangs prExtensions prParsedSource)

24 (mkSpanStream prParsedSource)

25 prCommentStream

26 prAnns

src/Ormolu/Printer/Meat/Module.hs+16−2

@@ -8,6 +8,7 @@ module Ormolu.Printer.Meat.Module

8where

9

10import Control.Monad

11+import qualified Data.Text as T

11import GHC

12import GHC

12import Ormolu.Imports

13import Ormolu.Imports

13import Ormolu.Parser.Pragma

14import Ormolu.Parser.Pragma

@@ -19,8 +20,16 @@ import Ormolu.Printer.Meat.Declaration.Warning

19import Ormolu.Printer.Meat.ImportExport

20import Ormolu.Printer.Meat.ImportExport

20import Ormolu.Printer.Meat.Pragma

21import Ormolu.Printer.Meat.Pragma

21

22

23+-- | Render a module.

24+p_hsModule ::

25+ -- | Shebangs

26+ [Located String] ->

27+ -- | Pragmas

28+ [Pragma] ->

29+ -- | AST to print

22−p_hsModule :: [Pragma] -> ParsedSource -> R ()

30+ ParsedSource ->

31+ R ()

23−p_hsModule pragmas (L moduleSpan HsModule {..}) = do

32+p_hsModule shebangs pragmas (L moduleSpan HsModule {..}) = do

24 -- NOTE If span of exports in multiline, the whole thing is multiline.

33 -- NOTE If span of exports in multiline, the whole thing is multiline.

25 -- This is especially important because span of module itself always seems

34 -- This is especially important because span of module itself always seems

26 -- to have length zero, so it's not reliable for layout selection.

35 -- to have length zero, so it's not reliable for layout selection.

@@ -28,6 +37,11 @@ p_hsModule pragmas (L moduleSpan HsModule {..}) = do

28 deprecSpan = maybe [] (\(L s _) -> [s]) hsmodDeprecMessage

37 deprecSpan = maybe [] (\(L s _) -> [s]) hsmodDeprecMessage

29 spans' = exportSpans ++ deprecSpan ++ [moduleSpan]

38 spans' = exportSpans ++ deprecSpan ++ [moduleSpan]

30 switchLayout spans' $ do

39 switchLayout spans' $ do

40+ forM_ shebangs $ \x ->

41+ located x $ \shebang -> do

42+ txt (T.pack shebang)

43+ newline

44+ newline

31 p_pragmas pragmas

45 p_pragmas pragmas

32 newline

46 newline

33 case hsmodName of

47 case hsmodName of