Skip to content

Commit e38c721

Browse files
ota-meshimichalsnik
authored andcommitted
1 parent f7a4dc0 commit e38c721

File tree

3 files changed

+10
-35
lines changed

3 files changed

+10
-35
lines changed

lib/rules/attributes-order.js

+2-17
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,10 @@ function create (context) {
7777
const attributes = node.parent.attributes
7878
const shiftAttrs = attributes.slice(attributes.indexOf(previousNode), attributes.indexOf(node) + 1)
7979

80-
// If we can upgrade requirements to `eslint@>4.1.0`, this code can be replaced by:
81-
// return shiftAttrs.map((attr, i) => {
82-
// const text = attr === previousNode ? sourceCode.getText(node) : sourceCode.getText(shiftAttrs[i - 1])
83-
// return fixer.replaceText(attr, text)
84-
// })
85-
const replaceDataList = shiftAttrs.map((attr, i) => {
80+
return shiftAttrs.map((attr, i) => {
8681
const text = attr === previousNode ? sourceCode.getText(node) : sourceCode.getText(shiftAttrs[i - 1])
87-
return {
88-
range: attr.range,
89-
text
90-
}
82+
return fixer.replaceText(attr, text)
9183
})
92-
const replaceRange = [previousNode.range[0], node.range[1]]
93-
let text = sourceCode.text.slice(replaceRange[0], replaceRange[1])
94-
replaceDataList.reverse().forEach((data) => {
95-
const textRange = data.range.map(r => r - replaceRange[0])
96-
text = text.slice(0, textRange[0]) + data.text + text.slice(textRange[1], text.length)
97-
})
98-
return fixer.replaceTextRange(replaceRange, text)
9984
}
10085
})
10186
}

lib/rules/component-name-in-template-casing.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ module.exports = {
5151
const caseType = allowedCaseOptions.indexOf(caseOption) !== -1 ? caseOption : defaultCase
5252
const ignores = options.ignores || []
5353
const tokens = context.parserServices.getTemplateBodyTokenStore && context.parserServices.getTemplateBodyTokenStore()
54-
const sourceCode = context.getSourceCode()
5554

5655
let hasInvalidEOF = false
5756

@@ -92,13 +91,10 @@ module.exports = {
9291
return fixer.replaceText(open, `<${casingName}`)
9392
}
9493
const endTagOpen = tokens.getFirstToken(endTag)
95-
// If we can upgrade requirements to `eslint@>4.1.0`, this code can be replaced by:
96-
// return [
97-
// fixer.replaceText(open, `<${casingName}`),
98-
// fixer.replaceText(endTagOpen, `</${casingName}`)
99-
// ]
100-
const code = `<${casingName}${sourceCode.text.slice(open.range[1], endTagOpen.range[0])}</${casingName}`
101-
return fixer.replaceTextRange([open.range[0], endTagOpen.range[1]], code)
94+
return [
95+
fixer.replaceText(open, `<${casingName}`),
96+
fixer.replaceText(endTagOpen, `</${casingName}`)
97+
]
10298
}
10399
})
104100
}

lib/rules/no-shared-component-data.js

+4-10
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,10 @@ module.exports = {
6666
fix (fixer) {
6767
const tokens = getFirstAndLastTokens(p.value, sourceCode)
6868

69-
// If we can upgrade requirements to `eslint@>4.1.0`, this code can be replaced by:
70-
// return [
71-
// fixer.insertTextBefore(tokens.first, 'function() {\nreturn '),
72-
// fixer.insertTextAfter(tokens.last, ';\n}')
73-
// ]
74-
// See: https://eslint.org/blog/2017/06/eslint-v4.1.0-released#applying-multiple-autofixes-simultaneously
75-
const range = [tokens.first.range[0], tokens.last.range[1]]
76-
const valueText = sourceCode.text.slice(range[0], range[1])
77-
const replacement = `function() {\nreturn ${valueText};\n}`
78-
return fixer.replaceTextRange(range, replacement)
69+
return [
70+
fixer.insertTextBefore(tokens.first, 'function() {\nreturn '),
71+
fixer.insertTextAfter(tokens.last, ';\n}')
72+
]
7973
}
8074
})
8175
})

0 commit comments

Comments
 (0)