fix(#2468): always apply filters to subdirectories #2537
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alex-courtis
requested changes
Nov 19, 2023
There was a problem hiding this comment.
Good catch!
This looks correct and will now correctly handle closed refreshes. However... we're now watching .git/* directories. We'll need to somehow apply the exclusions that are present elsewhere.
Testing branch vs master:
: ; diff --unified=1000 <(sed -e 's/.*watcher] //g' /tmp/ma.log) <(sed -e 's/.*watcher] //g' /tmp/br.log)
--- /proc/self/fd/11 2023-11-19 15:07:11.978193749 +1100
+++ /proc/self/fd/12 2023-11-19 15:07:11.974860405 +1100
@@ -1,33 +1,48 @@
Watcher:new '/home/alex/src/nvim-tree/r/2468' nil
Event:new '/home/alex/src/nvim-tree/r/2468'
Event:start '/home/alex/src/nvim-tree/r/2468'
git start
Watcher:new '/home/alex/src/nvim-tree/r/2468/.git' { "FETCH_HEAD", "HEAD", "HEAD.lock", "config", "index" }
Event:new '/home/alex/src/nvim-tree/r/2468/.git'
Event:start '/home/alex/src/nvim-tree/r/2468/.git'
Watcher:new '/home/alex/src/nvim-tree/r/2468/n' nil
Event:new '/home/alex/src/nvim-tree/r/2468/n'
Event:start '/home/alex/src/nvim-tree/r/2468/n'
Watcher:new '/home/alex/src/nvim-tree/r/2468/n/1' nil
Event:new '/home/alex/src/nvim-tree/r/2468/n/1'
Event:start '/home/alex/src/nvim-tree/r/2468/n/1'
Watcher:new '/home/alex/src/nvim-tree/r/2468/n/2' nil
Event:new '/home/alex/src/nvim-tree/r/2468/n/2'
Event:start '/home/alex/src/nvim-tree/r/2468/n/2'
Watcher:new '/home/alex/src/nvim-tree/r/2468/n/3' nil
Event:new '/home/alex/src/nvim-tree/r/2468/n/3'
Event:start '/home/alex/src/nvim-tree/r/2468/n/3'
Watcher:new '/home/alex/src/nvim-tree/r/2468/i' nil
Event:new '/home/alex/src/nvim-tree/r/2468/i'
Event:start '/home/alex/src/nvim-tree/r/2468/i'
+Watcher:new '/home/alex/src/nvim-tree/r/2468/.git/branches' nil
+Event:new '/home/alex/src/nvim-tree/r/2468/.git/branches'
+Event:start '/home/alex/src/nvim-tree/r/2468/.git/branches'
+Watcher:new '/home/alex/src/nvim-tree/r/2468/.git/hooks' nil
+Event:new '/home/alex/src/nvim-tree/r/2468/.git/hooks'
+Event:start '/home/alex/src/nvim-tree/r/2468/.git/hooks'
+Watcher:new '/home/alex/src/nvim-tree/r/2468/.git/info' nil
+Event:new '/home/alex/src/nvim-tree/r/2468/.git/info'
+Event:start '/home/alex/src/nvim-tree/r/2468/.git/info'
+Watcher:new '/home/alex/src/nvim-tree/r/2468/.git/objects' nil
+Event:new '/home/alex/src/nvim-tree/r/2468/.git/objects'
+Event:start '/home/alex/src/nvim-tree/r/2468/.git/objects'
+Watcher:new '/home/alex/src/nvim-tree/r/2468/.git/refs' nil
+Event:new '/home/alex/src/nvim-tree/r/2468/.git/refs'
+Event:start '/home/alex/src/nvim-tree/r/2468/.git/refs'
Watcher:new '/home/alex/src/nvim-tree/r/2468/i/1' nil
Event:new '/home/alex/src/nvim-tree/r/2468/i/1'
Event:start '/home/alex/src/nvim-tree/r/2468/i/1'
Watcher:new '/home/alex/src/nvim-tree/r/2468/i/2' nil
Event:new '/home/alex/src/nvim-tree/r/2468/i/2'
Event:start '/home/alex/src/nvim-tree/r/2468/i/2'
Watcher:new '/home/alex/src/nvim-tree/r/2468/i/3' nil
Event:new '/home/alex/src/nvim-tree/r/2468/i/3'
Event:start '/home/alex/src/nvim-tree/r/2468/i/3'
Watcher:destroy '/home/alex/src/nvim-tree/r/2468/i'
Event:destroy '/home/alex/src/nvim-tree/r/2468/i'
|
Not sure what the correct behavior should be, I did some tests and the watchers are triggered for |
I see. I think I had some incorrect assumptions around existing behaviour. The files that trigger a full refresh are the curated list: nvim-tree.lua/lua/nvim-tree/git/init.lua Line 22 in 28c3980 These directories are treated like any other and thus shouldn't result in any performance issues. I'm happy if you are. |
alex-courtis
approved these changes
Nov 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #2468
I might have found a fix for #2468, and if so it's a really simple one. From my tests it seems to apply correctly all filters to all subdirs, not sure about the resource leaks but they should go together as well.