Skip to content

[5.5] SourceKitLSP: properly handle paths on Windows #397

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 25, 2021
Merged

[5.5] SourceKitLSP: properly handle paths on Windows #397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbf0267
SourceKitLSP: properly handle paths on Windows
compnerd May 24, 2021
f670c42
SwiftLanguageServer: correct path detection on Windows
compnerd May 25, 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
22 changes: 21 additions & 1 deletion Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import SKCore
import SKSupport
import SourceKitD
import TSCBasic
#if os(Windows)
import WinSDK
#endif

fileprivate extension Range {
/// Checks if this range overlaps with the other range, counting an overlap with an empty range as a valid overlap.
Expand Down Expand Up @@ -1130,7 +1133,24 @@ extension SwiftLanguageServer: SKDNotificationHandler {

self.queue.async {
let uri: DocumentURI
if name.starts(with: "/") {

// Paths are expected to be absolute; on Windows, this means that the
// path is either drive letter prefixed (and thus `PathGetDriveNumberW`
// will provide the driver number OR it is a UNC path and `PathIsUNCW`
// will return `true`. On Unix platforms, the path will start with `/`
// which takes care of both a regular absolute path and a POSIX
// alternate root path.

// TODO: this is not completely portable, e.g. MacOS 9 HFS paths are
// unhandled.
#if os(Windows)
let isPath: Bool = name.withCString(encodedAs: UTF16.self) {
PathIsUNCW($0) || (0...25) ~= PathGetDriveNumberW($0)
}
#else
let isPath: Bool = name.starts(with: "/")
#endif
if isPath {
// If sourcekitd returns us a path, translate it back into a URL
uri = DocumentURI(URL(fileURLWithPath: name))
} else {
Expand Down