Merge pull request #1109 from luigy/bump-floskell

Bump floskell

Author: alanz

.gitmodules

@@ -34,4 +34,4 @@
 
 [submodule "submodules/floskell"]
 	path = submodules/floskell
-	url = https://github.com/bubba/floskell
+	url = https://github.com/ennocramer/floskell

src/Haskell/Ide/Engine/Plugin/Floskell.hs

@@ -38,7 +38,7 @@ provider uri typ _opts =
         let (range, selectedContents) = case typ of
               FormatDocument -> (fullRange contents, contents)
               FormatRange r  -> (r, extractRange r contents)
-            result = reformat config (uriToFilePath uri) (T.encodeUtf8 selectedContents)
+            result = reformat config (uriToFilePath uri) (BS.fromStrict (T.encodeUtf8 selectedContents))
         in  case result of
               Left  err -> return $ IdeResultFail (IdeError PluginError (T.pack err) Null)
               Right new -> return $ IdeResultOk [TextEdit range (T.decodeUtf8 (BS.toStrict new))]

submodules/floskell

@@ -150,7 +150,7 @@ formattedFloskell =
   \bar :: String -> IO String\n\
   \bar s = do\n\
   \  x <- return \"hello\"\n\
-  \  return \"asdf\"\n\
+  \  return \"asdf\"\n\n\
   \"
 
 formattedBrittanyPostFloskell :: T.Text
@@ -164,4 +164,4 @@ formattedBrittanyPostFloskell =
   \bar :: String -> IO String\n\
   \bar s = do\n\
   \  x <- return \"hello\"\n\
-  \  return \"asdf\"\n"
+  \  return \"asdf\"\n\n"