typeprof 0.30.0 → 0.31.0

data/lib/typeprof/core/type.rb

@@ -11,6 +11,24 @@ module TypeProf::Core
       s.start_with?("(") && s.end_with?(")") ? s[1..-2] || raise : s
     end
 
+    def self.strip_array(s)
+      s.start_with?("Array[") && s.end_with?("]") ? s[6..-2] || raise : s
+    end
+
+    def self.extract_hash_value_type(s)
+      if s.start_with?("Hash[") && s.end_with?("]")
+        type = RBS::Parser.parse_type(s)
+
+        if type.is_a?(RBS::Types::Union)
+          type.types.map {|t| t.args[1].to_s }.join(" | ")
+        else
+          type.args[1].to_s
+        end
+      else
+        s
+      end
+    end
+
     def self.default_param_map(genv, ty)
       ty = ty.base_type(genv)
       instance_ty = ty.is_a?(Type::Instance) ? ty : Type::Instance.new(genv, ty.mod, []) # TODO: type params
@@ -36,29 +54,6 @@ module TypeProf::Core
         self
       end
 
-      def check_match(genv, changes, vtx)
-        vtx.each_type do |other_ty|
-          case other_ty
-          when Singleton
-            other_mod = other_ty.mod
-            if other_mod.module?
-              # TODO: implement
-            else
-              mod = @mod
-              while mod
-                return true if mod == other_mod
-                changes.add_depended_superclass(mod)
-                mod = mod.superclass
-              end
-            end
-          when Instance
-            base_ty = @mod.module? ? genv.mod_type : genv.cls_type
-            return true if base_ty.check_match(genv, changes, Source.new(other_ty))
-          end
-        end
-        return false
-      end
-
       def show
         "singleton(#{ @mod.show_cpath })"
       end
@@ -84,60 +79,6 @@ module TypeProf::Core
         self
       end
 
-      def check_match(genv, changes, vtx)
-        vtx.each_type do |other_ty|
-          case other_ty
-          when Instance
-            ty = self
-            while ty
-              if ty.mod == other_ty.mod
-                args_all_match = true
-                ty.args.zip(other_ty.args) do |arg, other_arg|
-                  unless arg.check_match(genv, changes, other_arg)
-                    args_all_match = false
-                    break
-                  end
-                end
-                return true if args_all_match
-              end
-              changes.add_depended_superclass(ty.mod)
-
-              if other_ty.mod.module?
-                return true if check_match_included_modules(genv, changes, ty, other_ty)
-              end
-
-              ty = genv.get_superclass_type(ty, changes, {})
-            end
-          end
-        end
-        return false
-      end
-
-      def check_match_included_modules(genv, changes, ty, other_ty)
-        ty.mod.included_modules.each do |inc_decl, inc_mod|
-          if inc_decl.is_a?(AST::SigIncludeNode) && inc_mod.type_params
-            inc_ty = genv.get_instance_type(inc_mod, inc_decl.args, changes, {}, ty)
-          else
-            type_params = inc_mod.type_params.map {|ty_param| Source.new() } # TODO: better support
-            inc_ty = Type::Instance.new(genv, inc_mod, type_params)
-          end
-          if inc_ty.mod == other_ty.mod
-            args_all_match = true
-            inc_ty.args.zip(other_ty.args) do |arg, other_arg|
-              if other_arg && !arg.check_match(genv, changes, other_arg)
-                args_all_match = false
-                break
-              end
-            end
-            return true if args_all_match
-          end
-          changes.add_depended_superclass(inc_ty.mod)
-
-          return true if check_match_included_modules(genv, changes, inc_ty, other_ty)
-        end
-        return false
-      end
-
       def show
         case @mod.cpath
         when [:NilClass] then "nil"
@@ -200,24 +141,6 @@ module TypeProf::Core
         @base_type
       end
 
-      def check_match(genv, changes, vtx)
-        vtx.each_type do |other_ty|
-          if other_ty.is_a?(Array)
-            if @elems.size == other_ty.elems.size
-              match = true
-              @elems.zip(other_ty.elems) do |elem, other_elem|
-                unless elem.check_match(genv, changes, other_elem)
-                  match = false
-                  break
-                end
-              end
-              return true if match
-            end
-          end
-        end
-        @base_type.check_match(genv, changes, vtx)
-      end
-
       def show
         if @elems
           "[#{ @elems.map {|e| Type.strip_parens(e.show) }.join(", ") }]"
@@ -247,11 +170,6 @@ module TypeProf::Core
         @base_type
       end
 
-      def check_match(genv, changes, vtx)
-        # TODO: implement
-        @base_type.check_match(genv, changes, vtx)
-      end
-
       def show
         @base_type.show
       end
@@ -268,10 +186,6 @@ module TypeProf::Core
         genv.proc_type
       end
 
-      def check_match(genv, changes, vtx)
-        genv.proc_type.check_match(genv, changes, vtx)
-      end
-
       def show
         "<Proc>"
       end
