Skip to content

Commit

Permalink
fix type error from merge
Browse files Browse the repository at this point in the history
  • Loading branch information
DetachHead committed Aug 28, 2024
1 parent b8bd221 commit c09200f
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions packages/pyright-internal/src/analyzer/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -684,22 +684,20 @@ export class AnalyzerService {
// Ensure that if no command line or config options were applied, we have some defaults.
errors.push(...this._ensureDefaultOptions(host, configOptions, projectRoot, executionRoot, commandLineOptions));

if (errors.length > 0) {
this._reportConfigParseError(errors);
}

// Once we have defaults, we can then setup the execution environments. Execution enviroments
// inherit from the defaults.
if (configs) {
for (const config of configs) {
configOptions.setupExecutionEnvironments(
config.configFileJsonObj,
config.configFileDirUri,
this.serviceProvider.console()
errors.push(
...configOptions.setupExecutionEnvironments(config.configFileJsonObj, config.configFileDirUri)
);
}
}

if (errors.length > 0) {
this._reportConfigParseError(errors);
}

return configOptions;
}

Expand Down

0 comments on commit c09200f

Please sign in to comment.