Merge pull request #2052 from ahoppen/6.1/schedule-indexing-progress

ahoppen · web-flow · commit 62ffca48b956 · 2025-03-11T11:36:22.000-07:00
[6.1] Only show the `Scheduling Indexing` progress if no indexing tasks are currently happening
diff --git a/Sources/SemanticIndex/SemanticIndexManager.swift b/Sources/SemanticIndex/SemanticIndexManager.swift
@@ -215,9 +215,6 @@ package final actor SemanticIndexManager {
     if inProgressPreparationTasks.values.contains(where: { $0.purpose == .forEditorFunctionality }) {
       return .preparingFileForEditorFunctionality
     }
-    if !scheduleIndexingTasks.isEmpty {
-      return .schedulingIndexing
-    }
     let preparationTasks = inProgressPreparationTasks.mapValues { inProgressTask in
       return inProgressTask.task.isExecuting ? IndexTaskStatus.executing : IndexTaskStatus.scheduled
     }
@@ -230,6 +227,9 @@ package final actor SemanticIndexManager {
       }
     }
     if preparationTasks.isEmpty && indexTasks.isEmpty {
+      if !scheduleIndexingTasks.isEmpty {
+        return .schedulingIndexing
+      }
       return .upToDate
     }
     return .indexing(preparationTasks: preparationTasks, indexTasks: indexTasks)

Original file line number	Diff line number	Diff line change
`@@ -215,9 +215,6 @@ package final actor SemanticIndexManager {`
`215`	`215`	`if inProgressPreparationTasks.values.contains(where: { $0.purpose == .forEditorFunctionality }) {`
`216`	`216`	`return .preparingFileForEditorFunctionality`
`217`	`217`	`}`
`218`		`- if !scheduleIndexingTasks.isEmpty {`
`219`		`- return .schedulingIndexing`
`220`		`- }`
`221`	`218`	`let preparationTasks = inProgressPreparationTasks.mapValues { inProgressTask in`
`222`	`219`	`return inProgressTask.task.isExecuting ? IndexTaskStatus.executing : IndexTaskStatus.scheduled`
`223`	`220`	`}`
`@@ -230,6 +227,9 @@ package final actor SemanticIndexManager {`
`230`	`227`	`}`
`231`	`228`	`}`
`232`	`229`	`if preparationTasks.isEmpty && indexTasks.isEmpty {`
	`230`	`+ if !scheduleIndexingTasks.isEmpty {`
	`231`	`+ return .schedulingIndexing`
	`232`	`+ }`
`233`	`233`	`return .upToDate`
`234`	`234`	`}`
`235`	`235`	`return .indexing(preparationTasks: preparationTasks, indexTasks: indexTasks)`