orthoses 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5d17d8e6292f29138e1cbfe8feaf07425c55bdc2db58e0110ab1587bef062a
-  data.tar.gz: 724784da1b64edba217ea75a344ba67f787a4be3f53949b2c94c5ab00b15846f
+  metadata.gz: b4cab7a047064bc63f7fdab6b3644e019dc397cb6bc17670b4acf0d18227b949
+  data.tar.gz: 7cdf8af9f9cea0302b88095be8bd8ce98ccdc64c72cad37634de54fb3591c86d
 SHA512:
-  metadata.gz: f27081184ca9da7caa25fcd25dbac29dfa2b7cd3ef32bf00f49cf7232fd182b7b7f3d13f4f88f254e0b98cf93d5fbfbb5f47a65cc4edbd1cf68822c43d143fb2
-  data.tar.gz: ca45ade090eb276344b7a30457d74a7467d48caeb94b875b86fbfe51777841bbc04fcb85ea4c4df9b7399b7d8d3ec7fe03f2f5fab08dda5f2908e383ebb0365f
+  metadata.gz: 4d58a223aa21d7dc8db739a329c9037f7158aa41ddb30c500e30636730d21fe2bfba4492d9ffea1eeebd990e593028b009df0a8f74a938c15b93ef8267090eb3
+  data.tar.gz: 253a53938a1b1e20217e45dea9cf102ec5dfd1bb60be6b79b034da451cdd6b5f976d3c5cf5adc360201f676664bface13f3f26a0ab8d2bc780bbc0e6e78e92e8

data/lib/orthoses/content.rb

@@ -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/rbs_prototype_runtime.rb

@@ -32,7 +32,7 @@ module Orthoses
         )
 
         patterns = @patterns || store.keys
-        env = RBS::Environment.new
+        env = Utils.rbs_environment
         merge = false
         owners_included = []
         RBS::Prototype::Runtime.new(

data/lib/orthoses/utils/type_list.rb

@@ -8,19 +8,15 @@ module Orthoses
       NIL_TYPE = ::RBS::Types::Bases::Nil.new(location: nil)
       TRUE_TYPE = ::RBS::Types::Literal.new(literal: true, location: nil)
       FALSE_TYPE = ::RBS::Types::Literal.new(literal: false, location: nil)
+      BOOL_TYPE = ::RBS::Types::Bases::Bool.new(location: nil)
 
       def initialize(types)
-        @types = types.map do |type|
-          case type
-          when String
-            ::RBS::Parser.parse_type(type)
-          else
-            type
-          end
-        end
+        @types = types
       end
 
       def inject
+        normalize
+
         uniqed = @types.uniq
 
         return UNTYPED if uniqed.find { |t| t == UNTYPED }
@@ -28,7 +24,7 @@ module Orthoses
         has_true = uniqed.delete(TRUE_TYPE)
         has_false = uniqed.delete(FALSE_TYPE)
         if has_true || has_false
-          uniqed << ::RBS::Types::Bases::Bool.new(location: nil)
+          uniqed << BOOL_TYPE
         end
 
         return UNTYPED if uniqed.empty?
@@ -68,6 +64,37 @@ module Orthoses
 
         injected
       end
+
+      private
+
+      def normalize
+        @types = @types.map do |type|
+          case type
+          when String
+            ::RBS::Parser.parse_type(type)
+          else
+            type
+          end
+        end
+
+        @types = @types.map do |rbs_type|
+          case rbs_type
+          when ::RBS::Types::ClassInstance
+            case rbs_type.name.to_s
+            when 'TrueClass', '::TrueClass', 'FalseClass', '::FalseClass'
+              BOOL_TYPE
+            when 'NilClass', '::NilClass'
+              NIL_TYPE
+            else
+              rbs_type
+            end
+          else
+            rbs_type
+          end
+        end
+
+        self
+      end
     end
   end
 end

data/lib/orthoses/version.rb

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

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

data/sig/orthoses/utils/type_list.rbs

@@ -5,6 +5,8 @@ class Orthoses::Utils::TypeList
   @types: untyped
   def initialize: (untyped types) -> void
   def inject: () -> untyped
+  private def normalize: () -> self
+  BOOL_TYPE: RBS::Types::Bases::Bool
   FALSE_TYPE: RBS::Types::Literal
   NIL_TYPE: RBS::Types::Bases::Nil
   TRUE_TYPE: RBS::Types::Literal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs