@@ -228,32 +228,33 @@ export async function formatDocumentRangesWithProvider(
228
228
logService . trace ( `[format][provideDocumentRangeFormattingEdits] (response)` , provider . extensionId ?. value , result ) ;
229
229
rawEditsList . push ( result ) ;
230
230
} else {
231
+
231
232
for ( const range of ranges ) {
232
233
if ( cts . token . isCancellationRequested ) {
233
234
return true ;
234
235
}
235
236
rawEditsList . push ( await computeEdits ( range ) ) ;
236
237
}
237
- }
238
238
239
- for ( let i = 0 ; i < ranges . length ; ++ i ) {
240
- for ( let j = i + 1 ; j < ranges . length ; ++ j ) {
241
- if ( cts . token . isCancellationRequested ) {
242
- return true ;
243
- }
244
- if ( hasIntersectingEdit ( rawEditsList [ i ] , rawEditsList [ j ] ) ) {
245
- // Merge ranges i and j into a single range, recompute the associated edits
246
- const mergedRange = Range . plusRange ( ranges [ i ] , ranges [ j ] ) ;
247
- const edits = await computeEdits ( mergedRange ) ;
248
- ranges . splice ( j , 1 ) ;
249
- ranges . splice ( i , 1 ) ;
250
- ranges . push ( mergedRange ) ;
251
- rawEditsList . splice ( j , 1 ) ;
252
- rawEditsList . splice ( i , 1 ) ;
253
- rawEditsList . push ( edits ) ;
254
- // Restart scanning
255
- i = 0 ;
256
- j = 0 ;
239
+ for ( let i = 0 ; i < ranges . length ; ++ i ) {
240
+ for ( let j = i + 1 ; j < ranges . length ; ++ j ) {
241
+ if ( cts . token . isCancellationRequested ) {
242
+ return true ;
243
+ }
244
+ if ( hasIntersectingEdit ( rawEditsList [ i ] , rawEditsList [ j ] ) ) {
245
+ // Merge ranges i and j into a single range, recompute the associated edits
246
+ const mergedRange = Range . plusRange ( ranges [ i ] , ranges [ j ] ) ;
247
+ const edits = await computeEdits ( mergedRange ) ;
248
+ ranges . splice ( j , 1 ) ;
249
+ ranges . splice ( i , 1 ) ;
250
+ ranges . push ( mergedRange ) ;
251
+ rawEditsList . splice ( j , 1 ) ;
252
+ rawEditsList . splice ( i , 1 ) ;
253
+ rawEditsList . push ( edits ) ;
254
+ // Restart scanning
255
+ i = 0 ;
256
+ j = 0 ;
257
+ }
257
258
}
258
259
}
259
260
}
0 commit comments