averello/sourcekit-lsp
1
0
Fork 0
mirror of https://github.com/apple/sourcekit-lsp.git synced 2026-03-02 18:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1866 from ahoppen/cache-path-components

Browse Source 
Cache path components for directories returned from build system
This commit is contained in:
Alex Hoppen
2024-12-06 16:44:41 -08:00
committed by GitHub
parent f59fb2bb2f a61bbffdb4
commit 3cf015a2fc
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Sources/BuildSystemIntegration/BuildSystemManager.swift
View File

@@ -338,7 +338,10 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
let files: [DocumentURI: SourceFileInfo]
/// The source directories in the workspace, ie. all `SourceItem`s that have `kind == .directory`.
let directories: [DocumentURI: SourceFileInfo]
///
/// `pathComponents` is the result of `key.fileURL?.pathComponents`. We frequently need these path components to
/// determine if a file is descendent of the directory and computing them from the `DocumentURI` is expensive.
let directories: [DocumentURI: (pathComponents: [String]?, info: SourceFileInfo)]
}
private let cachedSourceFilesAndDirectories = Cache<SourceFilesAndDirectoriesKey, SourceFilesAndDirectories>()
@@ -679,12 +682,12 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
if let targets = filesAndDirectories.files[document]?.targets {
result.formUnion(targets)
}
if !filesAndDirectories.directories.isEmpty, let documentPath = document.fileURL {
for (directory, info) in filesAndDirectories.directories {
guard let directoryPath = directory.fileURL else {
if !filesAndDirectories.directories.isEmpty, let documentPathComponents = document.fileURL?.pathComponents {
for (directory, (directoryPathComponents, info)) in filesAndDirectories.directories {
guard let directoryPathComponents, let directoryPath = directory.fileURL else {
continue
}
if documentPath.isDescendant(of: directoryPath) {
if isDescendant(documentPathComponents, of: directoryPathComponents) {
result.formUnion(info.targets)
}
}
@@ -1055,7 +1058,7 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
return try await cachedSourceFilesAndDirectories.get(key, isolation: self) { key in
var files: [DocumentURI: SourceFileInfo] = [:]
var directories: [DocumentURI: SourceFileInfo] = [:]
var directories: [DocumentURI: (pathComponents: [String]?, info: SourceFileInfo)] = [:]
for sourcesItem in key.sourcesItems {
let target = targets[sourcesItem.target]?.target
let isPartOfRootProject = !(target?.tags.contains(.dependency) ?? false)
@@ -1077,7 +1080,9 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
case .file:
files[sourceItem.uri] = info.merging(files[sourceItem.uri])
case .directory:
directories[sourceItem.uri] = info.merging(directories[sourceItem.uri])
directories[sourceItem.uri] = (
sourceItem.uri.fileURL?.pathComponents, info.merging(directories[sourceItem.uri]?.info)
)
}
}
}
@@ -1226,3 +1231,12 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
}
}
}
/// Returns `true` if the path components `selfPathComponents`, retrieved from `URL.pathComponents` are a descendent
/// of the other path components.
///
/// This operates directly on path components instead of `URL`s because computing the path components of a URL is
/// expensive and this allows us to cache the path components.
private func isDescendant(_ selfPathComponents: [String], of otherPathComponents: [String]) -> Bool {
return selfPathComponents.dropLast().starts(with: otherPathComponents)
}