From 4ddf0a233ddaefcbaab740f4e209f0b1e3f09589 Mon Sep 17 00:00:00 2001
From: Fendor <power.walross@gmail.com>
Date: Mon, 16 Nov 2020 22:35:58 +0100
Subject: [PATCH] Always use utf-8 when opening file handles

---
 exe/Main.hs                   | 4 +++-
 exe/Wrapper.hs                | 3 ++-
 haskell-language-server.cabal | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/exe/Main.hs b/exe/Main.hs
index 575d80b3a0..64072f01d8 100644
--- a/exe/Main.hs
+++ b/exe/Main.hs
@@ -5,6 +5,8 @@
 {-# LANGUAGE RecordWildCards   #-}
 module Main(main) where
 
+import           Main.Utf8                 (withUtf8)
+
 import           Ide.Arguments             (Arguments (..), LspArguments (..),
                                             getArguments)
 import           Ide.Main                  (defaultMain)
@@ -72,7 +74,7 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
 -- ---------------------------------------------------------------------
 
 main :: IO ()
-main = do
+main = withUtf8 $ do
     args <- getArguments "haskell-language-server"
 
     let withExamples =
diff --git a/exe/Wrapper.hs b/exe/Wrapper.hs
index 61dc26cd99..76338f383d 100644
--- a/exe/Wrapper.hs
+++ b/exe/Wrapper.hs
@@ -4,6 +4,7 @@
 module Main where
 
 import Control.Monad.Extra
+import Main.Utf8
 import Data.Foldable
 import Data.List
 import Data.Void
@@ -23,7 +24,7 @@ import System.Process
 -- ---------------------------------------------------------------------
 
 main :: IO ()
-main = do
+main = withUtf8 $ do
   -- WARNING: If you write to stdout before runLanguageServer
   --          then the language server will not work
   args <- getArguments "haskell-language-server-wrapper"
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index b8d7f9dbc7..3f3b090b07 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -144,6 +144,7 @@ executable haskell-language-server
     , time
     , transformers
     , unordered-containers
+    , with-utf8
 
   if flag(agpl)
     build-depends: brittany
@@ -177,6 +178,7 @@ executable haskell-language-server-wrapper
     , hie-bios
     , optparse-applicative
     , optparse-simple
+    , with-utf8
     , process
 
   default-language: Haskell2010