Improved File Handling System #1341

Wouter01 · 2023-06-20T02:04:24Z

Description

Rewrite of the file handling system.

The current file handling system starts to get slow for larger projects. This is noticeable to the user by the slow startup times of codeedit, slower file moving in larger projects, etc. A new file handling system is added which is more performant. It also makes more use of the capabilities of NSDocument, simplyfying things.

Related Issues

✨ Async File Loading #1336

Checklist

I read and understood the contributing guide as well as the code of conduct
The issues this PR addresses are related to each other
My changes generate no new warnings
My code builds and runs on my machine
My changes are all related to the related issue above
I documented my code

Screenshots

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Rachmaye · 2023-06-20T05:02:10Z

Wowzer

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

matthijseikelenboom · 2023-06-20T20:22:04Z

CodeEdit/Features/CEWorkspace/Models/Resource.swift

+import AppKit
+import SwiftUI
+
+protocol Resource: AnyObject, Identifiable {


I'm wondering on whether the term Resource is too arbitrary

Feel free to suggest better names :) I chose this because it's used a lot throughout the codebase and is memorizable (compared to, for example, CEWorkspaceFile)

Apple's docs also refer to filesystem items as resources

matthijseikelenboom · 2023-06-20T20:22:56Z

CodeEdit/Features/CEWorkspace/Models/Resource.swift

