Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5dfe183

Browse files
committed
[feat] replace usages of NormalizedFilePath with NormalizedUri wherever possible
1 parent c3b61fe commit 5dfe183

File tree

71 files changed

+1234
-1173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1234
-1173
lines changed

‎ghcide-test/exe/Progress.hs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module Progress (tests) where
44
import Control.Concurrent.STM
55
import Data.Foldable (for_)
66
import qualified Data.HashMap.Strict as Map
7-
import Development.IDE (NormalizedFilePath)
7+
import Development.IDE
88
import Development.IDE.Core.ProgressReporting
99
import qualified "list-t" ListT
1010
import qualified StmContainers.Map as STM
@@ -18,7 +18,7 @@ tests = testGroup "Progress"
1818

1919
data InProgressModel = InProgressModel {
2020
done, todo :: Int,
21-
current :: Map.HashMap NormalizedFilePath Int
21+
current :: Map.HashMap NormalizedUri Int
2222
}
2323

2424
reportProgressTests :: TestTree
@@ -30,10 +30,11 @@ reportProgressTests = testGroup "recordProgress"
3030
]
3131
where
3232
p0 = pure $ InProgressModel 0 0 mempty
33-
addNew = recordProgressModel "A" succ p0
34-
increase = recordProgressModel "A" succ addNew
35-
decrease = recordProgressModel "A" succ increase
36-
done = recordProgressModel "A" pred decrease
33+
aUri = filePathToUri' "A"
34+
addNew = recordProgressModel aUri succ p0
35+
increase = recordProgressModel aUri succ addNew
36+
decrease = recordProgressModel aUri succ increase
37+
done = recordProgressModel aUri pred decrease
3738
recordProgressModel key change state =
3839
model state $ \st -> recordProgress st key change
3940
model stateModelIO k = do

