Style changes

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

@@ -26,12 +26,12 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 		if (offset < 0) {
 			return false;
 		}
-		var needleLength = needle.length;
-		var haystackLength = haystack.length;
+		const needleLength = needle.length;
+		const haystackLength = haystack.length;
 		if (offset + needleLength > haystackLength) {
 			return false;
 		}
-		for (var i = 0; i < needleLength; i++) {
+		for (let i = 0; i < needleLength; i++) {
 			if (haystack.charCodeAt(offset + i) !== needle.charCodeAt(i)) {
 				return false;
 			}
@@ -40,21 +40,21 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 	}
 
 	private _createOperationsForBlockComment(selection: Range, config: ICommentsConfiguration, model: editorCommon.ITokenizedModel, builder: editorCommon.IEditOperationBuilder): void {
-		var startLineNumber = selection.startLineNumber;
-		var startColumn = selection.startColumn;
-		var endLineNumber = selection.endLineNumber;
-		var endColumn = selection.endColumn;
+		const startLineNumber = selection.startLineNumber;
+		const startColumn = selection.startColumn;
+		const endLineNumber = selection.endLineNumber;
+		const endColumn = selection.endColumn;
 
-		var startToken = config.blockCommentStartToken;
-		var endToken = config.blockCommentEndToken;
+		let startToken = config.blockCommentStartToken;
+		let endToken = config.blockCommentEndToken;
 
-		var startTokenIndex = model.getLineContent(startLineNumber).lastIndexOf(startToken, startColumn - 1 + startToken.length);
-		var endTokenIndex = model.getLineContent(endLineNumber).indexOf(endToken, endColumn - 1 - endToken.length);
+		const startTokenIndex = model.getLineContent(startLineNumber).lastIndexOf(startToken, startColumn - 1 + startToken.length);
+		let endTokenIndex = model.getLineContent(endLineNumber).indexOf(endToken, endColumn - 1 - endToken.length);
 
-		var ops: editorCommon.IIdentifiedSingleEditOperation[];
+		let ops: editorCommon.IIdentifiedSingleEditOperation[];
 
 		if (startTokenIndex !== -1 && endTokenIndex !== -1) {
-			var endTokenBeforeCursorIndex = model.getLineContent(startLineNumber).lastIndexOf(endToken, startColumn - 1 + endToken.length);
+			const endTokenBeforeCursorIndex = model.getLineContent(startLineNumber).lastIndexOf(endToken, startColumn - 1 + endToken.length);
 			if (endTokenBeforeCursorIndex > startTokenIndex + startToken.length - 1) {
 				ops = BlockCommentCommand._createAddBlockCommentOperations(selection, startToken, endToken);
 				this._usedEndToken = ops.length === 1 ? endToken : null;
@@ -78,13 +78,13 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 			this._usedEndToken = ops.length === 1 ? endToken : null;
 		}
 
-		for (var i = 0; i < ops.length; i++) {
+		for (let i = 0; i < ops.length; i++) {
 			builder.addTrackedEditOperation(ops[i].range, ops[i].text);
 		}
 	}
 
 	public static _createRemoveBlockCommentOperations(r: Range, startToken: string, endToken: string): editorCommon.IIdentifiedSingleEditOperation[] {
-		var res: editorCommon.IIdentifiedSingleEditOperation[] = [];
+		let res: editorCommon.IIdentifiedSingleEditOperation[] = [];
 
 		if (!Range.isEmpty(r)) {
 			// Remove block comment start
@@ -110,7 +110,7 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 	}
 
 	public static _createAddBlockCommentOperations(r: Range, startToken: string, endToken: string): editorCommon.IIdentifiedSingleEditOperation[] {
-		var res: editorCommon.IIdentifiedSingleEditOperation[] = [];
+		let res: editorCommon.IIdentifiedSingleEditOperation[] = [];
 
 		if (!Range.isEmpty(r)) {
 			// Insert block comment start
@@ -130,10 +130,8 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 	}
 
 	public getEditOperations(model: editorCommon.ITokenizedModel, builder: editorCommon.IEditOperationBuilder): void {
-		var startLineNumber = this._selection.startLineNumber;
-		var startColumn = this._selection.startColumn;
-		var endLineNumber = this._selection.endLineNumber;
-		var endColumn = this._selection.endColumn;
+		const startLineNumber = this._selection.startLineNumber;
+		const startColumn = this._selection.startColumn;
 
 		model.tokenizeIfCheap(startLineNumber);
 		let languageId = model.getLanguageIdAtPosition(startLineNumber, startColumn);
@@ -144,15 +142,15 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 		}
 
 		this._createOperationsForBlockComment(
-			new Range(startLineNumber, startColumn, endLineNumber, endColumn), config, model, builder
+			this._selection, config, model, builder
 		);
 	}
 
 	public computeCursorState(model: editorCommon.ITokenizedModel, helper: editorCommon.ICursorStateComputerData): Selection {
-		var inverseEditOperations = helper.getInverseEditOperations();
+		const inverseEditOperations = helper.getInverseEditOperations();
 		if (inverseEditOperations.length === 2) {
-			var startTokenEditOperation = inverseEditOperations[0];
-			var endTokenEditOperation = inverseEditOperations[1];
+			const startTokenEditOperation = inverseEditOperations[0];
+			const endTokenEditOperation = inverseEditOperations[1];
 
 			return new Selection(
 				startTokenEditOperation.range.endLineNumber,
@@ -161,8 +159,8 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 				endTokenEditOperation.range.startColumn
 			);
 		} else {
-			var srcRange = inverseEditOperations[0].range;
-			var deltaColumn = this._usedEndToken ? -this._usedEndToken.length - 1 : 0; // minus 1 space before endToken
+			const srcRange = inverseEditOperations[0].range;
+			const deltaColumn = this._usedEndToken ? -this._usedEndToken.length - 1 : 0; // minus 1 space before endToken
 			return new Selection(
 				srcRange.endLineNumber,
 				srcRange.endColumn + deltaColumn,