feat(langserver): support for folding WHILE and TRY/EXCEPT/FINALLY st…

…atements
robotcodedev · Dec 8, 2024 · b3c1ce2 · b3c1ce2
1 parent d6b2ff4
commit b3c1ce2
Show file tree

Hide file tree

Showing 169 changed files with 2,800 additions and 5 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -167,6 +167,7 @@
 			"args": [
 				"--full-trace",
 				"--tb=native",
+				"--regtest2-reset",
 				//"--regtest-reset",
 				//"tests/robotcode/language_server/robotframework/parts/test_foldingrange.py"
 				//"tests/robotcode/language_server/robotframework/parts/test_references.py"
@@ -175,7 +176,8 @@
 				//"tests/robotcode/utils/test_dataclasses.py::test_really_complex_data"
 				//"tests/robotcode/language_server/robotframework/parts/test_foldingrange.py"
 				//"tests/robotcode/language_server/robotframework/parts/test_document_symbols.py",
-				"./tests/robotcode/language_server/robotframework/parts/test_semantic_tokens.py "
+				// "./tests/robotcode/language_server/robotframework/parts/test_semantic_tokens.py "
+				"tests/robotcode/language_server/robotframework/parts/test_foldingrange.py::test[False-foldingrange.robot-123-001-try end]"
 			],
 			"console": "integratedTerminal",
 			"justMyCode": false,

diff --git a/hatch.toml b/hatch.toml
@@ -37,7 +37,7 @@ pre-install-commands = ["install-packages"]
 cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=robotcode --cov=tests {args}"
 no-cov = "cov --no-cov {args}"
 test = "pytest {args}"
-test-reset = "test --regtest2-reset"
+test-reset = "pytest --regtest2-reset {args}"
 install-bundled-editable = "python ./scripts/install_bundled_editable.py"
 create-json-schema = "python ./scripts/create_robot_toml_json_schema.py"
 generate-rf-options = "python ./scripts/generate_rf_options.py"

diff --git a/package.json b/package.json
@@ -607,7 +607,7 @@
         },
         "extensions": [
           ".robotrepl",
-          ".robotsript"
+          ".robotscript"
         ],
         "configuration": "./language-configuration.json"
       },

diff --git a/packages/language_server/src/robotcode/language_server/robotframework/parts/folding_range.py b/packages/language_server/src/robotcode/language_server/robotframework/parts/folding_range.py
@@ -10,13 +10,17 @@
 from robotcode.core.lsp.types import FoldingRange
 from robotcode.core.text_document import TextDocument
 from robotcode.core.utils.logging import LoggingDescriptor
+from robotcode.robot.utils import get_robot_version
 from robotcode.robot.utils.visitor import Visitor
 
 from .protocol_part import RobotLanguageServerProtocolPart
 
 if TYPE_CHECKING:
     from ..protocol import RobotLanguageServerProtocol
 
+if get_robot_version() >= (5, 0):
+    from robot.parsing.model.blocks import Try, While
+
 
 class _Visitor(Visitor):
     def __init__(self, parent: RobotFoldingRangeProtocolPart) -> None:
@@ -117,6 +121,19 @@ def visit_If(self, node: If) -> None:  # noqa: N802
         if node.type == "IF":
             self.current_if.remove(node)
 
+    if get_robot_version() >= (5, 0):
+
+        def visit_While(self, node: While) -> None:  # noqa: N802
+            self.__append(node, kind="while")
+            self.generic_visit(node)
+
+        def visit_Try(self, node: Try) -> None:  # noqa: N802
+            self.__append(node, kind="try", end_node=node.body[-1] if node.body else None)
+            self.generic_visit(node)
+
+
+#
+
 
 class RobotFoldingRangeProtocolPart(RobotLanguageServerProtocolPart):
     _logger = LoggingDescriptor()

diff --git a/...est_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-082-001-while_start].out b/...est_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-082-001-while_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 82
+  name: while start
+result: []
diff --git a/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-086-001-while_end].out b/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-086-001-while_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 86
+  name: while end
+result: []
diff --git a/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-093-001-try_start].out b/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-093-001-try_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 93
+  name: try start
+result: []
diff --git a/...st_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-096-001-except_start].out b/...st_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-096-001-except_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 96
+  name: except start
+result: []
diff --git a/...regtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-099-001-try_end].out b/...regtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-099-001-try_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 99
+  name: try end
+result: []
diff --git a/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-102-001-try_start].out b/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-102-001-try_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 102
+  name: try start
+result: []
diff --git a/...t_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-105-001-finally_start].out b/...t_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-105-001-finally_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 105
+  name: finally start
+result: []
diff --git a/...regtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-108-001-try_end].out b/...regtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-108-001-try_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 108
+  name: try end
+result: []
diff --git a/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-111-001-try_start].out b/...gtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-111-001-try_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 111
+  name: try start
+result: []
diff --git a/...st_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-114-001-except_start].out b/...st_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-114-001-except_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 114
+  name: except start
+result: []
diff --git a/...st_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-117-001-except_start].out b/...st_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-117-001-except_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 117
+  name: except start
+result: []
diff --git a/...t_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-120-001-finally_start].out b/...t_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-120-001-finally_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 120
+  name: finally start
+result: []
diff --git a/...regtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-123-001-try_end].out b/...regtest_outputs/rf41/test_foldingrange.test[False-foldingrange.robot-123-001-try_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 123
+  name: try end
+result: []
diff --git a/...test_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-082-001-while_start].out b/...test_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-082-001-while_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 82
+  name: while start
+result: []
diff --git a/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-086-001-while_end].out b/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-086-001-while_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 86
+  name: while end
+result: []
diff --git a/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-093-001-try_start].out b/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-093-001-try_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 93
+  name: try start
+result: []
diff --git a/...est_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-096-001-except_start].out b/...est_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-096-001-except_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 96
+  name: except start
+result: []
diff --git a/..._regtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-099-001-try_end].out b/..._regtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-099-001-try_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 99
+  name: try end
+result: []
diff --git a/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-102-001-try_start].out b/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-102-001-try_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 102
+  name: try start
+result: []
diff --git a/...st_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-105-001-finally_start].out b/...st_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-105-001-finally_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 105
+  name: finally start
+result: []
diff --git a/..._regtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-108-001-try_end].out b/..._regtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-108-001-try_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 108
+  name: try end
+result: []
diff --git a/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-111-001-try_start].out b/...egtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-111-001-try_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 111
+  name: try start
+result: []
diff --git a/...est_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-114-001-except_start].out b/...est_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-114-001-except_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 114
+  name: except start
+result: []
diff --git a/...est_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-117-001-except_start].out b/...est_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-117-001-except_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 117
+  name: except start
+result: []
diff --git a/...st_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-120-001-finally_start].out b/...st_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-120-001-finally_start].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 120
+  name: finally start
+result: []
diff --git a/..._regtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-123-001-try_end].out b/..._regtest_outputs/rf41/test_foldingrange.test[True-foldingrange.robot-123-001-try_end].out
@@ -0,0 +1,5 @@
+data: !GeneratedTestData
+  character: 1
+  line: 123
+  name: try end
+result: []