Skip to content

added semicolon rule converter plus tests #220

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.

Sign up for GitHub

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 5 commits into from
Oct 6, 2019
Merged

added semicolon rule converter plus tests #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aec5772
added the editor tab width for people who have their editors configur…
YashdalfTheGray Oct 6, 2019
0fbc611
added the semicolon rule and some tests, plus export from converters
YashdalfTheGray Oct 6, 2019
764e786
fixed an eslint issue with the build
YashdalfTheGray Oct 6, 2019
4a73c46
fixed not following converter naming convention
YashdalfTheGray Oct 6, 2019
996d11e
code review changes
YashdalfTheGray Oct 6, 2019
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
2 changes: 2 additions & 0 deletions src/rules/converters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ import { convertPreferTemplate } from "./converters/prefer-template";
import { convertPromiseFunctionAsync } from "./converters/promise-function-async";
import { convertRadix } from "./converters/radix";
import { convertRestrictPlusOperands } from "./converters/restrict-plus-operands";
import { convertSemicolon } from "./converters/semicolon";
import { convertSpaceBeforeFunctionParen } from "./converters/space-before-function-paren";
import { convertSwitchDefault } from "./converters/switch-default";
import { convertTypedefWhitespace } from "./converters/typedef-whitespace";
Expand Down Expand Up @@ -217,6 +218,7 @@ export const converters = new Map([
["quotemark", convertQuotemark],
["radix", convertRadix],
["restrict-plus-operands", convertRestrictPlusOperands],
["semicolon", convertSemicolon],
["space-before-function-paren", convertSpaceBeforeFunctionParen],
["switch-default", convertSwitchDefault],
["triple-equals", convertTripleEquals],
Expand Down
48 changes: 48 additions & 0 deletions src/rules/converters/semicolon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { RuleConverter } from "../converter";

export const convertSemicolon: RuleConverter = tslintRule => {
const getMultilineDelimiter = (strategy: "always" | "never") => {
if (strategy === "always") {
return "semi";
}
return "none";
};

const ignoreInterfaces = tslintRule.ruleArguments.includes("ignore-interfaces");
const strictBoundClassMethods = tslintRule.ruleArguments.includes("strict-bound-class-methods");

return {
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: [tslintRule.ruleArguments[0]],
},
...(ignoreInterfaces
? []
: [
{
ruleName: "@typescript-eslint/member-delimiter-style",
ruleArguments: [
"error",
{
multiline: {
delimiter: getMultilineDelimiter(tslintRule.ruleArguments[0]),
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
],
},
]),
],

notices: strictBoundClassMethods
? [
"Option `strict-bound-class-methods` was found, there is no exact equivalent yet supported.",
]
: undefined,
};
};
199 changes: 199 additions & 0 deletions src/rules/converters/tests/semicolon.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
import { convertSemicolon } from "../semicolon";

describe(convertSemicolon, () => {
test("conversion with always", () => {
const result = convertSemicolon({
ruleArguments: ["always"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["always"],
},
{
ruleName: "@typescript-eslint/member-delimiter-style",
ruleArguments: [
"error",
{
multiline: {
delimiter: "semi",
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
],
},
],
});
});

test("conversion with never", () => {
const result = convertSemicolon({
ruleArguments: ["never"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["never"],
},
{
ruleName: "@typescript-eslint/member-delimiter-style",
ruleArguments: [
"error",
{
multiline: {
delimiter: "none",
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
],
},
],
});
});

test("conversion with always and strict bound class methods", () => {
const result = convertSemicolon({
ruleArguments: ["always", "strict-bound-class-methods"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["always"],
},
{
ruleName: "@typescript-eslint/member-delimiter-style",
ruleArguments: [
"error",
{
multiline: {
delimiter: "semi",
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
],
},
],
notices: [
"Option `strict-bound-class-methods` was found, there is no exact equivalent yet supported.",
],
});
});

test("conversion with never and strict bound class methods", () => {
const result = convertSemicolon({
ruleArguments: ["never", "strict-bound-class-methods"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["never"],
},
{
ruleName: "@typescript-eslint/member-delimiter-style",
ruleArguments: [
"error",
{
multiline: {
delimiter: "none",
requireLast: true,
},
singleline: {
delimiter: "semi",
requireLast: false,
},
},
],
},
],
notices: [
"Option `strict-bound-class-methods` was found, there is no exact equivalent yet supported.",
],
});
});

test("conversion with always and ignore interfaces", () => {
const result = convertSemicolon({
ruleArguments: ["always", "ignore-interfaces"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["always"],
},
],
});
});

test("conversion with never and ignore interfaces", () => {
const result = convertSemicolon({
ruleArguments: ["never", "ignore-interfaces"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["never"],
},
],
});
});

test("conversion with always, strict bound class methods and ignore interfaces", () => {
const result = convertSemicolon({
ruleArguments: ["always", "ignore-interfaces", "strict-bound-class-methods"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["always"],
},
],
notices: [
"Option `strict-bound-class-methods` was found, there is no exact equivalent yet supported.",
],
});
});

test("conversion with always, strict bound class methods and ignore interfaces", () => {
const result = convertSemicolon({
ruleArguments: ["never", "ignore-interfaces", "strict-bound-class-methods"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/semi",
ruleArguments: ["never"],
},
],
notices: [
"Option `strict-bound-class-methods` was found, there is no exact equivalent yet supported.",
],
});
});
});