From b8576d214e436e5238e5064b36d6bc244090fc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szikszai=20Guszt=C3=A1v?= Date: Tue, 18 Jul 2023 17:05:58 +0200 Subject: [PATCH] Fixes for Crystal 1.9.1 --- .tool-versions | 2 +- shard.lock | 4 ++-- shard.yml | 2 +- src/lsp/protocol/request_message.cr | 3 +++ src/type_checkers/case.cr | 2 +- src/utils/terminal_snippet.cr | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.tool-versions b/.tool-versions index f2b9f0e40..47937bdba 100644 --- 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 index 2771dcba1..7e0566914 100644 --- 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 index 5a959de6b..85f60db55 100644 --- 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 index ec359c1ad..fd3b7b6fb 100644 --- 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 index 2eb458276..e137aff05 100644 --- 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 index fd7e9d6fb..9e5dd2e68 100644 --- 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