-
Notifications
You must be signed in to change notification settings - Fork 471
Reuse package resolution for ppx #7776
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
Open
nojaf
wants to merge
2
commits into
rescript-lang:master
Choose a base branch
from
nojaf:ppx-paul
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 | ||||
|---|---|---|---|---|---|---|
| @@ -1,10 +1,12 @@ | ||||||
| use crate::build::packages; | ||||||
| use crate::helpers; | ||||||
| use crate::helpers::deserialize::*; | ||||||
| use crate::project_context::ProjectContext; | ||||||
| use anyhow::{Result, bail}; | ||||||
| use convert_case::{Case, Casing}; | ||||||
| use serde::Deserialize; | ||||||
| use std::fs; | ||||||
| use std::path::{Path, PathBuf}; | ||||||
| use std::path::{MAIN_SEPARATOR, Path, PathBuf}; | ||||||
|
|
||||||
| #[derive(Deserialize, Debug, Clone)] | ||||||
| #[serde(untagged)] | ||||||
|
|
@@ -296,56 +298,61 @@ pub fn flatten_flags(flags: &Option<Vec<OneOrMore<String>>>) -> Vec<String> { | |||||
| /// Since ppx-flags could be one or more, and could potentially be nested, this function takes the | ||||||
| /// flags and flattens them. | ||||||
| pub fn flatten_ppx_flags( | ||||||
| node_modules_dir: &Path, | ||||||
| project_context: &ProjectContext, | ||||||
| package_config: &Config, | ||||||
| flags: &Option<Vec<OneOrMore<String>>>, | ||||||
| package_name: &String, | ||||||
| ) -> Vec<String> { | ||||||
| ) -> Result<Vec<String>> { | ||||||
| match flags { | ||||||
| None => vec![], | ||||||
| Some(flags) => flags | ||||||
| .iter() | ||||||
| .flat_map(|x| match x { | ||||||
| None => Ok(vec![]), | ||||||
| Some(flags) => flags.iter().try_fold(Vec::new(), |mut acc, x| { | ||||||
| match x { | ||||||
| OneOrMore::Single(y) => { | ||||||
| let first_character = y.chars().next(); | ||||||
| match first_character { | ||||||
| Some('.') => { | ||||||
| vec![ | ||||||
| "-ppx".to_string(), | ||||||
| node_modules_dir | ||||||
| .join(package_name) | ||||||
| .join(y) | ||||||
| .to_string_lossy() | ||||||
| .to_string(), | ||||||
| ] | ||||||
| let path = helpers::try_package_path( | ||||||
| package_config, | ||||||
| project_context, | ||||||
| format!("{}{}{}", &package_config.name, MAIN_SEPARATOR, y).as_str(), | ||||||
| ) | ||||||
| .map(|p| p.to_string_lossy().to_string())?; | ||||||
|
|
||||||
| acc.push(String::from("-ppx")); | ||||||
| acc.push(path); | ||||||
| } | ||||||
| _ => { | ||||||
| acc.push(String::from("-ppx")); | ||||||
| let path = helpers::try_package_path(package_config, project_context, y) | ||||||
| .map(|p| p.to_string_lossy().to_string())?; | ||||||
| acc.push(path); | ||||||
| } | ||||||
| _ => vec![ | ||||||
| "-ppx".to_string(), | ||||||
| node_modules_dir.join(y).to_string_lossy().to_string(), | ||||||
| ], | ||||||
| } | ||||||
| } | ||||||
| OneOrMore::Multiple(ys) if ys.is_empty() => vec![], | ||||||
| OneOrMore::Multiple(ys) if ys.is_empty() => (), | ||||||
| OneOrMore::Multiple(ys) => { | ||||||
| let first_character = ys[0].chars().next(); | ||||||
| let ppx = match first_character { | ||||||
| Some('.') => node_modules_dir | ||||||
| .join(package_name) | ||||||
| .join(&ys[0]) | ||||||
| .to_string_lossy() | ||||||
| .to_string(), | ||||||
| _ => node_modules_dir.join(&ys[0]).to_string_lossy().to_string(), | ||||||
| Some('.') => helpers::try_package_path( | ||||||
| package_config, | ||||||
| project_context, | ||||||
| format!("{}{}{}", package_config.name, MAIN_SEPARATOR, &ys[0]).as_str(), | ||||||
|
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. Similar to the previous occurrence, using Path::join() would be more idiomatic and handle cross-platform path separators automatically.
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
| ) | ||||||
| .map(|p| p.to_string_lossy().to_string())?, | ||||||
| _ => helpers::try_package_path(package_config, project_context, &ys[0]) | ||||||
| .map(|p| p.to_string_lossy().to_string())?, | ||||||
| }; | ||||||
| vec![ | ||||||
| "-ppx".to_string(), | ||||||
| acc.push(String::from("-ppx")); | ||||||
| acc.push( | ||||||
| vec![ppx] | ||||||
| .into_iter() | ||||||
| .chain(ys[1..].to_owned()) | ||||||
| .collect::<Vec<String>>() | ||||||
| .join(" "), | ||||||
| ] | ||||||
| ); | ||||||
| } | ||||||
| }) | ||||||
| .collect::<Vec<String>>(), | ||||||
| }; | ||||||
| Ok(acc) | ||||||
| }), | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
This file contains hidden or 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.
The string formatting with MAIN_SEPARATOR could be simplified using Path::join() which handles path separators correctly across platforms.
Copilot uses AI. Check for mistakes.
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.
I disagree with this really, making a Path and calling unwrap later seems worse.