-
Notifications
You must be signed in to change notification settings - Fork 228
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.
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
feat(psl-core): implement parse_configuration_multi_file
to correct prisma/prisma
's getConfig
implementation
#4825
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9990df9
feat(psl-core): implement "parse_configuration_multi_file" to correct…
jkomyno be6e628
Merge branch 'main' into feat/get-config-multi-file
jkomyno 8f902ae
Merge branch 'main' into feat/get-config-multi-file
jkomyno 2b4fa76
chore: fix clippy
jkomyno 48f2d45
Merge branch 'main' into feat/get-config-multi-file
jkomyno File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ pub use set_config_dir::set_config_dir; | |
|
||
use self::validate::{datasource_loader, generator_loader}; | ||
use diagnostics::Diagnostics; | ||
use parser_database::{ast, ParserDatabase, SourceFile}; | ||
use parser_database::{ast, Files, ParserDatabase, SourceFile}; | ||
|
||
/// The collection of all available connectors. | ||
pub type ConnectorRegistry<'a> = &'a [&'static dyn datamodel_connector::Connector]; | ||
|
@@ -54,18 +54,7 @@ impl ValidatedSchema { | |
} | ||
|
||
pub fn render_own_diagnostics(&self) -> String { | ||
self.render_diagnostics(&self.diagnostics) | ||
} | ||
|
||
pub fn render_diagnostics(&self, diagnostics: &Diagnostics) -> String { | ||
let mut out = Vec::new(); | ||
|
||
for error in diagnostics.errors() { | ||
let (file_name, source, _) = &self.db[error.span().file_id]; | ||
error.pretty_print(&mut out, file_name, source.as_str()).unwrap(); | ||
} | ||
|
||
String::from_utf8(out).unwrap() | ||
self.db.render_diagnostics(&self.diagnostics) | ||
} | ||
} | ||
|
||
|
@@ -149,6 +138,26 @@ pub fn parse_configuration( | |
diagnostics.to_result().map(|_| out) | ||
} | ||
|
||
pub fn parse_configuration_multi_file( | ||
files: Vec<(String, SourceFile)>, | ||
connectors: ConnectorRegistry<'_>, | ||
) -> Result<(Files, Configuration), (Files, diagnostics::Diagnostics)> { | ||
let mut diagnostics = Diagnostics::default(); | ||
let mut configuration = Configuration::default(); | ||
|
||
let asts = Files::new(files, &mut diagnostics); | ||
|
||
for (_, _, _, ast) in asts.iter() { | ||
let out = validate_configuration(ast, &mut diagnostics, connectors); | ||
configuration.extend(out); | ||
} | ||
Comment on lines
+148
to
+153
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I purposedly avoided creating a |
||
|
||
match diagnostics.to_result() { | ||
Ok(_) => Ok((asts, configuration)), | ||
Err(err) => Err((asts, err)), | ||
} | ||
} | ||
|
||
fn validate_configuration( | ||
schema_ast: &ast::SchemaAst, | ||
diagnostics: &mut Diagnostics, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not implement trait instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because of
which appears when trying to write e.g.
Also,
iter
andinto_iter
were previously defined like this by Tom, and I'd assume the reason he didn't implement the traits is the same one as mine. Do you have any explicit recommendation to work around this, or is it ok to leave the clippy warning suppressors as committed?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, i see. LGTM with no comments then