mt-lang 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63970cb18bb8d90aee1270f838e8a6520c0f4bce08871f36ffc53f9cbf11c8a0
-  data.tar.gz: f0faadd64e77babdde7b98fa2866681d7d8de8749dfb9d5e312a856be795b68d
+  metadata.gz: a2b1f14318677bf9232d4163ad6aac3905650056716de05bf89762f08e1aa7d5
+  data.tar.gz: af90e63fd1c9fd21f6af721c1c039b61159d931d20eaa3eaca3b41369da053c1
 SHA512:
-  metadata.gz: 03fb4af02f332e10f66abe76fd5e79a701f9a29ef91bfd0670e0988e0fd6e82e1424432f3d163b4d8f80330269c0484cc8f54cd20a521d1889e44fa9ecc138ed
-  data.tar.gz: a40c9ba93dfeb52a6752f33cba2365e4f941f1f7bee992ddb80eb6702f051b3830acbf79cce8c0c1bc6f3fe2a99d15d21ca827e1f3d9ef0e03c446dca8ead2d8
+  metadata.gz: cef8b0d7f55c4d9496f41d02b0ace0df87f233ff8c24892768543ff3518e68271a2e4613a7654cef661506d42835d1ea8baa9b3d84225614aae420c0d105a0a4
+  data.tar.gz: b55024abb91b7fdf2694b4be82bf972f1410aa01b949952d30fb49be517fddd501467ebc55fcf3a6dc1a1eb01334709aa74c26a231348026e3197cc5b163b74c

data/lib/milk_tea/base.rb

@@ -3,7 +3,7 @@
 require "pathname"
 
 module MilkTea
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 
   def self.root
     @root ||= Pathname.new(File.expand_path("../..", __dir__))

data/lib/milk_tea/core/semantic_analyzer/flow_refinement.rb

@@ -122,6 +122,15 @@ module MilkTea
         start_line = [binding.ast.respond_to?(:line) ? binding.ast.line : nil, snapshots.first.line].compact.min
         end_line = snapshots.last.line
 
+        # Generic function bodies are not analysed during structural checking,
+        # so the frame only has the initial snapshot at the declaration line.
+        # Extend end_line to cover the actual body so that completion and hover
+        # lookups for parameters resolve correctly inside the body.
+        if snapshots.length == 1 && binding.ast.respond_to?(:body) && binding.ast.body
+          body_end = last_ast_line(binding.ast.body)
+          end_line = body_end if body_end && body_end > end_line
+        end
+
         @local_completion_frames << LocalCompletionFrame.new(
           start_line:,
           end_line:,
@@ -350,6 +359,34 @@ module MilkTea
         end
       end
 
+      # Returns the highest line number across a list of AST statement nodes,
+      # recursing into nested bodies (if/else/match/while/for/defer/unsafe).
+      def last_ast_line(statements)
+        return nil if statements.nil? || statements.empty?
+
+        statements.filter_map do |stmt|
+          case stmt
+          when AST::IfStmt
+            branch_lines = stmt.branches.filter_map { |b| last_ast_line(b.body) }
+            else_lines = last_ast_line(stmt.else_body)
+            [stmt.line, *branch_lines, else_lines].compact.max
+          when AST::WhileStmt, AST::ForStmt, AST::UnsafeStmt, AST::ErrorBlockStmt
+            [stmt.respond_to?(:line) ? stmt.line : nil, last_ast_line(stmt.body)].compact.max
+          when AST::MatchStmt
+            arm_lines = stmt.arms.filter_map { |arm| last_ast_line(arm.body) }
+            [stmt.line, *arm_lines].compact.max
+          when AST::DeferStmt
+            [stmt.respond_to?(:line) ? stmt.line : nil, last_ast_line(stmt.body)].compact.max
+          when AST::WhenStmt
+            branch_lines = stmt.branches.filter_map { |b| last_ast_line(b.body) }
+            else_lines = last_ast_line(stmt.else_body)
+            [stmt.line, *branch_lines, else_lines].compact.max
+          else
+            stmt.respond_to?(:line) ? stmt.line : nil
+          end
+        end.compact.max
+      end
+
     end
   end
 end

data/lib/milk_tea/lsp/server/completion.rb

@@ -725,6 +725,18 @@ module MilkTea
         dispatch_receiver_type = method_dispatch_receiver_type_for_completion(receiver_type)
         receiver_candidates << dispatch_receiver_type if dispatch_receiver_type != receiver_type
 
+        # For GenericInstance or Nullable-wrapped GenericInstance, also try the
+        # struct definition from facts.types — method registration keys are
+        # always the GenericStructDefinition, not a GenericInstance.
+        [dispatch_receiver_type, receiver_type].each do |candidate|
+          base = candidate
+          base = base.base while base.is_a?(Types::Nullable)
+          next unless base.is_a?(Types::GenericInstance)
+
+          definition = facts.types[base.name]
+          receiver_candidates << definition if definition && !receiver_candidates.include?(definition)
+        end
+
         receiver_candidates.each do |candidate|
           facts.methods.fetch(candidate, {}).each do |name, binding|
             methods[name] ||= binding
@@ -745,10 +757,7 @@ module MilkTea
         return receiver_type.definition if receiver_type.is_a?(Types::StructInstance) || receiver_type.is_a?(Types::VariantInstance)
 
         if receiver_type.is_a?(Types::Nullable)
-          dispatch_base_type = method_dispatch_receiver_type_for_completion(receiver_type.base)
-          return receiver_type if dispatch_base_type == receiver_type.base
-
-          return Types::Registry.nullable(dispatch_base_type)
+          return method_dispatch_receiver_type_for_completion(receiver_type.base)
         end
 
         return receiver_type unless receiver_type.is_a?(Types::GenericInstance)
@@ -764,6 +773,7 @@ module MilkTea
       end
 
       def project_field_receiver_type_for_completion(type, facts = nil)
+        type = type.base while type.is_a?(Types::Nullable)
         type = project_receiver_type_for_completion(type)
         return type.definition if type.is_a?(Types::StructInstance) || type.is_a?(Types::VariantInstance)
         return field_type_from_struct_definition(type, facts) if facts

data/lib/milk_tea/lsp/server/signature_help.rb

@@ -100,7 +100,7 @@ module MilkTea
         extending = nil
         each_ast_node(ast) do |node|
           next unless node.is_a?(AST::ExtendingBlock)
-          if node.line && node.end_line && lsp_line + 1 >= node.line && lsp_line + 1 <= node.end_line
+          if node.line && lsp_line + 1 >= node.line && (!node.respond_to?(:end_line) || !node.end_line || lsp_line + 1 <= node.end_line)
             extending = node
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mt-lang
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Long (Teefan) Tran
@@ -583,7 +583,7 @@ metadata:
   homepage_uri: https://teefan.github.io/mt-lang/
   source_code_uri: https://github.com/teefan/mt-lang
 post_install_message: |
-  Milk Tea 0.2.16 installed!
+  Milk Tea 0.2.17 installed!
 
   System requirements:
     - A C compiler (gcc or clang) must be available on PATH