Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

src/vs/base/common/linkedList.ts

@@ -6,19 +6,24 @@
 import { Iterator, IteratorResult, FIN } from 'vs/base/common/iterator';
 
 class Node<E> {
+
+	static readonly Undefined = new Node<any>(undefined);
+
 	element: E;
-	next: Node<E> | undefined;
-	prev: Node<E> | undefined;
+	next: Node<E>;
+	prev: Node<E>;
 
 	constructor(element: E) {
 		this.element = element;
+		this.next = Node.Undefined;
+		this.prev = Node.Undefined;
 	}
 }
 
 export class LinkedList<E> {
 
-	private _first: Node<E> | undefined;
-	private _last: Node<E> | undefined;
+	private _first: Node<E> = Node.Undefined;
+	private _last: Node<E> = Node.Undefined;
 	private _size: number = 0;
 
 	get size(): number {
@@ -26,12 +31,12 @@ export class LinkedList<E> {
 	}
 
 	isEmpty(): boolean {
-		return !this._first;
+		return this._first === Node.Undefined;
 	}
 
 	clear(): void {
-		this._first = undefined;
-		this._last = undefined;
+		this._first = Node.Undefined;
+		this._last = Node.Undefined;
 		this._size = 0;
 	}
 
@@ -45,7 +50,7 @@ export class LinkedList<E> {
 
 	private _insert(element: E, atTheEnd: boolean): () => void {
 		const newNode = new Node(element);
-		if (!this._first) {
+		if (this._first === Node.Undefined) {
 			this._first = newNode;
 			this._last = newNode;
 
@@ -64,12 +69,18 @@ export class LinkedList<E> {
 			oldFirst.prev = newNode;
 		}
 		this._size += 1;
-		return this._remove.bind(this, newNode);
+
+		let didRemove = false;
+		return () => {
+			if (!didRemove) {
+				didRemove = true;
+				this._remove(newNode);
+			}
+		};
 	}
 
-
 	shift(): E | undefined {
-		if (!this._first) {
+		if (this._first === Node.Undefined) {
 			return undefined;
 		} else {
 			const res = this._first.element;
@@ -79,7 +90,7 @@ export class LinkedList<E> {
 	}
 
 	pop(): E | undefined {
-		if (!this._last) {
+		if (this._last === Node.Undefined) {
 			return undefined;
 		} else {
 			const res = this._last.element;
@@ -89,38 +100,30 @@ export class LinkedList<E> {
 	}
 
 	private _remove(node: Node<E>): void {
-		let candidate: Node<E> | undefined = this._first;
-		while (candidate instanceof Node) {
-			if (candidate !== node) {
-				candidate = candidate.next;
-				continue;
-			}
-			if (candidate.prev && candidate.next) {
-				// middle
-				const anchor = candidate.prev;
-				anchor.next = candidate.next;
-				candidate.next.prev = anchor;
+		if (node.prev !== Node.Undefined && node.next !== Node.Undefined) {
+			// middle
+			const anchor = node.prev;
+			anchor.next = node.next;
+			node.next.prev = anchor;
 
-			} else if (!candidate.prev && !candidate.next) {
-				// only node
-				this._first = undefined;
-				this._last = undefined;
+		} else if (node.prev === Node.Undefined && node.next === Node.Undefined) {
+			// only node
+			this._first = Node.Undefined;
+			this._last = Node.Undefined;
 
-			} else if (!candidate.next) {
-				// last
-				this._last = this._last!.prev!;
-				this._last.next = undefined;
+		} else if (node.next === Node.Undefined) {
+			// last
+			this._last = this._last!.prev!;
+			this._last.next = Node.Undefined;
 
-			} else if (!candidate.prev) {
-				// first
-				this._first = this._first!.next!;
-				this._first.prev = undefined;
-			}
-
-			// done
-			this._size -= 1;
-			break;
+		} else if (node.prev === Node.Undefined) {
+			// first
+			this._first = this._first!.next!;
+			this._first.prev = Node.Undefined;
 		}
+
+		// done
+		this._size -= 1;
 	}
 
 	iterator(): Iterator<E> {
@@ -128,7 +131,7 @@ export class LinkedList<E> {
 		let node = this._first;
 		return {
 			next(): IteratorResult<E> {
-				if (!node) {
+				if (node === Node.Undefined) {
 					return FIN;
 				}
 
@@ -145,7 +148,7 @@ export class LinkedList<E> {
 
 	toArray(): E[] {
 		const result: E[] = [];
-		for (let node = this._first; node instanceof Node; node = node.next) {
+		for (let node = this._first; node !== Node.Undefined; node = node.next) {
 			result.push(node.element);
 		}
 		return result;