‎ghcide-test/exe/UnitTests.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ tests = do
5151
let uri = Uri "file://"
5252
uriToFilePath' uri @?= Just ""
5353
, testCase "showDiagnostics prints ranges 1-based (like vscode)" $ do
54-
let diag = Diagnostics.FileDiagnostic "" Diagnostics.ShowDiag Diagnostic
54+
let diag = Diagnostics.FileDiagnostic (filePathToUri' "") Diagnostics.ShowDiag Diagnostic
5555
{ _codeDescription = Nothing
5656
, _data_ = Nothing
5757
, _range = Range

‎ghcide/session-loader/Development/IDE/Session.hs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ data Log
138138
| LogHieDbWriterThreadSQLiteError !SQLError
139139
| LogHieDbWriterThreadException !SomeException
140140
| LogInterfaceFilesCacheDir !FilePath
141-
| LogKnownFilesUpdated !(HashMap Target (HashSet NormalizedFilePath))
141+
| LogKnownFilesUpdated !(HashMap Target (HashSet NormalizedUri))
142142
| LogMakingNewHscEnv ![UnitId]
143143
| LogDLLLoadError !String
144144
| LogCradlePath !FilePath
@@ -199,7 +199,7 @@ instance Pretty Log where
199199
nest 2 $
200200
vcat
201201
[ "Known files updated:"
202-
, viaShow $ (HM.map . Set.map) fromNormalizedFilePath targetToPathsMap
202+
, viaShow $ (HM.map . Set.map) fromNormalizedUri targetToPathsMap
203203
]
204204
LogMakingNewHscEnv inPlaceUnitIds ->
205205
"Making new HscEnv. In-place unit ids:" <+> pretty (map show inPlaceUnitIds)
@@ -476,13 +476,13 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
476476
-- 'TargetFile Foo.hs' in the 'knownTargetsVar', thus not find 'TargetFile Foo.hs-boot'
477477
-- and also not find 'TargetModule Foo'.
478478
fs <- filterM (IO.doesFileExist . fromNormalizedFilePath) targetLocations
479-
pure $ map (\fp -> (TargetFile fp, Set.singleton fp)) (nubOrd (f:fs))
479+
pure $ map (\fp -> (TargetFile fp, Set.singleton $ filePathToUri' fp)) (nubOrd (f:fs))
480480
TargetModule _ -> do
481481
found <- filterM (IO.doesFileExist . fromNormalizedFilePath) targetLocations
482-
return [(targetTarget, Set.fromList found)]
482+
return [(targetTarget, Set.fromList $map filePathToUri' found)]
483483
hasUpdate <- atomically $ do
484484
known <- readTVar knownTargetsVar
485-
let known' = flip mapHashed known $ \k -> unionKnownTargets k (mkKnownTargets knownTargets)
485+
let known' = flip mapHashed known $ \k -> unionKnownTargets k (mkKnownTargets $knownTargets)
486486
hasUpdate = if known /= known' then Just (unhashed known') else Nothing
487487
writeTVar knownTargetsVar known'
488488
pure hasUpdate
@@ -566,7 +566,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
566566
this_target_details = TargetDetails (TargetFile _cfp) this_error_env this_dep_info [_cfp]
567567
this_flags = (this_error_env, this_dep_info)
568568
this_error_env = ([this_error], Nothing)
569-
this_error = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) _cfp
569+
this_error = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (filePathToUri' _cfp)
570570
(T.unlines
571571
[ "No cradle target found. Is this file listed in the targets of your cradle?"
572572
, "If you are using a .cabal file, please ensure that this module is listed in either the exposed-modules or other-modules section"
@@ -587,8 +587,8 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
587587
unless (null new_deps || not checkProject) $ do
588588
cfps' <- liftIO $ filterM (IO.doesFileExist . fromNormalizedFilePath) (concatMap targetLocations all_targets)
589589
void $ shakeEnqueue extras $ mkDelayedAction "InitialLoad" Debug $ void $ do
590-
mmt <- uses GetModificationTime cfps'
591-
let cs_exist = catMaybes (zipWith (<$) cfps' mmt)
590+
mmt <- uses GetModificationTime $map filePathToUri' cfps'
591+
let cs_exist = mapMaybe (fmap filePathToUri') (zipWith (<$) cfps' mmt)
592592
modIfaces <- uses GetModIface cs_exist
593593
-- update exports map
594594
shakeExtras <- getShakeExtras
@@ -887,7 +887,7 @@ newComponentCache recorder exts _cfp hsc_env old_cis new_cis = do
887887
let closure_errs = maybeToList $ checkHomeUnitsClosed' (hsc_unit_env hscEnv') (hsc_all_home_unit_ids hscEnv')
888888
closure_err_to_multi_err err =
889889
ideErrorWithSource
890-
(Just "cradle") (Just DiagnosticSeverity_Warning) _cfp
890+
(Just "cradle") (Just DiagnosticSeverity_Warning) (filePathToUri' _cfp)
891891
(T.pack (Compat.printWithoutUniques (singleMessage err)))
892892
(Just (fmap GhcDriverMessage err))
893893
multi_errs = map closure_err_to_multi_err closure_errs
@@ -1244,4 +1244,4 @@ showPackageSetupException PackageSetupException{..} = unwords
12441244

12451245
renderPackageSetupException :: FilePath -> PackageSetupException -> FileDiagnostic
12461246
renderPackageSetupException fp e =
1247-
ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (toNormalizedFilePath' fp) (T.pack $ showPackageSetupException e) Nothing
1247+
ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (filePathToUri' $toNormalizedFilePath' fp) (T.pack $ showPackageSetupException e) Nothing

‎ghcide/session-loader/Development/IDE/Session/Diagnostics.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ data CradleErrorDetails =
3030
renderCradleError :: CradleError -> Cradle a -> NormalizedFilePath -> FileDiagnostic
3131
renderCradleError cradleError cradle nfp =
3232
let noDetails =
33-
ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) nfp (T.unlines $ map T.pack userFriendlyMessage) Nothing
33+
ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (filePathToUri' nfp) (T.unlines $ map T.pack userFriendlyMessage) Nothing
3434
in
3535
if HieBios.isCabalCradle cradle
3636
then noDetails & fdLspDiagnosticL %~ \diag -> diag{_data_ = Just $ Aeson.toJSON CradleErrorDetails{cabalProjectFiles=absDeps}}

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

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ import Development.IDE.Types.HscEnvEq (hscEnv)
3030
import Development.IDE.Types.Location
3131
import qualified HieDb
3232
import Language.LSP.Protocol.Types (DocumentHighlight (..),
33-
SymbolInformation (..),
34-
normalizedFilePathToUri,
35-
uriToNormalizedFilePath)
33+
SymbolInformation (..))
3634

3735

3836
-- | Eventually this will lookup/generate URIs for files in dependencies, but not in the
@@ -55,14 +53,14 @@ lookupMod _dbchan _hie_f _mod _uid _boot = MaybeT $ pure Nothing
5553
-- block waiting for the rule to be properly computed.
5654

5755
-- | Try to get hover text for the name under point.
58-
getAtPoint :: NormalizedFilePath -> Position -> IdeAction (Maybe (Maybe Range, [T.Text]))
59-
getAtPoint file pos = runMaybeT $ do
56+
getAtPoint :: NormalizedUri -> Position -> IdeAction (Maybe (Maybe Range, [T.Text]))
57+
getAtPoint uri pos = runMaybeT $ do
6058
ide <- ask
6159
opts <- liftIO $ getIdeOptionsIO ide
6260

63-
(hf, mapping) <- useWithStaleFastMT GetHieAst file
64-
env <- hscEnv . fst <$> useWithStaleFastMT GhcSession file
65-
dkMap <- lift $ maybe (DKMap mempty mempty) fst <$> runMaybeT (useWithStaleFastMT GetDocMap file)
61+
(hf, mapping) <- useWithStaleFastMT GetHieAst uri
62+
env <- hscEnv . fst <$> useWithStaleFastMT GhcSession uri
63+
dkMap <- lift $ maybe (DKMap mempty mempty) fst <$> runMaybeT (useWithStaleFastMT GetDocMap uri)
6664

6765
!pos' <- MaybeT (return $ fromCurrentPosition mapping pos)
6866
MaybeT $ liftIO $ fmap (first (toCurrentRange mapping =<<)) <$> AtPoint.atPoint opts hf dkMap env pos'
@@ -71,79 +69,78 @@ getAtPoint file pos = runMaybeT $ do
7169
-- taking into account changes that may have occurred due to edits.
7270
toCurrentLocation
7371
:: PositionMapping
74-
-> NormalizedFilePath
72+
-> NormalizedUri
7573
-> Location
7674
-> IdeAction (Maybe Location)
77-
toCurrentLocation mapping file (Location uri range) =
75+
toCurrentLocation mapping uri (Location locUri locRange) =
7876
-- The Location we are going to might be in a different
7977
-- file than the one we are calling gotoDefinition from.
8078
-- So we check that the location file matches the file
8179
-- we are in.
82-
if nUri == normalizedFilePathToUri file
80+
if nUri == uri
8381
-- The Location matches the file, so use the PositionMapping
8482
-- we have.
85-
then pure $ Location uri <$> toCurrentRange mapping range
83+
then pure $ Location locUri <$> toCurrentRange mapping locRange
8684
-- The Location does not match the file, so get the correct
8785
-- PositionMapping and use that instead.
8886
else do
8987
otherLocationMapping <- fmap (fmap snd) $ runMaybeT $ do
90-
otherLocationFile <- MaybeT $ pure $ uriToNormalizedFilePath nUri
91-
useWithStaleFastMT GetHieAst otherLocationFile
92-
pure $ Location uri <$> (flip toCurrentRange range =<< otherLocationMapping)
88+
useWithStaleFastMT GetHieAst nUri
89+
pure $ Location locUri <$> (flip toCurrentRange locRange =<< otherLocationMapping)
9390
where
9491
nUri :: NormalizedUri
95-
nUri = toNormalizedUri uri
92+
nUri = toNormalizedUri locUri
9693

9794
-- | Goto Definition.
98-
getDefinition :: NormalizedFilePath -> Position -> IdeAction (Maybe [(Location, Identifier)])
99-
getDefinition file pos = runMaybeT $ do
95+
getDefinition :: NormalizedUri -> Position -> IdeAction (Maybe [(Location, Identifier)])
96+
getDefinition uri pos = runMaybeT $ do
10097
ide@ShakeExtras{ withHieDb, hiedbWriter } <- ask
10198
opts <- liftIO $ getIdeOptionsIO ide
102-
(hf, mapping) <- useWithStaleFastMT GetHieAst file
103-
(ImportMap imports, _) <- useWithStaleFastMT GetImportMap file
99+
(hf, mapping) <- useWithStaleFastMT GetHieAst uri
100+
(ImportMap imports, _) <- useWithStaleFastMT GetImportMap uri
104101
!pos' <- MaybeT (pure $ fromCurrentPosition mapping pos)
105102
locationsWithIdentifier <- AtPoint.gotoDefinition withHieDb (lookupMod hiedbWriter) opts imports hf pos'
106103
mapMaybeM (\(location, identifier) -> do
107-
fixedLocation <- MaybeT $ toCurrentLocation mapping file location
104+
fixedLocation <- MaybeT $ toCurrentLocation mapping uri location
108105
pure $ Just (fixedLocation, identifier)
109106
) locationsWithIdentifier
110107

111108

112-
getTypeDefinition :: NormalizedFilePath -> Position -> IdeAction (Maybe [(Location, Identifier)])
113-
getTypeDefinition file pos = runMaybeT $ do
109+
getTypeDefinition :: NormalizedUri -> Position -> IdeAction (Maybe [(Location, Identifier)])
110+
getTypeDefinition uri pos = runMaybeT $ do
114111
ide@ShakeExtras{ withHieDb, hiedbWriter } <- ask
115112
opts <- liftIO $ getIdeOptionsIO ide
116-
(hf, mapping) <- useWithStaleFastMT GetHieAst file
113+
(hf, mapping) <- useWithStaleFastMT GetHieAst uri
117114
!pos' <- MaybeT (return $ fromCurrentPosition mapping pos)
118115
locationsWithIdentifier <- AtPoint.gotoTypeDefinition withHieDb (lookupMod hiedbWriter) opts hf pos'
119116
mapMaybeM (\(location, identifier) -> do
120-
fixedLocation <- MaybeT $ toCurrentLocation mapping file location
117+
fixedLocation <- MaybeT $ toCurrentLocation mapping uri location
121118
pure $ Just (fixedLocation, identifier)
122119
) locationsWithIdentifier
123120

124-
getImplementationDefinition :: NormalizedFilePath -> Position -> IdeAction (Maybe [Location])
125-
getImplementationDefinition file pos = runMaybeT $ do
121+
getImplementationDefinition :: NormalizedUri -> Position -> IdeAction (Maybe [Location])
122+
getImplementationDefinition uri pos = runMaybeT $ do
126123
ide@ShakeExtras{ withHieDb, hiedbWriter } <- ask
127124
opts <- liftIO $ getIdeOptionsIO ide
128-
(hf, mapping) <- useWithStaleFastMT GetHieAst file
125+
(hf, mapping) <- useWithStaleFastMT GetHieAst uri
129126
!pos' <- MaybeT (pure $ fromCurrentPosition mapping pos)
130127
locs <- AtPoint.gotoImplementation withHieDb (lookupMod hiedbWriter) opts hf pos'
131-
traverse (MaybeT . toCurrentLocation mapping file) locs
128+
traverse (MaybeT . toCurrentLocation mapping uri) locs
132129

133-
highlightAtPoint :: NormalizedFilePath -> Position -> IdeAction (Maybe [DocumentHighlight])
134-
highlightAtPoint file pos = runMaybeT $ do
135-
(HAR _ hf rf _ _,mapping) <- useWithStaleFastMT GetHieAst file
130+
highlightAtPoint :: NormalizedUri -> Position -> IdeAction (Maybe [DocumentHighlight])
131+
highlightAtPoint uri pos = runMaybeT $ do
132+
(HAR _ hf rf _ _,mapping) <- useWithStaleFastMT GetHieAst uri
136133
!pos' <- MaybeT (return $ fromCurrentPosition mapping pos)
137134
let toCurrentHighlight (DocumentHighlight range t) = flip DocumentHighlight t <$> toCurrentRange mapping range
138135
mapMaybe toCurrentHighlight <$>AtPoint.documentHighlight hf rf pos'
139136

140137
-- Refs are not an IDE action, so it is OK to be slow and (more) accurate
141-
refsAtPoint :: NormalizedFilePath -> Position -> Action [Location]
142-
refsAtPoint file pos = do
138+
refsAtPoint :: NormalizedUri -> Position -> Action [Location]
139+
refsAtPoint uri pos = do
143140
ShakeExtras{withHieDb} <- getShakeExtras
144141
fs <- HM.keys <$> getFilesOfInterestUntracked
145142
asts <- HM.fromList . mapMaybe sequence . zip fs <$> usesWithStale GetHieAst fs
146-
AtPoint.referencesAtPoint withHieDb file pos (AtPoint.FOIReferences asts)
143+
AtPoint.referencesAtPoint withHieDb uri pos (AtPoint.BOIReferences asts)
147144

148145
workspaceSymbols :: T.Text -> IdeAction (Maybe [SymbolInformation])
149146
workspaceSymbols query = runMaybeT $ do

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /