Merge branch 'topic/foldingRange' into 'master'

Fix foldingRange request for 'loop' statements

See merge request eng/ide/ada_language_server!2082

Author: AnthonyLeonardoGracio

source/ada/lsp-ada_folding_range.adb

@@ -157,8 +157,7 @@ package body LSP.Ada_Folding_Range is
               Ada_Access_To_Subp_Def |
               Ada_Case_Stmt |
               Ada_If_Stmt |
-              Ada_For_Loop_Stmt |
-              Ada_While_Loop_Stmt |
+              Ada_Base_Loop_Stmt |
               Ada_Begin_Block |
               Ada_Decl_Block |
               Ada_Extended_Return_Stmt_Object_Decl |

testsuite/ada_lsp/als.1704.folding.loops/main.adb

@@ -0,0 +1,11 @@
+procedure Main is
+begin
+   for I in 1 .. 10 loop
+      while True loop
+         loop
+            exit when I > 5;
+            -- Inner loop body
+         end loop;
+      end loop;
+   end loop;
+end Main;

testsuite/ada_lsp/als.1704.folding.loops/p.gpr

@@ -0,0 +1,2 @@
+project p is
+end p;

testsuite/ada_lsp/als.1704.folding.loops/test.json

@@ -0,0 +1,151 @@
+[
+   {
+      "comment": [
+         "Test whether foldingRange works fine with all loop statements (while, for, loop)"
+      ]
+   },
+   {
+      "start": {
+         "cmd": ["${ALS}"]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "params": {
+               "processId": 18560,
+               "capabilities": {
+                  "textDocument": {
+                     "foldingRange": {
+                        "lineFoldingOnly": true
+                     }
+                  }
+               },
+               "rootUri": "$URI{.}"
+            },
+            "jsonrpc": "2.0",
+            "id": 1,
+            "method": "initialize"
+         },
+         "wait": []
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "method": "initialized"
+         },
+         "wait": []
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "params": {
+               "settings": {
+                  "ada": {
+                     "projectFile": "$URI{p.gpr}",
+                     "scenarioVariables": {},
+                     "adaFileDiagnostics": false,
+                     "defaultCharset": "ISO-8859-1"
+                  }
+               }
+            },
+            "jsonrpc": "2.0",
+            "method": "workspace/didChangeConfiguration"
+         },
+         "wait": []
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "params": {
+               "textDocument": {
+                  "text": "procedure Main is\nbegin\n   for I in 1 .. 10 loop\n      while True loop\n         loop\n            exit when I > 5;\n            -- Inner loop body\n         end loop;\n      end loop;\n   end loop;\nend Main;\n",
+                  "version": 0,
+                  "uri": "$URI{main.adb}",
+                  "languageId": "Ada"
+               }
+            },
+            "jsonrpc": "2.0",
+            "method": "textDocument/didOpen"
+         },
+         "wait": []
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "params": {
+               "settings": {
+                  "ada": {
+                     "foldComments": false
+                  }
+               }
+            },
+            "jsonrpc": "2.0",
+            "method": "workspace/didChangeConfiguration"
+         },
+         "wait": []
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "params": {
+               "textDocument": {
+                  "uri": "$URI{main.adb}"
+               }
+            },
+            "jsonrpc": "2.0",
+            "id": 3,
+            "method": "textDocument/foldingRange"
+         },
+         "wait": [
+            {
+               "id": 3,
+               "jsonrpc": "2.0",
+               "result": [
+                  {
+                     "endLine": 10,
+                     "kind": "region",
+                     "startLine": 0
+                  },
+                  {
+                     "endLine": 9,
+                     "kind": "region",
+                     "startLine": 2
+                  },
+                  {
+                     "endLine": 8,
+                     "kind": "region",
+                     "startLine": 3
+                  },
+                  {
+                     "endLine": 7,
+                     "kind": "region",
+                     "startLine": 4
+                  }
+               ]
+            }
+         ]
+      }
+   },
+   {
+      "send": {
+         "request": {
+            "jsonrpc": "2.0",
+            "id": 4,
+            "method": "shutdown"
+         },
+         "wait": []
+      }
+   },
+   {
+      "stop": {
+         "exit_code": 0
+      }
+   }
+]

testsuite/ada_lsp/als.1704.folding.loops/test.yaml

@@ -0,0 +1 @@
+title: 'als.1704.folding.loops'