Skip to content

Commit e00b5ec

Browse files
RyanCavanaughRyanCavanaugh
authored
Enable max-statements-per-line lint rule (microsoft#45475)
* Enable the rule * Fix all the violations
1 parent 339ad92 commit e00b5ec

37 files changed

Lines changed: 215 additions & 109 deletions

‎.eslintrc.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"@typescript-eslint/consistent-type-definitions": ["error", "interface"],
3737
"@typescript-eslint/consistent-type-assertions": ["error", { "assertionStyle": "as" }],
3838

39+
"max-statements-per-line": ["error", { "max": 1 }],
40+
3941
"no-duplicate-imports": "off",
4042
"@typescript-eslint/no-duplicate-imports": "error",
4143

‎scripts/processDiagnosticMessages.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ function createKey(name: string, code: number): string {
105105

106106
function convertPropertyName(origName: string): string {
107107
let result = origName.split("").map(char => {
108-
if (char === "*") { return "_Asterisk"; }
109-
if (char === "/") { return "_Slash"; }
110-
if (char === ":") { return "_Colon"; }
108+
if (char === "*") return "_Asterisk";
109+
if (char === "/") return "_Slash";
110+
if (char === ":") return "_Colon";
111111
return /\w/.test(char) ? char : "_";
112112
}).join("");
113113

‎scripts/produceLKG.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,9 @@ async function exec(path: string, args: string[] = []) {
102102
childProcess.execSync(cmdLine);
103103
}
104104

105-
process.on("unhandledRejection", err => { throw err; });
106-
produceLKG().then(() => console.log("Done"), err => { throw err; });
105+
process.on("unhandledRejection", err => {
106+
throw err;
107+
});
108+
produceLKG().then(() => console.log("Done"), err => {
109+
throw err;
110+
});

‎src/compiler/builder.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ namespace ts {
232232
else if (canCopySemanticDiagnostics) {
233233
const sourceFile = newProgram.getSourceFileByPath(sourceFilePath)!;
234234

235-
if (sourceFile.isDeclarationFile && !copyDeclarationFileDiagnostics) { return; }
236-
if (sourceFile.hasNoDefaultLib && !copyLibFileDiagnostics) { return; }
235+
if (sourceFile.isDeclarationFile && !copyDeclarationFileDiagnostics) return;
236+
if (sourceFile.hasNoDefaultLib && !copyLibFileDiagnostics) return;
237237

238238
// Unchanged file copy diagnostics
239239
const diagnostics = oldState!.semanticDiagnosticsPerFile!.get(sourceFilePath);

‎src/compiler/builderState.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ namespace ts {
258258
if (sourceFile.moduleAugmentations.length) {
259259
const checker = program.getTypeChecker();
260260
for (const moduleName of sourceFile.moduleAugmentations) {
261-
if (!isStringLiteral(moduleName)) { continue; }
261+
if (!isStringLiteral(moduleName)) continue;
262262
const symbol = checker.getSymbolAtLocation(moduleName);
263-
if (!symbol) { continue; }
263+
if (!symbol) continue;
264264

265265
// Add any file other than our own as reference
266266
addReferenceFromAmbientModule(symbol);

‎src/compiler/checker.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34531,7 +34531,9 @@ namespace ts {
3453134531
case SyntaxKind.ImportClause:
3453234532
let result = DeclarationSpaces.None;
3453334533
const target = resolveAlias(getSymbolOfNode(d)!);
34534-
forEach(target.declarations, d => { result |= getDeclarationSpaces(d); });
34534+
forEach(target.declarations, d => {
34535+
result |= getDeclarationSpaces(d);
34536+
});
3453534537
return result;
3453634538
case SyntaxKind.VariableDeclaration:
3453734539
case SyntaxKind.BindingElement:
@@ -37943,7 +37945,9 @@ namespace ts {
3794337945
return properties;
3794437946
}
3794537947
const seen = new Map<__String, Symbol>();
37946-
forEach(properties, p => { seen.set(p.escapedName, p); });
37948+
forEach(properties, p => {
37949+
seen.set(p.escapedName, p);
37950+
});
3794737951

3794837952
for (const base of baseTypes) {
3794937953
const properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
@@ -37966,7 +37970,9 @@ namespace ts {
3796637970

3796737971
interface InheritanceInfoMap { prop: Symbol; containingType: Type; }
3796837972
const seen = new Map<__String, InheritanceInfoMap>();
37969-
forEach(resolveDeclaredMembers(type).declaredProperties, p => { seen.set(p.escapedName, { prop: p, containingType: type }); });
37973+
forEach(resolveDeclaredMembers(type).declaredProperties, p => {
37974+
seen.set(p.escapedName, { prop: p, containingType: type });
37975+
});
3797037976
let ok = true;
3797137977

3797237978
for (const base of baseTypes) {

‎src/compiler/core.ts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,19 +1568,29 @@ namespace ts {
15681568
export function noop(_?: {} | null | undefined): void { }
15691569

15701570
/** Do nothing and return false */
1571-
export function returnFalse(): false { return false; }
1571+
export function returnFalse(): false {
1572+
return false;
1573+
}
15721574

15731575
/** Do nothing and return true */
1574-
export function returnTrue(): true { return true; }
1576+
export function returnTrue(): true {
1577+
return true;
1578+
}
15751579

15761580
/** Do nothing and return undefined */
1577-
export function returnUndefined(): undefined { return undefined; }
1581+
export function returnUndefined(): undefined {
1582+
return undefined;
1583+
}
15781584

15791585
/** Returns its argument. */
1580-
export function identity<T>(x: T) { return x; }
1586+
export function identity<T>(x: T) {
1587+
return x;
1588+
}
15811589

15821590
/** Returns lower case string */
1583-
export function toLowerCase(x: string) { return x.toLowerCase(); }
1591+
export function toLowerCase(x: string) {
1592+
return x.toLowerCase();
1593+
}
15841594

15851595
// We convert the file names to lower case as key for file name on case insensitive file system
15861596
// While doing so we need to handle special characters (eg \u0130) to ensure that we dont convert

‎src/compiler/factory/nodeFactory.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,18 +1059,18 @@ namespace ts {
10591059
// @api
10601060
function createModifiersFromModifierFlags(flags: ModifierFlags) {
10611061
const result: Modifier[] = [];
1062-
if (flags & ModifierFlags.Export) { result.push(createModifier(SyntaxKind.ExportKeyword)); }
1063-
if (flags & ModifierFlags.Ambient) { result.push(createModifier(SyntaxKind.DeclareKeyword)); }
1064-
if (flags & ModifierFlags.Default) { result.push(createModifier(SyntaxKind.DefaultKeyword)); }
1065-
if (flags & ModifierFlags.Const) { result.push(createModifier(SyntaxKind.ConstKeyword)); }
1066-
if (flags & ModifierFlags.Public) { result.push(createModifier(SyntaxKind.PublicKeyword)); }
1067-
if (flags & ModifierFlags.Private) { result.push(createModifier(SyntaxKind.PrivateKeyword)); }
1068-
if (flags & ModifierFlags.Protected) { result.push(createModifier(SyntaxKind.ProtectedKeyword)); }
1069-
if (flags & ModifierFlags.Abstract) { result.push(createModifier(SyntaxKind.AbstractKeyword)); }
1070-
if (flags & ModifierFlags.Static) { result.push(createModifier(SyntaxKind.StaticKeyword)); }
1071-
if (flags & ModifierFlags.Override) { result.push(createModifier(SyntaxKind.OverrideKeyword)); }
1072-
if (flags & ModifierFlags.Readonly) { result.push(createModifier(SyntaxKind.ReadonlyKeyword)); }
1073-
if (flags & ModifierFlags.Async) { result.push(createModifier(SyntaxKind.AsyncKeyword)); }
1062+
if (flags & ModifierFlags.Export) result.push(createModifier(SyntaxKind.ExportKeyword));
1063+
if (flags & ModifierFlags.Ambient) result.push(createModifier(SyntaxKind.DeclareKeyword));
1064+
if (flags & ModifierFlags.Default) result.push(createModifier(SyntaxKind.DefaultKeyword));
1065+
if (flags & ModifierFlags.Const) result.push(createModifier(SyntaxKind.ConstKeyword));
1066+
if (flags & ModifierFlags.Public) result.push(createModifier(SyntaxKind.PublicKeyword));
1067+
if (flags & ModifierFlags.Private) result.push(createModifier(SyntaxKind.PrivateKeyword));
1068+
if (flags & ModifierFlags.Protected) result.push(createModifier(SyntaxKind.ProtectedKeyword));
1069+
if (flags & ModifierFlags.Abstract) result.push(createModifier(SyntaxKind.AbstractKeyword));
1070+
if (flags & ModifierFlags.Static) result.push(createModifier(SyntaxKind.StaticKeyword));
1071+
if (flags & ModifierFlags.Override) result.push(createModifier(SyntaxKind.OverrideKeyword));
1072+
if (flags & ModifierFlags.Readonly) result.push(createModifier(SyntaxKind.ReadonlyKeyword));
1073+
if (flags & ModifierFlags.Async) result.push(createModifier(SyntaxKind.AsyncKeyword));
10741074
return result;
10751075
}
10761076

‎src/compiler/program.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ namespace ts {
556556
// Visit project references first
557557
if (cbRef) {
558558
const result = cbRef(projectReferences, parent);
559-
if (result) { return result; }
559+
if (result) return result;
560560
}
561561

562562
return forEach(resolvedProjectReferences, (resolvedRef, index) => {
@@ -2238,7 +2238,7 @@ namespace ts {
22382238
}
22392239

22402240
function getOptionsDiagnosticsOfConfigFile() {
2241-
if (!options.configFile) { return emptyArray; }
2241+
if (!options.configFile) return emptyArray;
22422242
let diagnostics = programDiagnostics.getDiagnostics(options.configFile.fileName);
22432243
forEachResolvedProjectReference(resolvedRef => {
22442244
diagnostics = concatenate(diagnostics, programDiagnostics.getDiagnostics(resolvedRef.sourceFile.fileName));

‎src/compiler/resolutionCache.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -764,14 +764,14 @@ namespace ts {
764764
}
765765

766766
function removeResolutionsFromProjectReferenceRedirects(filePath: Path) {
767-
if (!fileExtensionIs(filePath, Extension.Json)) { return; }
767+
if (!fileExtensionIs(filePath, Extension.Json)) return;
768768

769769
const program = resolutionHost.getCurrentProgram();
770-
if (!program) { return; }
770+
if (!program) return;
771771

772772
// If this file is input file for the referenced project, get it
773773
const resolvedProjectReference = program.getResolvedProjectReferenceByPath(filePath);
774-
if (!resolvedProjectReference) { return; }
774+
if (!resolvedProjectReference) return;
775775

776776
// filePath is for the projectReference and the containing file is from this project reference, invalidate the resolution
777777
resolvedProjectReference.commandLine.fileNames.forEach(f => removeResolutionsOfFile(resolutionHost.toPath(f)));

0 commit comments

Comments
 (0)