Skip to content

Commit 74a977b

Browse files
authored
Update to support strictBuiltinIteratorReturn (#222009)
1 parent 709d1b8 commit 74a977b

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

extensions/grunt/src/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ class TaskDetector {
316316
if (this.detectors.size === 0) {
317317
return Promise.resolve([]);
318318
} else if (this.detectors.size === 1) {
319-
return this.detectors.values().next().value.getTasks();
319+
return this.detectors.values().next().value!.getTasks();
320320
} else {
321321
const promises: Promise<vscode.Task[]>[] = [];
322322
for (const detector of this.detectors.values()) {
@@ -338,7 +338,7 @@ class TaskDetector {
338338
if (this.detectors.size === 0) {
339339
return undefined;
340340
} else if (this.detectors.size === 1) {
341-
return this.detectors.values().next().value.getTask(task);
341+
return this.detectors.values().next().value!.getTask(task);
342342
} else {
343343
if ((task.scope === vscode.TaskScope.Workspace) || (task.scope === vscode.TaskScope.Global)) {
344344
return undefined;

extensions/gulp/src/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ class TaskDetector {
357357
if (this.detectors.size === 0) {
358358
return Promise.resolve([]);
359359
} else if (this.detectors.size === 1) {
360-
return this.detectors.values().next().value.getTasks();
360+
return this.detectors.values().next().value!.getTasks();
361361
} else {
362362
const promises: Promise<vscode.Task[]>[] = [];
363363
for (const detector of this.detectors.values()) {
@@ -379,7 +379,7 @@ class TaskDetector {
379379
if (this.detectors.size === 0) {
380380
return undefined;
381381
} else if (this.detectors.size === 1) {
382-
return this.detectors.values().next().value.getTask(task);
382+
return this.detectors.values().next().value!.getTask(task);
383383
} else {
384384
if ((task.scope === vscode.TaskScope.Workspace) || (task.scope === vscode.TaskScope.Global)) {
385385
// Not supported, we don't have enough info to create the task.

extensions/jake/src/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ class TaskDetector {
290290
if (this.detectors.size === 0) {
291291
return Promise.resolve([]);
292292
} else if (this.detectors.size === 1) {
293-
return this.detectors.values().next().value.getTasks();
293+
return this.detectors.values().next().value!.getTasks();
294294
} else {
295295
const promises: Promise<vscode.Task[]>[] = [];
296296
for (const detector of this.detectors.values()) {
@@ -312,7 +312,7 @@ class TaskDetector {
312312
if (this.detectors.size === 0) {
313313
return undefined;
314314
} else if (this.detectors.size === 1) {
315-
return this.detectors.values().next().value.getTask(task);
315+
return this.detectors.values().next().value!.getTask(task);
316316
} else {
317317
if ((task.scope === vscode.TaskScope.Workspace) || (task.scope === vscode.TaskScope.Global)) {
318318
// Not supported, we don't have enough info to create the task.

src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export class WorkerBasedDocumentDiffProvider implements IDocumentDiffProvider, I
152152

153153
// max 10 items in cache
154154
if (WorkerBasedDocumentDiffProvider.diffCache.size > 10) {
155-
WorkerBasedDocumentDiffProvider.diffCache.delete(WorkerBasedDocumentDiffProvider.diffCache.keys().next().value);
155+
WorkerBasedDocumentDiffProvider.diffCache.delete(WorkerBasedDocumentDiffProvider.diffCache.keys().next().value!);
156156
}
157157

158158
WorkerBasedDocumentDiffProvider.diffCache.set(uriKey, { result, context });

src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
787787
if (this.editor.hasModel() && (typeof lineNumber === 'number' || !this.widget.provider)) {
788788
index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
789789
} else {
790-
const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value;
790+
const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value!;
791791
const mapIndex = providerChanges.findIndex(value => value === this.widget!.index);
792792
index = providerChanges[rot(mapIndex + 1, providerChanges.length)];
793793
}
@@ -807,7 +807,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
807807
if (this.editor.hasModel() && (typeof lineNumber === 'number')) {
808808
index = this.model.findPreviousClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
809809
} else {
810-
const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value;
810+
const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value!;
811811
const mapIndex = providerChanges.findIndex(value => value === this.widget!.index);
812812
index = providerChanges[rot(mapIndex - 1, providerChanges.length)];
813813
}

src/vs/workbench/contrib/timeline/browser/timelinePane.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ export class TimelinePane extends ViewPane {
732732
timeline.lastRenderedIndex = count - 1;
733733
}
734734
else {
735-
const sources: { timeline: TimelineAggregate; iterator: IterableIterator<TimelineItem>; nextItem: IteratorResult<TimelineItem, TimelineItem> }[] = [];
735+
const sources: { timeline: TimelineAggregate; iterator: IterableIterator<TimelineItem>; nextItem: IteratorResult<TimelineItem, undefined> }[] = [];
736736

737737
let hasAnyItems = false;
738738
let mostRecentEnd = 0;
@@ -766,15 +766,15 @@ export class TimelinePane extends ViewPane {
766766
function getNextMostRecentSource() {
767767
return sources
768768
.filter(source => !source.nextItem.done)
769-
.reduce((previous, current) => (previous === undefined || current.nextItem.value.timestamp >= previous.nextItem.value.timestamp) ? current : previous, undefined!);
769+
.reduce((previous, current) => (previous === undefined || current.nextItem.value!.timestamp >= previous.nextItem.value!.timestamp) ? current : previous, undefined!);
770770
}
771771

772772
let lastRelativeTime: string | undefined;
773773
let nextSource;
774774
while (nextSource = getNextMostRecentSource()) {
775775
nextSource.timeline.lastRenderedIndex++;
776776

777-
const item = nextSource.nextItem.value;
777+
const item = nextSource.nextItem.value!;
778778
item.relativeTime = undefined;
779779
item.hideRelativeTime = undefined;
780780

0 commit comments

Comments
 (0)