Skip to content

Commit df1587c

Browse files
committed
Load RBS core types automatically
1 parent 7326f84 commit df1587c

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

lib/rdoc/generator/template/aliki/js/aliki.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ function wrapCodeBlocksWithCopyButton() {
436436
// - Modifying the formatter would require extending RDoc's core internals
437437

438438
// Find all pre elements that are not already wrapped
439-
const preElements = document.querySelectorAll('main pre:not(.code-block-wrapper pre)');
439+
const preElements = document.querySelectorAll('main pre:not(.code-block-wrapper pre):not(.method-type-signature)');
440440

441441
preElements.forEach((pre) => {
442442
// Skip if already wrapped

lib/rdoc/rbs_support.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def self.validate_type(sig)
3535
# Returns a Hash mapping "ClassName#method_name" => "type sig string".
3636

3737
def self.load_signatures(*dirs)
38-
loader = RBS::EnvironmentLoader.new(core_root: nil)
38+
loader = RBS::EnvironmentLoader.new
3939
dirs.each { |dir| loader.add(path: Pathname(dir)) }
4040

4141
env = RBS::Environment.new

lib/rdoc/rdoc.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,12 @@ def document(options)
493493

494494
@store.complete @options.visibility
495495

496-
# Load RBS signatures from sig/ directory
496+
# Load RBS type signatures from core types and sig/ directory
497+
sig_dirs = []
497498
sig_dir = File.join(@options.root.to_s, 'sig')
498-
if File.directory?(sig_dir)
499-
signatures = RDoc::RbsSupport.load_signatures(sig_dir)
500-
RDoc::RbsSupport.merge_into_store(@store, signatures) unless signatures.empty?
501-
end
499+
sig_dirs << sig_dir if File.directory?(sig_dir)
500+
signatures = RDoc::RbsSupport.load_signatures(*sig_dirs)
501+
RDoc::RbsSupport.merge_into_store(@store, signatures) unless signatures.empty?
502502

503503
@stats.coverage_level = @options.coverage_report
504504

0 commit comments

Comments
 (0)