Skip to content

Commit ce94759

Browse files
committed
Fix getFilename utility and import usage in version resolver
1 parent 4daabd7 commit ce94759

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

lib/util/eslint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function getSourceCode(context) {
55
}
66

77
function getFilename(context) {
8-
return context.getFilename ? context.getFilename : filename;
8+
return context.getFilename ? context.getFilename() : context.filename;
99
}
1010

1111
function getAncestors(context, node) {

lib/util/version.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const path = require('path');
1111
const resolve = require('resolve');
1212
const semver = require('semver');
1313
const error = require('./error');
14+
const eslintUtil = require('./eslint');
1415

1516
const ULTIMATE_LATEST_SEMVER = '999.999.999';
1617

@@ -28,7 +29,7 @@ function resetDetectedVersion() {
2829

2930
function resolveBasedir(contextOrFilename) {
3031
if (contextOrFilename) {
31-
const filename = typeof contextOrFilename === 'string' ? contextOrFilename : contextOrFilename.filename || contextOrFilename.getFilename();
32+
const filename = typeof contextOrFilename === 'string' ? contextOrFilename : eslintUtil.getFilename(contextOrFilename);
3233
const dirname = path.dirname(filename);
3334
try {
3435
if (fs.statSync(filename).isFile()) {

0 commit comments

Comments
 (0)