Skip to content

Commit 8d0b08f

Browse files
ferossfeross
committed
standard
1 parent 42f0368 commit 8d0b08f

8 files changed

+67
-66
lines changed

‎rules/array-bracket-even-spacing.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ module.exports = {
2020
},
2121

2222
create: function (context) {
23-
var spaced = context.options[0] === 'always'
24-
var either = context.options[0] === 'either'
23+
const spaced = context.options[0] === 'always'
24+
const either = context.options[0] === 'either'
2525

2626
/**
2727
* Determines whether an option is set, relative to the spacing option.
@@ -34,7 +34,7 @@ module.exports = {
3434
return context.options[1] != null ? context.options[1][option] === !spaced : false
3535
}
3636

37-
var options = {
37+
const options = {
3838
either,
3939
spaced,
4040
singleElementException: isOptionSet('singleValue'),
@@ -119,8 +119,8 @@ module.exports = {
119119
* @returns {boolean}
120120
*/
121121
function isEvenlySpacedAndNotTooLong (node, start, end) {
122-
var expectedSpace = start[1].range[0] - start[0].range[1]
123-
var endSpace = end[1].range[0] - end[0].range[1]
122+
const expectedSpace = start[1].range[0] - start[0].range[1]
123+
const endSpace = end[1].range[0] - end[0].range[1]
124124
return endSpace === expectedSpace && endSpace <= 1
125125
}
126126

@@ -134,19 +134,19 @@ module.exports = {
134134
return
135135
}
136136

137-
var first = context.getFirstToken(node)
138-
var second = context.getFirstToken(node, 1)
139-
var penultimate = context.getLastToken(node, 1)
140-
var last = context.getLastToken(node)
137+
const first = context.getFirstToken(node)
138+
const second = context.getFirstToken(node, 1)
139+
const penultimate = context.getLastToken(node, 1)
140+
const last = context.getLastToken(node)
141141

142-
var openingBracketMustBeSpaced =
142+
const openingBracketMustBeSpaced =
143143
(options.objectsInArraysException && second.value === '{') ||
144144
(options.arraysInArraysException && second.value === '[') ||
145145
(options.singleElementException && node.elements.length === 1)
146146
? !options.spaced
147147
: options.spaced
148148

149-
var closingBracketMustBeSpaced =
149+
const closingBracketMustBeSpaced =
150150
(options.objectsInArraysException && penultimate.value === '}') ||
151151
(options.arraysInArraysException && penultimate.value === ']') ||
152152
(options.singleElementException && node.elements.length === 1)

‎rules/computed-property-even-spacing.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ module.exports = {
1717
},
1818

1919
create: function (context) {
20-
var propertyNameMustBeSpaced = context.options[0] === 'always' // default is "never"
21-
var propertyNameMustBeEven = context.options[0] === 'even' // default is "never"
20+
const propertyNameMustBeSpaced = context.options[0] === 'always' // default is "never"
21+
const propertyNameMustBeEven = context.options[0] === 'even' // default is "never"
2222

2323
// --------------------------------------------------------------------------
2424
// Helpers
@@ -100,13 +100,13 @@ module.exports = {
100100
return
101101
}
102102

103-
var property = node[propertyName]
103+
const property = node[propertyName]
104104

105-
var before = context.getTokenBefore(property)
106-
var first = context.getFirstToken(property)
107-
var last = context.getLastToken(property)
108-
var after = context.getTokenAfter(property)
109-
var startSpace, endSpace
105+
const before = context.getTokenBefore(property)
106+
const first = context.getFirstToken(property)
107+
const last = context.getLastToken(property)
108+
const after = context.getTokenAfter(property)
109+
let startSpace, endSpace
110110

111111
if (propertyNameMustBeEven) {
112112
if (!isSameLine(before, after)) {

‎rules/no-callback-literal.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* @returns {boolean} True if there is a chance it contains an Error obj
1616
*/
1717
function couldBeError (node) {
18+
let exprs
1819
switch (node.type) {
1920
case 'Identifier':
2021
case 'CallExpression':
@@ -28,7 +29,7 @@ function couldBeError (node) {
2829
return couldBeError(node.right)
2930

3031
case 'SequenceExpression':
31-
var exprs = node.expressions
32+
exprs = node.expressions
3233
return exprs.length !== 0 && couldBeError(exprs[exprs.length - 1])
3334

3435
case 'LogicalExpression':
@@ -54,7 +55,7 @@ module.exports = {
5455
},
5556

5657
create: function (context) {
57-
var callbackNames = context.options[0] || ['callback', 'cb']
58+
const callbackNames = context.options[0] || ['callback', 'cb']
5859

5960
function isCallback (name) {
6061
return callbackNames.indexOf(name) > -1
@@ -63,8 +64,8 @@ module.exports = {
6364
return {
6465

6566
CallExpression: function (node) {
66-
var errorArg = node.arguments[0]
67-
var calleeName = node.callee.name
67+
const errorArg = node.arguments[0]
68+
const calleeName = node.callee.name
6869

6970
if (errorArg && !couldBeError(errorArg) && isCallback(calleeName)) {
7071
context.report(node, 'Unexpected literal in error position of callback.')

‎rules/object-curly-even-spacing.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ module.exports = {
2020
},
2121

2222
create: function (context) {
23-
var spaced = context.options[0] === 'always'
24-
var either = context.options[0] === 'either'
23+
const spaced = context.options[0] === 'always'
24+
const either = context.options[0] === 'either'
2525

2626
/**
2727
* Determines whether an option is set, relative to the spacing option.
@@ -34,7 +34,7 @@ module.exports = {
3434
return context.options[1] != null ? context.options[1][option] === !spaced : false
3535
}
3636

37-
var options = {
37+
const options = {
3838
spaced,
3939
either,
4040
arraysInObjectsException: isOptionSet('arraysInObjects'),
@@ -118,8 +118,8 @@ module.exports = {
118118
* @returns {boolean}
119119
*/
120120
function isEvenlySpacedAndNotTooLong (node, start, end) {
121-
var expectedSpace = start[1].range[0] - start[0].range[1]
122-
var endSpace = end[1].range[0] - end[0].range[1]
121+
const expectedSpace = start[1].range[0] - start[0].range[1]
122+
const endSpace = end[1].range[0] - end[0].range[1]
123123
return endSpace === expectedSpace && endSpace <= 1
124124
}
125125

@@ -133,7 +133,7 @@ module.exports = {
133133
* @returns {void}
134134
*/
135135
function validateBraceSpacing (node, first, second, penultimate, last) {
136-
var closingCurlyBraceMustBeSpaced =
136+
const closingCurlyBraceMustBeSpaced =
137137
(options.arraysInObjectsException && penultimate.value === ']') ||
138138
(options.objectsInObjectsException && penultimate.value === '}')
139139
? !options.spaced
@@ -186,13 +186,13 @@ module.exports = {
186186
return
187187
}
188188

189-
var firstSpecifier = node.properties[0]
190-
var lastSpecifier = node.properties[node.properties.length - 1]
189+
const firstSpecifier = node.properties[0]
190+
const lastSpecifier = node.properties[node.properties.length - 1]
191191

192-
var first = context.getTokenBefore(firstSpecifier)
193-
var second = context.getFirstToken(firstSpecifier)
194-
var penultimate = context.getLastToken(lastSpecifier)
195-
var last = context.getTokenAfter(lastSpecifier)
192+
const first = context.getTokenBefore(firstSpecifier)
193+
const second = context.getFirstToken(firstSpecifier)
194+
let penultimate = context.getLastToken(lastSpecifier)
195+
let last = context.getTokenAfter(lastSpecifier)
196196

197197
// support trailing commas
198198
if (last.value === ',') {
@@ -205,15 +205,15 @@ module.exports = {
205205

206206
// import {y} from 'x'
207207
ImportDeclaration: function (node) {
208-
var firstSpecifier = node.specifiers[0]
209-
var lastSpecifier = node.specifiers[node.specifiers.length - 1]
208+
const firstSpecifier = node.specifiers[0]
209+
const lastSpecifier = node.specifiers[node.specifiers.length - 1]
210210

211211
// don't do anything for namespace or default imports
212212
if (firstSpecifier && lastSpecifier && firstSpecifier.type === 'ImportSpecifier' && lastSpecifier.type === 'ImportSpecifier') {
213-
var first = context.getTokenBefore(firstSpecifier)
214-
var second = context.getFirstToken(firstSpecifier)
215-
var penultimate = context.getLastToken(lastSpecifier)
216-
var last = context.getTokenAfter(lastSpecifier)
213+
const first = context.getTokenBefore(firstSpecifier)
214+
const second = context.getFirstToken(firstSpecifier)
215+
const penultimate = context.getLastToken(lastSpecifier)
216+
const last = context.getTokenAfter(lastSpecifier)
217217

218218
validateBraceSpacing(node, first, second, penultimate, last)
219219
}
@@ -225,12 +225,12 @@ module.exports = {
225225
return
226226
}
227227

228-
var firstSpecifier = node.specifiers[0]
229-
var lastSpecifier = node.specifiers[node.specifiers.length - 1]
230-
var first = context.getTokenBefore(firstSpecifier)
231-
var second = context.getFirstToken(firstSpecifier)
232-
var penultimate = context.getLastToken(lastSpecifier)
233-
var last = context.getTokenAfter(lastSpecifier)
228+
const firstSpecifier = node.specifiers[0]
229+
const lastSpecifier = node.specifiers[node.specifiers.length - 1]
230+
const first = context.getTokenBefore(firstSpecifier)
231+
const second = context.getFirstToken(firstSpecifier)
232+
const penultimate = context.getLastToken(lastSpecifier)
233+
const last = context.getTokenAfter(lastSpecifier)
234234

235235
validateBraceSpacing(node, first, second, penultimate, last)
236236
},
@@ -241,10 +241,10 @@ module.exports = {
241241
return
242242
}
243243

244-
var first = context.getFirstToken(node)
245-
var second = context.getFirstToken(node, 1)
246-
var penultimate = context.getLastToken(node, 1)
247-
var last = context.getLastToken(node)
244+
const first = context.getFirstToken(node)
245+
const second = context.getFirstToken(node, 1)
246+
const penultimate = context.getLastToken(node, 1)
247+
const last = context.getLastToken(node)
248248

249249
validateBraceSpacing(node, first, second, penultimate, last)
250250
}

‎tests/array-bracket-even-spacing.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
// Requirements
1010
// ------------------------------------------------------------------------------
1111

12-
var RuleTester = require('eslint').RuleTester
13-
var rule = require('../rules/array-bracket-even-spacing')
14-
var parserOptions = { ecmaVersion: 2018, sourceType: 'module' }
12+
const RuleTester = require('eslint').RuleTester
13+
const rule = require('../rules/array-bracket-even-spacing')
14+
const parserOptions = { ecmaVersion: 2018, sourceType: 'module' }
1515

1616
// ------------------------------------------------------------------------------
1717
// Tests
1818
// ------------------------------------------------------------------------------
1919

20-
var ruleTester = new RuleTester()
20+
const ruleTester = new RuleTester()
2121
ruleTester.run('array-bracket-even-spacing', rule, {
2222
valid: [
2323

‎tests/computed-property-even-spacing.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
// Requirements
1010
// ------------------------------------------------------------------------------
1111

12-
var RuleTester = require('eslint').RuleTester
13-
var rule = require('../rules/computed-property-even-spacing')
12+
const RuleTester = require('eslint').RuleTester
13+
const rule = require('../rules/computed-property-even-spacing')
1414

15-
var parserOptions = { ecmaVersion: 2018, sourceType: 'module' }
15+
const parserOptions = { ecmaVersion: 2018, sourceType: 'module' }
1616

1717
// ------------------------------------------------------------------------------
1818
// Tests
1919
// ------------------------------------------------------------------------------
2020

21-
var ruleTester = new RuleTester()
21+
const ruleTester = new RuleTester()
2222
ruleTester.run('computed-property-even-spacing', rule, {
2323
valid: [
2424

‎tests/no-callback-literal.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
// Requirements
1010
// ------------------------------------------------------------------------------
1111

12-
var RuleTester = require('eslint').RuleTester
13-
var rule = require('../rules/no-callback-literal')
12+
const RuleTester = require('eslint').RuleTester
13+
const rule = require('../rules/no-callback-literal')
1414

1515
// ------------------------------------------------------------------------------
1616
// Tests
1717
// ------------------------------------------------------------------------------
1818

19-
var ruleTester = new RuleTester()
19+
const ruleTester = new RuleTester()
2020
ruleTester.run('no-callback-literal', rule, {
2121
valid: [
2222

‎tests/object-curly-even-spacing.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
// Requirements
1111
// ------------------------------------------------------------------------------
1212

13-
var RuleTester = require('eslint').RuleTester
14-
var rule = require('../rules/object-curly-even-spacing')
15-
var parserOptions = { ecmaVersion: 2018, sourceType: 'module' }
13+
const RuleTester = require('eslint').RuleTester
14+
const rule = require('../rules/object-curly-even-spacing')
15+
const parserOptions = { ecmaVersion: 2018, sourceType: 'module' }
1616

1717
// ------------------------------------------------------------------------------
1818
// Tests
1919
// ------------------------------------------------------------------------------
2020

21-
var ruleTester = new RuleTester()
21+
const ruleTester = new RuleTester()
2222
ruleTester.run('object-curly-even-spacing', rule, {
2323
valid: [
2424

0 commit comments

Comments
 (0)