orthoses 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4d2682b08812b2f8fa633aa299702d38fd509439e4e2ac0b8751a64358b32a
-  data.tar.gz: 28118eed7d772c490670f83277ccdabc4d2938ca329f5051f8aebd40be1f08a6
+  metadata.gz: 7a6942bb06928e29ae619e8dfd3f92ac603bda3d0feda99dafd309c4eb493327
+  data.tar.gz: 6affe9ebc4d0b1a3ec31c9192e271ee6a2b35765ad6c753c58fc2310fb6155ae
 SHA512:
-  metadata.gz: 1f4262320cb3d9ef5304cbdb53af7cb0e0895bac03e7d98697cf38fc73dabc25b579c6fd4a213ae5c0d97d1763f88dabde2f7f1e6455a084c424ef6b042a3acb
-  data.tar.gz: 35e2b8378b602ad6b853ba7f543d807aab514d0f2a7d8b931230912084d40c7222e45d09cfe4b3eddd614f62bcce578cac2b6e14dac08f5578089ecbb7d7895c
+  metadata.gz: 7e5f33fe35dc796660ea45096401a2157ec32ac19ead7af5ead38d4ab96fb40e28a4c266726bf4c0d6769cd8cfa0d6064501c18e99bbcceb1bdb2b929f610eb1
+  data.tar.gz: 8adf74dc954206d5e517cf6d0151cf50500375c9363ede9305c90a0989724f61d956b07daf6a17ebe8f1018912245474e10fa944ba4ecbbda4c927a6253eb0ff

data/lib/orthoses/content/environment.rb

@@ -33,10 +33,14 @@ module Orthoses
       end
 
       def <<(decl)
-        @load_env << decl
-        @known_env << decl
-      rescue RBS::DuplicatedDeclarationError => err
-        Orthoses.logger.warn(err.inspect)
+        begin
+          @load_env << decl
+          @known_env << decl
+        rescue RBS::DuplicatedDeclarationError => err
+          Orthoses.logger.warn(err.inspect)
+        end
+
+        self
       end
 
       def write_to(store:)
@@ -58,9 +62,13 @@ module Orthoses
           content = Content.new(name: name)
           content.comment = m_entry.primary.decl.comment&.string&.gsub(/^/, "# ")
           content.header = header_builder.build(entry: m_entry, name_hint: name)
-          decls_to_lines(m_entry.decls.map(&:decl)).each do |line|
+          decls = m_entry.decls.map(&:decl)
+          decls_to_lines(decls).each do |line|
             content << line
           end
+          detect_mixin_and_build_content(decls).each do |mixin_content|
+            yield mixin_content
+          end
           yield content
         end
 
@@ -92,6 +100,14 @@ module Orthoses
         end
       end
 
+      def detect_mixin_and_build_content(decls)
+        decls.flat_map do |decl|
+          decl.members.grep(RBS::AST::Members::Mixin).map do |decl|
+            Content.new(name: decl.name.relative!.to_s)
+          end
+        end
+      end
+
       def decls_to_lines(decls)
         out = StringIO.new
         writer = RBS::Writer.new(out: out)

data/lib/orthoses/content.rb

@@ -115,16 +115,16 @@ module Orthoses
     def build_super_class(val)
       return nil unless val.superclass && val.superclass != Object
 
+      super_module_name = Utils.module_name(val.superclass)
+      return nil unless super_module_name
+
       begin
         # check private const
-        eval(val.superclass.to_s)
+        eval("::#{val.superclass.to_s}")
       rescue NameError
         return nil
       end
 
-      super_module_name = Utils.module_name(val.superclass)
-      return nil unless super_module_name
-
       # https://github.com/ruby/rbs/pull/977
       return nil unless super_module_name != "Random::Base"
 
@@ -144,6 +144,7 @@ module Orthoses
         @outs
       end
     end
+    private_constant :ArrayIO
 
     def decl_to_lines(decl)
       out = ArrayIO.new
@@ -162,11 +163,23 @@ module Orthoses
     end
 
     def uniqed_body_decl
-      buffer = RBS::Buffer.new(
-        name: "orthoses/content.rb",
-        content: original_rbs
-      )
-      _, _, parsed_decls = RBS::Parser.parse_signature(buffer)
+      parsed_decls = begin
+        parse(original_rbs)
+      rescue RBS::ParsingError => e
+        begin
+          # retry with escape
+          Orthoses.logger.debug "Try to parse original rbs but ParsingError"
+          Orthoses.logger.debug e.message
+          Orthoses.logger.debug "```rbs\n#{original_rbs}```"
+          parse(escaped_rbs)
+        rescue RBS::ParsingError
+          # giveup
+          Orthoses.logger.error "Try to parse escaped rbs"
+          Orthoses.logger.error "```rbs\n#{escaped_rbs}```"
+          raise
+        end
+      end
+
       unless parsed_decls.length == 1
         raise "expect decls.length == 1, but got #{parsed_decls.length}"
       end
