bulk code format fix (#8707)

This commit is contained in:
Derek Bailey
2025-09-23 21:50:27 -07:00
committed by GitHub
parent 0e047869da
commit caf3b494db
559 changed files with 38871 additions and 31276 deletions

View File

@@ -16,11 +16,11 @@
import filecmp
import glob
from pathlib import Path
import shutil
import subprocess
import generate_grpc_examples
from pathlib import Path
from util import flatc, root_path, tests_path, args, flatc_path
from util import args, flatc, flatc_path, root_path, tests_path
# Specify the other paths that will be referenced
swift_code_gen = Path(root_path, "tests/swift/fuzzer/CodeGenerationTests")
@@ -31,33 +31,33 @@ reflection_path = Path(root_path, "reflection")
# Generate the code for flatbuffers reflection schema
def flatc_reflection(options, location, target):
full_options = ["--no-prefix"] + options
temp_dir = ".tmp"
flatc(
full_options,
prefix=temp_dir,
schema="reflection.fbs",
cwd=reflection_path,
)
new_reflection_path = Path(reflection_path, temp_dir, target)
original_reflection_path = Path(root_path, location, target)
if not filecmp.cmp(str(new_reflection_path), str(original_reflection_path)):
shutil.rmtree(str(original_reflection_path), ignore_errors=True)
shutil.move(str(new_reflection_path), str(original_reflection_path))
shutil.rmtree(str(Path(reflection_path, temp_dir)))
full_options = ["--no-prefix"] + options
temp_dir = ".tmp"
flatc(
full_options,
prefix=temp_dir,
schema="reflection.fbs",
cwd=reflection_path,
)
new_reflection_path = Path(reflection_path, temp_dir, target)
original_reflection_path = Path(root_path, location, target)
if not filecmp.cmp(str(new_reflection_path), str(original_reflection_path)):
shutil.rmtree(str(original_reflection_path), ignore_errors=True)
shutil.move(str(new_reflection_path), str(original_reflection_path))
shutil.rmtree(str(Path(reflection_path, temp_dir)))
def flatc_annotate(schema, file, include=None, cwd=tests_path):
cmd = [str(flatc_path)]
if include:
cmd += ["-I"] + [include]
cmd += ["--annotate", schema, file]
result = subprocess.run(cmd, cwd=str(cwd), check=True)
cmd = [str(flatc_path)]
if include:
cmd += ["-I"] + [include]
cmd += ["--annotate", schema, file]
result = subprocess.run(cmd, cwd=str(cwd), check=True)
# Glob a pattern relative to file path
def glob(path, pattern):
return [str(p) for p in path.glob(pattern)]
return [str(p) for p in path.glob(pattern)]
# flatc options that are shared
@@ -169,7 +169,9 @@ flatc(
# Also generate a suffix variant exercising the callback API to keep prior
# *_generated naming convention in sync with new callback additions.
flatc(
NO_INCL_OPTS + CPP_OPTS + ["--grpc", "--grpc-callback-api", "--filename-suffix", "_generated"],
NO_INCL_OPTS
+ CPP_OPTS
+ ["--grpc", "--grpc-callback-api", "--filename-suffix", "_generated"],
schema="monster_test.fbs",
include="include_test",
)
@@ -300,7 +302,9 @@ flatc_annotate(
)
flatc_annotate(
schema="monster_test.fbs", file="monsterdata_test.mon", include="include_test"
schema="monster_test.fbs",
file="monsterdata_test.mon",
include="include_test",
)
flatc(
@@ -330,19 +334,23 @@ flatc(
)
if not args.skip_monster_extra:
flatc(
CPP_OPTS + CS_OPTS + NO_INCL_OPTS + JAVA_OPTS + KOTLIN_OPTS + PYTHON_OPTS,
schema="monster_extra.fbs",
data="monsterdata_extra.json",
)
flatc(
CPP_OPTS + CS_OPTS + NO_INCL_OPTS + JAVA_OPTS + KOTLIN_OPTS + PYTHON_OPTS,
schema="monster_extra.fbs",
data="monsterdata_extra.json",
)
flatc(
DART_OPTS + ["--gen-object-api"],
schema="monster_extra.fbs",
)
flatc(
DART_OPTS + ["--gen-object-api"],
schema="monster_extra.fbs",
)
flatc(
CPP_OPTS + CS_OPTS + NO_INCL_OPTS + JAVA_OPTS + ["--jsonschema", "--scoped-enums"],
CPP_OPTS
+ CS_OPTS
+ NO_INCL_OPTS
+ JAVA_OPTS
+ ["--jsonschema", "--scoped-enums"],
schema="arrays_test.fbs",
)
@@ -352,7 +360,13 @@ flatc(
)
flatc(
["--cpp", "--gen-mutable", "--gen-compare", "--gen-object-api", "--reflect-names"],
[
"--cpp",
"--gen-mutable",
"--gen-compare",
"--gen-object-api",
"--reflect-names",
],
schema="native_inline_table_test.fbs",
)
@@ -385,7 +399,9 @@ optional_scalars_schema = "optional_scalars.fbs"
flatc(["--java", "--kotlin", "--lobster"], schema=optional_scalars_schema)
flatc(TS_OPTS, cwd=ts_code_gen, schema="../optional_scalars.fbs")
flatc(["--csharp", "--python", "--gen-object-api"], schema=optional_scalars_schema)
flatc(
["--csharp", "--python", "--gen-object-api"], schema=optional_scalars_schema
)
flatc(RUST_OPTS, prefix="optional_scalars", schema=optional_scalars_schema)
@@ -534,8 +550,14 @@ flatc(
# Sample files
samples_schema = "monster.fbs"
flatc(BASE_OPTS + CPP_OPTS + LOBSTER_OPTS + SWIFT_OPTS, schema=samples_schema, cwd=samples_path)
flatc(RUST_OPTS, prefix="rust_generated", schema=samples_schema, cwd=samples_path)
flatc(
BASE_OPTS + CPP_OPTS + LOBSTER_OPTS + SWIFT_OPTS,
schema=samples_schema,
cwd=samples_path,
)
flatc(
RUST_OPTS, prefix="rust_generated", schema=samples_schema, cwd=samples_path
)
flatc(
BINARY_OPTS + ["--bfbs-filenames", str(samples_path)],
schema=samples_schema,
@@ -547,10 +569,12 @@ flatc(
# Skip generating the reflection if told too, as we run this script after
# building flatc which uses the reflection_generated.h itself.
if not args.skip_gen_reflection:
# C++ Reflection
flatc_reflection(
["-c", "--cpp-std", "c++0x"], "include/flatbuffers", "reflection_generated.h"
)
# C++ Reflection
flatc_reflection(
["-c", "--cpp-std", "c++0x"],
"include/flatbuffers",
"reflection_generated.h",
)
# Python Reflection
flatc_reflection(["-p"], "python/flatbuffers", "reflection")
@@ -566,17 +590,19 @@ flatc_reflection(
def flatc_annotate(schema, include=None, data=None, cwd=tests_path):
cmd = [str(flatc_path)]
if include:
cmd += ["-I"] + [include]
cmd += ["--annotate", schema]
if data:
cmd += [data] if isinstance(data, str) else data
subprocess.run(cmd, cwd=str(cwd), check=True)
cmd = [str(flatc_path)]
if include:
cmd += ["-I"] + [include]
cmd += ["--annotate", schema]
if data:
cmd += [data] if isinstance(data, str) else data
subprocess.run(cmd, cwd=str(cwd), check=True)
flatc_annotate(
schema="monster_test.fbs", include="include_test", data="monsterdata_test.mon"
schema="monster_test.fbs",
include="include_test",
data="monsterdata_test.mon",
)
# Run the generate_grpc_examples script