Skip to content

Commit b49d521

Browse files
mightyiamJamesHenry
authored andcommitted
Chore: Update prettier and pin the version (typescript-eslint#94)
1 parent 56d3b46 commit b49d521

File tree

4 files changed

+29
-26
lines changed

4 files changed

+29
-26
lines changed

Diff for: packages/eslint-plugin-typescript/lib/rules/adjacent-overload-signatures.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ module.exports = {
8888
if (index > -1 && lastName !== name) {
8989
context.report({
9090
node: member,
91-
message: `All '${name}' signatures should be adjacent`
91+
message: `All '${
92+
name
93+
}' signatures should be adjacent`
9294
});
9395
} else if (name && index === -1) {
9496
seen.push(name);

Diff for: packages/eslint-plugin-typescript/lib/rules/explicit-member-accessibility.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ module.exports = {
3636
if (!methodDefinition.accessibility) {
3737
context.report({
3838
node: methodDefinition,
39-
message: `Missing accessibility modifier on method definition ${methodDefinition
40-
.key.name}.`
39+
message: `Missing accessibility modifier on method definition ${
40+
methodDefinition.key.name
41+
}.`
4142
});
4243
}
4344
}
@@ -52,8 +53,9 @@ module.exports = {
5253
if (!classProperty.accessibility) {
5354
context.report({
5455
node: classProperty,
55-
message: `Missing accessibility modifier on class property ${classProperty
56-
.key.name}.`
56+
message: `Missing accessibility modifier on class property ${
57+
classProperty.key.name
58+
}.`
5759
});
5860
}
5961
}

Diff for: packages/eslint-plugin-typescript/lib/rules/member-ordering.js

+19-20
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,26 @@ const util = require("../util");
1010
// Rule Definition
1111
//------------------------------------------------------------------------------
1212

13-
const schemaOptions = [
14-
"field",
15-
"method",
16-
"constructor"
17-
].reduce((options, type) => {
18-
options.push(type);
19-
20-
["public", "protected", "private"].forEach(accessibility => {
21-
options.push(`${accessibility}-${type}`);
22-
if (type !== "constructor") {
23-
["static", "instance"].forEach(scope => {
24-
if (options.indexOf(`${scope}-${type}`) === -1) {
25-
options.push(`${scope}-${type}`);
26-
}
27-
options.push(`${accessibility}-${scope}-${type}`);
28-
});
29-
}
30-
});
13+
const schemaOptions = ["field", "method", "constructor"].reduce(
14+
(options, type) => {
15+
options.push(type);
16+
17+
["public", "protected", "private"].forEach(accessibility => {
18+
options.push(`${accessibility}-${type}`);
19+
if (type !== "constructor") {
20+
["static", "instance"].forEach(scope => {
21+
if (options.indexOf(`${scope}-${type}`) === -1) {
22+
options.push(`${scope}-${type}`);
23+
}
24+
options.push(`${accessibility}-${scope}-${type}`);
25+
});
26+
}
27+
});
3128

32-
return options;
33-
}, []);
29+
return options;
30+
},
31+
[]
32+
);
3433

3534
module.exports = {
3635
meta: {

Diff for: packages/eslint-plugin-typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"husky": "^0.14.3",
3333
"lint-staged": "^4.1.3",
3434
"mocha": "^3.5.3",
35-
"prettier": "^1.6.1",
35+
"prettier": "1.8.2",
3636
"typescript": "~2.5.1",
3737
"typescript-eslint-parser": "^8.0.0"
3838
},

0 commit comments

Comments
 (0)