From 1b5dd502da11ad607d4c18b9fb49d61663cfa7e1 Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Mon, 16 Dec 2019 14:53:41 +0100
Subject: [PATCH] Rename hDuplicateTo to hDuplicateTo' (haskell/ghcide#259)

We have some issues in GHCi on the DAML codebase where it complains
about:

<interactive>:28:1: error:
    Ambiguous occurrence `hDuplicateTo'
    It could refer to either `Development.IDE.GHC.Util.hDuplicateTo',
                             imported from `Development.IDE.GHC.Util' at compiler/damlc/daml-opts/daml-opts/DA/Daml/Options.hs:36:1-31
                          or `GHC.IO.Handle.hDuplicateTo', imported from `GHC.IO.Handle'

Given that this is only internal to ghcide anyway, we can just rename it.
---
 ghcide/src/Development/IDE/GHC/Util.hs           | 10 +++++-----
 ghcide/src/Development/IDE/LSP/LanguageServer.hs |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ghcide/src/Development/IDE/GHC/Util.hs b/ghcide/src/Development/IDE/GHC/Util.hs
index 19bff44694..7549a7a91b 100644
--- a/ghcide/src/Development/IDE/GHC/Util.hs
+++ b/ghcide/src/Development/IDE/GHC/Util.hs
@@ -20,7 +20,7 @@ module Development.IDE.GHC.Util(
     moduleImportPath,
     HscEnvEq, hscEnv, newHscEnvEq,
     readFileUtf8,
-    hDuplicateTo,
+    hDuplicateTo',
     cgGutsToCoreModule
     ) where
 
@@ -167,8 +167,8 @@ cgGutsToCoreModule safeMode guts modDetails = CoreModule
 
 -- This is a slightly modified version of hDuplicateTo in GHC.
 -- See the inline comment for more details.
-hDuplicateTo :: Handle -> Handle -> IO ()
-hDuplicateTo h1@(FileHandle path m1) h2@(FileHandle _ m2)  = do
+hDuplicateTo' :: Handle -> Handle -> IO ()
+hDuplicateTo' h1@(FileHandle path m1) h2@(FileHandle _ m2)  = do
  withHandle__' "hDuplicateTo" h2 m2 $ \h2_ -> do
    -- The implementation in base has this call to hClose_help.
    -- _ <- hClose_help h2_
@@ -181,7 +181,7 @@ hDuplicateTo h1@(FileHandle path m1) h2@(FileHandle _ m2)  = do
    -- if it happens just in the right moment.
    withHandle_' "hDuplicateTo" h1 m1 $ \h1_ -> do
      dupHandleTo path h1 Nothing h2_ h1_ (Just handleFinalizer)
-hDuplicateTo h1@(DuplexHandle path r1 w1) h2@(DuplexHandle _ r2 w2)  = do
+hDuplicateTo' h1@(DuplexHandle path r1 w1) h2@(DuplexHandle _ r2 w2)  = do
  withHandle__' "hDuplicateTo" h2 w2  $ \w2_ -> do
    _ <- hClose_help w2_
    withHandle_' "hDuplicateTo" h1 w1 $ \w1_ -> do
@@ -190,7 +190,7 @@ hDuplicateTo h1@(DuplexHandle path r1 w1) h2@(DuplexHandle _ r2 w2)  = do
    _ <- hClose_help r2_
    withHandle_' "hDuplicateTo" h1 r1 $ \r1_ -> do
      dupHandleTo path h1 (Just w1) r2_ r1_ Nothing
-hDuplicateTo h1 _ =
+hDuplicateTo' h1 _ =
   ioe_dupHandlesNotCompatible h1
 
 -- | This is copied unmodified from GHC since it is not exposed.
diff --git a/ghcide/src/Development/IDE/LSP/LanguageServer.hs b/ghcide/src/Development/IDE/LSP/LanguageServer.hs
index ee1e7c304d..3711c3759b 100644
--- a/ghcide/src/Development/IDE/LSP/LanguageServer.hs
+++ b/ghcide/src/Development/IDE/LSP/LanguageServer.hs
@@ -48,7 +48,7 @@ runLanguageServer options userHandlers getIdeState = do
     -- to stdout. This guards against stray prints from corrupting the JSON-RPC
     -- message stream.
     newStdout <- hDuplicate stdout
-    stderr `Ghcide.hDuplicateTo` stdout
+    stderr `Ghcide.hDuplicateTo'` stdout
     hSetBuffering stderr NoBuffering
     hSetBuffering stdout NoBuffering