Skip to content
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.

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

Fix misdetection of project root with --stdin-filename #3216

Merged
merged 6 commits into from Aug 26, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
Expand Up @@ -34,6 +34,8 @@
<!-- Changes to how Black can be configured -->

- Black now uses the presence of debug f-strings to detect target version. (#3215)
- Fix misdetection of project root and verbose logging of sources in cases involving
`--stdin-filename` (#3216)

### Documentation

Expand Down
12 changes: 10 additions & 2 deletions src/black/__init__.py
Expand Up @@ -469,7 +469,13 @@ def main( # noqa: C901
out(main.get_usage(ctx) + "\n\nOne of 'SRC' or 'code' is required.")
ctx.exit(1)

root, method = find_project_root(src) if code is None else (None, None)
if stdin_filename is not None:
src_with_stdin_filename = tuple(stdin_filename if s == "-" else s for s in src)
else:
src_with_stdin_filename = src
root, method = (
find_project_root(src_with_stdin_filename) if code is None else (None, None)
)
hauntsaninja marked this conversation as resolved.
Show resolved Hide resolved
ctx.obj["root"] = root

if verbose:
Expand All @@ -480,7 +486,9 @@ def main( # noqa: C901
)

normalized = [
(normalize_path_maybe_ignore(Path(source), root), source)
(source, source)
if source == "-"
else (normalize_path_maybe_ignore(Path(source), root), source)
for source in src
]
srcs_string = ", ".join(
Expand Down