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

Find and Replace Functionality #1537

Merged
merged 20 commits into from
Jan 30, 2024
Merged

Find and Replace Functionality #1537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0402597
Added search and replace functions
tom-ludwig Dec 29, 2023
ab31b9d
Refactor search and replace functionality
tom-ludwig Jan 2, 2024
a0febc8
Add WorkspaceDocument+SearchState and WorkspaceDocument+Index
tom-ludwig Jan 2, 2024
a7140e6
Add error handling for file operations
tom-ludwig Jan 3, 2024
f717a5f
Added navigator status and fixed case sensitive searching
tom-ludwig Jan 12, 2024
21403a7
Removed "Match Whole Word" from the FindNavigator TextField.
tom-ludwig Jan 14, 2024
02875c1
FIX: Search options were not working
tom-ludwig Jan 14, 2024
0950f67
Display an error message when no occurrences of the search term are f…
tom-ludwig Jan 14, 2024
a2135f5
Cleaned up some code and spelling errors
tom-ludwig Jan 21, 2024
58e093b
Added a progress view while searching
tom-ludwig Jan 21, 2024
3fa096a
Added some tests
tom-ludwig Jan 21, 2024
d947830
Added tests for containing, matching word, starting with and ending with
tom-ludwig Jan 23, 2024
4058427
Code refactoring to stick to DRY
tom-ludwig Jan 23, 2024
5fc6480
Added testSearchWithOptionCaseSensitive()
tom-ludwig Jan 23, 2024
d8fe6f7
Tests for Find and Replace
tom-ludwig Jan 26, 2024
1fe166f
fix swift line warning
tom-ludwig Jan 26, 2024
9809ff3
Improved a few comments
tom-ludwig Jan 27, 2024
d68eb64
Timeout for indexing
tom-ludwig Jan 27, 2024
b4e38e6
FIX: Swiftlint warnings
tom-ludwig Jan 27, 2024
cb2b388
Merge branch 'CodeEditApp:main' into project-find-replace-all-1466
tom-ludwig Jan 27, 2024
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
32 changes: 28 additions & 4 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/* Begin PBXBuildFile section */
041FC6AD2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */; };
043BCF03281DA18A000AC47C /* WorkspaceDocument+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043BCF02281DA18A000AC47C /* WorkspaceDocument+Search.swift */; };
043BCF03281DA18A000AC47C /* WorkspaceDocument+SearchState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043BCF02281DA18A000AC47C /* WorkspaceDocument+SearchState.swift */; };
043C321427E31FF6006AE443 /* CodeEditDocumentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043C321327E31FF6006AE443 /* CodeEditDocumentController.swift */; };
043C321627E3201F006AE443 /* WorkspaceDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043C321527E3201F006AE443 /* WorkspaceDocument.swift */; };
04540D5E27DD08C300E91B77 /* WorkspaceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B658FB3127DA9E0F00EA4DBD /* WorkspaceView.swift */; };
Expand Down Expand Up @@ -255,6 +255,7 @@
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 */; };
610C0FDA2B44438F00A01CA7 /* WorkspaceDocument+FindAndReplace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 610C0FD92B44438F00A01CA7 /* WorkspaceDocument+FindAndReplace.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 */; };
Expand All @@ -272,6 +273,11 @@
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 */; };
6195E30D2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6195E30C2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift */; };
6195E30F2B640474007261CA /* WorkspaceDocument+SearchState+FindAndReplaceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6195E30E2B640474007261CA /* WorkspaceDocument+SearchState+FindAndReplaceTests.swift */; };
6195E3112B640485007261CA /* WorkspaceDocument+SearchState+IndexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6195E3102B640485007261CA /* WorkspaceDocument+SearchState+IndexTests.swift */; };
61A53A7E2B4449870093BF8A /* WorkspaceDocument+Find.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61A53A7D2B4449870093BF8A /* WorkspaceDocument+Find.swift */; };
61A53A812B4449F00093BF8A /* WorkspaceDocument+Index.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61A53A802B4449F00093BF8A /* WorkspaceDocument+Index.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 */; };
6C092EDA2A53A58600489202 /* EditorLayout+StateRestoration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C092ED92A53A58600489202 /* EditorLayout+StateRestoration.swift */; };
Expand Down Expand Up @@ -537,7 +543,7 @@

