Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 134035c

Browse files
EncodePandafendor
authored andcommitted
Extend FormatSpec with a data types
Show how different formatters are formatting code with a data type definition
1 parent 6bd219d commit 134035c

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

test/functional/FormatSpec.hs

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ spec = do
9595
describe "ormolu" $ do
9696
let formatLspConfig provider =
9797
object [ "languageServerHaskell" .= object ["formattingProvider" .= (provider :: Value)] ]
98-
98+
9999
it "formats correctly" $ runSession hieCommand fullCaps "test/testdata" $ do
100100
sendNotification WorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "ormolu"))
101101
doc <- openDoc "Format.hs" "haskell"
@@ -117,7 +117,8 @@ formattedDocTabSize2 =
117117
\bar :: String -> IO String\n\
118118
\bar s = do\n\
119119
\ x <- return \"hello\"\n\
120-
\ return \"asdf\"\n\n"
120+
\ return \"asdf\"\n\n\
121+
\data Baz = Baz { a :: Int, b :: String }\n\n"
121122

122123
formattedDocTabSize5 :: T.Text
123124
formattedDocTabSize5 =
@@ -128,7 +129,8 @@ formattedDocTabSize5 =
128129
\bar :: String -> IO String\n\
129130
\bar s = do\n\
130131
\ x <- return \"hello\"\n\
131-
\ return \"asdf\"\n\n"
132+
\ return \"asdf\"\n\n\
133+
\data Baz = Baz { a :: Int, b :: String }\n\n"
132134

133135
formattedRangeTabSize2 :: T.Text
134136
formattedRangeTabSize2 =
@@ -140,7 +142,8 @@ formattedRangeTabSize2 =
140142
\bar s = do\n\
141143
\ x <- return \"hello\"\n\
142144
\ return \"asdf\"\n\
143-
\ \n"
145+
\\n\
146+
\data Baz = Baz { a :: Int, b :: String }\n\n"
144147

145148
formattedRangeTabSize5 :: T.Text
146149
formattedRangeTabSize5 =
@@ -152,7 +155,8 @@ formattedRangeTabSize5 =
152155
\bar s = do\n\
153156
\ x <- return \"hello\"\n\
154157
\ return \"asdf\"\n\
155-
\ \n"
158+
\\n\
159+
\data Baz = Baz { a :: Int, b :: String }\n\n"
156160

157161
formattedFloskell :: T.Text
158162
formattedFloskell =
@@ -166,7 +170,7 @@ formattedFloskell =
166170
\bar s = do\n\
167171
\ x <- return \"hello\"\n\
168172
\ return \"asdf\"\n\n\
169-
\"
173+
\data Baz = Baz { a :: Int, b :: String }\n\n"
170174

171175
formattedBrittanyPostFloskell :: T.Text
172176
formattedBrittanyPostFloskell =
@@ -179,7 +183,8 @@ formattedBrittanyPostFloskell =
179183
\bar :: String -> IO String\n\
180184
\bar s = do\n\
181185
\ x <- return \"hello\"\n\
182-
\ return \"asdf\"\n\n"
186+
\ return \"asdf\"\n\n\
187+
\data Baz = Baz { a :: Int, b :: String }\n\n"
183188

184189
formattedOrmolu :: T.Text
185190
formattedOrmolu =
@@ -192,10 +197,11 @@ formattedOrmolu =
192197
\bar :: String -> IO String\n\
193198
\bar s = do\n\
194199
\ x <- return \"hello\"\n\
195-
\ return \"asdf\"\n"
196-
200+
\ return \"asdf\"\n\n\
201+
\data Baz = Baz {a :: Int, b :: String}\n"
202+
197203
unchangedOrmolu :: T.Text
198-
unchangedOrmolu =
204+
unchangedOrmolu =
199205
"module Format where\n\
200206
\foo :: Int -> Int\n\
201207
\foo 3 = 2\n\
@@ -204,4 +210,5 @@ unchangedOrmolu =
204210
\bar s = do\n\
205211
\ x <- return \"hello\"\n\
206212
\ return \"asdf\"\n\
207-
\ \n"
213+
\ \n\
214+
\data Baz = Baz { a :: Int, b :: String }\n\n"

test/testdata/Format.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ bar :: String -> IO String
66
bar s = do
77
x <- return "hello"
88
return "asdf"
9-
9+
10+
data Baz = Baz { a :: Int, b :: String }
11+

0 commit comments

Comments
 (0)