Skip to content

Commit 33992ce

Browse files
author
codegen-bot
committed
[Codegen] 🔧 Convert Function Calls to Use Named Kwargs
1 parent dd31328 commit 33992ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+382
-382
lines changed

pylsp/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def main():
7171
parser = argparse.ArgumentParser()
7272
add_arguments(parser)
7373
args = parser.parse_args()
74-
_configure_logger(args.verbose, args.log_config, args.log_file)
74+
_configure_logger(verbose=args.verbose, log_config=args.log_config, log_file=args.log_file)
7575

7676
if args.tcp:
7777
start_tcp_lang_server(

pylsp/_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def position_to_jedi_linecolumn(document, position):
264264
code_position = {
265265
"line": position["line"] + 1,
266266
"column": clip_column(
267-
position["character"], document.lines, position["line"]
267+
column=position["character"], lines=document.lines, line_number=position["line"]
268268
),
269269
}
270270
return code_position

pylsp/plugins/autopep8_format.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
def pylsp_format_document(config, workspace, document, options):
1818
with workspace.report_progress("format: autopep8"):
1919
log.info("Formatting document %s with autopep8", document)
20-
return _format(config, document)
20+
return _format(config=config, document=document)
2121

2222

2323
@hookimpl(tryfirst=True) # Prefer autopep8 over YAPF
@@ -31,11 +31,11 @@ def pylsp_format_range(config, workspace, document, range, options):
3131

3232
# Add 1 for 1-indexing vs LSP's 0-indexing
3333
line_range = (range["start"]["line"] + 1, range["end"]["line"])
34-
return _format(config, document, line_range=line_range)
34+
return _format(config=config, document=document, line_range=line_range)
3535

3636

3737
def _format(config, document, line_range=None):
38-
options = _autopep8_config(config, document)
38+
options = _autopep8_config(config=config, document=document)
3939
if line_range:
4040
options["line_range"] = list(line_range)
4141

pylsp/plugins/definition.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def pylsp_definitions(
4646
config: Config, document: Document, position: Dict[str, int]
4747
) -> List[Dict[str, Any]]:
4848
settings = config.plugin_settings("jedi_definition")
49-
code_position = _utils.position_to_jedi_linecolumn(document, position)
49+
code_position = _utils.position_to_jedi_linecolumn(document=document, position=position)
5050
script = document.jedi_script(use_document_path=True)
5151
auto_import_modules = jedi.settings.auto_import_modules
5252

@@ -57,14 +57,14 @@ def pylsp_definitions(
5757
follow_builtin_imports=settings.get("follow_builtin_imports", True),
5858
**code_position,
5959
)
60-
definitions = [_resolve_definition(d, script, settings) for d in definitions]
60+
definitions = [_resolve_definition(maybe_defn=d, script=script, settings=settings) for d in definitions]
6161
finally:
6262
jedi.settings.auto_import_modules = auto_import_modules
6363

6464
follow_builtin_defns = settings.get("follow_builtin_definitions", True)
6565
return [
6666
{
67-
"uri": uris.uri_with(document.uri, path=str(d.module_path)),
67+
"uri": uris.uri_with(uri=document.uri, path=str(d.module_path)),
6868
"range": {
6969
"start": {"line": d.line - 1, "character": d.column},
7070
"end": {"line": d.line - 1, "character": d.column + len(d.name)},

pylsp/plugins/flake8_lint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ def pylsp_lint(workspace, document):
9797
# ensure the same source is used for flake8 execution and result parsing;
9898
# single source access improves performance as it is only one disk access
9999
source = document.source
100-
output = run_flake8(flake8_executable, args, document, source)
101-
return parse_stdout(source, output)
100+
output = run_flake8(flake8_executable=flake8_executable, args=args, document=document, source=source)
101+
return parse_stdout(source=source, stdout=output)
102102

103103

104104
def run_flake8(flake8_executable, args, document, source):

pylsp/plugins/folding.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def pylsp_folding_range(document):
1717
program = document.source + "\n"
1818
lines = program.splitlines()
1919
tree = parso.parse(program)
20-
ranges = __compute_folding_ranges(tree, lines)
20+
ranges = __compute_folding_ranges(tree=tree, lines=lines)
2121

2222
results = []
2323
for start_line, end_line in ranges:
@@ -88,18 +88,18 @@ def __compute_folding_ranges_identation(text):
8888
current_level = level
8989
elif level < current_level:
9090
identation_stack, folding_ranges = __match_identation_stack(
91-
identation_stack, level, level_limits, folding_ranges, current_line
91+
identation_stack=identation_stack, level=level, level_limits=level_limits, folding_ranges=folding_ranges, current_line=current_line
9292
)
9393
current_level = level
9494
else:
9595
folding_ranges = __empty_identation_stack(
96-
identation_stack, level_limits, current_line, folding_ranges
96+
identation_stack=identation_stack, level_limits=level_limits, current_line=current_line, folding_ranges=folding_ranges
9797
)
9898
current_level = 0
9999
if line.strip() != "":
100100
current_line = i
101101
folding_ranges = __empty_identation_stack(
102-
identation_stack, level_limits, current_line, folding_ranges
102+
identation_stack=identation_stack, level_limits=level_limits, current_line=current_line, folding_ranges=folding_ranges
103103
)
104104
return dict(folding_ranges)
105105

@@ -136,25 +136,25 @@ def __handle_flow_nodes(node, end_line, stack):
136136
if isinstance(node, tree_nodes.Keyword):
137137
from_keyword = True
138138
if node.value in {"if", "elif", "with", "while"}:
139-
node, end_line = __handle_skip(stack, 2)
139+
node, end_line = __handle_skip(stack=stack, skip=2)
140140
elif node.value in {"except"}:
141141
first_node = stack[0]
142142
if isinstance(first_node, tree_nodes.Operator):
143-
node, end_line = __handle_skip(stack, 1)
143+
node, end_line = __handle_skip(stack=stack, skip=1)
144144
else:
145-
node, end_line = __handle_skip(stack, 2)
145+
node, end_line = __handle_skip(stack=stack, skip=2)
146146
elif node.value in {"for"}:
147-
node, end_line = __handle_skip(stack, 4)
147+
node, end_line = __handle_skip(stack=stack, skip=4)
148148
elif node.value in {"else"}:
149-
node, end_line = __handle_skip(stack, 1)
149+
node, end_line = __handle_skip(stack=stack, skip=1)
150150
return end_line, from_keyword, node, stack
151151

152152

153153
def __compute_start_end_lines(node, stack):
154154
start_line, _ = node.start_pos
155155
end_line, _ = node.end_pos
156156
modified = False
157-
end_line, from_keyword, node, stack = __handle_flow_nodes(node, end_line, stack)
157+
end_line, from_keyword, node, stack = __handle_flow_nodes(node=node, end_line=end_line, stack=stack)
158158

159159
last_leaf = node.get_last_leaf()
160160
last_newline = isinstance(last_leaf, tree_nodes.Newline)
@@ -194,12 +194,12 @@ def __compute_folding_ranges(tree, lines):
194194
padding = [""] * start_line
195195
text = "\n".join(padding + lines[start_line:]) + "\n"
196196
identation_ranges = __compute_folding_ranges_identation(text)
197-
folding_ranges = __merge_folding_ranges(folding_ranges, identation_ranges)
197+
folding_ranges = __merge_folding_ranges(left=folding_ranges, right=identation_ranges)
198198
break
199199
if not isinstance(node, SKIP_NODES):
200200
valid = __check_if_node_is_valid(node)
201201
if valid:
202-
start_line, end_line, stack = __compute_start_end_lines(node, stack)
202+
start_line, end_line, stack = __compute_start_end_lines(node=node, stack=stack)
203203
if end_line > start_line:
204204
current_end = folding_ranges.get(start_line, -1)
205205
folding_ranges[start_line] = max(current_end, end_line)

pylsp/plugins/highlight.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@hookimpl
1212
def pylsp_document_highlight(document, position):
13-
code_position = _utils.position_to_jedi_linecolumn(document, position)
13+
code_position = _utils.position_to_jedi_linecolumn(document=document, position=position)
1414
usages = document.jedi_script().get_references(**code_position)
1515

1616
def is_valid(definition):

pylsp/plugins/hover.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@hookimpl
1212
def pylsp_hover(config, document, position):
13-
code_position = _utils.position_to_jedi_linecolumn(document, position)
13+
code_position = _utils.position_to_jedi_linecolumn(document=document, position=position)
1414
definitions = document.jedi_script(use_document_path=True).infer(**code_position)
1515
word = document.word_at_position(position)
1616

@@ -43,8 +43,8 @@ def pylsp_hover(config, document, position):
4343
return {
4444
"contents": _utils.format_docstring(
4545
# raw docstring returns only doc, without signature
46-
definition.docstring(raw=True),
47-
preferred_markup_kind,
46+
contents=definition.docstring(raw=True),
47+
markup_kind=preferred_markup_kind,
4848
signatures=[signature] if signature else None,
4949
)
5050
}

pylsp/plugins/jedi_completion.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def pylsp_completions(config, document, position):
4040
"""Get formatted completions for current code position"""
4141
settings = config.plugin_settings("jedi_completion", document_path=document.path)
4242
resolve_eagerly = settings.get("eager", False)
43-
code_position = _utils.position_to_jedi_linecolumn(document, position)
43+
code_position = _utils.position_to_jedi_linecolumn(document=document, position=position)
4444

4545
code_position["fuzzy"] = settings.get("fuzzy", False)
4646
completions = document.jedi_script(use_document_path=True).complete(**code_position)
@@ -67,22 +67,22 @@ def pylsp_completions(config, document, position):
6767
SNIPPET_RESOLVER.cached_modules = modules_to_cache_for
6868

6969
include_params = (
70-
snippet_support and should_include_params and use_snippets(document, position)
70+
snippet_support and should_include_params and use_snippets(document=document, position=position)
7171
)
7272
include_class_objects = (
7373
snippet_support
7474
and should_include_class_objects
75-
and use_snippets(document, position)
75+
and use_snippets(document=document, position=position)
7676
)
7777
include_function_objects = (
7878
snippet_support
7979
and should_include_function_objects
80-
and use_snippets(document, position)
80+
and use_snippets(document=document, position=position)
8181
)
8282

8383
ready_completions = [
8484
_format_completion(
85-
c,
85+
d=c,
8686
markup_kind=preferred_markup_kind,
8787
include_params=include_params if c.type in ["class", "function"] else False,
8888
resolve=resolve_eagerly,
@@ -97,7 +97,7 @@ def pylsp_completions(config, document, position):
9797
for i, c in enumerate(completions):
9898
if c.type == "class":
9999
completion_dict = _format_completion(
100-
c,
100+
d=c,
101101
markup_kind=preferred_markup_kind,
102102
include_params=False,
103103
resolve=resolve_eagerly,
@@ -112,7 +112,7 @@ def pylsp_completions(config, document, position):
112112
for i, c in enumerate(completions):
113113
if c.type == "function":
114114
completion_dict = _format_completion(
115-
c,
115+
d=c,
116116
markup_kind=preferred_markup_kind,
117117
include_params=False,
118118
resolve=resolve_eagerly,
@@ -152,7 +152,7 @@ def pylsp_completion_item_resolve(config, completion_item, document):
152152

153153
if shared_data:
154154
completion, data = shared_data
155-
return _resolve_completion(completion, data, markup_kind=preferred_markup_kind)
155+
return _resolve_completion(completion=completion, d=data, markup_kind=preferred_markup_kind)
156156
return completion_item
157157

158158

@@ -211,7 +211,7 @@ def _resolve_completion(completion, d, markup_kind: str):
211211
completion["detail"] = _detail(d)
212212
try:
213213
docs = _utils.format_docstring(
214-
d.docstring(raw=True),
214+
contents=d.docstring(raw=True),
215215
signatures=[signature.to_string() for signature in d.get_signatures()],
216216
markup_kind=markup_kind,
217217
)
@@ -230,14 +230,14 @@ def _format_completion(
230230
snippet_support=False,
231231
):
232232
completion = {
233-
"label": _label(d, resolve_label_or_snippet),
233+
"label": _label(definition=d, resolve=resolve_label_or_snippet),
234234
"kind": _TYPE_MAP.get(d.type),
235235
"sortText": _sort_text(d),
236236
"insertText": d.name,
237237
}
238238

239239
if resolve:
240-
completion = _resolve_completion(completion, d, markup_kind)
240+
completion = _resolve_completion(completion=completion, d=d, markup_kind=markup_kind)
241241

242242
# Adjustments for file completions
243243
if d.type == "path":
@@ -260,7 +260,7 @@ def _format_completion(
260260
completion["insertText"] = path
261261

262262
if include_params and not is_exception_class(d.name):
263-
snippet = _snippet(d, resolve_label_or_snippet)
263+
snippet = _snippet(definition=d, resolve=resolve_label_or_snippet)
264264
completion.update(snippet)
265265

266266
return completion

pylsp/plugins/jedi_rename.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def pylsp_rename(config, workspace, document, position, new_name):
1313
log.debug(
1414
"Executing rename of %s to %s", document.word_at_position(position), new_name
1515
)
16-
kwargs = _utils.position_to_jedi_linecolumn(document, position)
16+
kwargs = _utils.position_to_jedi_linecolumn(document=document, position=position)
1717
kwargs["new_name"] = new_name
1818
try:
1919
refactoring = document.jedi_script().rename(**kwargs)

pylsp/plugins/pydocstyle_lint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def pylsp_lint(config, workspace, document):
8686
for error in errors:
8787
if error.code not in checked_codes:
8888
continue
89-
diags.append(_parse_diagnostic(document, error))
89+
diags.append(_parse_diagnostic(document=document, error=error))
9090
except pydocstyle.parser.ParseError:
9191
# In the case we cannot parse the Python file, just continue
9292
pass

pylsp/plugins/pylint_lint.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def pylsp_lint(config, workspace, document, is_saved):
223223
if settings.get("executable") and sys.version_info[0] >= 3:
224224
flags = build_args_stdio(settings)
225225
pylint_executable = settings.get("executable", "pylint")
226-
return pylint_lint_stdin(pylint_executable, document, flags)
226+
return pylint_lint_stdin(pylint_executable=pylint_executable, document=document, flags=flags)
227227
flags = _build_pylint_flags(settings)
228228
return PylintLinter.lint(document, is_saved, flags=flags)
229229

@@ -260,8 +260,8 @@ def pylint_lint_stdin(pylint_executable, document, flags):
260260
:return: linting diagnostics
261261
:rtype: list
262262
"""
263-
pylint_result = _run_pylint_stdio(pylint_executable, document, flags)
264-
return _parse_pylint_stdio_result(document, pylint_result)
263+
pylint_result = _run_pylint_stdio(pylint_executable=pylint_executable, document=document, flags=flags)
264+
return _parse_pylint_stdio_result(document=document, stdout=pylint_result)
265265

266266

267267
def _run_pylint_stdio(pylint_executable, document, flags):

pylsp/plugins/references.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@hookimpl
1212
def pylsp_references(document, position, exclude_declaration):
13-
code_position = _utils.position_to_jedi_linecolumn(document, position)
13+
code_position = _utils.position_to_jedi_linecolumn(document=document, position=position)
1414
usages = document.jedi_script().get_references(**code_position)
1515

1616
if exclude_declaration:
@@ -20,7 +20,7 @@ def pylsp_references(document, position, exclude_declaration):
2020
# Filter out builtin modules
2121
return [
2222
{
23-
"uri": uris.uri_with(document.uri, path=str(d.module_path))
23+
"uri": uris.uri_with(uri=document.uri, path=str(d.module_path))
2424
if d.module_path
2525
else document.uri,
2626
"range": {

0 commit comments

Comments
 (0)