Skip to content

Fix watcher to ignore Git commit index updates #14

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix watcher to ignore Git commit index updates #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 35 additions & 5 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,19 +181,49 @@ function setupRepositoryWatcher(context: vscode.ExtensionContext, repository: Re
const indexPath = vscode.Uri.joinPath(repository.rootUri, '.git/index');
const watcher = vscode.workspace.createFileSystemWatcher(indexPath.fsPath);

let debounceHandle: NodeJS.Timeout | undefined;
let lastFingerprint = '';

const handleIndexChange = () => {
setTimeout(() => {
if (repository.state.indexChanges.length > 0) {
onFilesStaged();
if (debounceHandle) {
clearTimeout(debounceHandle);
}

debounceHandle = setTimeout(() => {
const staged = repository.state.indexChanges ?? [];

if (staged.length === 0) {
// Reset fingerprint so the next staging event is picked up.
lastFingerprint = '';
return;
}
}, 100);

const fingerprint = staged
.map(change => change.uri.fsPath)
.sort()
.join('|');

if (fingerprint === lastFingerprint) {
return;
}

lastFingerprint = fingerprint;
onFilesStaged();
}, 250);
};

watcher.onDidChange(handleIndexChange);
watcher.onDidCreate(handleIndexChange);
watcher.onDidDelete(handleIndexChange);

context.subscriptions.push(watcher);
context.subscriptions.push(
new vscode.Disposable(() => {
if (debounceHandle) {
clearTimeout(debounceHandle);
}
})
);
}

export async function activate(context: vscode.ExtensionContext) {
Expand Down Expand Up @@ -226,4 +256,4 @@ export async function activate(context: vscode.ExtensionContext) {
});
}

export function deactivate() {}
export function deactivate() {}