Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/vs/editor/common/diff/diffComputer.ts

@@ -34,24 +34,6 @@ class MarkerSequence implements ISequence {
 		this.endMarkers = endMarkers;
 	}
 
-	public equals(other: any): boolean {
-		if (!(other instanceof MarkerSequence)) {
-			return false;
-		}
-		const otherMarkerSequence = <MarkerSequence>other;
-		if (this.getLength() !== otherMarkerSequence.getLength()) {
-			return false;
-		}
-		for (let i = 0, len = this.getLength(); i < len; i++) {
-			const myElement = this.getElementHash(i);
-			const otherElement = otherMarkerSequence.getElementHash(i);
-			if (myElement !== otherElement) {
-				return false;
-			}
-		}
-		return true;
-	}
-
 	public getLength(): number {
 		return this.startMarkers.length;
 	}
@@ -321,7 +303,6 @@ class LineChange implements ILineChange {
 export interface IDiffComputerOpts {
 	shouldPostProcessCharChanges: boolean;
 	shouldIgnoreTrimWhitespace: boolean;
-	shouldConsiderTrimWhitespaceInEmptyCase: boolean;
 	shouldMakePrettyDiff: boolean;
 }
 
@@ -347,11 +328,6 @@ export class DiffComputer {
 		this.modifiedLines = modifiedLines;
 		this.original = new LineMarkerSequence(originalLines);
 		this.modified = new LineMarkerSequence(modifiedLines);
-
-		if (opts.shouldConsiderTrimWhitespaceInEmptyCase && this.shouldIgnoreTrimWhitespace && this.original.equals(this.modified)) {
-			// Diff would be empty with `shouldIgnoreTrimWhitespace`
-			this.shouldIgnoreTrimWhitespace = false;
-		}
 	}
 
 	public computeDiff(): ILineChange[] {