#4247 Fix racing build-on-save when multiple files are edited

James-Yu · Apr 24, 2024 · b58bc13 · b58bc13
1 parent 12c3ff6
commit b58bc13
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/compile/build.ts b/src/compile/build.ts
@@ -40,6 +40,7 @@ function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: bo
         logger.log('Autobuild temporarily disabled.')
         return
     }
+    lw.compile.lastAutoBuildTime = Date.now()
     if (!bibChanged && lw.root.subfiles.path && configuration.get('latex.rootFile.useSubFile')) {
         return build(true, lw.root.subfiles.path, lw.root.subfiles.langId)
     } else {
@@ -57,7 +58,7 @@ function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: bo
  */
 function canAutoBuild(): boolean {
     const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.file.path ? vscode.Uri.file(lw.root.file.path) : undefined)
-    return Date.now() - lw.compile.lastBuildTime >= (configuration.get('latex.autoBuild.interval', 1000) as number)
+    return Date.now() - lw.compile.lastAutoBuildTime >= (configuration.get('latex.autoBuild.interval', 1000) as number)
 }
 
 let isBuilding = false
@@ -147,7 +148,6 @@ async function buildLoop() {
 
     isBuilding = true
     lw.compile.compiledPDFWriting++
-    lw.compile.lastBuildTime = Date.now()
     // Stop watching the PDF file to avoid reloading the PDF viewer twice.
     // The builder will be responsible for refreshing the viewer.
     let skipped = true

diff --git a/src/compile/index.ts b/src/compile/index.ts
@@ -8,7 +8,7 @@ export const compile = {
     autoBuild,
     terminate,
     lastSteps: [] as Step[],
-    lastBuildTime: 0,
+    lastAutoBuildTime: 0,
     compiledPDFPath: '',
     compiledPDFWriting: 0,
     process: undefined as ChildProcessWithoutNullStreams | undefined

diff --git a/src/core/commands.ts b/src/core/commands.ts
@@ -445,7 +445,7 @@ export function texdocUsepackages() {
 }
 
 export async function saveActive() {
-    lw.compile.lastBuildTime = Date.now()
+    lw.compile.lastAutoBuildTime = Date.now()
     await vscode.window.activeTextEditor?.document.save()
 }
 

diff --git a/test/suites/utils.ts b/test/suites/utils.ts
@@ -76,7 +76,7 @@ export async function reset() {
     await vscode.commands.executeCommand('workbench.action.closeAllEditors')
     await Promise.all(Object.values(lw.cache.promises))
     lw.compile.lastSteps = []
-    lw.compile.lastBuildTime = 0
+    lw.compile.lastAutoBuildTime = 0
     lw.compile.compiledPDFPath = ''
     lw.compile.compiledPDFWriting = 0
     lw.root.file.path = undefined