shifathosn
/
AnyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3386 from GalaxyGamingFR/fix/conventions-path-with-spaces 

fix(conventions): keep per-line rules for file names with spaces
This commit is contained in:
Adrià 2026-10-11 12:19:02 +02:00 committed by GitHub
parent e7827eb4d4 68f60cf348
commit 68ae2a895d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/check_conventions.py
View File

@ -66,7 +66,7 @@ class Check:
path = None
for line in git("diff", "-U0", "--no-color", "--no-renames", "--no-prefix", self.base, head).splitlines():
if line.startswith("+++ "):
path = None if line == "+++ /dev/null" else line[4:]
path = None if line == "+++ /dev/null" else line[4:].rstrip("\t")
elif line.startswith("@@"):
number = int(re.search(r"\+(\d+)", line).group(1))
elif line.startswith("+") and path:

32
tools/tests/test_check_conventions_comments.py
View File

@ -226,5 +226,37 @@ class PullRequestTemplateTests(unittest.TestCase):
self.assertEqual(self.findings("- [x] all"), [])
class SpacedPathTests(unittest.TestCase):
def test_comment_in_path_with_space_is_reported(self):
checker = Path(__file__).resolve().parents[1] / "check_conventions.py"
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
def git(*args):
return subprocess.run(
["git", "-c", "user.name=Conventions Test", "-c", "user.email=test@example.com",
"-c", "commit.gpgsign=false", *args],
cwd=root, capture_output=True, text=True, check=True,
)
git("init", "-q")
(root / "readme.txt").write_text("x\n", encoding="utf-8")
git("add", ".")
git("commit", "-qm", "docs: add readme")
source = root / "core/a b.cpp"
source.parent.mkdir(parents=True)
source.write_text("int x; // note\n", encoding="utf-8")
git("add", ".")
git("commit", "-qm", "feat: add spaced file")
result = subprocess.run(
[sys.executable, "-I", str(checker), "--base", "HEAD~1"],
cwd=root, capture_output=True, text=True,
env={key: value for key, value in os.environ.items()
if key not in ("GITHUB_EVENT_PATH", "GITHUB_STEP_SUMMARY", "GITHUB_ACTIONS")},
)
self.assertEqual(result.returncode, 1, result.stdout + result.stderr)
self.assertIn("core/a b.cpp:1: error: [comment]", result.stdout)
if __name__ == "__main__":
unittest.main()