Resolve #1029: Support files and folders to be dragged in externally … (#1040)

RayZhao1998 · web-flow · commit 17591e7ce0d0 · 2023-02-11T08:19:37.000-06:00
* Resolve #1029: Support files and folders to be dragged in externally into project navigator * Support holding option while dropping to copy * feat: show + when dragging with option clicked
diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
@@ -339,6 +339,7 @@
 		D7012EE827E757850001E1EF /* FindNavigatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7012EE727E757850001E1EF /* FindNavigatorView.swift */; };
 		D7211D4327E066CE008F2ED7 /* Localized+Ex.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7211D4227E066CE008F2ED7 /* Localized+Ex.swift */; };
 		D7211D4727E06BFE008F2ED7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D7211D4927E06BFE008F2ED7 /* Localizable.strings */; };
+		D7DC4B76298FFBE900D6C83D /* OutlintViewController+OutlineTableViewCellDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7DC4B75298FFBE900D6C83D /* OutlintViewController+OutlineTableViewCellDelegate.swift */; };
 		D7E201AE27E8B3C000CB86D0 /* String+Ranges.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7E201AD27E8B3C000CB86D0 /* String+Ranges.swift */; };
 		D7E201B027E8C07300CB86D0 /* FindNavigatorSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7E201AF27E8C07300CB86D0 /* FindNavigatorSearchBar.swift */; };
 		D7E201B227E8D50000CB86D0 /* FindNavigatorModeSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7E201B127E8D50000CB86D0 /* FindNavigatorModeSelector.swift */; };
@@ -733,6 +734,7 @@
 		D7012EE727E757850001E1EF /* FindNavigatorView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = FindNavigatorView.swift; sourceTree = "<group>"; tabWidth = 4; };
 		D7211D4227E066CE008F2ED7 /* Localized+Ex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Localized+Ex.swift"; sourceTree = "<group>"; };
 		D7211D4827E06BFE008F2ED7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		D7DC4B75298FFBE900D6C83D /* OutlintViewController+OutlineTableViewCellDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OutlintViewController+OutlineTableViewCellDelegate.swift"; sourceTree = "<group>"; };
 		D7E201AD27E8B3C000CB86D0 /* String+Ranges.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Ranges.swift"; sourceTree = "<group>"; };
 		D7E201AF27E8C07300CB86D0 /* FindNavigatorSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNavigatorSearchBar.swift; sourceTree = "<group>"; };
 		D7E201B127E8D50000CB86D0 /* FindNavigatorModeSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNavigatorModeSelector.swift; sourceTree = "<group>"; };
@@ -959,6 +961,7 @@
 				285FEC6D27FE4B4A00E57D53 /* OutlineViewController.swift */,
 				285FEC6F27FE4B9800E57D53 /* OutlineTableViewCell.swift */,
 				285FEC7127FE4EEF00E57D53 /* OutlineMenu.swift */,
+				D7DC4B75298FFBE900D6C83D /* OutlintViewController+OutlineTableViewCellDelegate.swift */,
 			);
 			path = OutlineView;
 			sourceTree = "<group>";
@@ -2601,6 +2604,7 @@
 				58822534292C280D00E83CDE /* CursorLocation.swift in Sources */,
 				201169E52837B40300F92B46 /* SourceControlNavigatorRepositoriesView.swift in Sources */,
 				587B9E6A29301D8F00AC7927 /* GitLabPermissions.swift in Sources */,
+				D7DC4B76298FFBE900D6C83D /* OutlintViewController+OutlineTableViewCellDelegate.swift in Sources */,
 				587B9E9229301D8F00AC7927 /* BitBucketAccount.swift in Sources */,
 				58F2EAFE292FB2B0004A9BDE /* GitHubEnterpriseLoginView.swift in Sources */,
 				DE513F52281B672D002260B9 /* TabBarAccessory.swift in Sources */,
diff --git a/CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/OutlineTableViewCell.swift b/CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/OutlineTableViewCell.swift
@@ -9,6 +9,7 @@ import SwiftUI
 
 protocol OutlineTableViewCellDelegate: AnyObject {
     func moveFile(file: WorkspaceClient.FileItem, to destination: URL)
+    func copyFile(file: WorkspaceClient.FileItem, to destination: URL)
 }
 
 /// A `NSTableCellView` showing an ``icon`` and a ``label``
diff --git a/CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/OutlineViewController.swift b/CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/OutlineViewController.swift
@@ -173,7 +173,7 @@ extension OutlineViewController: NSOutlineViewDataSource {
             if !fileItem.isFolder {
                 outlineView.setDropItem(fileItem.parent, dropChildIndex: index)
             }
-            return .move
+            return info.draggingSourceOperationMask == .copy ? .copy : .move
         }
         return []
     }
@@ -199,7 +199,13 @@ extension OutlineViewController: NSOutlineViewDataSource {
             }
 
             // Needs to come before call to .removeItem or else race condition occurs
-            guard let srcFileItem = try? workspace?.workspaceClient?.getFileItem(fileItemURL.relativePath) else {
+            var srcFileItem: WorkspaceClient.FileItem? = try? workspace?.workspaceClient?.getFileItem(fileItemURL.path)
+            // If srcFileItem is nil, fileItemUrl is an external file url.
+            if srcFileItem == nil {
+                srcFileItem = WorkspaceClient.FileItem(url: URL(fileURLWithPath: fileItemURL.path))
+            }
+
+            guard let srcFileItem else {
                 return false
             }
 
@@ -214,8 +220,11 @@ extension OutlineViewController: NSOutlineViewDataSource {
                     fatalError(error.localizedDescription)
                 }
             }
