Skip to content

Use espree when parsing expressions #62

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

Closed
wants to merge 1 commit into from
Closed

Use espree when parsing expressions #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/script/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,14 @@ function parseScriptFragment(
code: string,
locationCalculator: LocationCalculator,
parserOptions: any,
useSpecifiedParser?: boolean,
): ESLintExtendedProgram {
try {
const result = parseScript(code, parserOptions)
const result = parseScript(
code,
parserOptions,
Boolean(useSpecifiedParser),
)
postprocess(result, locationCalculator)
return result
} catch (err) {
Expand Down Expand Up @@ -563,9 +568,10 @@ export type ESLintCustomParserResult = ESLintProgram | ESLintExtendedProgram
export function parseScript(
code: string,
parserOptions: any,
useSpecifiedParser = true,
): ESLintExtendedProgram {
const parser: ESLintCustomParser =
typeof parserOptions.parser === "string"
typeof parserOptions.parser === "string" && useSpecifiedParser
? // eslint-disable-next-line @mysticatea/ts/no-require-imports
require(parserOptions.parser)
: // eslint-disable-next-line @mysticatea/ts/no-require-imports
Expand Down Expand Up @@ -603,7 +609,12 @@ export function parseScriptElement(
const locationCalculator = globalLocationCalculator.getSubCalculatorAfter(
offset,
)
const result = parseScriptFragment(code, locationCalculator, parserOptions)
const result = parseScriptFragment(
code,
locationCalculator,
parserOptions,
true,
)

// Needs the tokens of start/end tags for `lines-around-*` rules to work
// correctly.
Expand Down