refactor(cli): move --(no)-diagnostic switch to the discover command

Author: d-biehl

packages/plugin/src/robotcode/plugin/__init__.py

@@ -59,11 +59,23 @@ class CommonConfig:
     launcher_script: Optional[str] = None
     output_format: Optional[OutputFormat] = None
     pager: Optional[bool] = None
+    log_enabled: bool = False
+    log_level: Optional[str] = None
+    log_calls: bool = False
 
 
 class Application:
     def __init__(self) -> None:
         self.config = CommonConfig()
+        self._show_diagnostics = True
+
+    @property
+    def show_diagnostics(self) -> bool:
+        return self._show_diagnostics
+
+    @show_diagnostics.setter
+    def show_diagnostics(self, value: bool) -> None:
+        self._show_diagnostics = value
 
     @property
     def colored(self) -> bool:

packages/runner/src/robotcode/runner/cli/discover/discover.py

@@ -338,14 +338,21 @@ def visit_test(self, test: TestCase) -> None:
 
 
 @click.group(invoke_without_command=False)
+@click.option(
+    "--diagnostics / --no-diagnostics",
+    "show_diagnostics",
+    default=True,
+    show_default=True,
+    help="Display `robot` parsing errors and warning that occur during discovering.",
+)
 @click.option(
     "--read-from-stdin",
     is_flag=True,
     help="Read file contents from stdin. This is an internal option.",
     hidden=show_hidden_arguments(),
 )
 @pass_application
-def discover(app: Application, read_from_stdin: bool) -> None:
+def discover(app: Application, show_diagnostics: bool, read_from_stdin: bool) -> None:
     """\
     Commands to discover informations about the current project.
 
@@ -356,6 +363,7 @@ def discover(app: Application, read_from_stdin: bool) -> None:
     robotcode --profile regression discover tests
     ```
     """
+    app.show_diagnostics = show_diagnostics or app.config.log_enabled
     if read_from_stdin:
         global _stdin_data
         _stdin_data = from_json(sys.stdin.buffer.read(), Dict[str, str], strict=True)
@@ -422,7 +430,6 @@ def add_diagnostic(
 
 def handle_options(
     app: Application,
-    diagnostics: bool,
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
     robot_options_and_args: Tuple[str, ...],
@@ -447,7 +454,7 @@ def handle_options(
 
         settings = RobotSettings(options)
 
-        if diagnostics:
+        if app.show_diagnostics:
             LOGGER.register_console_logger(**settings.console_output_config)
         else:
             LOGGER.unregister_console_logger()
@@ -505,17 +512,6 @@ def handle_options(
     raise UnknownError("Unexpected error happened.")
 
 
-DIAGOSTICS_OPTIONS = {
-    click.option(
-        "--diagnostics / --no-diagnostics",
-        "show_diagnostics",
-        default=True,
-        show_default=True,
-        help="Display `robot` parsing errors and warning that occur during discovering.",
-    )
-}
-
-
 @discover.command(
     context_settings={
         "allow_extra_args": True,
@@ -524,12 +520,10 @@ def handle_options(
     add_help_option=True,
     epilog='Use "-- --help" to see `robot` help.',
 )
-@add_options(*DIAGOSTICS_OPTIONS)
 @add_options(*ROBOT_OPTIONS)
 @pass_application
 def all(
     app: Application,
-    show_diagnostics: bool,
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
     robot_options_and_args: Tuple[str, ...],
@@ -549,9 +543,7 @@ def all(
     ```
     """
 
-    suite, collector, diagnostics = handle_options(
-        app, show_diagnostics, by_longname, exclude_by_longname, robot_options_and_args
-    )
+    suite, collector, diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
 
     if collector.all.children:
         if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:
@@ -614,12 +606,10 @@ def print(item: TestItem, indent: int = 0) -> Iterable[str]:
     show_default=True,
     help="Show full paths instead of releative.",
 )
-@add_options(*DIAGOSTICS_OPTIONS)
 @add_options(*ROBOT_OPTIONS)
 @pass_application
 def tests(
     app: Application,
-    show_diagnostics: bool,
     full_paths: bool,
     show_tags: bool,
     by_longname: Tuple[str, ...],
@@ -641,9 +631,7 @@ def tests(
     ```
     """
 
-    suite, collector, diagnostics = handle_options(
-        app, show_diagnostics, by_longname, exclude_by_longname, robot_options_and_args
-    )
+    suite, collector, diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
 
     if collector.all.children:
         if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:
@@ -674,12 +662,10 @@ def print(items: List[TestItem]) -> Iterable[str]:
     add_help_option=True,
     epilog='Use "-- --help" to see `robot` help.',
 )
-@add_options(*DIAGOSTICS_OPTIONS)
 @add_options(*ROBOT_OPTIONS)
 @pass_application
 def suites(
     app: Application,
-    show_diagnostics: bool,
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
     robot_options_and_args: Tuple[str, ...],
@@ -699,9 +685,7 @@ def suites(
     ```
     """
 
-    suite, collector, diagnostics = handle_options(
-        app, show_diagnostics, by_longname, exclude_by_longname, robot_options_and_args
-    )
+    suite, collector, diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
 
     if collector.all.children:
         if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:
@@ -751,12 +735,10 @@ class TagsResult:
     show_default=True,
     help="Show full paths instead of releative.",
 )
-@add_options(*DIAGOSTICS_OPTIONS)
 @add_options(*ROBOT_OPTIONS)
 @pass_application
 def tags(
     app: Application,
-    show_diagnostics: bool,
     normalized: bool,
     show_tests: bool,
     full_paths: bool,
@@ -780,9 +762,7 @@ def tags(
     ```
     """
 
-    _suite, collector, _diagnostics = handle_options(
-        app, show_diagnostics, by_longname, exclude_by_longname, robot_options_and_args
-    )
+    _suite, collector, _diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
 
     if collector.all.children:
         if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:

src/robotcode/cli/__init__.py

@@ -178,6 +178,9 @@ def robotcode(
     app.config.output_format = format
     app.config.launcher_script = launcher_script
     app.config.default_paths = default_path
+    app.config.log_enabled = log
+    app.config.log_level = log_level
+    app.config.log_calls = log_calls
 
     if log:
         if log_calls:

vscode-client/languageclientsmanger.ts

@@ -531,8 +531,8 @@ export class LanguageClientsManager {
             e.newState === State.Starting
               ? ClientState.Starting
               : e.newState === State.Stopped
-              ? ClientState.Stopped
-              : ClientState.Running,
+                ? ClientState.Stopped
+                : ClientState.Running,
         });
       });
 

vscode-client/testcontrollermanager.ts

@@ -622,7 +622,7 @@ export class TestControllerManager {
 
       const result = await this.discoverTests(
         folder,
-        ["discover", "--read-from-stdin", "all"],
+        ["discover", "--no-diagnostics", "--read-from-stdin", "all"],
         [],
         JSON.stringify(o),
         token,