-
-            self.moveFile(file: srcFileItem, to: destURL)
+            if info.draggingSourceOperationMask == .copy {
+                self.copyFile(file: srcFileItem, to: destURL)
+            } else {
+                self.moveFile(file: srcFileItem, to: destURL)
+            }
         }
         return true
     }
@@ -375,17 +384,3 @@ extension OutlineViewController: NSMenuDelegate {
         menu.update()
     }
 }
-
-// MARK: - OutlineTableViewCellDelegate
-
-extension OutlineViewController: OutlineTableViewCellDelegate {
-    func moveFile(file: Item, to destination: URL) {
-        if !file.isFolder {
-            workspace?.closeTab(item: .codeEditor(file.id))
-        }
-        file.move(to: destination)
-        if !file.isFolder {
-            workspace?.openTab(item: file)
-        }
-    }
-}
diff --git a/CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/OutlintViewController+OutlineTableViewCellDelegate.swift b/CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/OutlintViewController+OutlineTableViewCellDelegate.swift
@@ -0,0 +1,26 @@
+//
+//  OutlintViewController+OutlineTableViewCellDelegate.swift
+//  CodeEdit
+//
+//  Created by Ziyuan Zhao on 2023/2/5.
+//
+
+import Foundation
+
+// MARK: - OutlineTableViewCellDelegate
+
+extension OutlineViewController: OutlineTableViewCellDelegate {
+    func moveFile(file: Item, to destination: URL) {
+        if !file.isFolder {
+            workspace?.closeTab(item: .codeEditor(file.id))
+        }
+        file.move(to: destination)
+        if !file.isFolder {
+            workspace?.openTab(item: file)
+        }
+    }
+
+    func copyFile(file: WorkspaceClient.FileItem, to destination: URL) {
+        file.duplicate(to: destination)
+    }
+}
diff --git a/CodeEdit/Utils/WorkspaceClient/Model/FileItem.swift b/CodeEdit/Utils/WorkspaceClient/Model/FileItem.swift
@@ -257,9 +257,9 @@ extension WorkspaceClient {
         }
 
         /// This function duplicates the item or folder
-        func duplicate() {
+        func duplicate(to destination: URL? = nil) {
+            var fileUrl = destination == nil ? self.url : destination!
             // if a file/folder with the same name exists, add "copy" to the end
-            var fileUrl = self.url
             while FileItem.fileManger.fileExists(atPath: fileUrl.path) {
                 let previousName = fileUrl.deletingPathExtension().lastPathComponent
                 let filextension = fileUrl.pathExtension

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import SwiftUI`
`9`	`9`
`10`	`10`	`protocol OutlineTableViewCellDelegate: AnyObject {`
`11`	`11`	`func moveFile(file: WorkspaceClient.FileItem, to destination: URL)`
	`12`	`+ func copyFile(file: WorkspaceClient.FileItem, to destination: URL)`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	/// A `NSTableCellView` showing an ``icon`` and a ``label``
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ extension OutlineViewController: NSOutlineViewDataSource {`
`173`	`173`	`if !fileItem.isFolder {`
`174`	`174`	`outlineView.setDropItem(fileItem.parent, dropChildIndex: index)`
`175`	`175`	`}`
`176`		`- return .move`
	`176`	`+ return info.draggingSourceOperationMask == .copy ? .copy : .move`
`177`	`177`	`}`
`178`	`178`	`return []`
`179`	`179`	`}`
`@@ -199,7 +199,13 @@ extension OutlineViewController: NSOutlineViewDataSource {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`// Needs to come before call to .removeItem or else race condition occurs`
`202`		`- guard let srcFileItem = try? workspace?.workspaceClient?.getFileItem(fileItemURL.relativePath) else {`
	`202`	`+ var srcFileItem: WorkspaceClient.FileItem? = try? workspace?.workspaceClient?.getFileItem(fileItemURL.path)`
	`203`	`+ // If srcFileItem is nil, fileItemUrl is an external file url.`
	`204`	`+ if srcFileItem == nil {`
	`205`	`+ srcFileItem = WorkspaceClient.FileItem(url: URL(fileURLWithPath: fileItemURL.path))`
	`206`	`+ }`
	`207`	`+`
	`208`	`+ guard let srcFileItem else {`
`203`	`209`	`return false`
`204`	`210`	`}`
`205`	`211`
`@@ -214,8 +220,11 @@ extension OutlineViewController: NSOutlineViewDataSource {`
`214`	`220`	`fatalError(error.localizedDescription)`
`215`	`221`	`}`
`216`	`222`	`}`
`217`		`-`
`218`		`- self.moveFile(file: srcFileItem, to: destURL)`
	`223`	`+ if info.draggingSourceOperationMask == .copy {`
	`224`	`+ self.copyFile(file: srcFileItem, to: destURL)`
	`225`	`+ } else {`
	`226`	`+ self.moveFile(file: srcFileItem, to: destURL)`
	`227`	`+ }`
`219`	`228`	`}`
`220`	`229`	`return true`
`221`	`230`	`}`
`@@ -375,17 +384,3 @@ extension OutlineViewController: NSMenuDelegate {`
`375`	`384`	`menu.update()`
`376`	`385`	`}`
`377`	`386`	`}`
`378`		`-`
`379`		`-// MARK: - OutlineTableViewCellDelegate`
`380`		`-`
`381`		`-extension OutlineViewController: OutlineTableViewCellDelegate {`
`382`		`- func moveFile(file: Item, to destination: URL) {`
`383`		`- if !file.isFolder {`
`384`		`- workspace?.closeTab(item: .codeEditor(file.id))`
`385`		`- }`
`386`		`- file.move(to: destination)`
`387`		`- if !file.isFolder {`
`388`		`- workspace?.openTab(item: file)`
`389`		`- }`
`390`		`- }`
`391`		`-}`