Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Minor performance optimizations #1432

Merged
merged 3 commits into from
Feb 24, 2021
Merged

Minor performance optimizations #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3582203
Use a newtype
pepeiborra Feb 21, 2021
a4a2a19
Avoid O(n) operation in loop
pepeiborra Feb 23, 2021
a69191d
Merge branch 'master' into minor-optimizations
Ailrun Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ghcide/src/Development/IDE/Core/RuleTypes.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ type instance RuleResult GetModIfaceWithoutLinkable = HiFileResult
type instance RuleResult GetFileContents = (FileVersion, Maybe Text)

-- The Shake key type for getModificationTime queries
data GetModificationTime = GetModificationTime_
newtype GetModificationTime = GetModificationTime_
{ missingFileDiagnostics :: Bool
-- ^ If false, missing file diagnostics are not reported
}
Expand Down
16 changes: 10 additions & 6 deletions ghcide/src/Development/IDE/Import/DependencyInformation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,29 @@ type FilePathIdSet = IntSet
data PathIdMap = PathIdMap
{ idToPathMap :: !(FilePathIdMap ArtifactsLocation)
, pathToIdMap :: !(HashMap NormalizedFilePath FilePathId)
, nextFreshId :: !Int
}
deriving (Show, Generic)

instance NFData PathIdMap

emptyPathIdMap :: PathIdMap
emptyPathIdMap = PathIdMap IntMap.empty HMS.empty
emptyPathIdMap = PathIdMap IntMap.empty HMS.empty 0

getPathId :: ArtifactsLocation -> PathIdMap -> (FilePathId, PathIdMap)
getPathId path m@PathIdMap{..} =
case HMS.lookup (artifactFilePath path) pathToIdMap of
Nothing ->
let !newId = FilePathId $ HMS.size pathToIdMap
let !newId = FilePathId nextFreshId
in (newId, insertPathId path newId m)
Just id -> (id, m)

insertPathId :: ArtifactsLocation -> FilePathId -> PathIdMap -> PathIdMap
insertPathId path id PathIdMap{..} =
PathIdMap (IntMap.insert (getFilePathId id) path idToPathMap) (HMS.insert (artifactFilePath path) id pathToIdMap)
where
insertPathId :: ArtifactsLocation -> FilePathId -> PathIdMap -> PathIdMap
insertPathId path id PathIdMap{..} =
PathIdMap
(IntMap.insert (getFilePathId id) path idToPathMap)
(HMS.insert (artifactFilePath path) id pathToIdMap)
(succ nextFreshId)

insertImport :: FilePathId -> Either ModuleParseError ModuleImports -> RawDependencyInformation -> RawDependencyInformation
insertImport (FilePathId k) v rawDepInfo = rawDepInfo { rawImports = IntMap.insert k v (rawImports rawDepInfo) }
Expand Down