Skip to content

Re-ran Prettier for new version #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/adapters/logger.stubs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ const removeOddCharactersAndTrim = (text: string) =>
.trim();

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

expect(realCalls).toEqual(actualCalls);
Expand Down
2 changes: 1 addition & 1 deletion src/cli/runCli.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ describe("runCli", () => {
let defaultConfig;
const dependencies = createStubRunCliDependencies({
convertConfigs: [
parsedArgs => {
(parsedArgs) => {
defaultConfig = parsedArgs.config;
return Promise.resolve({
status: ResultStatus.Succeeded,
Expand Down
2 changes: 1 addition & 1 deletion src/creation/eslint/createEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const createEnv = ({
const node =
packages === undefined ||
[...Object.keys(packages.dependencies), ...Object.keys(packages.devDependencies)].some(
dependency => dependency.toLowerCase() === "@types/node",
(dependency) => dependency.toLowerCase() === "@types/node",
);

return {
Expand Down
6 changes: 3 additions & 3 deletions src/creation/formatConvertedRules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export const formatConvertedRules = (
tslintConfiguration: TSLintConfiguration,
) => {
const output: { [i: string]: string | any[] } = {};
const sortedRuleEntries = Array.from(conversionResults.converted).sort(
([ruleNameA], [ruleNameB]) => ruleNameA.localeCompare(ruleNameB),
);
const sortedRuleEntries = Array.from(
conversionResults.converted,
).sort(([ruleNameA], [ruleNameB]) => ruleNameA.localeCompare(ruleNameB));

for (const [ruleName, rule] of sortedRuleEntries) {
output[ruleName] = formatConvertedRule(rule);
Expand Down
2 changes: 1 addition & 1 deletion src/creation/simplification/resolveExtensionNames.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const resolveExtensionNames = (rawExtensionNames: string | string[]) => {
rawExtensionNames = [rawExtensionNames];
}

return rawExtensionNames.map(rawExtensionName =>
return rawExtensionNames.map((rawExtensionName) =>
rawExtensionName.startsWith(".") ||
rawExtensionName.startsWith("eslint-plugin-") ||
rawExtensionName.startsWith("eslint:") ||
Expand Down
2 changes: 1 addition & 1 deletion src/creation/simplification/retrieveExtendsValues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const retrieveExtendsValues = async (
const extensionNames = resolveExtensionNames(rawExtensionNames);

await Promise.all(
extensionNames.map(async extensionName => {
extensionNames.map(async (extensionName) => {
const builtInExtension = builtInExtensions.get(extensionName);
if (builtInExtension !== undefined) {
importedExtensions.push(
Expand Down
4 changes: 3 additions & 1 deletion src/editorSettings/converters/editor-code-actions-on-save.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import { EditorSettingConverter } from "../converter";

const SUB_SETTING_SOURCE_FIXALL = "source.fixAll.tslint";

export const convertEditorCodeActionsOnSave: EditorSettingConverter = originalCodeActionsOnSave => {
export const convertEditorCodeActionsOnSave: EditorSettingConverter = (
originalCodeActionsOnSave,
) => {
// Split properties to replace (into parent) and original ones.
const {
[SUB_SETTING_SOURCE_FIXALL]: originalSourceFixAllTsLint,
Expand Down
2 changes: 1 addition & 1 deletion src/input/importer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const importer = async (

return new Error(
`Could not find '${moduleName}' after trying: ${pathAttempts
.map(attempt => `'${attempt}'`)
.map((attempt) => `'${attempt}'`)
.join(", ")}`,
);
};
2 changes: 1 addition & 1 deletion src/reporting/reportConversionResults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type RuleWithNotices = {

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

if (rulesWithNotices.length !== 0) {
Expand Down
6 changes: 3 additions & 3 deletions src/reporting/reportOutputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const logFailedConversions = (failed: ErrorSummary[], logger: Logger) =>
logger.stderr.write(chalk.red(` error${failed.length === 1 ? "" : "s"}`));
logger.stderr.write(chalk.red(" thrown."));
logger.stderr.write(chalk.redBright(` ❌${EOL}`));
logger.info.write(failed.map(failed => failed.getSummary()).join("\n\n") + "\n\n");
logger.info.write(failed.map((failed) => failed.getSummary()).join("\n\n") + "\n\n");
logger.stderr.write(chalk.gray(` Check ${logger.debugFileName} for details.${EOL}`));
};

Expand Down Expand Up @@ -60,7 +60,7 @@ export const logMissingConversionTarget = <T>(
}

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

logger.stdout.write(
Array.from(plugins)
.map(pluginName => ` ${chalk.cyanBright(pluginName)}${EOL}`)
.map((pluginName) => ` ${chalk.cyanBright(pluginName)}${EOL}`)
.join(""),
);
logger.stdout.write(EOL);
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/align.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertAlign: RuleConverter = tslintRule => {
export const convertAlign: RuleConverter = (tslintRule) => {
const alignArguments = tslintRule.ruleArguments.includes("arguments");
const alignElements = tslintRule.ruleArguments.includes("elements");
const alignMembers = tslintRule.ruleArguments.includes("members");
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/array-type.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertArrayType: RuleConverter = tslintRule => {
export const convertArrayType: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/arrow-parens.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertArrowParens: RuleConverter = tslintRule => {
export const convertArrowParens: RuleConverter = (tslintRule) => {
const ruleArguments = [
tslintRule.ruleArguments.length !== 0 &&
tslintRule.ruleArguments[0] === "ban-single-arg-parens"
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/arrow-return-shorthand.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertArrowReturnShorthand: RuleConverter = tslintRule => {
export const convertArrowReturnShorthand: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/ban-types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertBanTypes: RuleConverter = tslintRule => {
export const convertBanTypes: RuleConverter = (tslintRule) => {
type ConvertBanTypeArgument = {
message: string;
};
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/comment-format.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ type CommentFormatOptions = {

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

export const convertCommentFormat: RuleConverter = tslintRule => {
export const convertCommentFormat: RuleConverter = (tslintRule) => {
const capitalizedRuleArguments: string[] = [];
const spaceCommentRuleArguments: string[] = [];
const capitalizedNotices: string[] = [];
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/curly.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertCurly: RuleConverter = tslintRule => {
export const convertCurly: RuleConverter = (tslintRule) => {
const ruleArguments: string[] = [];

if (tslintRule.ruleArguments.includes("ignore-same-line")) {
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/cyclomatic-complexity.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertCyclomaticComplexity: RuleConverter = tslintRule => {
export const convertCyclomaticComplexity: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/file-name-casing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const CASES_MAP: { [s: string]: string } = {
"snake-case": "snakeCase",
};

export const convertFileNameCasing: RuleConverter = tslintRule => {
export const convertFileNameCasing: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/increment-decrement.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertIncrementDecrement: RuleConverter = tslintRule => {
export const convertIncrementDecrement: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/indent.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

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

if (tslintRule.ruleArguments[0] === "tabs") {
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/jsdoc-format.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const convertJSDocFormat: RuleConverter = () => {
"jsdoc/newline-after-description",
];

const mappedRuleNames: ConvertedRuleChanges[] = ruleNames.map(ruleName => {
const mappedRuleNames: ConvertedRuleChanges[] = ruleNames.map((ruleName) => {
return { ruleName };
});

Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/linebreak-style.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertLinebreakStyle: RuleConverter = tslintRule => {
export const convertLinebreakStyle: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/max-classes-per-file.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertMaxClassesPerFile: RuleConverter = tslintRule => {
export const convertMaxClassesPerFile: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/rules/converters/max-file-line-count.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertMaxFileLineCount: RuleConverter = tslintRule => {
export const convertMaxFileLineCount: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
86 changes: 43 additions & 43 deletions src/rules/converters/max-line-length.ts
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
import { RuleConverter } from "../converter";
export const convertMaxLineLength: RuleConverter = tslintRule => {
return {
rules: [
{
...collectArguments(tslintRule.ruleArguments),
ruleName: "max-len",
},
],
};
};
const collectArguments = (ruleArguments: any[]) => {
if (ruleArguments.length === 0) {
return undefined;
}
const argument = ruleArguments[0];
if (typeof argument === "number") {
return {
ruleArguments: [
{
code: argument,
},
],
};
}
return {
ruleArguments: [
{
...("check-regex" in argument && {
ignoreRegExpLiterals: !argument["check-regex"],
}),
...("check-strings" in argument && { ignoreStrings: !argument["check-strings"] }),
...("ignore-pattern" in argument && { ignorePattern: argument["ignore-pattern"] }),
...("limit" in argument && { code: argument.limit }),
},
],
};
};
import { RuleConverter } from "../converter";

export const convertMaxLineLength: RuleConverter = (tslintRule) => {
return {
rules: [
{
...collectArguments(tslintRule.ruleArguments),
ruleName: "max-len",
},
],
};
};

const collectArguments = (ruleArguments: any[]) => {
if (ruleArguments.length === 0) {
return undefined;
}

const argument = ruleArguments[0];

if (typeof argument === "number") {
return {
ruleArguments: [
{
code: argument,
},
],
};
}

return {
ruleArguments: [
{
...("check-regex" in argument && {
ignoreRegExpLiterals: !argument["check-regex"],
}),
...("check-strings" in argument && { ignoreStrings: !argument["check-strings"] }),
...("ignore-pattern" in argument && { ignorePattern: argument["ignore-pattern"] }),
...("limit" in argument && { code: argument.limit }),
},
],
};
};
2 changes: 1 addition & 1 deletion src/rules/converters/member-access.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type MemberAccessSchema = {
overrides?: Record<string, string>;
};

export const convertMemberAccess: RuleConverter = tslintRule => {
export const convertMemberAccess: RuleConverter = (tslintRule) => {
const schema: MemberAccessSchema = {
accessibility: AccessibilityLevel.Explicit,
};
Expand Down
22 changes: 11 additions & 11 deletions src/rules/converters/no-async-without-await.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { RuleConverter } from "../converter";
export const convertNoAsyncWithoutAwait: RuleConverter = () => {
return {
rules: [
{
ruleName: "@typescript-eslint/require-await",
},
],
};
};
import { RuleConverter } from "../converter";

export const convertNoAsyncWithoutAwait: RuleConverter = () => {
return {
rules: [
{
ruleName: "@typescript-eslint/require-await",
},
],
};
};
2 changes: 1 addition & 1 deletion src/rules/converters/no-consecutive-blank-lines.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertNoConsecutiveBlankLines: RuleConverter = tslintRule => {
export const convertNoConsecutiveBlankLines: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand Down
4 changes: 2 additions & 2 deletions src/rules/converters/no-console.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { RuleConverter } from "../converter";

export const convertNoConsole: RuleConverter = tslintRule => {
export const convertNoConsole: RuleConverter = (tslintRule) => {
return {
rules: [
{
Expand All @@ -9,7 +9,7 @@ export const convertNoConsole: RuleConverter = tslintRule => {
ruleArguments: [
{
allow: Object.keys(console).filter(
method => !tslintRule.ruleArguments.includes(method),
(method) => !tslintRule.ruleArguments.includes(method),
),
},
],
Expand Down
Loading