Skip to content

Commit bdcc6bc

Browse files
author
Josh Goldberg
authored
Re-ran Prettier for new version (#403)
1 parent 4a5400f commit bdcc6bc

File tree

66 files changed

+513
-509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+513
-509
lines changed

src/adapters/logger.stubs.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ const removeOddCharactersAndTrim = (text: string) =>
4040
.trim();
4141

4242
export const expectEqualWrites = (fn: jest.Mock, ...actual: string[]) => {
43-
const realCalls = removeOddCharactersAndTrim(fn.mock.calls.map(args => args.join("")).join(""));
43+
const realCalls = removeOddCharactersAndTrim(
44+
fn.mock.calls.map((args) => args.join("")).join(""),
45+
);
4446
const actualCalls = removeOddCharactersAndTrim(actual.join(EOL) + EOL);
4547

4648
expect(realCalls).toEqual(actualCalls);

src/cli/runCli.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ describe("runCli", () => {
142142
let defaultConfig;
143143
const dependencies = createStubRunCliDependencies({
144144
convertConfigs: [
145-
parsedArgs => {
145+
(parsedArgs) => {
146146
defaultConfig = parsedArgs.config;
147147
return Promise.resolve({
148148
status: ResultStatus.Succeeded,

src/creation/eslint/createEnv.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const createEnv = ({
1616
const node =
1717
packages === undefined ||
1818
[...Object.keys(packages.dependencies), ...Object.keys(packages.devDependencies)].some(
19-
dependency => dependency.toLowerCase() === "@types/node",
19+
(dependency) => dependency.toLowerCase() === "@types/node",
2020
);
2121

2222
return {

src/creation/formatConvertedRules.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export const formatConvertedRules = (
88
tslintConfiguration: TSLintConfiguration,
99
) => {
1010
const output: { [i: string]: string | any[] } = {};
11-
const sortedRuleEntries = Array.from(conversionResults.converted).sort(
12-
([ruleNameA], [ruleNameB]) => ruleNameA.localeCompare(ruleNameB),
13-
);
11+
const sortedRuleEntries = Array.from(
12+
conversionResults.converted,
13+
).sort(([ruleNameA], [ruleNameB]) => ruleNameA.localeCompare(ruleNameB));
1414

1515
for (const [ruleName, rule] of sortedRuleEntries) {
1616
output[ruleName] = formatConvertedRule(rule);

src/creation/simplification/resolveExtensionNames.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export const resolveExtensionNames = (rawExtensionNames: string | string[]) => {
33
rawExtensionNames = [rawExtensionNames];
44
}
55

6-
return rawExtensionNames.map(rawExtensionName =>
6+
return rawExtensionNames.map((rawExtensionName) =>
77
rawExtensionName.startsWith(".") ||
88
rawExtensionName.startsWith("eslint-plugin-") ||
99
rawExtensionName.startsWith("eslint:") ||

src/creation/simplification/retrieveExtendsValues.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const retrieveExtendsValues = async (
4545
const extensionNames = resolveExtensionNames(rawExtensionNames);
4646

4747
await Promise.all(
48-
extensionNames.map(async extensionName => {
48+
extensionNames.map(async (extensionName) => {
4949
const builtInExtension = builtInExtensions.get(extensionName);
5050
if (builtInExtension !== undefined) {
5151
importedExtensions.push(

src/editorSettings/converters/editor-code-actions-on-save.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import { EditorSettingConverter } from "../converter";
22

33
const SUB_SETTING_SOURCE_FIXALL = "source.fixAll.tslint";
44

5-
export const convertEditorCodeActionsOnSave: EditorSettingConverter = originalCodeActionsOnSave => {
5+
export const convertEditorCodeActionsOnSave: EditorSettingConverter = (
6+
originalCodeActionsOnSave,
7+
) => {
68
// Split properties to replace (into parent) and original ones.
79
const {
810
[SUB_SETTING_SOURCE_FIXALL]: originalSourceFixAllTsLint,

src/input/importer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const importer = async (
4848

4949
return new Error(
5050
`Could not find '${moduleName}' after trying: ${pathAttempts
51-
.map(attempt => `'${attempt}'`)
51+
.map((attempt) => `'${attempt}'`)
5252
.join(", ")}`,
5353
);
5454
};

src/reporting/reportConversionResults.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type RuleWithNotices = {
5252

5353
const logNotices = (converted: Map<string, ESLintRuleOptions>, logger: Logger) => {
5454
const rulesWithNotices = Array.from(converted.values()).filter(
55-
ruleOptions => ruleOptions.notices && ruleOptions.notices.length >= 1,
55+
(ruleOptions) => ruleOptions.notices && ruleOptions.notices.length >= 1,
5656
) as RuleWithNotices[];
5757

5858
if (rulesWithNotices.length !== 0) {

src/reporting/reportOutputs.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const logFailedConversions = (failed: ErrorSummary[], logger: Logger) =>
2727
logger.stderr.write(chalk.red(` error${failed.length === 1 ? "" : "s"}`));
2828
logger.stderr.write(chalk.red(" thrown."));
2929
logger.stderr.write(chalk.redBright(` ❌${EOL}`));
30-
logger.info.write(failed.map(failed => failed.getSummary()).join("\n\n") + "\n\n");
30+
logger.info.write(failed.map((failed) => failed.getSummary()).join("\n\n") + "\n\n");
3131
logger.stderr.write(chalk.gray(` Check ${logger.debugFileName} for details.${EOL}`));
3232
};
3333

@@ -60,7 +60,7 @@ export const logMissingConversionTarget = <T>(
6060
}
6161

6262
logger.info.write(
63-
chalk.yellow(missing.map(conversion => missingOutputMapping(conversion)).join("")),
63+
chalk.yellow(missing.map((conversion) => missingOutputMapping(conversion)).join("")),
6464
);
6565
logger.stdout.write(chalk.yellow(EOL));
6666
};
@@ -74,7 +74,7 @@ export const logMissingPlugins = (plugins: Set<string>, logger: Logger) => {
7474

7575
logger.stdout.write(
7676
Array.from(plugins)
77-
.map(pluginName => ` ${chalk.cyanBright(pluginName)}${EOL}`)
77+
.map((pluginName) => ` ${chalk.cyanBright(pluginName)}${EOL}`)
7878
.join(""),
7979
);
8080
logger.stdout.write(EOL);

src/rules/converters/align.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertAlign: RuleConverter = tslintRule => {
3+
export const convertAlign: RuleConverter = (tslintRule) => {
44
const alignArguments = tslintRule.ruleArguments.includes("arguments");
55
const alignElements = tslintRule.ruleArguments.includes("elements");
66
const alignMembers = tslintRule.ruleArguments.includes("members");

src/rules/converters/array-type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertArrayType: RuleConverter = tslintRule => {
3+
export const convertArrayType: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{

src/rules/converters/arrow-parens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertArrowParens: RuleConverter = tslintRule => {
3+
export const convertArrowParens: RuleConverter = (tslintRule) => {
44
const ruleArguments = [
55
tslintRule.ruleArguments.length !== 0 &&
66
tslintRule.ruleArguments[0] === "ban-single-arg-parens"

src/rules/converters/arrow-return-shorthand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertArrowReturnShorthand: RuleConverter = tslintRule => {
3+
export const convertArrowReturnShorthand: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{

src/rules/converters/ban-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertBanTypes: RuleConverter = tslintRule => {
3+
export const convertBanTypes: RuleConverter = (tslintRule) => {
44
type ConvertBanTypeArgument = {
55
message: string;
66
};

src/rules/converters/comment-format.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ type CommentFormatOptions = {
77

88
export const CapitalizedIgnoreMessage = "Only accepts a single string pattern to be ignored.";
99

10-
export const convertCommentFormat: RuleConverter = tslintRule => {
10+
export const convertCommentFormat: RuleConverter = (tslintRule) => {
1111
const capitalizedRuleArguments: string[] = [];
1212
const spaceCommentRuleArguments: string[] = [];
1313
const capitalizedNotices: string[] = [];

src/rules/converters/curly.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertCurly: RuleConverter = tslintRule => {
3+
export const convertCurly: RuleConverter = (tslintRule) => {
44
const ruleArguments: string[] = [];
55

66
if (tslintRule.ruleArguments.includes("ignore-same-line")) {

src/rules/converters/cyclomatic-complexity.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertCyclomaticComplexity: RuleConverter = tslintRule => {
3+
export const convertCyclomaticComplexity: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{

src/rules/converters/file-name-casing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const CASES_MAP: { [s: string]: string } = {
1010
"snake-case": "snakeCase",
1111
};
1212

13-
export const convertFileNameCasing: RuleConverter = tslintRule => {
13+
export const convertFileNameCasing: RuleConverter = (tslintRule) => {
1414
return {
1515
rules: [
1616
{

src/rules/converters/increment-decrement.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertIncrementDecrement: RuleConverter = tslintRule => {
3+
export const convertIncrementDecrement: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{

src/rules/converters/indent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertIndent: RuleConverter = tslintRule => {
3+
export const convertIndent: RuleConverter = (tslintRule) => {
44
let indentSize: number | string = 4; // @typescript-eslint/indent default
55

66
if (tslintRule.ruleArguments[0] === "tabs") {

src/rules/converters/jsdoc-format.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const convertJSDocFormat: RuleConverter = () => {
1010
"jsdoc/newline-after-description",
1111
];
1212

13-
const mappedRuleNames: ConvertedRuleChanges[] = ruleNames.map(ruleName => {
13+
const mappedRuleNames: ConvertedRuleChanges[] = ruleNames.map((ruleName) => {
1414
return { ruleName };
1515
});
1616

src/rules/converters/linebreak-style.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertLinebreakStyle: RuleConverter = tslintRule => {
3+
export const convertLinebreakStyle: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{

src/rules/converters/max-classes-per-file.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertMaxClassesPerFile: RuleConverter = tslintRule => {
3+
export const convertMaxClassesPerFile: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{

src/rules/converters/max-file-line-count.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertMaxFileLineCount: RuleConverter = tslintRule => {
3+
export const convertMaxFileLineCount: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{
Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
import { RuleConverter } from "../converter";
2-
3-
export const convertMaxLineLength: RuleConverter = tslintRule => {
4-
return {
5-
rules: [
6-
{
7-
...collectArguments(tslintRule.ruleArguments),
8-
ruleName: "max-len",
9-
},
10-
],
11-
};
12-
};
13-
14-
const collectArguments = (ruleArguments: any[]) => {
15-
if (ruleArguments.length === 0) {
16-
return undefined;
17-
}
18-
19-
const argument = ruleArguments[0];
20-
21-
if (typeof argument === "number") {
22-
return {
23-
ruleArguments: [
24-
{
25-
code: argument,
26-
},
27-
],
28-
};
29-
}
30-
31-
return {
32-
ruleArguments: [
33-
{
34-
...("check-regex" in argument && {
35-
ignoreRegExpLiterals: !argument["check-regex"],
36-
}),
37-
...("check-strings" in argument && { ignoreStrings: !argument["check-strings"] }),
38-
...("ignore-pattern" in argument && { ignorePattern: argument["ignore-pattern"] }),
39-
...("limit" in argument && { code: argument.limit }),
40-
},
41-
],
42-
};
43-
};
1+
import { RuleConverter } from "../converter";
2+
3+
export const convertMaxLineLength: RuleConverter = (tslintRule) => {
4+
return {
5+
rules: [
6+
{
7+
...collectArguments(tslintRule.ruleArguments),
8+
ruleName: "max-len",
9+
},
10+
],
11+
};
12+
};
13+
14+
const collectArguments = (ruleArguments: any[]) => {
15+
if (ruleArguments.length === 0) {
16+
return undefined;
17+
}
18+
19+
const argument = ruleArguments[0];
20+
21+
if (typeof argument === "number") {
22+
return {
23+
ruleArguments: [
24+
{
25+
code: argument,
26+
},
27+
],
28+
};
29+
}
30+
31+
return {
32+
ruleArguments: [
33+
{
34+
...("check-regex" in argument && {
35+
ignoreRegExpLiterals: !argument["check-regex"],
36+
}),
37+
...("check-strings" in argument && { ignoreStrings: !argument["check-strings"] }),
38+
...("ignore-pattern" in argument && { ignorePattern: argument["ignore-pattern"] }),
39+
...("limit" in argument && { code: argument.limit }),
40+
},
41+
],
42+
};
43+
};

src/rules/converters/member-access.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type MemberAccessSchema = {
1717
overrides?: Record<string, string>;
1818
};
1919

20-
export const convertMemberAccess: RuleConverter = tslintRule => {
20+
export const convertMemberAccess: RuleConverter = (tslintRule) => {
2121
const schema: MemberAccessSchema = {
2222
accessibility: AccessibilityLevel.Explicit,
2323
};
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { RuleConverter } from "../converter";
2-
3-
export const convertNoAsyncWithoutAwait: RuleConverter = () => {
4-
return {
5-
rules: [
6-
{
7-
ruleName: "@typescript-eslint/require-await",
8-
},
9-
],
10-
};
11-
};
1+
import { RuleConverter } from "../converter";
2+
3+
export const convertNoAsyncWithoutAwait: RuleConverter = () => {
4+
return {
5+
rules: [
6+
{
7+
ruleName: "@typescript-eslint/require-await",
8+
},
9+
],
10+
};
11+
};

src/rules/converters/no-consecutive-blank-lines.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertNoConsecutiveBlankLines: RuleConverter = tslintRule => {
3+
export const convertNoConsecutiveBlankLines: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{

src/rules/converters/no-console.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RuleConverter } from "../converter";
22

3-
export const convertNoConsole: RuleConverter = tslintRule => {
3+
export const convertNoConsole: RuleConverter = (tslintRule) => {
44
return {
55
rules: [
66
{
@@ -9,7 +9,7 @@ export const convertNoConsole: RuleConverter = tslintRule => {
99
ruleArguments: [
1010
{
1111
allow: Object.keys(console).filter(
12-
method => !tslintRule.ruleArguments.includes(method),
12+
(method) => !tslintRule.ruleArguments.includes(method),
1313
),
1414
},
1515
],

0 commit comments

Comments
 (0)