Debt: var -> let

This commit is contained in:
Alex Dima
2018-05-02 11:42:16 +02:00
parent 8aeffbca07
commit 8745c1f89a
59 changed files with 519 additions and 553 deletions
@@ -9,8 +9,8 @@ import { DiffComputer } from 'vs/editor/common/diff/diffComputer';
import { IChange, ICharChange, ILineChange } from 'vs/editor/common/editorCommon';
function extractCharChangeRepresentation(change: ICharChange, expectedChange: ICharChange): ICharChange {
var hasOriginal = expectedChange && expectedChange.originalStartLineNumber > 0;
var hasModified = expectedChange && expectedChange.modifiedStartLineNumber > 0;
let hasOriginal = expectedChange && expectedChange.originalStartLineNumber > 0;
let hasModified = expectedChange && expectedChange.modifiedStartLineNumber > 0;
return {
originalStartLineNumber: hasOriginal ? change.originalStartLineNumber : 0,
originalStartColumn: hasOriginal ? change.originalStartColumn : 0,
@@ -52,15 +52,15 @@ function extractLineChangeRepresentation(change: ILineChange, expectedChange: IL
}
function assertDiff(originalLines: string[], modifiedLines: string[], expectedChanges: IChange[], shouldPostProcessCharChanges: boolean = false, shouldIgnoreTrimWhitespace: boolean = false) {
var diffComputer = new DiffComputer(originalLines, modifiedLines, {
let diffComputer = new DiffComputer(originalLines, modifiedLines, {
shouldPostProcessCharChanges: shouldPostProcessCharChanges || false,
shouldIgnoreTrimWhitespace: shouldIgnoreTrimWhitespace || false,
shouldMakePrettyDiff: true
});
var changes = diffComputer.computeDiff();
let changes = diffComputer.computeDiff();
var extracted = [];
for (var i = 0; i < changes.length; i++) {
let extracted = [];
for (let i = 0; i < changes.length; i++) {
extracted.push(extractLineChangeRepresentation(changes[i], <ILineChange>(i < expectedChanges.length ? expectedChanges[i] : null)));
}
assert.deepEqual(extracted, expectedChanges);
@@ -141,111 +141,111 @@ suite('Editor Diff - DiffComputer', () => {
// ---- insertions
test('one inserted line below', () => {
var original = ['line'];
var modified = ['line', 'new line'];
var expected = [createLineInsertion(2, 2, 1)];
let original = ['line'];
let modified = ['line', 'new line'];
let expected = [createLineInsertion(2, 2, 1)];
assertDiff(original, modified, expected);
});
test('two inserted lines below', () => {
var original = ['line'];
var modified = ['line', 'new line', 'another new line'];
var expected = [createLineInsertion(2, 3, 1)];
let original = ['line'];
let modified = ['line', 'new line', 'another new line'];
let expected = [createLineInsertion(2, 3, 1)];
assertDiff(original, modified, expected);
});
test('one inserted line above', () => {
var original = ['line'];
var modified = ['new line', 'line'];
var expected = [createLineInsertion(1, 1, 0)];
let original = ['line'];
let modified = ['new line', 'line'];
let expected = [createLineInsertion(1, 1, 0)];
assertDiff(original, modified, expected);
});
test('two inserted lines above', () => {
var original = ['line'];
var modified = ['new line', 'another new line', 'line'];
var expected = [createLineInsertion(1, 2, 0)];
let original = ['line'];
let modified = ['new line', 'another new line', 'line'];
let expected = [createLineInsertion(1, 2, 0)];
assertDiff(original, modified, expected);
});
test('one inserted line in middle', () => {
var original = ['line1', 'line2', 'line3', 'line4'];
var modified = ['line1', 'line2', 'new line', 'line3', 'line4'];
var expected = [createLineInsertion(3, 3, 2)];
let original = ['line1', 'line2', 'line3', 'line4'];
let modified = ['line1', 'line2', 'new line', 'line3', 'line4'];
let expected = [createLineInsertion(3, 3, 2)];
assertDiff(original, modified, expected);
});
test('two inserted lines in middle', () => {
var original = ['line1', 'line2', 'line3', 'line4'];
var modified = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
var expected = [createLineInsertion(3, 4, 2)];
let original = ['line1', 'line2', 'line3', 'line4'];
let modified = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
let expected = [createLineInsertion(3, 4, 2)];
assertDiff(original, modified, expected);
});
test('two inserted lines in middle interrupted', () => {
var original = ['line1', 'line2', 'line3', 'line4'];
var modified = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
var expected = [createLineInsertion(3, 3, 2), createLineInsertion(5, 5, 3)];
let original = ['line1', 'line2', 'line3', 'line4'];
let modified = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
let expected = [createLineInsertion(3, 3, 2), createLineInsertion(5, 5, 3)];
assertDiff(original, modified, expected);
});
// ---- deletions
test('one deleted line below', () => {
var original = ['line', 'new line'];
var modified = ['line'];
var expected = [createLineDeletion(2, 2, 1)];
let original = ['line', 'new line'];
let modified = ['line'];
let expected = [createLineDeletion(2, 2, 1)];
assertDiff(original, modified, expected);
});
test('two deleted lines below', () => {
var original = ['line', 'new line', 'another new line'];
var modified = ['line'];
var expected = [createLineDeletion(2, 3, 1)];
let original = ['line', 'new line', 'another new line'];
let modified = ['line'];
let expected = [createLineDeletion(2, 3, 1)];
assertDiff(original, modified, expected);
});
test('one deleted lines above', () => {
var original = ['new line', 'line'];
var modified = ['line'];
var expected = [createLineDeletion(1, 1, 0)];
let original = ['new line', 'line'];
let modified = ['line'];
let expected = [createLineDeletion(1, 1, 0)];
assertDiff(original, modified, expected);
});
test('two deleted lines above', () => {
var original = ['new line', 'another new line', 'line'];
var modified = ['line'];
var expected = [createLineDeletion(1, 2, 0)];
let original = ['new line', 'another new line', 'line'];
let modified = ['line'];
let expected = [createLineDeletion(1, 2, 0)];
assertDiff(original, modified, expected);
});
test('one deleted line in middle', () => {
var original = ['line1', 'line2', 'new line', 'line3', 'line4'];
var modified = ['line1', 'line2', 'line3', 'line4'];
var expected = [createLineDeletion(3, 3, 2)];
let original = ['line1', 'line2', 'new line', 'line3', 'line4'];
let modified = ['line1', 'line2', 'line3', 'line4'];
let expected = [createLineDeletion(3, 3, 2)];
assertDiff(original, modified, expected);
});
test('two deleted lines in middle', () => {
var original = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
var modified = ['line1', 'line2', 'line3', 'line4'];
var expected = [createLineDeletion(3, 4, 2)];
let original = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
let modified = ['line1', 'line2', 'line3', 'line4'];
let expected = [createLineDeletion(3, 4, 2)];
assertDiff(original, modified, expected);
});
test('two deleted lines in middle interrupted', () => {
var original = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
var modified = ['line1', 'line2', 'line3', 'line4'];
var expected = [createLineDeletion(3, 3, 2), createLineDeletion(5, 5, 3)];
let original = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
let modified = ['line1', 'line2', 'line3', 'line4'];
let expected = [createLineDeletion(3, 3, 2), createLineDeletion(5, 5, 3)];
assertDiff(original, modified, expected);
});
// ---- changes
test('one line changed: chars inserted at the end', () => {
var original = ['line'];
var modified = ['line changed'];
var expected = [
let original = ['line'];
let modified = ['line changed'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 5, 1, 13)
])
@@ -254,9 +254,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars inserted at the beginning', () => {
var original = ['line'];
var modified = ['my line'];
var expected = [
let original = ['line'];
let modified = ['my line'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 1, 1, 4)
])
@@ -265,9 +265,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars inserted in the middle', () => {
var original = ['abba'];
var modified = ['abzzba'];
var expected = [
let original = ['abba'];
let modified = ['abzzba'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 3, 1, 5)
])
@@ -276,9 +276,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars inserted in the middle (two spots)', () => {
var original = ['abba'];
var modified = ['abzzbzza'];
var expected = [
let original = ['abba'];
let modified = ['abzzbzza'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 3, 1, 5),
createCharInsertion(1, 6, 1, 8)
@@ -288,9 +288,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars deleted 1', () => {
var original = ['abcdefg'];
var modified = ['abcfg'];
var expected = [
let original = ['abcdefg'];
let modified = ['abcfg'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharDeletion(1, 4, 1, 6)
])
@@ -299,9 +299,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars deleted 2', () => {
var original = ['abcdefg'];
var modified = ['acfg'];
var expected = [
let original = ['abcdefg'];
let modified = ['acfg'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharDeletion(1, 2, 1, 3),
createCharDeletion(1, 4, 1, 6)
@@ -311,9 +311,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('two lines changed 1', () => {
var original = ['abcd', 'efgh'];
var modified = ['abcz'];
var expected = [
let original = ['abcd', 'efgh'];
let modified = ['abcz'];
let expected = [
createLineChange(1, 2, 1, 1, [
createCharChange(1, 4, 2, 5, 1, 4, 1, 5)
])
@@ -322,9 +322,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('two lines changed 2', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['foo', 'abcz', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['foo', 'abcz', 'BAR'];
let expected = [
createLineChange(2, 3, 2, 2, [
createCharChange(2, 4, 3, 5, 2, 4, 2, 5)
])
@@ -333,9 +333,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('two lines changed 3', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['foo', 'abcz', 'zzzzefgh', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['foo', 'abcz', 'zzzzefgh', 'BAR'];
let expected = [
createLineChange(2, 3, 2, 3, [
createCharChange(2, 4, 2, 5, 2, 4, 3, 5)
])
@@ -344,9 +344,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('three lines changed', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['foo', 'zzzefgh', 'xxx', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['foo', 'zzzefgh', 'xxx', 'BAR'];
let expected = [
createLineChange(2, 3, 2, 3, [
createCharChange(2, 1, 2, 5, 2, 1, 2, 4),
createCharInsertion(3, 1, 3, 4)
@@ -356,9 +356,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('big change part 1', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
let expected = [
createLineInsertion(1, 1, 0),
createLineChange(2, 3, 3, 4, [
createCharChange(2, 1, 2, 5, 3, 1, 3, 4),
@@ -369,9 +369,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('big change part 2', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR', 'RAB'];
var modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR', 'RAB'];
let modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
let expected = [
createLineInsertion(1, 1, 0),
createLineChange(2, 3, 3, 4, [
createCharChange(2, 1, 2, 5, 3, 1, 3, 4),
@@ -383,9 +383,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('char change postprocessing merges', () => {
var original = ['abba'];
var modified = ['azzzbzzzbzzza'];
var expected = [
let original = ['abba'];
let modified = ['azzzbzzzbzzza'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharChange(1, 2, 1, 4, 1, 2, 1, 13)
])
@@ -394,9 +394,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('ignore trim whitespace', () => {
var original = ['\t\t foo ', 'abcd', 'efgh', '\t\t BAR\t\t'];
var modified = [' hello\t', '\t foo \t', 'zzzefgh', 'xxx', ' BAR \t'];
var expected = [
let original = ['\t\t foo ', 'abcd', 'efgh', '\t\t BAR\t\t'];
let modified = [' hello\t', '\t foo \t', 'zzzefgh', 'xxx', ' BAR \t'];
let expected = [
createLineInsertion(1, 1, 0),
createLineChange(2, 3, 3, 4, [
createCharChange(2, 1, 2, 5, 3, 1, 3, 4),
@@ -407,18 +407,18 @@ suite('Editor Diff - DiffComputer', () => {
});
test('issue #12122 r.hasOwnProperty is not a function', () => {
var original = ['hasOwnProperty'];
var modified = ['hasOwnProperty', 'and another line'];
var expected = [
let original = ['hasOwnProperty'];
let modified = ['hasOwnProperty', 'and another line'];
let expected = [
createLineInsertion(2, 2, 1)
];
assertDiff(original, modified, expected);
});
test('empty diff 1', () => {
var original = [''];
var modified = ['something'];
var expected = [
let original = [''];
let modified = ['something'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
@@ -427,9 +427,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('empty diff 2', () => {
var original = [''];
var modified = ['something', 'something else'];
var expected = [
let original = [''];
let modified = ['something', 'something else'];
let expected = [
createLineChange(1, 1, 1, 2, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
@@ -438,9 +438,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('empty diff 3', () => {
var original = ['something', 'something else'];
var modified = [''];
var expected = [
let original = ['something', 'something else'];
let modified = [''];
let expected = [
createLineChange(1, 2, 1, 1, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
@@ -449,9 +449,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('empty diff 4', () => {
var original = ['something'];
var modified = [''];
var expected = [
let original = ['something'];
let modified = [''];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
@@ -460,7 +460,7 @@ suite('Editor Diff - DiffComputer', () => {
});
test('pretty diff 1', () => {
var original = [
let original = [
'suite(function () {',
' test1() {',
' assert.ok(true);',
@@ -472,7 +472,7 @@ suite('Editor Diff - DiffComputer', () => {
'});',
'',
];
var modified = [
let modified = [
'// An insertion',
'suite(function () {',
' test1() {',
@@ -489,7 +489,7 @@ suite('Editor Diff - DiffComputer', () => {
'});',
'',
];
var expected = [
let expected = [
createLineInsertion(1, 1, 0),
createLineInsertion(10, 13, 8)
];
@@ -497,7 +497,7 @@ suite('Editor Diff - DiffComputer', () => {
});
test('pretty diff 2', () => {
var original = [
let original = [
'// Just a comment',
'',
'function compute(a, b, c, d) {',
@@ -515,7 +515,7 @@ suite('Editor Diff - DiffComputer', () => {
' }',
'}',
];
var modified = [
let modified = [
'// Here is an inserted line',
'// and another inserted line',
'// and another one',
@@ -532,7 +532,7 @@ suite('Editor Diff - DiffComputer', () => {
' }',
'}',
];
var expected = [
let expected = [
createLineInsertion(1, 3, 0),
createLineDeletion(10, 13, 12),
];
@@ -540,7 +540,7 @@ suite('Editor Diff - DiffComputer', () => {
});
test('pretty diff 3', () => {
var original = [
let original = [
'class A {',
' /**',
' * m1',
@@ -553,7 +553,7 @@ suite('Editor Diff - DiffComputer', () => {
' method3() {}',
'}',
];
var modified = [
let modified = [
'class A {',
' /**',
' * m1',
@@ -571,7 +571,7 @@ suite('Editor Diff - DiffComputer', () => {
' method3() {}',
'}',
];
var expected = [
let expected = [
createLineInsertion(7, 11, 6)
];
assertDiff(original, modified, expected, false, true);
@@ -636,7 +636,7 @@ suite('Editor Diff - DiffComputer', () => {
' }',
' }',
];
var expected = [
let expected = [
createLineChange(
1, 27, 1, 27,
[
@@ -681,7 +681,7 @@ suite('Editor Diff - DiffComputer', () => {
let modified = [
' * `yarn` -- Install project NPM dependencies. You should only need to run this if you add dependencies in `package.json`.',
];
var expected = [
let expected = [
createLineChange(
1, 1, 1, 1,
[