@@ -173,11 +173,7 @@ def all_in_scope_params
173173 param = ext . params . find { |p | p . name == param_name }
174174 raise "There is no param '#{ param_name } ' in extension '#{ ext_name } " if param . nil?
175175
176- next unless ext . versions . any? do |ext_ver |
177- ver_req = ext_data [ "version" ] || ">= #{ ext . min_version . version_spec } "
178- ExtensionRequirement . new ( ext_name , ver_req , arch : @arch ) . satisfied_by? ( ext_ver ) &&
179- param . defined_in_extension_version? ( ext_ver )
180- end
176+ next unless param . when . could_be_satisfied_by_ext_reqs? ( in_scope_ext_reqs )
181177
182178 @all_in_scope_params << InScopeParameter . new ( param , param_data [ "schema" ] , param_data [ "note" ] )
183179 end
@@ -208,9 +204,7 @@ def in_scope_params(ext_req)
208204 param = ext . params . find { |p | p . name == param_name }
209205 raise "There is no param '#{ param_name } ' in extension '#{ ext_req . name } " if param . nil?
210206
211- next unless ext . versions . any? do |ext_ver |
212- ext_req . satisfied_by? ( ext_ver ) && param . defined_in_extension_version? ( ext_ver )
213- end
207+ next unless param . when . could_be_satisfied_by_ext_reqs? ( in_scope_ext_reqs )
214208
215209 params << InScopeParameter . new ( param , param_data [ "schema" ] , param_data [ "note" ] )
216210 end
@@ -229,11 +223,6 @@ def all_out_of_scope_params
229223 ext . params . each do |param |
230224 next if all_in_scope_params . any? { |c | c . param . name == param . name }
231225
232- next unless ext . versions . any? do |ext_ver |
233- ext_req . satisfied_by? ( ext_ver ) &&
234- param . defined_in_extension_version? ( ext_ver )
235- end
236-
237226 @all_out_of_scope_params << param
238227 end
239228 end
0 commit comments