Merge pull request #759 from abhiroopdutta/abhiroopdutta/issue754

Fix incorrect folding for `else`

Author: andyw8

lib/ruby_lsp/requests/folding_ranges.rb

@@ -27,7 +27,6 @@ class FoldingRanges < BaseRequest
           SyntaxTree::For,
           SyntaxTree::HashLiteral,
           SyntaxTree::Heredoc,
-          SyntaxTree::IfNode,
           SyntaxTree::ModuleDeclaration,
           SyntaxTree::SClass,
           SyntaxTree::UnlessNode,
@@ -42,6 +41,7 @@ class FoldingRanges < BaseRequest
 
       NODES_WITH_STATEMENTS = T.let(
         [
+          SyntaxTree::IfNode,
           SyntaxTree::Elsif,
           SyntaxTree::In,
           SyntaxTree::Rescue,
@@ -52,6 +52,7 @@ class FoldingRanges < BaseRequest
 
       StatementNode = T.type_alias do
         T.any(
+          SyntaxTree::IfNode,
           SyntaxTree::Elsif,
           SyntaxTree::In,
           SyntaxTree::Rescue,

test/expectations/folding_ranges/call_chained.exp.json

@@ -7,7 +7,7 @@
     },
     {
       "startLine": 2,
-      "endLine": 5,
+      "endLine": 3,
       "kind": "region"
     },
     {

test/expectations/folding_ranges/if_elsif_else.exp.json

@@ -2,7 +2,7 @@
   "result": [
     {
       "startLine": 0,
-      "endLine": 5,
+      "endLine": 1,
       "kind": "region"
     },
     {

test/expectations/folding_ranges/if_elsif_else_empty.exp.json

@@ -1,9 +1,4 @@
 {
   "result": [
-    {
-      "startLine": 0,
-      "endLine": 2,
-      "kind": "region"
-    }
   ]
 }