Fix calling middleware creates infinite loop

intitni · intitni · commit 5116c1d144b8 · 2023-10-16T15:03:14.000+08:00
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit 943c94477524098f3cd90baa5e2eca0f4dead323
+Subproject commit 7796423c9827e16a928d5611cf30cec2908b33b0
diff --git a/Tool/Sources/SuggestionService/SuggestionService.swift b/Tool/Sources/SuggestionService/SuggestionService.swift
@@ -131,13 +131,13 @@ public actor SuggestionService: SuggestionServiceType {
 }
 
 public extension SuggestionService {
-    func getSuggestions(
+    func getSuggestions( 
         _ request: SuggestionRequest
     ) async throws -> [SuggestionModel.CodeSuggestion] {
         var getSuggestion = suggestionProvider.getSuggestions
-
+ 
         for middleware in Self.middlewares.reversed() {
-            getSuggestion = { request in
+            getSuggestion = { [getSuggestion] request in
                 try await middleware.getSuggestion(request, next: getSuggestion)
             }
         }
@@ -169,7 +169,6 @@ public extension SuggestionService {
         try await suggestionProvider.notifySaveTextDocument(fileURL: fileURL)
     }
 
-    #warning("Move the cancellation to this type so that we can also cancel middlewares")
     func cancelRequest() async {
         await suggestionProvider.cancelRequest()
     }

Original file line number	Diff line number	Diff line change
`@@ -131,13 +131,13 @@ public actor SuggestionService: SuggestionServiceType {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`public extension SuggestionService {`
`134`		`- func getSuggestions(`
	`134`	`+ func getSuggestions(`
`135`	`135`	`_ request: SuggestionRequest`
`136`	`136`	`) async throws -> [SuggestionModel.CodeSuggestion] {`
`137`	`137`	`var getSuggestion = suggestionProvider.getSuggestions`
`138`		`-`
	`138`	`+`
`139`	`139`	`for middleware in Self.middlewares.reversed() {`
`140`		`- getSuggestion = { request in`
	`140`	`+ getSuggestion = { [getSuggestion] request in`
`141`	`141`	`try await middleware.getSuggestion(request, next: getSuggestion)`
`142`	`142`	`}`
`143`	`143`	`}`
`@@ -169,7 +169,6 @@ public extension SuggestionService {`
`169`	`169`	`try await suggestionProvider.notifySaveTextDocument(fileURL: fileURL)`
`170`	`170`	`}`
`171`	`171`
`172`		`- #warning("Move the cancellation to this type so that we can also cancel middlewares")`
`173`	`172`	`func cancelRequest() async {`
`174`	`173`	`await suggestionProvider.cancelRequest()`
`175`	`174`	`}`