Merge pull request #41 from haskell-jp/issue22

Fix #22: Disable -fdiagnostics-color=always on Windows
haskell-jp · Oct 30, 2018 · 9d47e20 · 9d47e20
2 parents a949f22 + 44f13fa
commit 9d47e20
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Education/MakeMistakesToLearnHaskell/Evaluator/RunHaskell.hs b/src/Education/MakeMistakesToLearnHaskell/Evaluator/RunHaskell.hs
@@ -33,12 +33,17 @@ resolveInterpreter :: IO [String]
 resolveInterpreter = do
   stack <- Dir.findExecutable "stack"
   case stack of
-      Just p -> return [p, "exec", executableName, "--", optionAlwaysColor]
-      _ -> maybe [] (: [optionAlwaysColor]) <$> Dir.findExecutable executableName
+      Just p -> return $ [p, "exec", executableName, "--"] ++ optionsAlwaysColor
+      _ -> maybe [] (: optionsAlwaysColor) <$> Dir.findExecutable executableName
 
 
-optionAlwaysColor :: String
-optionAlwaysColor = "--ghc-arg=-fdiagnostics-color=always"
+optionsAlwaysColor :: [String]
+#ifdef mingw32_HOST_OS
+-- FIXME: Command Prompt can't handle -fdiagnostics-color=always properly.
+optionsAlwaysColor = []
+#else
+optionsAlwaysColor = ["--ghc-arg=-fdiagnostics-color=always"]
+#endif
 
 
 executableName :: String