@@ -289,18 +203,6 @@ module TypeProf::Core
         genv.symbol_type
       end
 
-      def check_match(genv, changes, vtx)
-        vtx.each_type do |other_ty|
-          case other_ty
-          when Symbol
-            return true if @sym == other_ty.sym
-          when Instance
-            return true if genv.symbol_type.check_match(genv, changes, Source.new(other_ty))
-          end
-        end
-        return false
-      end
-
       def show
         @sym.inspect
       end
@@ -314,10 +216,6 @@ module TypeProf::Core
         genv.obj_type
       end
 
-      def check_match(genv, changes, vtx)
-        return true
-      end
-
       def show
         "bot"
       end
@@ -336,12 +234,43 @@ module TypeProf::Core
         genv.obj_type # Is this ok?
       end
 
-      def check_match(genv, changes, vtx)
-        true # should implement a better support...
+      def show
+        "var[#{ @name }]"
+      end
+    end
+
+    class Record < Type
+      #: (GlobalEnv, ::Hash[Symbol, Vertex], Instance) -> void
+      def initialize(genv, fields, base_type)
+        @fields = fields
+        @base_type = base_type
+        raise unless base_type.is_a?(Instance)
+      end
+
+      attr_reader :fields
+
+      def get_value(key = nil)
+        if key
+          # Return specific field value if it exists
+          @fields[key]
+        elsif @fields.empty?
+          # Empty record has no values
+          nil
+        else
+          # Return union of all field values if no specific key
+          @base_type.args[1]
+        end
+      end
+
+      def base_type(genv)
+        @base_type
       end
 
       def show
-        "var[#{ @name }]"
+        field_strs = @fields.map do |key, val_vtx|
+          "#{ key }: #{ Type.strip_parens(val_vtx.show) }"
+        end
+        "{ #{ field_strs.join(", ") } }"
       end
     end
   end

data/lib/typeprof/core.rb

@@ -23,7 +23,7 @@ require_relative "core/env/type_alias_entity"
 require_relative "core/env/value_entity"
 require_relative "core/env/method"
 require_relative "core/env/static_read"
-require_relative "core/graph"
+require_relative "core/env/narrowing"
 require_relative "core/graph/change_set"
 require_relative "core/graph/vertex"
 require_relative "core/graph/filter"

data/lib/typeprof/diagnostic.rb

@@ -1,18 +1,17 @@
 module TypeProf
   class Diagnostic
-    def initialize(node, meth, msg)
+    def initialize(node, meth, msg, tags: nil)
       @node = node
       @meth = meth
       @msg = msg
-      @severity = :error # TODO: keyword argument
-      @tags = nil # TODO: keyword argument
+      @tags = tags
     end
 
     def reuse(new_node)
       @node = new_node
     end
 
-    attr_reader :msg, :severity
+    attr_reader :node, :msg, :tags
 
     def code_range
       @node.send(@meth)
@@ -21,13 +20,13 @@ module TypeProf
     SEVERITY = { error: 1, warning: 2, info: 3, hint: 4 }
     TAG = { unnecessary: 1, deprecated: 2 }
 
-    def to_lsp
+    def to_lsp(severity: :error)
       json = {
         range: code_range.to_lsp,
         source: "TypeProf",
         message: @msg,
       }
-      json[:severity] = SEVERITY[@severity] if @severity
+      json[:severity] = SEVERITY[severity]
       json[:tags] = @tags.map {|tag| TAG[tag] } if @tags
       json
     end

data/lib/typeprof/lsp/messages.rb

@@ -1,5 +1,6 @@
 module TypeProf::LSP
   class Message
+    #: (Server, untyped) -> void
     def initialize(server, json)
       @server = server
       @id = json[:id]
@@ -28,21 +29,6 @@ module TypeProf::LSP
       @server.send_notification(method, **params)
     end
 
-    def publish_diagnostics(uri)
-      text = @server.open_texts[uri]
-      diags = []
-      if text
-        @server.core.diagnostics(text.path) do |diag|
-          diags << diag.to_lsp
-        end
-      end
-      notify(
-        "textDocument/publishDiagnostics",
-        uri: uri,
-        diagnostics: diags
-      )
-    end
-
     Classes = []
     def self.inherited(klass)
       Classes << klass
@@ -72,7 +58,7 @@ module TypeProf::LSP
     def run
       folders = @params[:workspaceFolders].map do |folder|
         folder => { uri:, }
-        TypeProf::LSP.file_uri_to_path(uri)
+        @server.uri_to_path(uri)
       end
 
       @server.add_workspaces(folders)
@@ -105,7 +91,6 @@ module TypeProf::LSP
               "typeprof.disableSignature",
             ],
           },
