Skip to content

Commit 5b9284f

Browse files
committed
fix(eslint): correctly port getScope, getAncestors, markVariableAsUsed
close #51
1 parent 0831e43 commit 5b9284f

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

packages/eslint/index.ts

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export { create as createDisableNextLinePlugin } from './lib/plugins/disableNext
77
export { create as createShowDocsActionPlugin } from './lib/plugins/showDocsAction.js';
88

99
const estrees = new WeakMap<ts.SourceFile, {
10-
estree: any;
11-
sourceCode: any;
10+
estree: ESLint.AST.Program;
11+
sourceCode: ESLint.SourceCode;
1212
eventQueue: any[];
1313
}>();
1414
const noop = () => { };
@@ -302,6 +302,8 @@ export function convertRule(
302302
}
303303
}
304304

305+
let currentNode: any;
306+
305307
const cwd = languageServiceHost.getCurrentDirectory();
306308
const ruleListeners = eslintRule.create({
307309
cwd,
@@ -397,17 +399,17 @@ export function convertRule(
397399
}
398400
}
399401
},
400-
getAncestors(...args) {
401-
return sourceCode.getAncestors(...args);
402+
getAncestors() {
403+
return sourceCode.getAncestors(currentNode);
402404
},
403-
getDeclaredVariables(...args) {
404-
return sourceCode.getDeclaredVariables(...args);
405+
getDeclaredVariables(node) {
406+
return sourceCode.getDeclaredVariables(node);
405407
},
406-
getScope(...args) {
407-
return sourceCode.getScope(...args);
408+
getScope() {
409+
return sourceCode.getScope(currentNode);
408410
},
409-
markVariableAsUsed(...args) {
410-
return sourceCode.markVariableAsUsed(...args);
411+
markVariableAsUsed(name) {
412+
return sourceCode.markVariableAsUsed(name, currentNode);
411413
},
412414
...context,
413415
});
@@ -423,6 +425,7 @@ export function convertRule(
423425
case 1: {
424426
try {
425427
if (step.phase === 1) {
428+
currentNode = step.target;
426429
eventGenerator.enterNode(step.target);
427430
} else {
428431
eventGenerator.leaveNode(step.target);

0 commit comments

Comments
 (0)