Skip to content

[LSP] Send the configured project settings to the client as default values #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[LSP] Send the configured project settings to the client as default values #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions codeflash/cli_cmds/cmd_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,8 @@ def get_formatter_cmds(formatter: str) -> list[str]:
return ["your-formatter $file"]
if formatter in {"don't use a formatter", "disabled"}:
return ["disabled"]
if " && " in formatter:
return formatter.split(" && ")
return [formatter]


Expand Down
22 changes: 18 additions & 4 deletions codeflash/lsp/beta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,25 @@ def get_config_suggestions(_params: any) -> dict[str, any]:
test_framework_suggestions, default_test_framework = get_suggestions(CommonSections.test_framework)
formatter_suggestions, default_formatter = get_suggestions(CommonSections.formatter_cmds)
get_valid_subdirs.cache_clear()

configured_module_root = Path(server.args.module_root).relative_to(Path.cwd()) if server.args.module_root else None
configured_tests_root = Path(server.args.tests_root).relative_to(Path.cwd()) if server.args.tests_root else None
configured_test_framework = server.args.test_framework if server.args.test_framework else None

configured_formatter = ""
if isinstance(server.args.formatter_cmds, list):
configured_formatter = " && ".join([cmd.strip() for cmd in server.args.formatter_cmds])
elif isinstance(server.args.formatter_cmds, str):
configured_formatter = server.args.formatter_cmds.strip()

return {
"module_root": {"choices": module_root_suggestions, "default": default_module_root},
"tests_root": {"choices": tests_root_suggestions, "default": default_tests_root},
"test_framework": {"choices": test_framework_suggestions, "default": default_test_framework},
"formatter_cmds": {"choices": formatter_suggestions, "default": default_formatter},
"module_root": {"choices": module_root_suggestions, "default": configured_module_root or default_module_root},
"tests_root": {"choices": tests_root_suggestions, "default": configured_tests_root or default_tests_root},
"test_framework": {
"choices": test_framework_suggestions,
"default": configured_test_framework or default_test_framework,
},
"formatter_cmds": {"choices": formatter_suggestions, "default": configured_formatter or default_formatter},
}


Expand Down
Loading