feat: add command line options

Author: tomoto

fortls/interface.py

@@ -280,6 +280,22 @@ def cli(name: str = "fortls") -> argparse.ArgumentParser:
         help="Enable experimental code actions (default: false)",
     )
 
+    # Folding Range options ----------------------------------------------------
+    group = parser.add_argument_group("FoldingRange options")
+    group.add_argument(
+        "--folding-range-mode",
+        choices=["indent", "syntax"],
+        default="indent",
+        help="How to detect folding ranges, by indent or syntax (default: indent)",
+    )
+    group.add_argument(
+        "--folding-range-comment-lines",
+        type=int,
+        default=3,
+        metavar="INTEGER",
+        help="Number of comment lines to consider for folding (default: 3)",
+    )
+
     # Debug
     # By default debug arguments are hidden
     _debug_commandline_args(parser)

fortls/langserver.py

@@ -1554,12 +1554,18 @@ def serve_folding_range(self, request: dict):
         if file_obj is None:
             return None
 
-        result = get_folding_ranges_by_block_comment(file_obj, min_block_size=3)
-        use_indent = True  # If False, use syntax
-        if use_indent:
+        result = []
+
+        result += get_folding_ranges_by_block_comment(
+            file_obj,
+            min_block_size=self.folding_range_comment_lines,
+        )
+
+        if self.folding_range_mode == "indent":
             result += get_folding_ranges_by_indent(file_obj)
-        else:
+        elif self.folding_range_mode == "syntax":
             result += get_folding_ranges_by_syntax(file_obj)
+        
         return result
 
     def _load_config_file(self) -> None:
@@ -1667,6 +1673,13 @@ def _load_config_file_general(self, config_dict: dict) -> None:
         self.enable_code_actions = config_dict.get(
             "enable_code_actions", self.enable_code_actions
         )
+        # Folding Range Options ------------------------------------------------
+        self.folding_range_mode = config_dict.get(
+            "folding_range_mode", self.folding_range_mode
+        )
+        self.folding_range_comment_lines = config_dict.get(
+            "folding_range_comment_lines", self.folding_range_comment_lines
+        )
 
     def _load_config_file_preproc(self, config_dict: dict) -> None:
         self.pp_suffixes = config_dict.get("pp_suffixes", None)

test/test_interface.py

@@ -83,6 +83,20 @@ def test_command_line_code_actions_options():
     assert args.enable_code_actions
 
 
+def test_command_line_folding_range_options():
+    args = parser.parse_args(
+        "--folding-range-mode syntax --folding-range-comment-lines 5".split()
+    )
+    assert args.folding_range_mode == "syntax"
+    assert args.folding_range_comment_lines == 5
+
+
+def test_command_line_folding_range_options_default():
+    args = parser.parse_args("".split())
+    assert args.folding_range_mode == "indent"
+    assert args.folding_range_comment_lines == 3
+
+
 def unittest_server_init(conn=None):
     from fortls.langserver import LangServer