Merge pull request #800 from alexdeem/fix/workspace-with-symlink

Author: thecoolwinter

CodeEditModules/Modules/WorkspaceClient/src/Live.swift

@@ -23,7 +23,8 @@ public extension WorkspaceClient {
         /// - Parameter url: The URL of the directory to load the items of
         /// - Returns: `[FileItem]` representing the contents of the directory
         func loadFiles(fromURL url: URL) throws -> [FileItem] {
-            let directoryContents = try fileManager.contentsOfDirectory(at: url, includingPropertiesForKeys: nil)
+            let directoryContents = try fileManager.contentsOfDirectory(at: url.resolvingSymlinksInPath(),
+                                                                        includingPropertiesForKeys: nil)
             var items: [FileItem] = []
 
             for itemURL in directoryContents {
@@ -75,7 +76,7 @@ public extension WorkspaceClient {
             var didChangeSomething = false
 
             // get the actual directory children
-            let directoryContentsUrls = try fileManager.contentsOfDirectory(at: fileItem.url,
+            let directoryContentsUrls = try fileManager.contentsOfDirectory(at: fileItem.url.resolvingSymlinksInPath(),
                                                                             includingPropertiesForKeys: nil)
 
             // test for deleted children, and remove them from the index