From dc8c442aa57d7d75a51af4254654c63e46a5385c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= Date: Thu, 5 Mar 2026 07:21:42 -0800 Subject: [PATCH] Normalize template specialization angle bracket spacing (#55910) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55910 Normalizes angle bracket spacing in scope names for template specializations. Doxygen encodes template specializations with spaces around angle brackets in compound names (e.g., `CSSDataTypeParser< CSSMatrix >`). This caused inconsistent output in API snapshots. The fix applies `normalize_angle_brackets()` to qualified paths when parsing scope names, ensuring consistent output: - `CSSDataTypeParser< CSSMatrix >` → `CSSDataTypeParser` - `Callback< R(Args...)>` → `Callback` Added a new test case `should_normalize_template_specialization_angle_brackets` to verify the fix. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D95204780 fbshipit-source-id: d0d5fe7759a414b32630647f334b39e26da15108 --- scripts/cxx-api/parser/__main__.py | 5 +++ scripts/cxx-api/parser/builders.py | 3 +- .../cxx-api/parser/utils/qualified_path.py | 7 +++ .../snapshot.api | 2 +- .../snapshot.api | 17 +++++++ .../test.h | 44 +++++++++++++++++++ 6 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/snapshot.api create mode 100644 scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/test.h diff --git a/scripts/cxx-api/parser/__main__.py b/scripts/cxx-api/parser/__main__.py index 2d7a8cfd52c..49270bad790 100644 --- a/scripts/cxx-api/parser/__main__.py +++ b/scripts/cxx-api/parser/__main__.py @@ -201,6 +201,7 @@ def main(): "input_filters", "doxygen_strip_comments.py", ) + input_filter = None if os.path.exists(input_filter_path): input_filter = f"python3 {input_filter_path}" @@ -263,3 +264,7 @@ def main(): ) ) build_snapshots(output_dir, verbose=True) + + +if __name__ == "__main__": + main() diff --git a/scripts/cxx-api/parser/builders.py b/scripts/cxx-api/parser/builders.py index 95c8dba7faf..47b3eb2ed40 100644 --- a/scripts/cxx-api/parser/builders.py +++ b/scripts/cxx-api/parser/builders.py @@ -33,6 +33,7 @@ from .utils import ( Argument, extract_qualifiers, InitializerType, + normalize_angle_brackets, normalize_pointer_spacing, parse_qualified_path, resolve_linked_text_name, @@ -59,7 +60,7 @@ def get_base_classes( # - prot: protection level (public, protected, private) # - virt: virtual inheritance (non-virtual, virtual, pure-virtual) # - valueOf_: the name of the base class - base_name = base.valueOf_ + base_name = normalize_angle_brackets(base.valueOf_) base_prot = base.prot base_virt = base.virt base_refid = base.refid diff --git a/scripts/cxx-api/parser/utils/qualified_path.py b/scripts/cxx-api/parser/utils/qualified_path.py index 1010ca6a6cd..95d06d3581b 100644 --- a/scripts/cxx-api/parser/utils/qualified_path.py +++ b/scripts/cxx-api/parser/utils/qualified_path.py @@ -5,6 +5,8 @@ from __future__ import annotations +from .text_resolution import normalize_angle_brackets + def parse_qualified_path(path: str) -> list[str]: """ @@ -19,7 +21,12 @@ def parse_qualified_path(path: str) -> list[str]: - Comparison operators inside parentheses: "std::enable_if<(N > 0)>::type" - Arrow operators: "decltype(ptr->member)::type" - Bitshift operators: "std::integral_constant> 2)>::value" + + Normalizes angle bracket spacing (e.g., "Foo< Bar >" -> "Foo"). """ + # Normalize angle bracket spacing before parsing + path = normalize_angle_brackets(path) + result = [] current = "" angle_depth = 0 diff --git a/scripts/cxx-api/tests/snapshots/should_handle_template_specialization_self_reference/snapshot.api b/scripts/cxx-api/tests/snapshots/should_handle_template_specialization_self_reference/snapshot.api index a21de2ffbd2..8baf3d8840b 100644 --- a/scripts/cxx-api/tests/snapshots/should_handle_template_specialization_self_reference/snapshot.api +++ b/scripts/cxx-api/tests/snapshots/should_handle_template_specialization_self_reference/snapshot.api @@ -3,7 +3,7 @@ class test::Callback { } template -class test::Callback< R(Args...)> { +class test::Callback { public Callback(const test::Callback&) = delete; public Callback(test::Callback&& other) noexcept; public R call(Args... args) const; diff --git a/scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/snapshot.api b/scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/snapshot.api new file mode 100644 index 00000000000..54af97aa469 --- /dev/null +++ b/scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/snapshot.api @@ -0,0 +1,17 @@ +class AndroidSwitchComponentDescriptor : public ConcreteComponentDescriptor { + public AndroidSwitchComponentDescriptor(const ComponentDescriptorParameters& parameters); + public void adopt(ShadowNode& shadowNode) const; +} + +struct CSSDataTypeParser { + public static constexpr std::optional consumeFunctionBlock(const CSSFunctionBlock& func, CSSValueParser& parser); +} + +struct CSSMatrix { + public constexpr bool operator==(const CSSMatrix& rhs) const = default; + public std::array values; +} + +template +class ConcreteComponentDescriptor { +} diff --git a/scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/test.h b/scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/test.h new file mode 100644 index 00000000000..f7eba86e456 --- /dev/null +++ b/scripts/cxx-api/tests/snapshots/should_normalize_template_specialization_angle_brackets/test.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +struct CSSMatrix { + std::array values{}; + + constexpr bool operator==(const CSSMatrix &rhs) const = default; +}; + +template <> +struct CSSDataTypeParser { + static constexpr auto consumeFunctionBlock(const CSSFunctionBlock &func, CSSValueParser &parser) + -> std::optional + { + if (!iequals(func.name, "matrix")) { + return {}; + } + + CSSMatrix matrix{}; + for (int i = 0; i < 6; i++) { + auto value = parser.parseNextValue(i == 0 ? CSSDelimiter::None : CSSDelimiter::Comma); + if (std::holds_alternative(value)) { + return {}; + } + matrix.values[i] = std::get(value).value; + } + + return matrix; + } +}; + +// Test base class inheritance with template angle brackets +template +class ConcreteComponentDescriptor {}; + +class AndroidSwitchComponentDescriptor : public ConcreteComponentDescriptor { + public: + AndroidSwitchComponentDescriptor(const ComponentDescriptorParameters ¶meters); + void adopt(ShadowNode &shadowNode) const; +};