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.

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

Eliminate duplicate files in glob expansion #450

Merged
merged 2 commits into from
Mar 23, 2023
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/savi/compiler/source_service.cr
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class Savi::Compiler::SourceService
# We will yield it later when yielding all the other overrides.
if (dir_overrides = @source_overrides[File.dirname(name)]?) \
&& (override = dir_overrides[File.basename(name)]?)
yield ({name, override})
next
else
# Try to read the content from the file, or skip it if we fail for any
# reason, such as filesystem issues or deletion race conditions.
Expand Down Expand Up @@ -257,7 +257,7 @@ class Savi::Compiler::SourceService
}

try_dirname = File.expand_path("..", dirname)
break unless try_dirname.starts_with?(Dir.current)
break unless try_dirname.starts_with?(File.expand_path("..", Dir.current))
end

Error.at Source::Pos.none,
Expand Down