/* Begin PBXFileReference section */
041FC6AC2AE437CE00C1F65A /* SourceControlNavigatorNewBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorNewBranchView.swift; sourceTree = "<group>"; };
043BCF02281DA18A000AC47C /* WorkspaceDocument+Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+Search.swift"; sourceTree = "<group>"; };
043BCF02281DA18A000AC47C /* WorkspaceDocument+SearchState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+SearchState.swift"; sourceTree = "<group>"; };
043C321327E31FF6006AE443 /* CodeEditDocumentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditDocumentController.swift; sourceTree = "<group>"; };
043C321527E3201F006AE443 /* WorkspaceDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspaceDocument.swift; sourceTree = "<group>"; };
04660F6027E3A68A00477777 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -788,6 +794,7 @@
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>"; };
610C0FD92B44438F00A01CA7 /* WorkspaceDocument+FindAndReplace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+FindAndReplace.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>"; };
Expand All @@ -805,6 +812,11 @@
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>"; };
6195E30C2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+SearchState+FindTests.swift"; sourceTree = "<group>"; };
6195E30E2B640474007261CA /* WorkspaceDocument+SearchState+FindAndReplaceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+SearchState+FindAndReplaceTests.swift"; sourceTree = "<group>"; };
6195E3102B640485007261CA /* WorkspaceDocument+SearchState+IndexTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+SearchState+IndexTests.swift"; sourceTree = "<group>"; };
61A53A7D2B4449870093BF8A /* WorkspaceDocument+Find.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+Find.swift"; sourceTree = "<group>"; };
61A53A802B4449F00093BF8A /* WorkspaceDocument+Index.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+Index.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 @@ -1050,7 +1062,10 @@
5831E3CE2933F3DE00D5A6D2 /* Controllers */,
5831E3CF2933F4E000D5A6D2 /* Views */,
043C321527E3201F006AE443 /* WorkspaceDocument.swift */,
043BCF02281DA18A000AC47C /* WorkspaceDocument+Search.swift */,
043BCF02281DA18A000AC47C /* WorkspaceDocument+SearchState.swift */,
61A53A802B4449F00093BF8A /* WorkspaceDocument+Index.swift */,
61A53A7D2B4449870093BF8A /* WorkspaceDocument+Find.swift */,
610C0FD92B44438F00A01CA7 /* WorkspaceDocument+FindAndReplace.swift */,
615AA2192B0CFD480013FCCC /* LazyStringLoader.swift */,
6C05A8AE284D0CA3007F4EAA /* WorkspaceDocument+Listeners.swift */,
6C092EDF2A53BFCF00489202 /* WorkspaceStateKey.swift */,
Expand Down Expand Up @@ -1268,6 +1283,9 @@
children = (
4EE96ECC296059D200FFBEA8 /* Mocks */,
4EE96ECA2960565E00FFBEA8 /* DocumentsUnitTests.swift */,
6195E3102B640485007261CA /* WorkspaceDocument+SearchState+IndexTests.swift */,
6195E30C2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift */,
6195E30E2B640474007261CA /* WorkspaceDocument+SearchState+FindAndReplaceTests.swift */,
613053582B23916D00D767E3 /* Indexer */,
);
path = Documents;
Expand Down Expand Up @@ -3229,6 +3247,7 @@
587B9E5F29301D8F00AC7927 /* GitLabProjectRouter.swift in Sources */,
587B9E7329301D8F00AC7927 /* GitRouter.swift in Sources */,
6C2C156129B4F52F00EA60A5 /* SplitViewModifiers.swift in Sources */,
61A53A812B4449F00093BF8A /* WorkspaceDocument+Index.swift in Sources */,
201169DD2837B3AC00F92B46 /* SourceControlNavigatorToolbarBottom.swift in Sources */,
587B9E8B29301D8F00AC7927 /* GitHubAccount+deleteReference.swift in Sources */,
58798237292E30B90085B254 /* FeedbackView.swift in Sources */,
Expand Down Expand Up @@ -3391,6 +3410,7 @@
581BFB682926431000D251EC /* WelcomeView.swift in Sources */,
6CFF967829BEBCF600182D6F /* MainCommands.swift in Sources */,
587B9E7129301D8F00AC7927 /* GitURLSession.swift in Sources */,
610C0FDA2B44438F00A01CA7 /* WorkspaceDocument+FindAndReplace.swift in Sources */,
5882252C292C280D00E83CDE /* UtilityAreaView.swift in Sources */,
2847019E27FDDF7600F87B6B /* ProjectNavigatorOutlineView.swift in Sources */,
B607184C2B17E037009CDAB4 /* SourceControlStashChangesView.swift in Sources */,
Expand Down Expand Up @@ -3438,6 +3458,7 @@
6C6BD70429CD17B600235D17 /* ExtensionsManager.swift in Sources */,
587B9E6129301D8F00AC7927 /* GitLabOAuthConfiguration.swift in Sources */,
587B9E6229301D8F00AC7927 /* GitLabConfiguration.swift in Sources */,
61A53A7E2B4449870093BF8A /* WorkspaceDocument+Find.swift in Sources */,
6CABB19E29C5591D00340467 /* NSTableViewWrapper.swift in Sources */,
5879821B292D92370085B254 /* SearchResultMatchModel.swift in Sources */,
04BA7C1E2AE2D8A000584E1C /* GitClient+Clone.swift in Sources */,
Expand Down Expand Up @@ -3503,7 +3524,7 @@
B6E41C7429DD40010088F9F4 /* View+HideSidebarToggle.swift in Sources */,
611191FA2B08CC9000D4459B /* SearchIndexer.swift in Sources */,
58822532292C280D00E83CDE /* UtilityAreaViewModel.swift in Sources */,
043BCF03281DA18A000AC47C /* WorkspaceDocument+Search.swift in Sources */,
043BCF03281DA18A000AC47C /* WorkspaceDocument+SearchState.swift in Sources */,
58822527292C280D00E83CDE /* StatusBarIndentSelector.swift in Sources */,
587B9E9629301D8F00AC7927 /* BitBucketRepositories.swift in Sources */,
5878DAA6291AE76700DD95A3 /* QuickOpenPreviewView.swift in Sources */,
Expand Down Expand Up @@ -3555,7 +3576,10 @@
4EE96ECB2960565E00FFBEA8 /* DocumentsUnitTests.swift in Sources */,
4EE96ECE296059E000FFBEA8 /* NSHapticFeedbackPerformerMock.swift in Sources */,
6130535C2B23933D00D767E3 /* MemoryIndexingTests.swift in Sources */,
6195E3112B640485007261CA /* WorkspaceDocument+SearchState+IndexTests.swift in Sources */,
6130536B2B24722C00D767E3 /* AsyncIndexingTests.swift in Sources */,
6195E30D2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift in Sources */,
6195E30F2B640474007261CA /* WorkspaceDocument+SearchState+FindAndReplaceTests.swift in Sources */,
587B612E293419B700D5CD8F /* CodeFileTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Loading
Loading