-          #typeDefinitionProvider: true,
           referencesProvider: true,
         },
         serverInfo: {
@@ -146,14 +131,15 @@ module TypeProf::LSP
     def run
       @params => { textDocument: { uri:, version:, text: } }
 
-      path = TypeProf::LSP.file_uri_to_path(uri)
+      path = @server.uri_to_path(uri)
       return unless @server.target_path?(path)
 
       text = Text.new(path, text, version)
       @server.open_texts[uri] = text
-      @server.core.update_rb_file(text.path, text.string)
+      @server.update_file(text.path, text.string)
+      notify("typeprof.enableToggleButton")
       @server.send_request("workspace/codeLens/refresh")
-      publish_diagnostics(uri)
+      @server.publish_updated_diagnostics
     end
   end
 
@@ -161,12 +147,14 @@ module TypeProf::LSP
     METHOD = "textDocument/didChange" # notification
     def run
       @params => { textDocument: { uri:, version: }, contentChanges: changes }
+
       text = @server.open_texts[uri]
       return unless text
+
       text.apply_changes(changes, version)
-      @server.core.update_rb_file(text.path, text.string)
+      @server.update_file(text.path, text.string)
       @server.send_request("workspace/codeLens/refresh")
-      publish_diagnostics(uri)
+      @server.publish_updated_diagnostics
     end
   end
 
@@ -178,9 +166,11 @@ module TypeProf::LSP
     METHOD = "textDocument/didClose" # notification
     def run
       @params => { textDocument: { uri: } }
+
       text = @server.open_texts.delete(uri)
       return unless text
-      @server.core.update_rb_file(text.path, nil)
+
+      @server.update_file(text.path, nil)
     end
   end
 
@@ -193,18 +183,19 @@ module TypeProf::LSP
         textDocument: { uri: },
         position: pos,
       }
+
       text = @server.open_texts[uri]
       unless text
         respond(nil)
         return
       end
-      defs = @server.core.definitions(text.path, TypeProf::CodePosition.from_lsp(pos))
+      defs = @server.definitions(text.path, TypeProf::CodePosition.from_lsp(pos))
       if defs.empty?
         respond(nil)
       else
         respond(defs.map do |path, code_range|
           {
-            uri: "file://" + path,
+            uri: @server.path_to_uri(path),
             range: code_range.to_lsp,
           }
         end)
@@ -224,13 +215,13 @@ module TypeProf::LSP
         respond(nil)
         return
       end
-      defs = @server.core.type_definitions(text.path, TypeProf::CodePosition.from_lsp(pos))
+      defs = @server.type_definitions(text.path, TypeProf::CodePosition.from_lsp(pos))
       if defs.empty?
         respond(nil)
       else
         respond(defs.map do |path, code_range|
           {
-            uri: "file://" + path,
+            uri: @server.path_to_uri(path),
             range: code_range.to_lsp,
           }
         end)
@@ -250,11 +241,11 @@ module TypeProf::LSP
         respond(nil)
         return
       end
-      callsites = @server.core.references(text.path, TypeProf::CodePosition.from_lsp(pos))
+      callsites = @server.references(text.path, TypeProf::CodePosition.from_lsp(pos))
       if callsites
         respond(callsites.map do |path, code_range|
           {
-            uri: "file://" + path,
+            uri: @server.path_to_uri(path),
             range: code_range.to_lsp,
           }
         end)
@@ -276,7 +267,7 @@ module TypeProf::LSP
         respond(nil)
         return
       end
-      str = @server.core.hover(text.path, TypeProf::CodePosition.from_lsp(pos))
+      str = @server.hover(text.path, TypeProf::CodePosition.from_lsp(pos))
       if str
         respond(contents: { language: "ruby", value: str })
       else
@@ -295,7 +286,7 @@ module TypeProf::LSP
         return
       end
       ret = []
-      @server.core.code_lens(text.path) do |code_range, title|
+      @server.code_lens(text.path) do |code_range, title|
         pos = code_range.first
         ret << {
           range: TypeProf::CodeRange.new(pos, pos.right).to_lsp,
@@ -332,9 +323,9 @@ module TypeProf::LSP
       items = []
       sort = "aaaa"
       text.modify_for_completion(text, pos) do |string, trigger, pos|
-        @server.core.update_rb_file(text.path, string)
+        @server.update_file(text.path, string)
         pos = TypeProf::CodePosition.from_lsp(pos)
-        @server.core.completion(text.path, trigger, pos) do |mid, hint|
+        @server.completion(text.path, trigger, pos) do |mid, hint|
           items << {
             label: mid,
             kind: 2, # Method
@@ -348,7 +339,7 @@ module TypeProf::LSP
         isIncomplete: false,
         items: items,
       )
-      @server.core.update_rb_file(text.path, text.string)
+      @server.update_file(text.path, text.string)
     end
   end
 
@@ -369,11 +360,11 @@ module TypeProf::LSP
         respond(nil)
         return
       end
-      renames = @server.core.rename(text.path, TypeProf::CodePosition.from_lsp(pos))
+      renames = @server.rename(text.path, TypeProf::CodePosition.from_lsp(pos))
       if renames
         changes = {}
         renames.each do |path, cr|
-          (changes["file://" + path] ||= []) << {
+          (changes[@server.path_to_uri(path)] ||= []) << {
             range: cr.to_lsp,
             newText: newName,
           }