Skip to content
This repository was archived by the owner on Feb 9, 2023. It is now read-only.

Commit 203fede

Browse files
committed
enable prefer-rest-params, prefer-spread
1 parent 916e42e commit 203fede

File tree

4 files changed

+14
-26
lines changed

4 files changed

+14
-26
lines changed

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@
5151
"eslintConfig": {
5252
"extends": [
5353
"stylelint"
54-
],
55-
"rules": {
56-
"prefer-rest-params": "off",
57-
"prefer-spread": "off"
58-
}
54+
]
5955
},
6056
"remarkConfig": {
6157
"plugins": [

template-parser.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ class TemplateParser extends Parser {
88
createTokenizer() {
99
this.tokenizer = templateTokenize(this.input);
1010
}
11-
other() {
12-
const args = arguments;
13-
14-
return helper.literal.apply(this, args) || super.other.apply(this, args);
11+
other(start) {
12+
return helper.literal.call(this, start) || super.other.call(this, start);
1513
}
16-
freeSemicolon() {
17-
return helper.freeSemicolon.apply(this, arguments);
14+
freeSemicolon(token) {
15+
return helper.freeSemicolon.call(this, token);
1816
}
1917
}
2018
module.exports = TemplateParser;

template-safe-parser.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ class TemplateSafeParser extends SafeParser {
99
createTokenizer() {
1010
this.tokenizer = templateTokenize(this.input, { ignoreErrors: true });
1111
}
12-
other() {
13-
const args = arguments;
14-
15-
return helper.literal.apply(this, args) || super.other.apply(this, args);
12+
other(start) {
13+
return helper.literal.call(this, start) || super.other.call(this, start);
1614
}
17-
freeSemicolon() {
18-
return helper.freeSemicolon.apply(this, arguments);
15+
freeSemicolon(token) {
16+
return helper.freeSemicolon.call(this, token);
1917
}
2018
}
2119
module.exports = TemplateSafeParser;

template-tokenize.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
const tokenize = require('postcss/lib/tokenize');
44

5-
function templateTokenize(input) {
5+
function templateTokenize(input, options = {}) {
66
let pos = input.quasis[0].start;
77
const quasis = input.quasis.filter((quasi) => quasi.start !== quasi.end);
8-
const tokenizer = tokenize.apply(this, arguments);
8+
const tokenizer = tokenize(input, options);
99

1010
function tokenInExpressions(token, returned) {
1111
const start = pos;
@@ -27,20 +27,16 @@ function templateTokenize(input) {
2727
function back(token) {
2828
pos -= token[1].length;
2929

30-
return tokenizer.back.apply(tokenizer, arguments);
30+
return tokenizer.back(token);
3131
}
3232

33-
function nextToken() {
34-
const args = arguments;
33+
function nextToken(opts) {
3534
const returned = [];
3635
let token;
3736
let line;
3837
let column;
3938

40-
while (
41-
(token = tokenizer.nextToken.apply(tokenizer, args)) &&
42-
tokenInExpressions(token, returned)
43-
) {
39+
while ((token = tokenizer.nextToken(opts)) && tokenInExpressions(token, returned)) {
4440
line = token[4] || token[2] || line;
4541
column = token[5] || token[3] || column;
4642
returned.push(token);

0 commit comments

Comments
 (0)