+    func fileName(typeHidden: Bool) -> String
+}
+
+extension Resource {


Why are these properties in an extension?

Protocols cannot have function (or property) implementations, only declarations. To add default implementations you need to use an extension

matthijseikelenboom · 2023-06-20T20:28:24Z

CodeEdit/Features/CEWorkspace/Models/WorkspaceDocument+buildTree.swift

Does this functionality even belong in this feature (as in the feature folder)

I placed them here for now, once the PR is ready for review these things will be resolved.

matthijseikelenboom · 2023-06-20T20:28:38Z

CodeEdit/Features/CEWorkspace/Models/WorkspaceDocument+presentedSubitem.swift

Does this functionality even belong in this feature (as in the feature folder)

I placed them here for now, once the PR is ready for review these things will be resolved.

matthijseikelenboom · 2023-06-20T20:37:16Z

CodeEdit/Features/Documents/WorkspaceDocument.swift

This class is becoming a bit of a mess. Inner enums, property and function definitions are all over the place. They should either be separated by functionality with the // MARK comment or it should be something like, enum definitions first, then normal properties, then calculated properties, then override functions, then normal functions

I placed them here for now, once the PR is ready for review these things will be resolved.

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Signed-off-by: Wouter01 <wouterhennen@gmail.com> # Conflicts: # CodeEdit/Features/InspectorSidebar/InspectorSidebarView.swift # CodeEdit/Features/NavigatorSidebar/OutlineView/FileSystemTableViewCell.swift # CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/ProjectNavigatorTableViewCell.swift # CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/ProjectNavigatorViewController+OutlineTableViewCellDelegate.swift

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Signed-off-by: Wouter01 <wouterhennen@gmail.com> # Conflicts: # CodeEdit/Features/Documents/Views/WorkspaceCodeFileView.swift # CodeEdit/Features/InspectorSidebar/Views/FileInspectorView.swift # CodeEdit/Features/NavigatorSidebar/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

austincondiff · 2023-08-16T18:02:06Z

What is the status of this PR?

Wouter01 · 2023-08-16T18:08:17Z

What is the status of this PR?

It's 80% done, but I currently don't have the time to resume working on it

austincondiff · 2023-08-16T18:09:35Z

So close! That is okay, I totally understand. Do you have any idea when you might get the time in the future? Depending, it may be best to close this for the time being and reopen when that time comes. What do you think?

Wouter01 · 2023-08-16T18:13:59Z

So close! That is okay, I totally understand. Do you have any idea when you might get the time in the future? Depending, it may be best to close this for the time being and reopen when that time comes. What do you think?

Maybe in September, but I can't promise anything 😅. It's fine for me to close this PR for now, but it's probably best that a linked issue is created so the work doesn't get lost. Also, branches are removed from time to time, so I'm hoping this one doesn't get deleted. I have a local copy though

austincondiff · 2023-08-16T18:16:17Z

In that case, we can keep this PR open. It may help to keep it updated from time to time though so you don't end up with major conflicts down the road.

Wouter01 added 10 commits June 19, 2023 14:48

reduce filemanager usages

74c019a

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Cleanup of unused code

95cc504

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Make parent weak

7112862

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

partially moved over to workspacedocument

fd1f796

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

First working version

24db8c4

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Fixed name change

5bc004d

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

cleanup, comments, error handling

ca99d6a

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

fix for folder ignoring

01a3fc7

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Partially adopted UI for new file system

94ba650

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Refactoring

4412ef5

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Wouter01 changed the title ~~Filemanager actor~~ Improved File Handling System Jun 20, 2023

Wouter01 added 7 commits June 20, 2023 12:54

Add task cancellation

e36fb1a

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

fixed concurrency issues

e467900

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Fix color

2e09b81

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Rename ResourceData to Resource

4a479cf

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

concurrency fixes

c9e8d8d

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

merged similar functions

198434e

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Merge branch 'main' into filemanager-actor

b44af63

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

matthijseikelenboom reviewed Jun 20, 2023

View reviewed changes

Wouter01 added 10 commits June 21, 2023 03:19

Added file identifier

e9268fa

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

move to fileResourceTypeKey

09e69b9

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Fixed editor, tabbar, and much more

5ae9808

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

merge fixes

3b6270c

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

increased task priority

8d65acd

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

fixed path bar

3c73353

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Fixed openquickly overlay

c29ebf2

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Fixed document opening

7113ee4

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Wouter01 added 8 commits June 25, 2023 03:03

outlineview fixes

9340dd8

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Changed ID from URL to UInt64

bd1c9b6

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

outlineview fixes

d64eca1

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

removed old code

7cf48fa

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Improved document loading

cd5e24a

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

fixed reveal in project navigator

6202bc1

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

added filemap

5152e6b

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Improve performance of quickopenviewmodel

62410d3

Signed-off-by: Wouter01 <wouterhennen@gmail.com>

Improved File Handling System #1341

Improved File Handling System #1341

Wouter01 commented Jun 20, 2023 •

edited

Rachmaye commented Jun 20, 2023

matthijseikelenboom Jun 20, 2023

Wouter01 Jun 20, 2023 •

edited

Wouter01 Jun 21, 2023 •

edited

matthijseikelenboom Jun 20, 2023

Wouter01 Jun 20, 2023

matthijseikelenboom Jun 20, 2023

Wouter01 Jun 20, 2023

matthijseikelenboom Jun 20, 2023

Wouter01 Jun 20, 2023

matthijseikelenboom Jun 20, 2023

Wouter01 Jun 20, 2023

austincondiff commented Aug 16, 2023

Wouter01 commented Aug 16, 2023

austincondiff commented Aug 16, 2023 •

edited

Wouter01 commented Aug 16, 2023

austincondiff commented Aug 16, 2023

Improved File Handling System #1341

Are you sure you want to change the base?

Improved File Handling System #1341

Conversation

Wouter01 commented Jun 20, 2023 • edited

Description

Related Issues

Checklist

Screenshots

Rachmaye commented Jun 20, 2023

Choose a reason for hiding this comment

Wouter01 Jun 20, 2023 • edited

Choose a reason for hiding this comment

Wouter01 Jun 21, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

austincondiff commented Aug 16, 2023

Wouter01 commented Aug 16, 2023

austincondiff commented Aug 16, 2023 • edited

Wouter01 commented Aug 16, 2023

austincondiff commented Aug 16, 2023

Wouter01 commented Jun 20, 2023 •

edited

Wouter01 Jun 20, 2023 •

edited

Wouter01 Jun 21, 2023 •

edited

austincondiff commented Aug 16, 2023 •

edited