Skip to content

Commit

Permalink
Fix nilable error
Browse files Browse the repository at this point in the history
  • Loading branch information
JamieMagee committed Jun 19, 2024
1 parent 43549c0 commit f7720b7
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions bundler/lib/dependabot/bundler/file_fetcher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,20 @@ def uniq_files(fetched_files)
def gemfile
return @gemfile if defined?(@gemfile)

@gemfile = T.let(fetch_file_if_present("gems.rb") || fetch_file_if_present("Gemfile"), T.nilable(Dependabot::DependencyFile))
@gemfile = T.let(
fetch_file_if_present("gems.rb") || fetch_file_if_present("Gemfile"),
T.nilable(Dependabot::DependencyFile)
)
end

sig { returns(T.nilable(DependencyFile)) }
def lockfile
return @lockfile if defined?(@lockfile)

@lockfile = T.let(fetch_file_if_present("gems.locked") || fetch_file_if_present("Gemfile.lock"), T.nilable(Dependabot::DependencyFile))
@lockfile = T.let(
fetch_file_if_present("gems.locked") || fetch_file_if_present("Gemfile.lock"),
T.nilable(Dependabot::DependencyFile)
)
end

sig { returns(T::Array[Dependabot::DependencyFile]) }
Expand All @@ -90,7 +96,10 @@ def gemspecs
.map { |f| File.join(d, f.name) }
end

@gemspecs = T.let(gemspecs_paths.map { |n| fetch_file_from_host(n) }, T.nilable(T::Array[Dependabot::DependencyFile]))
@gemspecs ||= T.let(
gemspecs_paths.map { |n| fetch_file_from_host(n) },
T.nilable(T::Array[Dependabot::DependencyFile])
)
rescue Octokit::NotFound
[]
end
Expand Down Expand Up @@ -221,7 +230,10 @@ def sanitized_lockfile_content
lockfile&.content&.gsub(regex, "")
end

sig { params(file: DependencyFile, previously_fetched_files: T::Array[DependencyFile]).returns(T::Array[DependencyFile]) }
sig do
params(file: DependencyFile,
previously_fetched_files: T::Array[DependencyFile]).returns(T::Array[DependencyFile])
end
def fetch_child_gemfiles(file:, previously_fetched_files:)
paths = ChildGemfileFinder.new(gemfile: file).child_gemfile_paths

Expand Down

0 comments on commit f7720b7

Please sign in to comment.