Merge branch 'master' into locales

mint-lang · Jul 18, 2023 · 673b361 · 673b361
2 parents 6e51ae0 + b8576d2
commit 673b361
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-crystal 1.8.2
+crystal 1.9.1
 mint 0.18.0
diff --git a/shard.lock b/shard.lock
@@ -6,7 +6,7 @@ shards:
 
   ameba:
     git: https://github.com/crystal-ameba/ameba.git
-    version: 1.4.3
+    version: 1.4.3+git.commit.8c9d234d0b06d945d0cf841dfa0596734acc715c
 
   backtracer:
     git: https://github.com/sija/backtracer.cr.git
@@ -22,7 +22,7 @@ shards:
 
   exception_page:
     git: https://github.com/crystal-loot/exception_page.git
-    version: 0.3.0
+    version: 0.3.1
 
   kemal:
     git: https://github.com/kemalcr/kemal.git

diff --git a/shard.yml b/shard.yml
@@ -24,7 +24,7 @@ dependencies:
 development_dependencies:
   ameba:
     github: crystal-ameba/ameba
-    version: ~> 1.4.3
+    branch: master
 
 targets:
   mint:

diff --git a/src/lsp/protocol/request_message.cr b/src/lsp/protocol/request_message.cr
@@ -5,6 +5,9 @@ module LSP
   abstract class RequestMessage
     include JSON::Serializable
 
+    # WHY IS THIS NEEDED FOR 1.9.1 and not for 1.8??????
+    property snippet_support : Bool?
+
     # The request id.
     property id : Int32 | String
 

diff --git a/src/type_checkers/case.cr b/src/type_checkers/case.cr
@@ -102,7 +102,7 @@ module Mint
             if destructurings.empty?
               true
             else
-              (1..destructurings.map(&.items.size).max).to_a.all? do |length|
+              (1..destructurings.max_of(&.items.size)).to_a.all? do |length|
                 destructurings.any?(&.covers?(length))
               end
             end

diff --git a/src/utils/terminal_snippet.cr b/src/utils/terminal_snippet.cr
@@ -76,7 +76,7 @@ module Mint
         lines[start_line, end_line - start_line]
 
       min_width = {
-        relevant_lines.map(&.size).max + gutter_width + 5,
+        relevant_lines.max_of(&.size) + gutter_width + 5,
         width,
       }.max