Skip to content

Commit

Permalink
fix option merging
Browse files Browse the repository at this point in the history
  • Loading branch information
bradzacher committed Oct 6, 2022
1 parent 37d0961 commit a069dd8
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions packages/utils/src/eslint-utils/rule-tester/RuleTester.ts
Expand Up @@ -4,6 +4,7 @@ import * as path from 'path';
import * as semver from 'semver';

import * as TSESLint from '../../ts-eslint';
import { deepMerge } from '../deepMerge';
import type { DependencyConstraint } from './dependencyConstraints';
import { satisfiesAllDependencyConstraints } from './dependencyConstraints';

Expand Down Expand Up @@ -84,18 +85,19 @@ class RuleTester extends TSESLint.RuleTester {
});
}
private getFilename(testOptions?: TSESLint.ParserOptions): string {
const filename = `file.ts${testOptions?.ecmaFeatures?.jsx ? 'x' : ''}`;
if (testOptions?.project) {
const resolvedOptions = deepMerge(
this.#baseOptions.parserOptions,
testOptions,
) as TSESLint.ParserOptions;
const filename = `file.ts${resolvedOptions.ecmaFeatures?.jsx ? 'x' : ''}`;
if (resolvedOptions.project) {
return path.join(
testOptions.tsconfigRootDir != null
? testOptions.tsconfigRootDir
resolvedOptions.tsconfigRootDir != null
? resolvedOptions.tsconfigRootDir
: process.cwd(),
filename,
);
} else if (this.#baseOptions.parserOptions?.project) {
return this.getFilename(this.#baseOptions.parserOptions);
}

return filename;
}

Expand Down

0 comments on commit a069dd8

Please sign in to comment.