queue commit only if changed file is pending

yeoman · Nov 14, 2023 · 2af3410 · 2af3410
1 parent 3968a25
commit 2af3410
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/environment-base.ts b/src/environment-base.ts
@@ -873,7 +873,14 @@ export default class EnvironmentBase extends EventEmitter implements BaseEnviron
         async () => {
           debug('Adding queueCommit listener');
           // Conflicter can change files add listener before commit task.
-          this.sharedFs.once('change', queueCommit);
+          const changedFileHandler = (file: MemFsEditorFile) => {
+            if (isFilePending(file)) {
+              queueCommit();
+              this.sharedFs.removeListener('change', changedFileHandler);
+            }
+          };
+
+          this.sharedFs.on('change', changedFileHandler);
 
           debug('Running conflicts');
           const { customCommitTask = async () => commitSharedFsTask(this) } = this.composedStore;