Minor update

Author: stevapple

Sources/TSCBasic/Path.swift

@@ -114,8 +114,8 @@ extension Path {
     }
 
     public var suffix: String? {
-        if let ext = `extension` {
-            return ".\(ext)"
+        if let ext = self.extension {
+            return "." + ext
         } else {
             return nil
         }

Sources/TSCBasic/PathShims.swift

@@ -19,7 +19,6 @@
 
 import TSCLibc
 import Foundation
-import SystemPackage
 
 /// Returns the "real path" corresponding to `path` by resolving any symbolic links.
 public func resolveSymlinks(_ path: AbsolutePath) -> AbsolutePath {
@@ -169,18 +168,16 @@ extension AbsolutePath {
     /// Returns a path suitable for display to the user (if possible, it is made
     /// to be relative to the current working directory).
     public func prettyPath(cwd: AbsolutePath? = localFileSystem.currentWorkingDirectory) -> String {
-        guard let dir = cwd else {
-            // No current directory, display as is.
+        guard let dir = cwd,
+            let rel = try? relative(to: dir) else {
+            // Cannot create relative path, display as is.
             return self.pathString
         }
-        // FIXME: Instead of string prefix comparison we should add a proper API
-        // to AbsolutePath to determine ancestry.
-        if self == dir {
-            return "."
-        } else if self.pathString.hasPrefix(dir.pathString + "/") {
-            return try! "./" + self.relative(to: dir).pathString
+        if let first = rel.components.first,
+            first != ".." {
+            return "./" + rel.pathString
         } else {
-            return self.pathString
+            return rel.pathString
         }
     }
 }