Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementing Fundamental Indexing #1483

Merged
merged 18 commits into from
Dec 4, 2023
Merged

Implementing Fundamental Indexing #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
94c13db
Basic indexing
tom-ludwig Nov 18, 2023
6f81ff9
Implemented indexing
tom-ludwig Nov 19, 2023
1c40d70
Added async searching
tom-ludwig Nov 19, 2023
c0a712f
Added LayzFilePathEnumerator
tom-ludwig Nov 21, 2023
0a5983f
Improved search func
tom-ludwig Nov 23, 2023
b2d62c5
Removed whitespace
tom-ludwig Nov 23, 2023
9ebbe5b
Improved async searching
tom-ludwig Nov 24, 2023
10d16bd
Slight improvements and more documentation
tom-ludwig Nov 24, 2023
c09b73f
Removed unnecessary code
tom-ludwig Nov 24, 2023
333d608
Merge branch 'CodeEditApp:main' into indexing
tom-ludwig Nov 24, 2023
b6dae8e
Fine tuning
tom-ludwig Nov 27, 2023
f491952
Apply suggestions from code review
tom-ludwig Nov 30, 2023
154858f
CanReplace defaults to true
tom-ludwig Nov 30, 2023
b208046
clear button resets search results
tom-ludwig Nov 30, 2023
1abbbd3
Only add results if the results has line matches
tom-ludwig Nov 30, 2023
cbc64c5
Merge branch 'CodeEditApp:main' into indexing
tom-ludwig Nov 30, 2023
65d4d65
Replaced .split with .components
tom-ludwig Dec 1, 2023
6c887f0
Out-of-Bounds Safety
tom-ludwig Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,19 @@
58FD7608291EA1CB0051D6E4 /* CommandPaletteViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7605291EA1CB0051D6E4 /* CommandPaletteViewModel.swift */; };
58FD7609291EA1CB0051D6E4 /* CommandPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7607291EA1CB0051D6E4 /* CommandPaletteView.swift */; };
5C4BB1E128212B1E00A92FB2 /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4BB1E028212B1E00A92FB2 /* World.swift */; };
611191FA2B08CC9000D4459B /* SearchIndexer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611191F92B08CC9000D4459B /* SearchIndexer.swift */; };
611191FC2B08CCB800D4459B /* SearchIndexer+AsyncController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611191FB2B08CCB800D4459B /* SearchIndexer+AsyncController.swift */; };
611191FE2B08CCD200D4459B /* SearchIndexer+File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611191FD2B08CCD200D4459B /* SearchIndexer+File.swift */; };
611192002B08CCD700D4459B /* SearchIndexer+Memory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611191FF2B08CCD700D4459B /* SearchIndexer+Memory.swift */; };
611192022B08CCDC00D4459B /* SearchIndexer+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611192012B08CCDC00D4459B /* SearchIndexer+Search.swift */; };
611192042B08CCED00D4459B /* SearchIndexer+ProgressivSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611192032B08CCED00D4459B /* SearchIndexer+ProgressivSearch.swift */; };
611192062B08CCF600D4459B /* SearchIndexer+Add.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611192052B08CCF600D4459B /* SearchIndexer+Add.swift */; };
611192082B08CCFD00D4459B /* SearchIndexer+Terms.swift in Sources */ = {isa = PBXBuildFile; fileRef = 611192072B08CCFD00D4459B /* SearchIndexer+Terms.swift */; };
6111920C2B08CD0B00D4459B /* SearchIndexer+InternalMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6111920B2B08CD0B00D4459B /* SearchIndexer+InternalMethods.swift */; };
613DF55E2B08DD5D00E9D902 /* FileHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 613DF55D2B08DD5D00E9D902 /* FileHelper.swift */; };
61538B902B111FE800A88846 /* String+AppearancesOfSubstring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61538B8F2B111FE800A88846 /* String+AppearancesOfSubstring.swift */; };
61538B932B11201900A88846 /* String+Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61538B922B11201900A88846 /* String+Character.swift */; };
615AA21A2B0CFD480013FCCC /* LazyStringLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 615AA2192B0CFD480013FCCC /* LazyStringLoader.swift */; };
6C049A372A49E2DB00D42923 /* DirectoryEventStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C049A362A49E2DB00D42923 /* DirectoryEventStream.swift */; };
6C05A8AF284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C05A8AE284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift */; };
6C092EC62A4E803300489202 /* CodeEditTextView in Frameworks */ = {isa = PBXBuildFile; productRef = 6C092EC52A4E803300489202 /* CodeEditTextView */; };
Expand Down Expand Up @@ -746,6 +759,19 @@
58FD7605291EA1CB0051D6E4 /* CommandPaletteViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandPaletteViewModel.swift; sourceTree = "<group>"; };
58FD7607291EA1CB0051D6E4 /* CommandPaletteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandPaletteView.swift; sourceTree = "<group>"; };
5C4BB1E028212B1E00A92FB2 /* World.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = World.swift; sourceTree = "<group>"; };
611191F92B08CC9000D4459B /* SearchIndexer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchIndexer.swift; sourceTree = "<group>"; };
611191FB2B08CCB800D4459B /* SearchIndexer+AsyncController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+AsyncController.swift"; sourceTree = "<group>"; };
611191FD2B08CCD200D4459B /* SearchIndexer+File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+File.swift"; sourceTree = "<group>"; };
611191FF2B08CCD700D4459B /* SearchIndexer+Memory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+Memory.swift"; sourceTree = "<group>"; };
611192012B08CCDC00D4459B /* SearchIndexer+Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+Search.swift"; sourceTree = "<group>"; };
611192032B08CCED00D4459B /* SearchIndexer+ProgressivSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+ProgressivSearch.swift"; sourceTree = "<group>"; };
611192052B08CCF600D4459B /* SearchIndexer+Add.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+Add.swift"; sourceTree = "<group>"; };
611192072B08CCFD00D4459B /* SearchIndexer+Terms.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+Terms.swift"; sourceTree = "<group>"; };
6111920B2B08CD0B00D4459B /* SearchIndexer+InternalMethods.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchIndexer+InternalMethods.swift"; sourceTree = "<group>"; };
613DF55D2B08DD5D00E9D902 /* FileHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileHelper.swift; sourceTree = "<group>"; };
61538B8F2B111FE800A88846 /* String+AppearancesOfSubstring.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+AppearancesOfSubstring.swift"; sourceTree = "<group>"; };
61538B922B11201900A88846 /* String+Character.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Character.swift"; sourceTree = "<group>"; };
615AA2192B0CFD480013FCCC /* LazyStringLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LazyStringLoader.swift; sourceTree = "<group>"; };
6C049A362A49E2DB00D42923 /* DirectoryEventStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectoryEventStream.swift; sourceTree = "<group>"; };
6C05A8AE284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+Listeners.swift"; sourceTree = "<group>"; };
6C092ED92A53A58600489202 /* EditorLayout+StateRestoration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EditorLayout+StateRestoration.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -959,8 +985,12 @@
5831E3CF2933F4E000D5A6D2 /* Views */,
043C321527E3201F006AE443 /* WorkspaceDocument.swift */,
043BCF02281DA18A000AC47C /* WorkspaceDocument+Search.swift */,
615AA2192B0CFD480013FCCC /* LazyStringLoader.swift */,
6C05A8AE284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift */,
6C092EDF2A53BFCF00489202 /* WorkspaceStateKey.swift */,
61538B8F2B111FE800A88846 /* String+AppearancesOfSubstring.swift */,
61538B922B11201900A88846 /* String+Character.swift */,
611191F82B08CC8000D4459B /* Indexer */,
);
path = Documents;
sourceTree = "<group>";
Expand Down Expand Up @@ -2102,6 +2132,23 @@
name = Frameworks;
sourceTree = "<group>";
};
611191F82B08CC8000D4459B /* Indexer */ = {
isa = PBXGroup;
children = (
611191F92B08CC9000D4459B /* SearchIndexer.swift */,
611191FB2B08CCB800D4459B /* SearchIndexer+AsyncController.swift */,
611191FF2B08CCD700D4459B /* SearchIndexer+Memory.swift */,
611191FD2B08CCD200D4459B /* SearchIndexer+File.swift */,
611192012B08CCDC00D4459B /* SearchIndexer+Search.swift */,
611192032B08CCED00D4459B /* SearchIndexer+ProgressivSearch.swift */,
611192052B08CCF600D4459B /* SearchIndexer+Add.swift */,
611192072B08CCFD00D4459B /* SearchIndexer+Terms.swift */,
6111920B2B08CD0B00D4459B /* SearchIndexer+InternalMethods.swift */,
613DF55D2B08DD5D00E9D902 /* FileHelper.swift */,
);
path = Indexer;
sourceTree = "<group>";
};
6C092EDC2A53A63E00489202 /* Views */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2995,6 +3042,8 @@
587B9E8F29301D8F00AC7927 /* BitBucketUserRouter.swift in Sources */,
B66A4E5129C917D5004573B4 /* AboutWindow.swift in Sources */,
58F2EB03292FB2B0004A9BDE /* Documentation.docc in Sources */,
611192042B08CCED00D4459B /* SearchIndexer+ProgressivSearch.swift in Sources */,
611192022B08CCDC00D4459B /* SearchIndexer+Search.swift in Sources */,
04BA7C272AE2E9F100584E1C /* GitClient+Push.swift in Sources */,
2B7A583527E4BA0100D25D4E /* AppDelegate.swift in Sources */,
D7012EE827E757850001E1EF /* FindNavigatorView.swift in Sources */,
Expand Down Expand Up @@ -3046,8 +3095,10 @@
587B9E8C29301D8F00AC7927 /* GitHubOpenness.swift in Sources */,
5894E59729FEF7740077E59C /* CEWorkspaceFile+Recursion.swift in Sources */,
587B9E8229301D8F00AC7927 /* GitHubPreviewHeader.swift in Sources */,
611191FC2B08CCB800D4459B /* SearchIndexer+AsyncController.swift in Sources */,
58F2EB02292FB2B0004A9BDE /* Loopable.swift in Sources */,
6C578D8929CD36E400DC73B2 /* Commands+ForEach.swift in Sources */,
611192082B08CCFD00D4459B /* SearchIndexer+Terms.swift in Sources */,
041FC6AA2AE42C9100C1F65A /* SourceControlNavigatorBranchGroupView.swift in Sources */,
28B8F884280FFE4600596236 /* NSTableView+Background.swift in Sources */,
6CBA0D512A1BF524002C6FAA /* SegmentedControlImproved.swift in Sources */,
Expand All @@ -3070,6 +3121,7 @@
587B9E7529301D8F00AC7927 /* String+QueryParameters.swift in Sources */,
58798219292D92370085B254 /* SearchModeModel.swift in Sources */,
6C5C891B2A3F736500A94FE1 /* FocusedValues.swift in Sources */,
611192062B08CCF600D4459B /* SearchIndexer+Add.swift in Sources */,
B62AEDD72A27B3D0009A9F52 /* UtilityAreaTabViewModel.swift in Sources */,
85773E1E2A3E0A1F00C5D926 /* SettingsSearchResult.swift in Sources */,
B66A4E4F29C917B8004573B4 /* WelcomeWindow.swift in Sources */,
Expand Down Expand Up @@ -3097,6 +3149,8 @@
581550CF29FBD30400684881 /* StandardTableViewCell.swift in Sources */,
B62AEDB82A1FE2DC009A9F52 /* UtilityAreaOutputView.swift in Sources */,
587B9E5C29301D8F00AC7927 /* Parameters.swift in Sources */,
61538B932B11201900A88846 /* String+Character.swift in Sources */,
613DF55E2B08DD5D00E9D902 /* FileHelper.swift in Sources */,
58798235292E30B90085B254 /* FeedbackModel.swift in Sources */,
04C3255C2801F86900C8DA2D /* ProjectNavigatorMenu.swift in Sources */,
587B9E6429301D8F00AC7927 /* GitLabCommit.swift in Sources */,
Expand All @@ -3110,6 +3164,7 @@
04BA7C132AE2AA7300584E1C /* GitCheckoutBranchViewModel.swift in Sources */,
04540D5E27DD08C300E91B77 /* WorkspaceView.swift in Sources */,
DE6F77872813625500D00A76 /* EditorTabBarDivider.swift in Sources */,
6111920C2B08CD0B00D4459B /* SearchIndexer+InternalMethods.swift in Sources */,
6CABB1A129C5593800340467 /* OverlayView.swift in Sources */,
D7211D4327E066CE008F2ED7 /* Localized+Ex.swift in Sources */,
581BFB692926431000D251EC /* WelcomeActionView.swift in Sources */,
Expand Down Expand Up @@ -3144,6 +3199,7 @@
285FEC7027FE4B9800E57D53 /* ProjectNavigatorTableViewCell.swift in Sources */,
6CB9144B29BEC7F100BC47F2 /* (null) in Sources */,
587B9E7429301D8F00AC7927 /* URL+URLParameters.swift in Sources */,
61538B902B111FE800A88846 /* String+AppearancesOfSubstring.swift in Sources */,
6C5BE51C2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift in Sources */,
581BFB6B2926431000D251EC /* RecentProjectItem.swift in Sources */,
587FB99029C1246400B519DD /* EditorTabView.swift in Sources */,
Expand Down Expand Up @@ -3188,6 +3244,7 @@
B62AEDB52A1FE295009A9F52 /* UtilityAreaDebugView.swift in Sources */,
6C049A372A49E2DB00D42923 /* DirectoryEventStream.swift in Sources */,
04BA7C0E2AE2A76E00584E1C /* SourceControlNavigatorChangesCommitView.swift in Sources */,
615AA21A2B0CFD480013FCCC /* LazyStringLoader.swift in Sources */,
6CAAF68A29BC9C2300A1F48A /* (null) in Sources */,
6C6BD6EF29CD12E900235D17 /* ExtensionManagerWindow.swift in Sources */,
6CFF967629BEBCD900182D6F /* FileCommands.swift in Sources */,
Expand Down Expand Up @@ -3271,6 +3328,7 @@
587B9E6D29301D8F00AC7927 /* GitLabEventNote.swift in Sources */,
587B9E9129301D8F00AC7927 /* BitBucketOAuthRouter.swift in Sources */,
B6E41C7429DD40010088F9F4 /* View+HideSidebarToggle.swift in Sources */,
611191FA2B08CC9000D4459B /* SearchIndexer.swift in Sources */,
58822532292C280D00E83CDE /* UtilityAreaViewModel.swift in Sources */,
043BCF03281DA18A000AC47C /* WorkspaceDocument+Search.swift in Sources */,
58822527292C280D00E83CDE /* StatusBarIndentSelector.swift in Sources */,
Expand All @@ -3290,7 +3348,9 @@
6C2C155829B4F49100EA60A5 /* SplitViewItem.swift in Sources */,
6CDA84AD284C1BA000C1CC3A /* EditorTabBarContextMenu.swift in Sources */,
6C81916729B3E80700B75C92 /* ModifierKeysObserver.swift in Sources */,
611192002B08CCD700D4459B /* SearchIndexer+Memory.swift in Sources */,
587B9E8129301D8F00AC7927 /* PublicKey.swift in Sources */,
611191FE2B08CCD200D4459B /* SearchIndexer+File.swift in Sources */,
6CB52DC92AC8DC3E002E75B3 /* CEWorkspaceFileManager+FileManagement.swift in Sources */,
58F2EB0B292FB2B0004A9BDE /* AccountsSettings.swift in Sources */,
5882252A292C280D00E83CDE /* StatusBarToggleUtilityAreaButton.swift in Sources */,
Expand Down
22 changes: 22 additions & 0 deletions CodeEdit/Features/Documents/Indexer/FileHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// FileHelper.swift
// CodeEdit
//
// Created by Tommy Ludwig on 18.11.23.
//

import Foundation

enum FileHelper {
static func urlIsFolder(_ url: URL) -> Bool {
var isDirectory: ObjCBool = false
let exists = FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory)
return exists && isDirectory.boolValue
}

static func urlIsFile(_ url: URL) -> Bool {
var isDirectory: ObjCBool = false
let exists = FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory)
return exists && !isDirectory.boolValue
}
}
Loading