@@ -174,9 +187,20 @@ module Orthoses
       parsed_decl.tap do |decl|
         DuplicationChecker.new(decl).update_decl
       end
-    rescue RBS::ParsingError
-      Orthoses.logger.error "```rbs\n#{original_rbs}```"
-      raise
+    end
+
+    def escaped_rbs
+      rbs = original_rbs
+      rbs.gsub!(/def\s*(self\??\.)?(.+?):/) { "def #{$1}`#{$2}`:" }
+      rbs.gsub!(/alias\s*(self\.)?(.+?)\s+(self\.)?(.+)$/) { "alias #{$1}`#{$2}` #{$3}`#{$4}`" }
+      rbs.gsub!(/attr_(reader|writer|accessor)\s*(self\.)?(.+)\s*:\s*(.+)$/) { "attr_#{$1} #{$2}`#{$3}`: #{$4}" }
+      rbs
+    end
+
+    def parse(rbs)
+      rbs.then { |wraped| RBS::Buffer.new(name: "orthoses/content.rb", content: rbs) }
+        .then { |buffer| RBS::Parser.parse_signature(buffer) }
+        .then { |_, _, decls| decls }
     end
 
     def temporary_type_params(name)

data/lib/orthoses/lazy_trace_point.rb

@@ -32,7 +32,8 @@ module Orthoses
     end
     ::Module.prepend MethodAddedHook
 
-    module SignletonMethodAddedHook
+    class ::BasicObject
+      undef singleton_method_added
       def singleton_method_added(id)
         begin
           if h = SINGLETON_METHOD_ADDED_HOOKS[id]
@@ -42,10 +43,8 @@ module Orthoses
           end
         rescue TypeError => e
         end
-        super
       end
     end
-    ::BasicObject.prepend SignletonMethodAddedHook
 
     def enable(target: nil, &block)
       return super unless target.kind_of?(String)

data/lib/orthoses/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orthoses
-  VERSION = "1.9.0"
+  VERSION = "1.11.0"
 end

data/sig/orthoses/content/environment.rbs

@@ -10,13 +10,14 @@ class Orthoses::Content::Environment
   @attribute_filter: attribute_filter?
   def self.load_from_paths: (untyped paths) -> untyped
   def initialize: (?method_definition_filter: method_definition_filter?, ?alias_filter: alias_filter?, ?constant_filter: constant_filter?, ?mixin_filter: mixin_filter?, ?attribute_filter: attribute_filter?) -> void
-  def <<: (RBS::AST::Declarations::t decl) -> RBS::Environment
+  def <<: (RBS::AST::Declarations::t decl) -> self
   def write_to: (store: Orthoses::store) -> void
   def each: () { (Orthoses::Content) -> void } -> void
   # Avoid `RBS::GenericParameterMismatchError` from like rbs_prototype_rb
   #     class Array # <= RBS::GenericParameterMismatchError
   #     end
   private def avoid_generic_parameter_mismatch_error: () -> untyped
+  private def detect_mixin_and_build_content: (untyped decls) -> untyped
   private def decls_to_lines: (untyped decls) -> untyped
   type method_definition_filter = ^(RBS::AST::Members::MethodDefinition) -> boolish
   type alias_filter = ^(RBS::AST::Members::Alias) -> boolish

data/sig/orthoses/content.rbs

@@ -21,6 +21,8 @@ class Orthoses::Content
   private def decl_to_lines: (untyped decl) -> untyped
   private def uniqed_body_string: () -> String
   private def uniqed_body_decl: () -> RBS::AST::Declarations::t
+  private def escaped_rbs: () -> untyped
+  private def parse: (untyped rbs) -> untyped
   private def temporary_type_params: (untyped name) -> untyped
   private def type_params: (untyped name) -> untyped
   attr_reader name: String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -101,7 +101,6 @@ files:
 - sig/orthoses/filter.rbs
 - sig/orthoses/lazy_trace_point.rbs
 - sig/orthoses/lazy_trace_point/method_added_hook.rbs
-- sig/orthoses/lazy_trace_point/signleton_method_added_hook.rbs
 - sig/orthoses/load_rbs.rbs
 - sig/orthoses/missing_name.rbs
 - sig/orthoses/missing_name/missing_class.rbs

data/sig/orthoses/lazy_trace_point/signleton_method_added_hook.rbs

@@ -1,5 +0,0 @@
-# THIS IS GENERATED CODE from `$ rake sig`
-
-module Orthoses::LazyTracePoint::SignletonMethodAddedHook
-  def singleton_method_added: (untyped id) -> untyped
-end