Use moduleNameSlashes

Author: nlander

ghcide/src/Development/IDE/Core/Actions.hs

@@ -80,30 +80,11 @@ lookupMod HieDbWriter{indexQueue} hieFile moduleName uid _boot = MaybeT $ do
         writeOutDir :: FilePath
         writeOutDir = projectRoot </> ".hls" </> "dependencies" </> show uid
         writeOutFile :: FilePath
-        writeOutFile = toFilePath moduleName ++ ".hs"
+        writeOutFile = moduleNameSlashes moduleName ++ ".hs"
         writeOutPath :: FilePath
         writeOutPath = writeOutDir </> writeOutFile
         moduleUri :: Uri
         moduleUri = AtPoint.toUri writeOutPath
-        toFilePath :: ModuleName -> FilePath
-        toFilePath = separateDirectories . prettyModuleName
-          where
-            separateDirectories :: FilePath -> FilePath
-            separateDirectories moduleNameString =
-              case breakOnDot moduleNameString of
-                [] -> ""
-                ms -> foldr1 (</>) ms
-            breakOnDot :: FilePath -> [FilePath]
-            breakOnDot = words . map replaceDotWithSpace
-            replaceDotWithSpace :: Char -> Char
-            replaceDotWithSpace '.' = ' '
-            replaceDotWithSpace c = c
-            prettyModuleName :: ModuleName -> String
-            prettyModuleName = filter (/= '"')
-              . concat
-              . drop 1
-              . words
-              . show
 
 
 

ghcide/src/Development/IDE/Types/HscEnvEq.hs

@@ -155,33 +155,14 @@ newHscEnvEqWithImportPaths envImportPaths recorder se hscEnv deps = do
         indexModuleHieFile hieDir modIface = do
             let hiePath :: NormalizedFilePath
                 hiePath = toNormalizedFilePath' $
-                  hieDir </> toFilePath (moduleName $ mi_module modIface) ++ ".hie"
+                  hieDir </> moduleNameSlashes (moduleName $ mi_module modIface) ++ ".hie"
             hieCheck <- checkHieFile recorder se "newHscEnvEqWithImportPaths" hiePath
             case hieCheck of
                 HieFileMissing -> return ()
                 HieAlreadyIndexed -> return ()
                 CouldNotLoadHie _e -> return ()
                 DoIndexing hash hie ->
                     indexHieFile se hiePath (FakeFile Nothing) hash hie
-        toFilePath :: ModuleName -> FilePath
-        toFilePath = separateDirectories . prettyModuleName
-            where
-                separateDirectories :: FilePath -> FilePath
-                separateDirectories moduleNameString =
-                    case breakOnDot moduleNameString of
-                        [] -> ""
-                        ms -> foldr1 (</>) ms
-                breakOnDot :: FilePath -> [FilePath]
-                breakOnDot = words . map replaceDotWithSpace
-                replaceDotWithSpace :: Char -> Char
-                replaceDotWithSpace '.' = ' '
-                replaceDotWithSpace c = c
-                prettyModuleName :: ModuleName -> String
-                prettyModuleName = filter (/= '"')
-                    . concat
-                    . drop 1
-                    . words
-                    . show
         loadModIface :: Module -> IO (Maybe ModIface)
         loadModIface m = do
             modIface <- initIfaceLoad hscEnv $