Skip to content

Commit ac1daa1

Browse files
committed
feat(robotcode): use default configuration if no project root or project configuration is found
1 parent 5fb0d61 commit ac1daa1

File tree

8 files changed

+9
-23
lines changed

8 files changed

+9
-23
lines changed

packages/language_server/src/robotcode/language_server/cli.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ def language_server(
7171

7272
profile: Optional[RobotBaseProfile] = None
7373

74-
config_files, root_folder, _ = get_config_files(
75-
paths, app.config.config_files, raise_on_error=False, verbose_callback=app.verbose
76-
)
74+
config_files, root_folder, _ = get_config_files(paths, app.config.config_files, verbose_callback=app.verbose)
7775
if root_folder:
7876
os.chdir(root_folder)
7977

packages/robot/src/robotcode/robot/config/utils.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,14 @@ def get_config_files(
3232
paths: Optional[Sequence[Union[str, Path]]] = None,
3333
config_files: Optional[Sequence[Path]] = None,
3434
*,
35-
raise_on_error: bool = True,
3635
verbose_callback: Optional[Callable[[str], None]] = None,
3736
) -> Tuple[Sequence[Tuple[Path, ConfigType]], Optional[Path], DiscoverdBy]:
3837
root_folder, discovered_by = find_project_root(*(paths or []))
3938

4039
if root_folder is None:
41-
if raise_on_error:
42-
raise FileNotFoundError("Cannot detect root folder. 😥")
40+
root_folder = Path.cwd()
4341
if verbose_callback:
44-
verbose_callback("Cannot detect root folder. 😥")
45-
return [], None, DiscoverdBy.NOT_FOUND
42+
verbose_callback(f"Cannot detect root folder. Use current folder '{root_folder}' as root.")
4643

4744
if verbose_callback:
4845
verbose_callback(f"Found root at:\n {root_folder} ({discovered_by.value})")
@@ -55,9 +52,6 @@ def get_config_files(
5552
else:
5653
result = get_config_files_from_folder(root_folder)
5754

58-
if not result and raise_on_error:
59-
raise FileNotFoundError("Cannot find any configuration file. 😥")
60-
6155
if verbose_callback:
6256
if result:
6357
verbose_callback(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def libdoc(
7272
pass
7373

7474
config_files, root_folder, _ = get_config_files(
75-
robot_arguments, app.config.config_files, raise_on_error=False, verbose_callback=app.verbose
75+
robot_arguments, app.config.config_files, verbose_callback=app.verbose
7676
)
7777
try:
7878
profile = (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def rebot(
7272
pass
7373

7474
config_files, root_folder, _ = get_config_files(
75-
robot_arguments, app.config.config_files, raise_on_error=False, verbose_callback=app.verbose
75+
robot_arguments, app.config.config_files, verbose_callback=app.verbose
7676
)
7777

7878
try:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def handle_robot_options(
9393
sys.path = old_sys_path
9494

9595
config_files, root_folder, _ = get_config_files(
96-
robot_arguments, app.config.config_files, raise_on_error=False, verbose_callback=app.verbose
96+
robot_arguments, app.config.config_files, verbose_callback=app.verbose
9797
)
9898
try:
9999
profile = (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def testdoc(
7272
pass
7373

7474
config_files, root_folder, _ = get_config_files(
75-
robot_arguments, app.config.config_files, raise_on_error=False, verbose_callback=app.verbose
75+
robot_arguments, app.config.config_files, verbose_callback=app.verbose
7676
)
7777

7878
try:

src/robotcode/cli/commands/config.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def show(
5757
for file, _ in config_files:
5858
config = load_config_from_path(file)
5959
click.secho(f"File: {file}")
60-
app.print_data(config, remove_defaults=True)
60+
app.print_data(config, remove_defaults=True, default_output_format=OutputFormat.TOML)
6161

6262
return
6363

@@ -89,12 +89,7 @@ def files(app: Application, paths: List[Path], user: bool = False) -> None:
8989
"""
9090

9191
try:
92-
config_files, _, discovered_by = get_config_files(
93-
paths,
94-
app.config.config_files,
95-
verbose_callback=app.verbose,
96-
raise_on_error=app.config.output_format is None or app.config.output_format == OutputFormat.TEXT,
97-
)
92+
config_files, _, discovered_by = get_config_files(paths, app.config.config_files, verbose_callback=app.verbose)
9893

9994
result: Dict[str, Any] = {
10095
"files": [{"path": str(file), "type": type} for file, type in config_files],

src/robotcode/cli/commands/profiles.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ def list(
5959
paths,
6060
app.config.config_files,
6161
verbose_callback=app.verbose,
62-
raise_on_error=app.config.output_format is None or app.config.output_format == OutputFormat.TEXT,
6362
)
6463

6564
config = load_config_from_path(*config_files)

0 commit comments

Comments
 (0)