Skip to content

Commit 401a393

Browse files
sandersnsandersn
committed
Fix ++/-- lint
1 parent 189357d commit 401a393

12 files changed

Lines changed: 142 additions & 79 deletions

File tree

‎src/compiler/checker.ts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@ namespace ts {
77
let nextMergeId = 1;
88

99
export function getNodeId(node: Node): number {
10-
if (!node.id) node.id = nextNodeId++;
10+
if (!node.id) {
11+
node.id = nextNodeId;
12+
nextNodeId++;
13+
}
1114
return node.id;
1215
}
1316

1417
export let checkTime = 0;
1518

1619
export function getSymbolId(symbol: Symbol): number {
1720
if (!symbol.id) {
18-
symbol.id = nextSymbolId++;
21+
symbol.id = nextSymbolId;
22+
nextSymbolId++;
1923
}
2024

2125
return symbol.id;
@@ -279,7 +283,10 @@ namespace ts {
279283
}
280284

281285
function recordMergedSymbol(target: Symbol, source: Symbol) {
282-
if (!source.mergeId) source.mergeId = nextMergeId++;
286+
if (!source.mergeId) {
287+
source.mergeId = nextMergeId;
288+
nextMergeId++;
289+
}
283290
mergedSymbols[source.mergeId] = target;
284291
}
285292

@@ -1181,7 +1188,8 @@ namespace ts {
11811188

11821189
function createType(flags: TypeFlags): Type {
11831190
const result = new Type(checker, flags);
1184-
result.id = typeCount++;
1191+
result.id = typeCount;
1192+
typeCount++;
11851193
return result;
11861194
}
11871195

@@ -1731,11 +1739,13 @@ namespace ts {
17311739
}
17321740
if (pos < end) {
17331741
writePunctuation(writer, SyntaxKind.LessThanToken);
1734-
writeType(typeArguments[pos++], TypeFormatFlags.None);
1742+
writeType(typeArguments[pos], TypeFormatFlags.None);
1743+
pos++;
17351744
while (pos < end) {
17361745
writePunctuation(writer, SyntaxKind.CommaToken);
17371746
writeSpace(writer);
1738-
writeType(typeArguments[pos++], TypeFormatFlags.None);
1747+
writeType(typeArguments[pos], TypeFormatFlags.None);
1748+
pos++;
17391749
}
17401750
writePunctuation(writer, SyntaxKind.GreaterThanToken);
17411751
}
@@ -5598,7 +5608,7 @@ namespace ts {
55985608
return Ternary.False;
55995609
}
56005610
let result = Ternary.True;
5601-
for (let i = 0, len = sourceSignatures.length; i < len; ++i) {
5611+
for (let i = 0, len = sourceSignatures.length; i < len; i++) {
56025612
const related = compareSignatures(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
56035613
if (!related) {
56045614
return Ternary.False;
@@ -5770,7 +5780,7 @@ namespace ts {
57705780
if (source.typeParameters.length !== target.typeParameters.length) {
57715781
return Ternary.False;
57725782
}
5773-
for (let i = 0, len = source.typeParameters.length; i < len; ++i) {
5783+
for (let i = 0, len = source.typeParameters.length; i < len; i++) {
57745784
const related = compareTypes(source.typeParameters[i], target.typeParameters[i]);
57755785
if (!related) {
57765786
return Ternary.False;
@@ -13596,7 +13606,8 @@ namespace ts {
1359613606
}
1359713607

1359813608
if (autoValue !== undefined) {
13599-
getNodeLinks(member).enumMemberValue = autoValue++;
13609+
getNodeLinks(member).enumMemberValue = autoValue;
13610+
autoValue++;
1360013611
}
1360113612
}
1360213613

‎src/compiler/commandLineParser.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,8 @@ namespace ts {
334334
function parseStrings(args: string[]) {
335335
let i = 0;
336336
while (i < args.length) {
337-
let s = args[i++];
337+
let s = args[i];
338+
i++;
338339
if (s.charCodeAt(0) === CharacterCodes.at) {
339340
parseResponseFile(s.slice(1));
340341
}
@@ -356,18 +357,21 @@ namespace ts {
356357

357358
switch (opt.type) {
358359
case "number":
359-
options[opt.name] = parseInt(args[i++]);
360+
options[opt.name] = parseInt(args[i]);
361+
i++;
360362
break;
361363
case "boolean":
362364
options[opt.name] = true;
363365
break;
364366
case "string":
365-
options[opt.name] = args[i++] || "";
367+
options[opt.name] = args[i] || "";
368+
i++;
366369
break;
367370
// If not a primitive, the possible types are specified in what is effectively a map of options.
368371
default:
369372
let map = <Map<number>>opt.type;
370-
let key = (args[i++] || "").toLowerCase();
373+
let key = (args[i] || "").toLowerCase();
374+
i++;
371375
if (hasProperty(map, key)) {
372376
options[opt.name] = map[key];
373377
}

‎src/compiler/core.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,11 @@ namespace ts {
244244
const count = array.length;
245245
if (count > 0) {
246246
let pos = 0;
247-
let result = arguments.length <= 2 ? array[pos++] : initial;
247+
let result = arguments.length <= 2 ? array[pos] : initial;
248+
pos++;
248249
while (pos < count) {
249-
result = f(<U>result, array[pos++]);
250+
result = f(<U>result, array[pos]);
251+
pos++;
250252
}
251253
return <U>result;
252254
}
@@ -260,9 +262,11 @@ namespace ts {
260262
if (array) {
261263
let pos = array.length - 1;
262264
if (pos >= 0) {
263-
let result = arguments.length <= 2 ? array[pos--] : initial;
265+
let result = arguments.length <= 2 ? array[pos] : initial;
266+
pos--;
264267
while (pos >= 0) {
265-
result = f(<U>result, array[pos--]);
268+
result = f(<U>result, array[pos]);
269+
pos--;
266270
}
267271
return <U>result;
268272
}

‎src/compiler/declarationEmitter.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,8 @@ namespace ts {
501501
}
502502
let count = 0;
503503
while (true) {
504-
const name = baseName + "_" + (++count);
504+
count++;
505+
const name = baseName + "_" + count;
505506
if (!hasProperty(currentIdentifiers, name)) {
506507
return name;
507508
}

‎src/compiler/emitter.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5470,7 +5470,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
54705470
});
54715471
leadingComma = true;
54725472
}
5473-
++parameterIndex;
5473+
parameterIndex++;
54745474
}
54755475
}
54765476
return argumentsWritten;
@@ -6481,7 +6481,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
64816481

64826482
let started = false;
64836483
if (exportedDeclarations) {
6484-
for (let i = 0; i < exportedDeclarations.length; ++i) {
6484+
for (let i = 0; i < exportedDeclarations.length; i++) {
64856485
// write name of exported declaration, i.e 'export var x...'
64866486
writeExportedName(exportedDeclarations[i]);
64876487
}
@@ -6597,7 +6597,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
65976597
writeLine();
65986598
write("var ");
65996599
const seen: Map<string> = {};
6600-
for (let i = 0; i < hoistedVars.length; ++i) {
6600+
for (let i = 0; i < hoistedVars.length; i++) {
66016601
const local = hoistedVars[i];
66026602
const name = local.kind === SyntaxKind.Identifier
66036603
? <Identifier>local
@@ -6809,7 +6809,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
68096809
function emitSetters(exportStarFunction: string, dependencyGroups: DependencyGroup[]) {
68106810
write("setters:[");
68116811

6812-
for (let i = 0; i < dependencyGroups.length; ++i) {
6812+
for (let i = 0; i < dependencyGroups.length; i++) {
68136813
if (i !== 0) {
68146814
write(",");
68156815
}
@@ -6857,7 +6857,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
68576857
write(`${exportFunctionForFile}({`);
68586858
writeLine();
68596859
increaseIndent();
6860-
for (let i = 0, len = (<ExportDeclaration>entry).exportClause.elements.length; i < len; ++i) {
6860+
for (let i = 0, len = (<ExportDeclaration>entry).exportClause.elements.length; i < len; i++) {
68616861
if (i !== 0) {
68626862
write(",");
68636863
writeLine();
@@ -6900,7 +6900,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
69006900
write("execute: function() {");
69016901
increaseIndent();
69026902
writeLine();
6903-
for (let i = startIndex; i < node.statements.length; ++i) {
6903+
for (let i = startIndex; i < node.statements.length; i++) {
69046904
const statement = node.statements[i];
69056905
switch (statement.kind) {
69066906
// - function declarations are not emitted because they were already hoisted
@@ -6962,7 +6962,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
69626962
const groupIndices: Map<number> = {};
69636963
const dependencyGroups: DependencyGroup[] = [];
69646964

6965-
for (let i = 0; i < externalImports.length; ++i) {
6965+
for (let i = 0; i < externalImports.length; i++) {
69666966
const text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName);
69676967
if (hasProperty(groupIndices, text)) {
69686968
// deduplicate/group entries in dependency list by the dependency name
@@ -7285,7 +7285,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
72857285

72867286
function emitDirectivePrologues(statements: Node[], startWithNewLine: boolean, ensureUseStrict?: boolean): number {
72877287
let foundUseStrict = false;
7288-
for (let i = 0; i < statements.length; ++i) {
7288+
for (let i = 0; i < statements.length; i++) {
72897289
if (isPrologueDirective(statements[i])) {
72907290
if (isUseStrictPrologue(statements[i] as ExpressionStatement)) {
72917291
foundUseStrict = true;
@@ -7307,7 +7307,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
73077307

73087308
function writeLines(text: string): void {
73097309
const lines = text.split(/\r\n|\r|\n/g);
7310-
for (let i = 0; i < lines.length; ++i) {
7310+
for (let i = 0; i < lines.length; i++) {
73117311
const line = lines[i];
73127312
if (line.length) {
73137313
writeLine();

‎src/compiler/program.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ namespace ts {
495495
const moduleNames = map(newSourceFile.imports, name => name.text);
496496
const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
497497
// ensure that module resolution results are still correct
498-
for (let i = 0; i < moduleNames.length; ++i) {
498+
for (let i = 0; i < moduleNames.length; i++) {
499499
const newResolution = resolutions[i];
500500
const oldResolution = getResolvedModule(oldSourceFile, moduleNames[i]);
501501
const resolutionChanged = oldResolution
@@ -523,7 +523,7 @@ namespace ts {
523523
}
524524

525525
// update fileName -> file mapping
526-
for (let i = 0, len = newSourceFiles.length; i < len; ++i) {
526+
for (let i = 0, len = newSourceFiles.length; i < len; i++) {
527527
filesByName.set(filePaths[i], newSourceFiles[i]);
528528
}
529529

@@ -1072,7 +1072,7 @@ namespace ts {
10721072
file.resolvedModules = {};
10731073
const moduleNames = map(file.imports, name => name.text);
10741074
const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(file.fileName, currentDirectory));
1075-
for (let i = 0; i < file.imports.length; ++i) {
1075+
for (let i = 0; i < file.imports.length; i++) {
10761076
const resolution = resolutions[i];
10771077
setResolvedModule(file, moduleNames[i], resolution);
10781078
if (resolution && !options.noResolve) {

0 commit comments

Comments
 (0)