Skip to content
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

Jump to bottom

refactor: remove eslint internal traverser #910

Merged
merged 4 commits into from Jun 24, 2019
Merged

refactor: remove eslint internal traverser #910

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f32655
fix `traverser.js` location for eslint@6
fisker Jun 22, 2019
2451c8e
chore: add comment
fisker Jun 22, 2019
2e5b90e
[WIP] switch to vue-eslint-parser `traverseNodes`
fisker Jun 23, 2019
f99dab4
fix: fix broken tests
fisker Jun 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 18 additions & 6 deletions lib/rules/order-in-components.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
'use strict'

const utils = require('../utils')
const Traverser = require('eslint/lib/util/traverser')
const traverseNodes = require('vue-eslint-parser').AST.traverseNodes

const defaultOrder = [
'el',
Expand Down Expand Up @@ -93,9 +93,14 @@ const LOGICAL_OPERATORS = ['&&', '||']
*/
function isNotSideEffectsNode (node, visitorKeys) {
let result = true
new Traverser().traverse(node, {
const noSideEffectsNodes = new Set()
traverseNodes(node, {
visitorKeys,
enter (node, parent) {
enterNode (node, parent) {
if (!result || noSideEffectsNodes.has(node)) {
return
}

if (
node.type === 'FunctionExpression' ||
node.type === 'Identifier' ||
Expand All @@ -105,7 +110,14 @@ function isNotSideEffectsNode (node, visitorKeys) {
node.type === 'TemplateElement'
) {
// no side effects node
this.skip()
noSideEffectsNodes.add(node)
traverseNodes(node, {
visitorKeys,
enterNode (node) {
noSideEffectsNodes.add(node)
},
leaveNode () {}
})
} else if (
node.type !== 'Property' &&
node.type !== 'ObjectExpression' &&
Expand All @@ -121,9 +133,9 @@ function isNotSideEffectsNode (node, visitorKeys) {
) {
// Can not be sure that a node has no side effects
result = false
this.break()
}
}
},
leaveNode () {}
})
return result
}
Expand Down