Skip to content
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

Add source information as path of the information #2466

Merged
merged 16 commits into from
Dec 11, 2024
Merged

Add source information as path of the information #2466

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
516fac5
Add source information as path of the information
psibi Nov 16, 2024
1676f0b
Remove duplicate test
psibi Nov 17, 2024
3593976
Use canonicalize to resolve macos failures
psibi Nov 18, 2024
6fc9e54
Fix remaining failing tests
psibi Nov 18, 2024
493e935
Merge branch 'master' into source-path
psibi Nov 30, 2024
5aefabd
Fix tests
psibi Dec 1, 2024
a660717
cargo fmt
psibi Dec 1, 2024
7c2e85a
Update
psibi Dec 1, 2024
9fe7237
Fix tests in Windows
psibi Dec 1, 2024
2b08b04
Remove log statemets
psibi Dec 1, 2024
457af31
Merge branch 'master' into source-path
casey Dec 10, 2024
6fbec2d
new_justfile_path → justfile_path_with_filename
casey Dec 10, 2024
6d7a8b2
Write recursive fix_source function
casey Dec 11, 2024
e21a230
Remove Clone
casey Dec 11, 2024
93c9718
Remove lexiclean
casey Dec 11, 2024
8ef0823
Simplify module_file and module_directory
casey Dec 11, 2024
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
3 changes: 2 additions & 1 deletion src/analyzer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
unstable_features.insert(UnstableFeature::ScriptInterpreterSetting);
}

let source = root.canonicalize().unwrap();
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Canonicalize produces weird paths. On Unix, it resolves symlinks, which is often not what you want, and on Windows it produces paths prefixed with \\?\ which is not very nice.

Canonicalize is also a system call, which means it can fail with an I/O error, so we can't unwrap here.

If we need to clean the path, we should use .lexiclean() instead of canonicalize, which cannot fail and doesn't produce weird paths.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have pushed a fix, but the tests in MacOS fails because I think of symbolic link. Do you know how to handle it ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I have pushed a fix where I have to use canonicalize only for the tests to make it pass. Let me know what you think.

let root = paths.get(root).unwrap();

Ok(Justfile {
Expand All @@ -205,7 +206,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
name,
recipes,
settings,
source: root.into(),
source,
unexports: self.unexports,
unstable_features,
warnings: self.warnings,
Expand Down
1 change: 0 additions & 1 deletion src/justfile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ pub(crate) struct Justfile<'src> {
pub(crate) name: Option<Name<'src>>,
pub(crate) recipes: Table<'src, Rc<Recipe<'src>>>,
pub(crate) settings: Settings<'src>,
#[serde(skip)]
pub(crate) source: PathBuf,
pub(crate) unexports: HashSet<String>,
#[serde(skip)]
Expand Down
Loading