tslint /editor/ and /platform/ tests

build/gulpfile.hygiene.js

@@ -78,8 +78,10 @@ var tslintFilter = [
 	'extensions/**/*.ts',
 	'!**/*.d.ts',
 	'!**/typings/**',
-	'!**/*.test.ts',
-	'!src/vs/editor/standalone-languages/test/**'
+	'!src/vs/base/**/*.test.ts',
+	'!src/vs/languages/**/*.test.ts',
+	'!src/vs/workbench/**/*.test.ts',
+	'!extensions/**/*.test.ts',
 ];
 
 var copyrightHeader = [

src/vs/base/test/browser/browser.test.ts

@@ -8,8 +8,8 @@ import * as assert from 'assert';
 import { isWindows, isMacintosh } from 'vs/base/common/platform';
 import * as browser from 'vs/base/browser/browser';
 
-suite("Browsers", () => {
-	test("all", function () {
+suite('Browsers', () => {
+	test('all', function () {
 		assert(!(isWindows && isMacintosh));
 
 		var isOpera = browser.isOpera || navigator.userAgent.indexOf('OPR') >= 0;
@@ -51,8 +51,8 @@ suite("Browsers", () => {
 			assert(hasCSSAnimations);
 		}
 
-		var canPlayMp3 = browser.canPlayAudio("audio/mpeg");
-		var canPlayMp4 = browser.canPlayVideo("video/mp4");
+		var canPlayMp3 = browser.canPlayAudio('audio/mpeg');
+		var canPlayMp4 = browser.canPlayVideo('video/mp4');
 
 		if ((isIE11orEarlier || isChrome) && !isOpera) {
 			assert(canPlayMp3);

src/vs/base/test/browser/browserService.test.ts

@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import BrowserService = require('vs/base/browser/browserService');
 import { MockBrowserServiceData } from 'vs/base/test/browser/mockBrowserService';
 
-suite("BrowserService", () => {
+suite('BrowserService', () => {
 	test('Mocking of Window', () => {
 		try {
 			var service = BrowserService.getService();

src/vs/base/test/browser/highlightedLabel.test.ts

@@ -5,12 +5,9 @@
 'use strict';
 
 import * as assert from 'assert';
-import { $, Builder } from 'vs/base/browser/builder';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import BrowserService = require('vs/base/browser/browserService');
-import mockBrowserService = require('vs/base/test/browser/mockBrowserService');
 
-suite("HighlightedLabel", () => {
+suite('HighlightedLabel', () => {
 	var label: HighlightedLabel;
 
 	setup(() => {
@@ -22,37 +19,37 @@ suite("HighlightedLabel", () => {
 		label = null;
 	});
 
-	test("empty label", function() {
-		assert.equal(label.element.innerHTML, "");
+	test('empty label', function() {
+		assert.equal(label.element.innerHTML, '');
 	});
 
-	test("no decorations", function() {
-		label.set("hello");
-		assert.equal(label.element.innerHTML, "<span>hello</span>");
+	test('no decorations', function() {
+		label.set('hello');
+		assert.equal(label.element.innerHTML, '<span>hello</span>');
 	});
 
-	test("escape html", function() {
-		label.set("hel<lo");
-		assert.equal(label.element.innerHTML, "<span>hel&lt;lo</span>");
+	test('escape html', function() {
+		label.set('hel<lo');
+		assert.equal(label.element.innerHTML, '<span>hel&lt;lo</span>');
 	});
 
-	test("everything highlighted", function() {
-		label.set("hello", [ { start: 0, end: 5 } ]);
+	test('everything highlighted', function() {
+		label.set('hello', [ { start: 0, end: 5 } ]);
 		assert.equal(label.element.innerHTML, '<span class="highlight">hello</span>');
 	});
 
-	test("beginning highlighted", function() {
-		label.set("hellothere", [ { start: 0, end: 5 } ]);
+	test('beginning highlighted', function() {
+		label.set('hellothere', [ { start: 0, end: 5 } ]);
 		assert.equal(label.element.innerHTML, '<span class="highlight">hello</span><span>there</span>');
 	});
 
-	test("ending highlighted", function() {
-		label.set("goodbye", [ { start: 4, end: 7 } ]);
+	test('ending highlighted', function() {
+		label.set('goodbye', [ { start: 4, end: 7 } ]);
 		assert.equal(label.element.innerHTML, '<span>good</span><span class="highlight">bye</span>');
 	});
 
-	test("middle highlighted", function() {
-		label.set("foobarfoo", [ { start: 3, end: 6 } ]);
+	test('middle highlighted', function() {
+		label.set('foobarfoo', [ { start: 3, end: 6 } ]);
 		assert.equal(label.element.innerHTML, '<span>foo</span><span class="highlight">bar</span><span>foo</span>');
 	});
 });
\ No newline at end of file

src/vs/base/test/browser/htmlContent.test.ts

@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { renderHtml } from 'vs/base/browser/htmlContentRenderer';
 
-suite("HtmlContent", () => {
+suite('HtmlContent', () => {
 	test('render text', () => {
 		var result = renderHtml({
 			text:'testing',

src/vs/base/test/browser/mockDom.test.ts

@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import MockDom = require('vs/base/test/browser/mockDom');
 
-suite("MockDom", () => {
+suite('MockDom', () => {
 	test('Create Element', () => {
 		var doc = new MockDom.MockDocument();
 		var div = doc.createElement('div');
@@ -24,7 +24,7 @@ suite("MockDom", () => {
 		var callback = function(event:any) {
 			assert.strictEqual(event, fakeEvent);
 			count++;
-		}
+		};
 		div.addEventListener('test', callback);
 		div.dispatchEvent(fakeEvent);
 		assert.strictEqual(count, 1);

src/vs/base/test/common/eventEmitter.test.ts

@@ -215,16 +215,16 @@ suite('EventEmitter', () => {
 
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener1-foo');
-			emitter.emit('bar')
+			emitter.emit('bar');
 		});
 
 
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener2-foo');
-		})
+		});
 		emitter.addListener('bar', function() {
 			actualCallOrder.push('listener2-bar');
-		})
+		});
 
 		emitter.emit('foo');
 
@@ -242,17 +242,17 @@ suite('EventEmitter', () => {
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener1-foo');
 			emitter.deferredEmit(() => {
-				emitter.emit('bar')
-			})
+				emitter.emit('bar');
+			});
 		});
 
 
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener2-foo');
-		})
+		});
 		emitter.addListener('bar', function() {
 			actualCallOrder.push('listener2-bar');
-		})
+		});
 
 		emitter.deferredEmit(() => {
 			emitter.emit('foo');
@@ -271,16 +271,16 @@ suite('EventEmitter', () => {
 
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener1-foo');
-			emitter.emit('bar')
+			emitter.emit('bar');
 		});
 
 
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener2-foo');
-		})
+		});
 		emitter.addListener('bar', function() {
 			actualCallOrder.push('listener2-bar');
-		})
+		});
 
 		emitter.emit('foo');
 
@@ -298,17 +298,17 @@ suite('EventEmitter', () => {
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener1-foo');
 			emitter.deferredEmit(() => {
-				emitter.emit('bar')
-			})
+				emitter.emit('bar');
+			});
 		});
 
 
 		emitter.addListener('foo', function() {
 			actualCallOrder.push('listener2-foo');
-		})
+		});
 		emitter.addListener('bar', function() {
 			actualCallOrder.push('listener2-bar');
-		})
+		});
 
 		emitter.deferredEmit(() => {
 			emitter.emit('foo');

src/vs/base/test/common/keyCodes.test.ts

@@ -6,7 +6,6 @@
 
 import * as assert from 'assert';
 import {KeyCode, KeyMod, BinaryKeybindings, Keybinding} from 'vs/base/common/keyCodes';
-import * as Strings from 'vs/base/common/strings';
 
 interface ITestKeybinding {
 	ctrlCmd?: boolean;
@@ -105,5 +104,5 @@ suite('keyCodes', () => {
 
 		// chords
 		testIsGood('ctrl+a ctrl+a');
-	})
+	});
 });

src/vs/editor/contrib/comment/test/common/blockCommentCommand.test.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import assert = require('assert');
 import {testCommand} from 'vs/editor/test/common/commands/commandTestUtils';
 import {CommentMode} from 'vs/editor/test/common/testModes';
 import {BlockCommentCommand} from 'vs/editor/contrib/comment/common/blockCommentCommand';

src/vs/editor/contrib/comment/test/common/lineCommentCommand.test.ts

@@ -5,8 +5,6 @@
 'use strict';
 
 import assert = require('assert');
-import EditorCommon = require('vs/editor/common/editorCommon');
-import Model = require('vs/editor/common/model/model');
 import TU = require('vs/editor/test/common/commands/commandTestUtils');
 import ModelModes = require('vs/editor/test/common/testModes');
 import LineCommentCommand = require('vs/editor/contrib/comment/common/lineCommentCommand');
@@ -127,7 +125,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				return {
 					commentStrOffset: offset,
 					ignore: false
-				}
+				};
 			});
 			LineCommentCommand.LineCommentCommand._normalizeInsertionPoint(model, offsets, 1, tabSize);
 			var actual = offsets.map(item => item.commentStrOffset);

src/vs/editor/contrib/find/test/common/findController.test.ts

@@ -5,11 +5,8 @@
 'use strict';
 
 import assert = require('assert');
-import {FindModelBoundToEditorModel, parseReplaceString} from 'vs/editor/contrib/find/common/findModel';
 import * as EditorCommon from 'vs/editor/common/editorCommon';
 import {withMockCodeEditor} from 'vs/editor/test/common/mocks/mockCodeEditor';
-import {Cursor} from 'vs/editor/common/controller/cursor';
-import {INewFindReplaceState, FindReplaceStateChangedEvent, FindReplaceState} from 'vs/editor/contrib/find/common/findState';
 import {Range} from 'vs/editor/common/core/range';
 import {Position} from 'vs/editor/common/core/position';
 import {

src/vs/editor/contrib/find/test/common/findModel.test.ts

@@ -9,7 +9,7 @@ import {FindModelBoundToEditorModel, parseReplaceString} from 'vs/editor/contrib
 import * as EditorCommon from 'vs/editor/common/editorCommon';
 import {withMockCodeEditor} from 'vs/editor/test/common/mocks/mockCodeEditor';
 import {Cursor} from 'vs/editor/common/controller/cursor';
-import {INewFindReplaceState, FindReplaceStateChangedEvent, FindReplaceState} from 'vs/editor/contrib/find/common/findState';
+import {FindReplaceState} from 'vs/editor/contrib/find/common/findState';
 import {Range} from 'vs/editor/common/core/range';
 import {Position} from 'vs/editor/common/core/position';
 

src/vs/editor/contrib/folding/test/indentFold.test.ts

@@ -102,4 +102,4 @@ suite('Folding', () => {
 	});
 
 
-})
\ No newline at end of file
+});
\ No newline at end of file

src/vs/editor/contrib/format/test/common/formatCommand.test.ts

@@ -38,7 +38,7 @@ suite('FormatCommand.trimEdit', () => {
 				'some text'
 			]),
 			null
-		)
+		);
 	});
 
 	test('multi-line no-op 1', () => {
@@ -52,7 +52,7 @@ suite('FormatCommand.trimEdit', () => {
 				'some other text'
 			]),
 			null
-		)
+		);
 	});
 
 	test('multi-line no-op 2', () => {
@@ -66,7 +66,7 @@ suite('FormatCommand.trimEdit', () => {
 				''
 			]),
 			null
-		)
+		);
 	});
 
 	test('simple prefix, no suffix', () => {
@@ -81,7 +81,7 @@ suite('FormatCommand.trimEdit', () => {
 			editOp(1,6,1,10, [
 				'interesting thing'
 			])
-		)
+		);
 	});
 
 	test('whole line prefix, no suffix', () => {
@@ -98,7 +98,7 @@ suite('FormatCommand.trimEdit', () => {
 				'',
 				'interesting thing'
 			])
-		)
+		);
 	});
 
 	test('multi-line prefix, no suffix', () => {
@@ -114,7 +114,7 @@ suite('FormatCommand.trimEdit', () => {
 			editOp(2,12,2,16, [
 				'interesting thing'
 			])
-		)
+		);
 	});
 
 	test('no prefix, simple suffix', () => {
@@ -129,7 +129,7 @@ suite('FormatCommand.trimEdit', () => {
 			editOp(1,1,1,5, [
 				'interesting'
 			])
-		)
+		);
 	});
 
 	test('no prefix, whole line suffix', () => {
@@ -146,7 +146,7 @@ suite('FormatCommand.trimEdit', () => {
 				'interesting thing',
 				''
 			])
-		)
+		);
 	});
 
 	test('no prefix, multi-line suffix', () => {
@@ -162,7 +162,7 @@ suite('FormatCommand.trimEdit', () => {
 			editOp(1,1,1,5, [
 				'interesting thing'
 			])
-		)
+		);
 	});
 
 	test('no overlapping prefix & suffix', () => {
@@ -176,7 +176,7 @@ suite('FormatCommand.trimEdit', () => {
 			editOp(1,6,1,10, [
 				'interesting'
 			])
-		)
+		);
 	});
 
 	test('overlapping prefix & suffix 1', () => {
@@ -190,7 +190,7 @@ suite('FormatCommand.trimEdit', () => {
 			editOp(1,11,1,11, [
 				'cool '
 			])
-		)
+		);
 	});
 
 	test('overlapping prefix & suffix 2', () => {
@@ -204,7 +204,7 @@ suite('FormatCommand.trimEdit', () => {
 			editOp(1,11,1,16, [
 				''
 			])
-		)
+		);
 	});
 });
 

src/vs/editor/contrib/linesOperations/test/common/copyLinesCommand.test.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import assert = require('assert');
 import {testCommand} from 'vs/editor/test/common/commands/commandTestUtils';
 import {CopyLinesCommand} from 'vs/editor/contrib/linesOperations/common/copyLinesCommand';
 import {Selection} from 'vs/editor/common/core/selection';

src/vs/editor/contrib/linesOperations/test/common/deleteLinesCommand.test.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import assert = require('assert');
 import {testCommand} from 'vs/editor/test/common/commands/commandTestUtils';
 import {DeleteLinesCommand} from 'vs/editor/contrib/linesOperations/common/deleteLinesCommand';
 import {Selection} from 'vs/editor/common/core/selection';

src/vs/editor/contrib/linesOperations/test/common/moveLinesCommand.test.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import assert = require('assert');
 import {testCommand} from 'vs/editor/test/common/commands/commandTestUtils';
 import {MoveLinesCommand} from 'vs/editor/contrib/linesOperations/common/moveLinesCommand';
 import {Selection} from 'vs/editor/common/core/selection';

src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts

@@ -28,7 +28,7 @@ suite('TokenSelectionSupport', () => {
 
 	function assertGetRangesToPosition(text:string[], lineNumber:number, column:number, ranges:Range[]): void {
 		let uri = URI.file('test.js');
-		let model = modelService.createModel(text.join('\n'), _mode, uri);
+		modelService.createModel(text.join('\n'), _mode, uri);
 
 		let actual = tokenSelectionSupport.getRangesToPositionSync(uri, {
 			lineNumber: lineNumber,

src/vs/editor/contrib/snippet/test/common/snippet.test.ts

@@ -6,7 +6,6 @@
 
 import assert = require('assert');
 import Snippet = require('vs/editor/contrib/snippet/common/snippet');
-import EditorCommon = require('vs/editor/common/editorCommon');
 import {Range} from 'vs/editor/common/core/range';
 
 suite('Editor Contrib - Snippets', () => {
@@ -14,9 +13,9 @@ suite('Editor Contrib - Snippets', () => {
 	test('bug #17541:[snippets] Support default text in mirrors', () => {
 
 		var external = [
-			"begin{${1:enumerate}}",
-			"\t$0",
-			"end{$1}"
+			'begin{${1:enumerate}}',
+			'\t$0',
+			'end{$1}'
 		].join('\n');
 
 		var internal = Snippet.CodeSnippet.convertExternalSnippet(external, Snippet.ExternalSnippetType.TextMateSnippet);
@@ -47,9 +46,9 @@ suite('Editor Contrib - Snippets', () => {
 	test('bug #17487:[snippets] four backslashes are required to get one backslash in the inserted text', () => {
 
 		var external = [
-			"\\begin{${1:enumerate}}",
-			"\t$0",
-			"\\end{$1}"
+			'\\begin{${1:enumerate}}',
+			'\t$0',
+			'\\end{$1}'
 		].join('\n');
 
 		var internal = Snippet.CodeSnippet.convertExternalSnippet(external, Snippet.ExternalSnippetType.TextMateSnippet);

src/vs/editor/standalone-languages/test/bat.test.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/bat');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('bat', languageDef.language, [
 	// support.functions
 	[{

src/vs/editor/standalone-languages/test/fsharp.test.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/fsharp');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('fsharp', languageDef.language, [
 	// comments - single line
 	[{

src/vs/editor/standalone-languages/test/lua.test.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/lua');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('lua', languageDef.language, [
 
 	// Keywords

src/vs/editor/standalone-languages/test/objective-c.test.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/objective-c');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('objective-c', languageDef.language, [
 	// Keywords
 	[{

src/vs/editor/standalone-languages/test/python.test.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/python');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('python', languageDef.language, [
 	// Keywords
 	[{

src/vs/editor/standalone-languages/test/r.test.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/r');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('r', languageDef.language, [
 	// Keywords
 	[{

src/vs/editor/standalone-languages/test/swift.test.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/swift');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('swift', languageDef.language, [
 
 	// Attributes

src/vs/editor/standalone-languages/test/testUtil.ts

@@ -6,11 +6,9 @@
 'use strict';
 
 import types = require('../types');
-import assert = require('assert');
 import modesUtil = require('vs/editor/test/common/modesUtil');
 import monarchCompile = require('vs/editor/common/modes/monarch/monarchCompile');
 import MonarchDefinition = require('vs/editor/common/modes/monarch/monarchDefinition');
-import {OnEnterSupport} from 'vs/editor/common/modes/supports/onEnter';
 import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport';
 
 export enum Bracket {

src/vs/editor/standalone-languages/test/vb.tests.ts

@@ -8,11 +8,6 @@
 import languageDef = require('vs/editor/standalone-languages/vb');
 import T = require('vs/editor/standalone-languages/test/testUtil');
 
-var Bracket = {
-	Open: 1,
-	Close: -1
-};
-
 T.testTokenization('vb', languageDef.language, [
 
 	// Comments - single line

src/vs/editor/test/common/commands/shiftCommand.test.ts

@@ -10,9 +10,7 @@ import {ShiftCommand} from 'vs/editor/common/commands/shiftCommand';
 import EditorCommon = require('vs/editor/common/editorCommon');
 import {withEditorModel} from 'vs/editor/test/common/editorTestUtils';
 import {Selection} from 'vs/editor/common/core/selection';
-import {Cursor} from 'vs/editor/common/controller/cursor';
 import * as Modes from 'vs/editor/common/modes';
-import {OnEnterSupport} from 'vs/editor/common/modes/supports/onEnter';
 import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport';
 
 function testShiftCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
@@ -626,7 +624,7 @@ suite('Editor Commands - ShiftCommand', () => {
 				r += str;
 			}
 			return r;
-		}
+		};
 
 		var testOutdent = (tabSize: number, oneIndent: string, lineText:string, expectedIndents:number) => {
 			var expectedIndent = repeatStr(oneIndent, expectedIndents);
@@ -722,7 +720,7 @@ suite('Editor Commands - ShiftCommand', () => {
 				isUnshift: true,
 				tabSize: tabSize,
 				oneIndent: oneIndent
-			})
+			});
 			var actual = TU.getEditOperation(model, op);
 			assert.deepEqual(actual, expected);
 		});
@@ -734,7 +732,7 @@ suite('Editor Commands - ShiftCommand', () => {
 				isUnshift: false,
 				tabSize: tabSize,
 				oneIndent: oneIndent
-			})
+			});
 			var actual = TU.getEditOperation(model, op);
 			assert.deepEqual(actual, expected);
 		});

src/vs/editor/test/common/commands/sideEditing.test.ts

@@ -6,13 +6,10 @@
 
 import assert = require('assert');
 import {Model} from 'vs/editor/common/model/model';
-import {Range} from 'vs/editor/common/core/range';
 import {Selection} from 'vs/editor/common/core/selection';
 import {Position} from 'vs/editor/common/core/position';
 import {Cursor} from 'vs/editor/common/controller/cursor';
 import EditorCommon = require('vs/editor/common/editorCommon');
-import {IMode} from 'vs/editor/common/modes';
-import {CommonEditorConfiguration, ICSSConfig} from 'vs/editor/common/config/commonEditorConfig';
 import {MockConfiguration} from 'vs/editor/test/common/mocks/mockConfiguration';
 import {EditOperation} from 'vs/editor/common/core/editOperation';
 import {ModelLine, ILineEdit} from 'vs/editor/common/model/modelLine';

src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts

@@ -7,7 +7,6 @@
 import assert = require('assert');
 
 import EditorCommon = require('vs/editor/common/editorCommon');
-import Model = require('vs/editor/common/model/model');
 import TU = require('vs/editor/test/common/commands/commandTestUtils');
 import TrimTrailingWhitespaceCommand = require('vs/editor/common/commands/trimTrailingWhitespaceCommand');
 import {Selection} from 'vs/editor/common/core/selection';

src/vs/editor/test/common/controller/cursor.test.ts

@@ -14,7 +14,6 @@ import * as Modes from 'vs/editor/common/modes';
 import {Handler, EventType, IPosition, ISelection, EndOfLinePreference} from 'vs/editor/common/editorCommon';
 import {MockConfiguration} from 'vs/editor/test/common/mocks/mockConfiguration';
 import {EditOperation} from 'vs/editor/common/core/editOperation';
-import {AbstractState} from 'vs/editor/common/modes/abstractState';
 import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport';
 
 let H = Handler;

src/vs/editor/test/common/controller/textAreaState.test.ts

@@ -7,7 +7,7 @@
 import assert = require('assert');
 import {Position} from 'vs/editor/common/core/position';
 import {Range} from 'vs/editor/common/core/range';
-import {EndOfLinePreference, IEditorRange, IRange, IEditorPosition} from 'vs/editor/common/editorCommon';
+import {EndOfLinePreference, IRange, IEditorPosition} from 'vs/editor/common/editorCommon';
 import {ISimpleModel, TextAreaState, IENarratorTextAreaState} from 'vs/editor/common/controller/textAreaState';
 import {MockTextAreaWrapper} from 'vs/editor/test/common/mocks/mockTextAreaWrapper';
 

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

@@ -42,10 +42,6 @@ function extractLineChangeRepresentation(change, expectedChange): EditorCommon.I
 	return result;
 }
 
-function lineChangeEqual(change, expectedChange): void {
-	assert.deepEqual(extractLineChangeRepresentation(change, expectedChange), expectedChange);
-}
-
 function assertDiff(originalLines:string[], modifiedLines:string[], expectedChanges:EditorCommon.IChange[], shouldPostProcessCharChanges:boolean = false, shouldIgnoreTrimWhitespace:boolean=false) {
 	var diffComputer = new DiffComputer.DiffComputer(originalLines, modifiedLines, {
 		shouldPostProcessCharChanges: shouldPostProcessCharChanges || false,

src/vs/editor/test/common/model/editableTextModel.test.ts

@@ -6,14 +6,10 @@
 
 import assert = require('assert');
 import {Range} from 'vs/editor/common/core/range';
-import Position = require('vs/editor/common/core/position');
 import EditorCommon = require('vs/editor/common/editorCommon');
 import {EditableTextModel, IValidatedEditOperation} from 'vs/editor/common/model/editableTextModel';
 import {TextModel} from 'vs/editor/common/model/textModel';
-import {LineMarker, TextModelWithMarkers} from 'vs/editor/common/model/textModelWithMarkers';
-import {ILineMarker} from 'vs/editor/common/model/modelLine';
 import {MirrorModel2} from 'vs/editor/common/model/mirrorModel2';
-import {MirrorModel, IMirrorModelEvents} from 'vs/editor/common/model/mirrorModel';
 import {assertSyncedModels, testApplyEditsWithSyncedModels} from 'vs/editor/test/common/model/editableTextModelTestUtils';
 
 suite('EditorModel - EditableTextModel._getInverseEdits', () => {
@@ -1377,7 +1373,7 @@ suite('EditorModel - EditableTextModel.applyEdits & markers', () => {
 				marker('g', 2, 21, true),
 				marker('h', 3, 24, false)
 			]
-		)
+		);
 	});
 
 	test('first line changes', () => {
@@ -1416,7 +1412,7 @@ suite('EditorModel - EditableTextModel.applyEdits & markers', () => {
 				marker('g', 2, 21, true),
 				marker('h', 3, 24, false)
 			]
-		)
+		);
 	});
 
 	test('inserting lines', () => {
@@ -1458,7 +1454,7 @@ suite('EditorModel - EditableTextModel.applyEdits & markers', () => {
 				marker('g', 4, 21, true),
 				marker('h', 5, 24, false)
 			]
-		)
+		);
 	});
 
 	test('replacing a lot', () => {
@@ -1511,6 +1507,6 @@ suite('EditorModel - EditableTextModel.applyEdits & markers', () => {
 				marker('j', 5, 19, false),
 				marker('k', 5, 19, false),
 			]
-		)
+		);
 	});
 });

src/vs/editor/test/common/model/editableTextModelAuto.test.ts

@@ -4,17 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import assert = require('assert');
 import {Range} from 'vs/editor/common/core/range';
 import Position = require('vs/editor/common/core/position');
 import EditorCommon = require('vs/editor/common/editorCommon');
-import {EditableTextModel, IValidatedEditOperation} from 'vs/editor/common/model/editableTextModel';
-import {TextModel} from 'vs/editor/common/model/textModel';
-import {LineMarker, TextModelWithMarkers} from 'vs/editor/common/model/textModelWithMarkers';
-import {ILineMarker} from 'vs/editor/common/model/modelLine';
-import {MirrorModel2} from 'vs/editor/common/model/mirrorModel2';
-import {MirrorModel, IMirrorModelEvents} from 'vs/editor/common/model/mirrorModel';
-import {assertSyncedModels, testApplyEditsWithSyncedModels} from 'vs/editor/test/common/model/editableTextModelTestUtils';
+import {testApplyEditsWithSyncedModels} from 'vs/editor/test/common/model/editableTextModelTestUtils';
 
 const GENERATE_TESTS = false;
 
@@ -31,24 +24,24 @@ suite('EditorModel Auto Tests', () => {
 	test('auto1', () => {
 		testApplyEditsWithSyncedModels(
 			[
-					"ioe",
-					"",
-					"yjct",
-					"",
-					"",
+					'ioe',
+					'',
+					'yjct',
+					'',
+					'',
 			],
 			[
-				editOp(1, 2, 1, 2, ["b", "r", "fq"]),
-				editOp(1, 4, 2, 1, ["", ""]),
+				editOp(1, 2, 1, 2, ['b', 'r', 'fq']),
+				editOp(1, 4, 2, 1, ['', '']),
 			],
 			[
-					"ib",
-					"r",
-					"fqoe",
-					"",
-					"yjct",
-					"",
-					"",
+					'ib',
+					'r',
+					'fqoe',
+					'',
+					'yjct',
+					'',
+					'',
 			]
 		);
 	});
@@ -56,25 +49,25 @@ suite('EditorModel Auto Tests', () => {
 	test('auto2', () => {
 		testApplyEditsWithSyncedModels(
 			[
-					"f",
-					"littnhskrq",
-					"utxvsizqnk",
-					"lslqz",
-					"jxn",
-					"gmm",
+					'f',
+					'littnhskrq',
+					'utxvsizqnk',
+					'lslqz',
+					'jxn',
+					'gmm',
 			],
 			[
-					editOp(1, 2, 1, 2, ["", "o"]),
-					editOp(2, 4, 2, 4, ["zaq", "avb"]),
-					editOp(2, 5, 6, 2, ["jlr", "zl", "j"]),
+					editOp(1, 2, 1, 2, ['', 'o']),
+					editOp(2, 4, 2, 4, ['zaq', 'avb']),
+					editOp(2, 5, 6, 2, ['jlr', 'zl', 'j']),
 			],
 			[
-					"f",
-					"o",
-					"litzaq",
-					"avbtjlr",
-					"zl",
-					"jmm",
+					'f',
+					'o',
+					'litzaq',
+					'avbtjlr',
+					'zl',
+					'jmm',
 			]
 		);
 	});
@@ -82,31 +75,31 @@ suite('EditorModel Auto Tests', () => {
 	test('auto3', () => {
 		testApplyEditsWithSyncedModels(
 			[
-					"ofw",
-					"qsxmziuvzw",
-					"rp",
-					"qsnymek",
-					"elth",
-					"wmgzbwudxz",
-					"iwsdkndh",
-					"bujlbwb",
-					"asuouxfv",
-					"xuccnb",
+					'ofw',
+					'qsxmziuvzw',
+					'rp',
+					'qsnymek',
+					'elth',
+					'wmgzbwudxz',
+					'iwsdkndh',
+					'bujlbwb',
+					'asuouxfv',
+					'xuccnb',
 			],
 			[
-					editOp(4, 3, 4, 3, [""]),
+					editOp(4, 3, 4, 3, ['']),
 			],
 			[
-					"ofw",
-					"qsxmziuvzw",
-					"rp",
-					"qsnymek",
-					"elth",
-					"wmgzbwudxz",
-					"iwsdkndh",
-					"bujlbwb",
-					"asuouxfv",
-					"xuccnb",
+					'ofw',
+					'qsxmziuvzw',
+					'rp',
+					'qsnymek',
+					'elth',
+					'wmgzbwudxz',
+					'iwsdkndh',
+					'bujlbwb',
+					'asuouxfv',
+					'xuccnb',
 			]
 		);
 	});
@@ -228,17 +221,17 @@ class TestModel {
 		r.push('testApplyEditsWithSyncedModels(');
 		r.push('\t[');
 		let initialLines = this.initialContent.split('\n');
-		r = r.concat(initialLines.map((i) => `\t\t"${i}",`));
+		r = r.concat(initialLines.map((i) => `\t\t'${i}',`));
 		r.push('\t],');
 		r.push('\t[');
 		r = r.concat(this.edits.map((i) => {
-			let text = `["` + i.text.split('\n').join(`", "`) + `"]`;
+			let text = `['` + i.text.split('\n').join(`', '`) + `']`;
 			return `\t\teditOp(${i.range.startLineNumber}, ${i.range.startColumn}, ${i.range.endLineNumber}, ${i.range.endColumn}, ${text}),`;
 		}));
 		r.push('\t],');
 		r.push('\t[');
 		let resultLines = this.resultingContent.split('\n');
-		r = r.concat(resultLines.map((i) => `\t\t"${i}",`));
+		r = r.concat(resultLines.map((i) => `\t\t'${i}',`));
 		r.push('\t]');
 		r.push(');');
 

src/vs/editor/test/common/model/model.brackets.test.ts

@@ -8,7 +8,6 @@ import assert = require('assert');
 import {TextModel} from 'vs/editor/common/model/textModel';
 import {TextModelWithTokens} from 'vs/editor/common/model/textModelWithTokens';
 import {IFoundBracket} from 'vs/editor/common/editorCommon';
-import {Position} from 'vs/editor/common/core/position';
 import {Range} from 'vs/editor/common/core/range';
 
 suite('TextModelWithTokens', () => {
@@ -125,7 +124,7 @@ suite('TextModelWithTokens', () => {
 			['{', '}'],
 			['[', ']'],
 			['(', ')']
-		])
+		]);
 	});
 
 });

src/vs/editor/test/common/model/model.line.test.ts

@@ -258,7 +258,7 @@ suite('Editor Model - ModelLine.applyEdits text & tokens', () => {
 			startIndex: 0,
 			type:''
 		}]);
-	})
+	});
 
 	test('updates tokens on insertion 1', () => {
 		testLineEditTokens(

src/vs/editor/test/common/model/model.test.ts

@@ -33,10 +33,6 @@ function isBracket(model, lineNumber1, column11, column12, lineNumber2, column21
 
 
 
-function positionEqual(position, lineNumber, column) {
-	assert.deepEqual(position, new Position(lineNumber, column));
-}
-
 function rangeEqual(range, startLineNumber, startColumn, endLineNumber, endColumn) {
 	assert.deepEqual(range, new Range(startLineNumber, startColumn, endLineNumber, endColumn));
 }
@@ -381,7 +377,7 @@ suite('Editor Model - Model Line Separators', () => {
 	});
 
 	test('Bug 13333:Model should line break on lonely CR too', () => {
-		var model = new Model.Model("Hello\rWorld!\r\nAnother line", null);
+		var model = new Model.Model('Hello\rWorld!\r\nAnother line', null);
 		assert.equal(model.getLineCount(), 3);
 		assert.equal(model.getValue(), 'Hello\r\nWorld!\r\nAnother line');
 		model.dispose();

src/vs/editor/test/common/model/modelDecorations.test.ts

@@ -518,7 +518,7 @@ suite('deltaDecorations', () => {
 				decoration('e', 2, 1, 2, 21),
 				decoration('f', 2, 17, 4, 16)
 			]
-		)
+		);
 	});
 
 	test('deltaDecorations 2', () => {
@@ -542,7 +542,7 @@ suite('deltaDecorations', () => {
 				decoration('c', 1, 4, 1, 5),
 				decoration('d', 1, 5, 1, 6)
 			]
-		)
+		);
 	});
 
 	test('deltaDecorations 3', () => {
@@ -561,7 +561,7 @@ suite('deltaDecorations', () => {
 				decoration('e', 1, 5, 1, 6)
 			],
 			[]
-		)
+		);
 	});
 
 	test('model doesn\'t get confused with individual tracked ranges', () => {
@@ -586,7 +586,7 @@ suite('deltaDecorations', () => {
 		assert.deepEqual(model.getDecorationRange(ids[0]), range(1,1,1,12));
 		assert.deepEqual(model.getDecorationRange(ids[1]), range(2,1,2,13));
 
-		var ids = model.deltaDecorations(ids, [
+		ids = model.deltaDecorations(ids, [
 			toModelDeltaDecoration(decoration('a', 1, 1, 1, 12)),
 			toModelDeltaDecoration(decoration('b', 2, 1, 2, 13))
 		]);

src/vs/editor/test/common/modes/autoIndentation.test.ts

@@ -6,7 +6,6 @@
 
 import assert = require('assert');
 import autoIndentation = require('vs/editor/common/modes/supports/electricCharacter');
-import modes = require('vs/editor/common/modes');
 import modesUtil = require('vs/editor/test/common/modesTestUtils');
 
 suite('Editor Modes - Auto Indentation', () => {

src/vs/editor/test/common/modes/languageSelector.test.ts

@@ -14,7 +14,7 @@ suite('LanguageSelector', function() {
 	let model = {
 		language: 'farboo',
 		uri: URI.parse('file:///testbed/file.fb')
-	}
+	};
 
 	test('score, invalid selector', function() {
 		assert.equal(score({}, model.uri, model.language), 0);

src/vs/editor/test/common/modes/linkComputer.test.ts

@@ -6,7 +6,6 @@
 
 import assert = require('assert');
 import LinkComputer = require('vs/editor/common/modes/linkComputer');
-import EditorCommon = require('vs/editor/common/editorCommon');
 import Modes = require('vs/editor/common/modes');
 
 class SimpleLinkComputerTarget implements LinkComputer.ILinkComputerTarget {

src/vs/editor/test/common/modes/modesRegistry.test.ts

@@ -8,10 +8,6 @@ import 'vs/languages/plaintext/common/plaintext.contribution';
 import 'vs/languages/html/common/html.contribution';
 
 import assert = require('assert');
-import Platform = require('vs/platform/platform');
-import ModesExtensions = require('vs/editor/common/modes/modesRegistry');
-import EditorCommon = require('vs/editor/common/editorCommon');
-import Modes = require('vs/editor/common/modes');
 import {createMockModeService} from 'vs/editor/test/common/servicesTestUtils';
 
 suite('Editor Modes - Modes Registry', () => {

src/vs/editor/test/common/modes/supports/onEnter.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import assert = require('assert');
-import {IIndentationRules, IBracketPair, OnEnterSupport} from 'vs/editor/common/modes/supports/onEnter';
+import {IBracketPair, OnEnterSupport} from 'vs/editor/common/modes/supports/onEnter';
 import {IndentAction} from 'vs/editor/common/modes';
 
 suite('OnEnter', () => {

src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts

@@ -8,7 +8,6 @@ import assert = require('assert');
 import {tokenizeToHtmlContent} from 'vs/editor/common/modes/textToHtmlTokenizer';
 import {AbstractState} from 'vs/editor/common/modes/abstractState';
 import modes = require('vs/editor/common/modes');
-import supports = require('vs/editor/common/modes/supports');
 import {TokenizationSupport} from 'vs/editor/common/modes/supports/tokenizationSupport';
 
 suite('Editor Modes - textToHtmlTokenizer', () => {
@@ -83,7 +82,7 @@ class Mode implements modes.IMode {
 	}
 
 	public getId(): string {
-		return "testMode";
+		return 'testMode';
 	}
 
 	public toSimplifiedMode(): modes.IMode {

src/vs/editor/test/common/modes/tokenization.test.ts

@@ -5,13 +5,9 @@
 'use strict';
 
 import assert = require('assert');
-import {TPromise} from 'vs/base/common/winjs.base';
 import modes = require('vs/editor/common/modes');
 import supports = require('vs/editor/common/modes/supports');
-import stream = require('vs/editor/common/modes/lineStream');
-import servicesUtil = require('vs/editor/test/common/servicesTestUtils');
 import {AbstractState} from 'vs/editor/common/modes/abstractState';
-import {tokenizeToHtmlContent} from 'vs/editor/common/modes/textToHtmlTokenizer';
 import {createLineContext} from 'vs/editor/test/common/modesTestUtils';
 import EditorCommon = require('vs/editor/common/editorCommon');
 import {IDisposable, empty as EmptyDisposable} from 'vs/base/common/lifecycle';
@@ -43,7 +39,7 @@ export class Mode implements modes.IMode {
 	}
 
 	public getId(): string {
-		return "testMode";
+		return 'testMode';
 	}
 
 	public toSimplifiedMode(): modes.IMode {

src/vs/editor/test/common/services/resourceService.test.ts

@@ -6,7 +6,6 @@
 
 import assert = require('assert');
 import URI from 'vs/base/common/uri';
-import Emit = require('vs/base/common/eventEmitter');
 import Service = require('vs/editor/common/services/resourceServiceImpl');
 import MirrorModel = require('vs/editor/common/model/mirrorModel');
 import resourceService = require('vs/editor/common/services/resourceService');

src/vs/editor/test/common/viewLayout/verticalObjects.test.ts

@@ -43,7 +43,7 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 		assert.equal(verticalObjects.getLineNumberAtOrAfterVerticalOffset(29, 10), 3);
 
 		// Add whitespace of height 5px after 2nd line
-		var a = verticalObjects.insertWhitespace(2, 0, 5);
+		verticalObjects.insertWhitespace(2, 0, 5);
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: a(2,5)
 		assert.equal(verticalObjects.getTotalHeight(10), 105);
@@ -67,8 +67,8 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 		assert.equal(verticalObjects.getLineNumberAtOrAfterVerticalOffset(105, 10), 10);
 
 		// Add two more whitespaces of height 5px
-		var b = verticalObjects.insertWhitespace(3, 0, 5);
-		var c = verticalObjects.insertWhitespace(4, 0, 5);
+		verticalObjects.insertWhitespace(3, 0, 5);
+		verticalObjects.insertWhitespace(4, 0, 5);
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: a(2,5), b(3, 5), c(4, 5)
 		assert.equal(verticalObjects.getTotalHeight(10), 115);
@@ -223,7 +223,7 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 	test('VerticalObjects getLineNumberAtOrAfterVerticalOffset', () => {
 		var verticalObjects = new VerticalObjects.VerticalObjects();
 		verticalObjects.replaceLines(10);
-		var a = verticalObjects.insertWhitespace(6, 0, 10);
+		verticalObjects.insertWhitespace(6, 0, 10);
 
 		// 10 lines
 		// whitespace: - a(6,10)
@@ -273,7 +273,7 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 	test('VerticalObjects getCenteredLineInViewport', () => {
 		var verticalObjects = new VerticalObjects.VerticalObjects();
 		verticalObjects.replaceLines(10);
-		var a = verticalObjects.insertWhitespace(6, 0, 10);
+		verticalObjects.insertWhitespace(6, 0, 10);
 
 		// 10 lines
 		// whitespace: - a(6,10)
@@ -357,7 +357,7 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 	test('VerticalObjects getLinesViewportData 1', () => {
 		var verticalObjects = new VerticalObjects.VerticalObjects();
 		verticalObjects.replaceLines(10);
-		var a = verticalObjects.insertWhitespace(6, 0, 100);
+		verticalObjects.insertWhitespace(6, 0, 100);
 
 		// 10 lines
 		// whitespace: - a(6,100)
@@ -381,63 +381,63 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 		assert.equal(viewportData.visibleRangesDeltaTop, 0);
 
 		// viewport 1->51
-		var viewportData = verticalObjects.getLinesViewportData(1,51,10);
+		viewportData = verticalObjects.getLinesViewportData(1,51,10);
 		assert.equal(viewportData.startLineNumber, 1);
 		assert.equal(viewportData.endLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -1);
 
 		// viewport 5->55
-		var viewportData = verticalObjects.getLinesViewportData(5,55,10);
+		viewportData = verticalObjects.getLinesViewportData(5,55,10);
 		assert.equal(viewportData.startLineNumber, 1);
 		assert.equal(viewportData.endLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -5);
 
 		// viewport 10->60
-		var viewportData = verticalObjects.getLinesViewportData(10,60,10);
+		viewportData = verticalObjects.getLinesViewportData(10,60,10);
 		assert.equal(viewportData.startLineNumber, 2);
 		assert.equal(viewportData.endLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [10, 20, 30, 40, 50]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -10);
 
 		// viewport 50->100
-		var viewportData = verticalObjects.getLinesViewportData(50,100,10);
+		viewportData = verticalObjects.getLinesViewportData(50,100,10);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 60->110
-		var viewportData = verticalObjects.getLinesViewportData(60,110,10);
+		viewportData = verticalObjects.getLinesViewportData(60,110,10);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -60);
 
 		// viewport 65->115
-		var viewportData = verticalObjects.getLinesViewportData(65,115,10);
+		viewportData = verticalObjects.getLinesViewportData(65,115,10);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -65);
 
 		// viewport 50->159
-		var viewportData = verticalObjects.getLinesViewportData(50,159,10);
+		viewportData = verticalObjects.getLinesViewportData(50,159,10);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 50->160
-		var viewportData = verticalObjects.getLinesViewportData(50,160,10);
+		viewportData = verticalObjects.getLinesViewportData(50,160,10);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 51->161
-		var viewportData = verticalObjects.getLinesViewportData(51,161,10);
+		viewportData = verticalObjects.getLinesViewportData(51,161,10);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
@@ -445,21 +445,21 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 
 
 		// viewport 150->169
-		var viewportData = verticalObjects.getLinesViewportData(150,169,10);
+		viewportData = verticalObjects.getLinesViewportData(150,169,10);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -150);
 
 		// viewport 159->169
-		var viewportData = verticalObjects.getLinesViewportData(159,169,10);
+		viewportData = verticalObjects.getLinesViewportData(159,169,10);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -159);
 
 		// viewport 160->169
-		var viewportData = verticalObjects.getLinesViewportData(160,169,10);
+		viewportData = verticalObjects.getLinesViewportData(160,169,10);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
@@ -467,7 +467,7 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 
 
 		// viewport 160->1000
-		var viewportData = verticalObjects.getLinesViewportData(160,1000,10);
+		viewportData = verticalObjects.getLinesViewportData(160,1000,10);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 10);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160, 170, 180, 190]);
@@ -510,12 +510,12 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 		}]);
 
 		// viewport 50->219
-		var viewportData = verticalObjects.getLinesViewportData(50,219,10);
+		viewportData = verticalObjects.getLinesViewportData(50,219,10);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -50);
-		var whitespaceData = verticalObjects.getWhitespaceViewportData(50,219,10);
+		whitespaceData = verticalObjects.getWhitespaceViewportData(50,219,10);
 		assert.deepEqual(whitespaceData, [{
 			id: a,
 			afterLineNumber: 6,
@@ -529,14 +529,14 @@ suite('Editor ViewLayout - VerticalObjects', () => {
 		}]);
 
 		// viewport 50->220
-		var viewportData = verticalObjects.getLinesViewportData(50,220,10);
+		viewportData = verticalObjects.getLinesViewportData(50,220,10);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 8);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160, 220]);
 		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 50->250
-		var viewportData = verticalObjects.getLinesViewportData(50,250,10);
+		viewportData = verticalObjects.getLinesViewportData(50,250,10);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 10);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160, 220, 230, 240]);

src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts

@@ -5,7 +5,6 @@
 'use strict';
 
 import assert = require('assert');
-import ViewLineParts = require('vs/editor/common/viewLayout/viewLineParts');
 import {renderLine} from 'vs/editor/common/viewLayout/viewLineRenderer';
 import {ILineToken} from 'vs/editor/common/editorCommon';
 

src/vs/editor/test/common/viewLayout/whitespaceComputer.test.ts

@@ -72,7 +72,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
 		assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(4), 10);
 
 		// Add a whitespace before the first line of height 50
-		var b = whitespaceComputer.insertWhitespace(0, 0, 50);
+		b = whitespaceComputer.insertWhitespace(0, 0, 50);
 		// whitespaces: b(0, 50), a(2, 10)
 		assert.equal(whitespaceComputer.getCount(), 2);
 		assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 0);
@@ -88,7 +88,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
 		assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(4), 60);
 
 		// Add a whitespace after line 4 of height 20
-		var c = whitespaceComputer.insertWhitespace(4, 0, 20);
+		whitespaceComputer.insertWhitespace(4, 0, 20);
 		// whitespaces: b(0, 50), a(2, 10), c(4, 20)
 		assert.equal(whitespaceComputer.getCount(), 3);
 		assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 0);
@@ -108,7 +108,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
 		assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(5), 80);
 
 		// Add a whitespace after line 3 of height 30
-		var d = whitespaceComputer.insertWhitespace(3, 0, 30);
+		whitespaceComputer.insertWhitespace(3, 0, 30);
 		// whitespaces: b(0, 50), a(2, 10), d(3, 30), c(4, 20)
 		assert.equal(whitespaceComputer.getCount(), 4);
 		assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 0);

src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts

@@ -41,8 +41,8 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 			assert.deepEqual(line1.getOutputPositionOfInputPosition(0, col), pos(2, col - 13 - 14), 'getOutputPositionOfInputPosition(' + col + ')');
 		}
 
-		var model1:SplitLinesCollection.IModel = createModel('My First LineMy Second LineAnd another one');
-		var line1 = createSplitLine([13, 14, 15], '\t');
+		model1 = createModel('My First LineMy Second LineAnd another one');
+		line1 = createSplitLine([13, 14, 15], '\t');
 
 		assert.equal(line1.getOutputLineCount(), 3);
 		assert.equal(line1.getOutputLineContent(model1, 1, 0), 'My First Line');

src/vs/platform/instantiation/test/common/instantiationService.test.ts

@@ -9,7 +9,7 @@ import assert = require('assert');
 import instantiation = require('vs/platform/instantiation/common/instantiation');
 import instantiationService = require('vs/platform/instantiation/common/instantiationService');
 
-import {SyncDescriptor, createSyncDescriptor} from 'vs/platform/instantiation/common/descriptors'
+import {SyncDescriptor, createSyncDescriptor} from 'vs/platform/instantiation/common/descriptors';
 
 export class Target1 {
 
@@ -19,7 +19,9 @@ export class Target1 {
 
 	validate(): boolean {
 		try {
+			/* tslint:disable:no-unused-expression */
 			this.platformServices.editorService;
+			/* tslint:enable:no-unused-expression */
 			return false;
 		} catch (e) {
 			return e instanceof Error;
@@ -38,7 +40,9 @@ export class Target2 {
 			return false;
 		}
 		try {
+			/* tslint:disable:no-unused-expression */
 			this.platformServices.editorService;
+			/* tslint:enable:no-unused-expression */
 			return false;
 		} catch (e) {
 			return e instanceof Error;

src/vs/platform/keybinding/test/common/keybindingService.test.ts

@@ -268,6 +268,7 @@ suite('Keybinding Service', () => {
 	});
 
 	test('contextMatchesRules', function() {
+		/* tslint:disable:triple-equals */
 		let context = {
 			'a': true,
 			'b': false,
@@ -298,5 +299,6 @@ suite('Keybinding Service', () => {
 		testExpression('a && !b', true && !false);
 		testExpression('a && b', true && false);
 		testExpression('a && !b && c == 5', true && !false && '5' == '5');
+		/* tslint:enable:triple-equals */
 	});
 });

src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts

@@ -167,7 +167,7 @@ suite('Plugin Version Validator', () => {
 			let reasons: string[] = [];
 			let actual = isValidExtensionVersion(version, desc, reasons);
 
-			assert.equal(actual, expectedResult, "version: " + version + ", desiredVersion: " + desiredVersion + ", desc: " + JSON.stringify(desc) + ", reasons: " + JSON.stringify(reasons));
+			assert.equal(actual, expectedResult, 'version: ' + version + ', desiredVersion: ' + desiredVersion + ', desc: ' + JSON.stringify(desc) + ', reasons: ' + JSON.stringify(reasons));
 		}
 
 		function testIsInvalidExtensionVersion(version: string, desiredVersion: string, isBuiltin: boolean, hasMain: boolean): void {