Skip to content

Commit aaef9d7

Browse files
authored
Merge pull request #58 from julia-vscode/revert-something
Revert "fix: make derived_testenv more robust"
2 parents a69f1b5 + e08885b commit aaef9d7

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

src/layer_testitems.jl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,11 @@ Salsa.@derived function derived_testenv(rt, uri)
129129
project_uri = nothing
130130
end
131131

132-
derivedproj = derived_project(rt, project_uri)
133-
134-
env_content_hash = isnothing(project_uri) || isnothing(derivedproj) ? hash(nothing) : derivedproj.content_hash
132+
env_content_hash = isnothing(project_uri) ? hash(nothing) : derived_project(rt, project_uri).content_hash
135133
if package_uri===nothing
136134
env_content_hash = hash(nothing, env_content_hash)
137135
else
138-
derivedpkg = derived_package(rt, package_uri)
139-
if isnothing(derivedpkg)
140-
env_content_hash = hash(nothing, env_content_hash)
141-
else
142-
env_content_hash = hash(derivedpkg.content_hash)
143-
end
136+
env_content_hash = hash(derived_package(rt, package_uri).content_hash)
144137
end
145138

146139
# We construct a string for the env content hash here so that later when we

0 commit comments

Comments
 (0)