Improve FileSystemError by adding associated path (swiftlang#348)

MaxDesiatov · web-flow · commit cd588d387228 · 2020-11-16T20:21:31.000Z
Currently `FileSystemError` doesn't have an associated path, which makes diagnosing errors harder. This is going to be fixed in TSC and SwiftPM, but this is a breaking change. Usage of `FileSystemError` is updated in the SourceKit-LSP codebase accordingly.
diff --git a/Sources/SKCore/XCToolchainPlist.swift b/Sources/SKCore/XCToolchainPlist.swift
@@ -46,14 +46,17 @@ extension XCToolchainPlist {
       RelativePath("Info.plist"), // Swift.org
     ]
 
+    var missingPlistPath: AbsolutePath?
     for plistPath in plistNames.lazy.map({ path.appending($0) }) {
       if fileSystem.isFile(plistPath) {
         try self.init(path: plistPath, fileSystem)
         return
       }
+
+      missingPlistPath = plistPath
     }
 
-    throw FileSystemError.noEntry
+    throw FileSystemError(.noEntry, missingPlistPath)
 #else
     throw Error.unsupportedPlatform
 #endif

Original file line number	Diff line number	Diff line change
`@@ -46,14 +46,17 @@ extension XCToolchainPlist {`
`46`	`46`	`RelativePath("Info.plist"), // Swift.org`
`47`	`47`	`]`
`48`	`48`
	`49`	`+ var missingPlistPath: AbsolutePath?`
`49`	`50`	`for plistPath in plistNames.lazy.map({ path.appending($0) }) {`
`50`	`51`	`if fileSystem.isFile(plistPath) {`
`51`	`52`	`try self.init(path: plistPath, fileSystem)`
`52`	`53`	`return`
`53`	`54`	`}`
	`55`	`+`
	`56`	`+ missingPlistPath = plistPath`
`54`	`57`	`}`
`55`	`58`
`56`		`- throw FileSystemError.noEntry`
	`59`	`+ throw FileSystemError(.noEntry, missingPlistPath)`
`57`	`60`	`#else`
`58`	`61`	`throw Error.unsupportedPlatform`
`59`	`62`	`#endif`