orthoses 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5d17d8e6292f29138e1cbfe8feaf07425c55bdc2db58e0110ab1587bef062a
-  data.tar.gz: 724784da1b64edba217ea75a344ba67f787a4be3f53949b2c94c5ab00b15846f
+  metadata.gz: 7a6942bb06928e29ae619e8dfd3f92ac603bda3d0feda99dafd309c4eb493327
+  data.tar.gz: 6affe9ebc4d0b1a3ec31c9192e271ee6a2b35765ad6c753c58fc2310fb6155ae
 SHA512:
-  metadata.gz: f27081184ca9da7caa25fcd25dbac29dfa2b7cd3ef32bf00f49cf7232fd182b7b7f3d13f4f88f254e0b98cf93d5fbfbb5f47a65cc4edbd1cf68822c43d143fb2
-  data.tar.gz: ca45ade090eb276344b7a30457d74a7467d48caeb94b875b86fbfe51777841bbc04fcb85ea4c4df9b7399b7d8d3ec7fe03f2f5fab08dda5f2908e383ebb0365f
+  metadata.gz: 7e5f33fe35dc796660ea45096401a2157ec32ac19ead7af5ead38d4ab96fb40e28a4c266726bf4c0d6769cd8cfa0d6064501c18e99bbcceb1bdb2b929f610eb1
+  data.tar.gz: 8adf74dc954206d5e517cf6d0151cf50500375c9363ede9305c90a0989724f61d956b07daf6a17ebe8f1018912245474e10fa944ba4ecbbda4c927a6253eb0ff

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orthoses
-  VERSION = "1.10.0"
+  VERSION = "1.11.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

metadata

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