mt-lang 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180f49844f839480b6aed67ca33f5aef4532cb0a372dce913699b892fc85c4b1
-  data.tar.gz: f99ec00f1749c5142694ff93211a9745cc1cbd0c53e7a1b311125a53aafedfd0
+  metadata.gz: 61a19112e2810978ecf1ce56b1d1d1290a26bcb933b9e89857ffca77d1323392
+  data.tar.gz: f68d1016a49c1cf195b5d24c430e4bbccde2c1ad9c7b82523b9e51d9f899d2b6
 SHA512:
-  metadata.gz: 8874f3444b514ac33d33949a01d438a5de17139443e618ba2fc282a47fefc9138df686493eb368b116802750a03b844535f881a2ba48c3fae8fbcfbb4062b608
-  data.tar.gz: 0172adf373b345e1b3d40f79c4c0f3e05e2da088053af78b582f258cff87312dd2bac29ba2434bafab09630e13455c7f75ea32cb33a517694206e46a4f2ce95e
+  metadata.gz: d7ffd6ea3d812428f451bbf304662a36a05986eb7ff2ec9a207364be7f37f81d84379e40325a155fd9565885d648503c73ab34fb1e851adbb1d5e53b193d696c
+  data.tar.gz: caa0c4acb4264740d58d857214ff68c3b726bf9a08d5f894ddc25466066e898567fd45c3b1c0e0634902be9a993acec7f1006b146af811ec0b918c778f60b234

data/lib/milk_tea/base.rb

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

data/lib/milk_tea/core/parser/expressions.rb

@@ -25,11 +25,29 @@ module MilkTea
 
       def parse_if_expression
         condition = parse_or
-        consume(:colon, "expected ':' after condition in if expression")
-        then_expression = parse_expression
-        consume(:else, "expected 'else' in if expression")
-        consume(:colon, "expected ':' after 'else' in if expression")
-        else_expression = parse_expression
+
+        if inline_block_body?
+          consume(:colon, "expected ':' after condition in if expression")
+          then_expression = parse_expression
+          consume(:else, "expected 'else' in if expression")
+          consume(:colon, "expected ':' after 'else' in if expression")
+          else_expression = parse_expression
+        else
+          consume(:colon, "expected ':' after condition in if expression")
+          consume(:newline, "expected newline after 'if condition:' in if expression")
+          consume(:indent, "expected indented body in if expression")
+          then_expression = parse_expression
+          consume_end_of_statement unless block_expression?(then_expression)
+          consume(:dedent, "expected end of if expression body")
+          consume(:else, "expected 'else' in if expression")
+          consume(:colon, "expected ':' after 'else' in if expression")
+          consume(:newline, "expected newline after 'else:' in if expression")
+          consume(:indent, "expected indented else body in if expression")
+          else_expression = parse_expression
+          consume_end_of_statement unless block_expression?(else_expression)
+          consume(:dedent, "expected end of else expression body")
+        end
+
         AST::IfExpr.new(condition:, then_expression:, else_expression:)
       end
 

data/lib/milk_tea/core/parser.rb

@@ -253,7 +253,7 @@ module MilkTea
     end
 
     def block_expression?(expression)
-      expression.is_a?(AST::ProcExpr) || expression.is_a?(AST::MatchExpr)
+      expression.is_a?(AST::ProcExpr) || expression.is_a?(AST::MatchExpr) || expression.is_a?(AST::IfExpr)
     end
 
     def parse_qualified_name

data/lib/milk_tea/tooling/linter/visitors.rb

@@ -197,14 +197,20 @@ module MilkTea
           with_scope { visit_statement_list(statement.body) }
           @unsafe_depth -= 1
         when AST::ForStmt
+          @loop_depth ||= 0
+          @loop_depth += 1
           visit_expression(statement.iterable)
           with_scope do
             declare_local(statement.name, statement.line, column: statement.column, var: false) if statement.name
             visit_statement_list(statement.body)
           end
+          @loop_depth -= 1
         when AST::WhileStmt
+          @loop_depth ||= 0
+          @loop_depth += 1
           visit_expression(statement.condition)
           with_scope { visit_statement_list(statement.body) }
+          @loop_depth -= 1
         when AST::ReturnStmt
           visit_expression(statement.value) if statement.value
           flag_redundant_widening_cast(statement.value) if statement.value
@@ -776,6 +782,7 @@ module MilkTea
         return unless stmts.all? { |s| inline_simple_statement?(s) }
 
         return if visually_inline_if?(statement, stmts)
+        return if inline_if_too_wide?(statement, stmts)
 
         emit_conciseness_hint(
           "prefer-inline-if",
@@ -785,6 +792,51 @@ module MilkTea
         )
       end
 
+      def inline_if_too_wide?(statement, stmts)
+        return false if statement.branches.empty?
+
+        text = +""
+
+        statement.branches.each_with_index do |b, i|
+          cond_src = source_line_from(b.line, b.column)
+          return false unless cond_src
+
+          stmt_col = stmts[i].respond_to?(:column) ? stmts[i].column : nil
+          stmt_line = stmts[i].respond_to?(:line) ? stmts[i].line : nil
+          body_src = source_line_from(stmt_line, stmt_col)
+          return false unless body_src
+
+          text << cond_src
+          text << " "
+          text << body_src
+          text << " "
+        end
+
+        if statement.else_line
+          else_src = source_line_from(statement.else_line, statement.else_column)
+          return false unless else_src
+          text << else_src
+          text << " "
+        end
+
+        stmt_col = stmts.last.respond_to?(:column) ? stmts.last.column : nil
+        stmt_line = stmts.last.respond_to?(:line) ? stmts.last.line : nil
+        else_body = source_line_from(stmt_line, stmt_col)
+        return false unless else_body
+        text << else_body
+
+        text.strip.length > 120
+      end
+
+      def source_line_from(line, column)
+        return nil unless line
+        line_idx = Integer(line) - 1
+        return nil if line_idx < 0 || line_idx >= @source_lines.length
+        raw = @source_lines[line_idx].to_s
+        return raw.strip if column.nil?
+        raw[Integer(column) - 1..]&.strip
+      end
+
       def visually_inline_if?(statement, stmts)
         n = statement.branches.length
         statement.branches.each_with_index.all? { |b, i|
@@ -801,6 +853,7 @@ module MilkTea
         return unless statement.else_body
 
         stmts = (statement.branches.map(&:body) + [statement.else_body]).map { |b| single_statement_body(b) }
+        return if inline_if_too_wide?(statement, stmts)
         report_conditional_expression(stmts, line: statement.line, column: statement.branches.first&.column, kind: "if")
       end
 
@@ -814,6 +867,7 @@ module MilkTea
 
       def report_conditional_expression(stmts, line:, column:, kind:)
         return if stmts.empty? || stmts.any?(&:nil?)
+        return if @loop_depth && @loop_depth > 0
 
         if stmts.all? { |s| s.is_a?(AST::ReturnStmt) && s.value }
           emit_conciseness_hint(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mt-lang
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Long (Teefan) Tran
@@ -603,7 +603,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.3.8 installed!
+  Milk Tea 0.3.9 installed!
 
   System requirements:
     - A C compiler (gcc or clang) must be available on PATH