Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Make shell/platform/{darwin|embedder}/... compatible with .clang-tidy. #48160

Merged
auto-submit merged 2 commits into from
Nov 18, 2023
Merged

Make shell/platform/{darwin|embedder}/... compatible with .clang-tidy. #48160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5068097
Make `shell/platform/{darwin|embedder}/...` compatible with `.clang-t…
matanlurey Nov 16, 2023
e43b012
++
matanlurey Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions shell/platform/darwin/common/framework/Headers/FlutterCodecs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,13 @@ FLUTTER_DARWIN_EXPORT
* - FlutterStandardDataTypeFloat64: 64-bit floats
*/
typedef NS_ENUM(NSInteger, FlutterStandardDataType) {
// NOLINTBEGIN(readability-identifier-naming)
FlutterStandardDataTypeUInt8,
FlutterStandardDataTypeInt32,
FlutterStandardDataTypeInt64,
FlutterStandardDataTypeFloat32,
FlutterStandardDataTypeFloat64,
// NOLINTEND(readability-identifier-naming)
};

/**
Expand Down
8 changes: 8 additions & 0 deletions shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
extern "C" {
#endif

// NOLINTBEGIN(google-runtime-int)

// Note: Update FlutterStandardFieldIsStandardType if this changes.
typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FlutterStandardFieldNil,
FlutterStandardFieldTrue,
FlutterStandardFieldFalse,
Expand All @@ -30,6 +33,7 @@ typedef enum {
FlutterStandardFieldList,
FlutterStandardFieldMap,
FlutterStandardFieldFloat32Data,
// NOLINTEND(readability-identifier-naming)
} FlutterStandardField;

static inline bool FlutterStandardFieldIsStandardType(uint8_t field) {
Expand All @@ -38,6 +42,7 @@ static inline bool FlutterStandardFieldIsStandardType(uint8_t field) {
}

typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FlutterStandardCodecObjcTypeNil,
FlutterStandardCodecObjcTypeNSNumber,
FlutterStandardCodecObjcTypeNSString,
Expand All @@ -46,6 +51,7 @@ typedef enum {
FlutterStandardCodecObjcTypeNSArray,
FlutterStandardCodecObjcTypeNSDictionary,
FlutterStandardCodecObjcTypeUnknown,
// NOLINTEND(readability-identifier-naming)
} FlutterStandardCodecObjcType;

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -105,6 +111,8 @@ bool FlutterStandardCodecHelperWriteNumber(CFMutableDataRef data,

///@}

// NOLINTEND(google-runtime-int)

#if defined(__cplusplus)
}
#endif
Expand Down
4 changes: 4 additions & 0 deletions shell/platform/embedder/embedder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2263,6 +2263,8 @@ typedef struct {

#ifndef FLUTTER_ENGINE_NO_PROTOTYPES

// NOLINTBEGIN(google-objc-function-naming)
Copy link
Member

@cbracken cbracken Nov 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way for us to not apply google-objc-function-naming to non-Objective-C headers?

We should apply it to headers under //flutter/shell/platform/darwin, but most of the repo should be treated as C/C++.

Copy link
Contributor Author

@matanlurey matanlurey Nov 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My guess is because this is imported by Obj-C code, it assumes it's Obj-C.


//------------------------------------------------------------------------------
/// @brief Creates the necessary data structures to launch a Flutter Dart
/// application in AOT mode. The data may only be collected after
Expand Down Expand Up @@ -3134,6 +3136,8 @@ FLUTTER_EXPORT
FlutterEngineResult FlutterEngineGetProcAddresses(
FlutterEngineProcTable* table);

// NOLINTEND(google-objc-function-naming)

#if defined(__cplusplus)
} // extern "C"
#endif
Expand Down
4 changes: 4 additions & 0 deletions shell/platform/embedder/tests/embedder_assertions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#include "third_party/skia/include/core/SkPoint.h"
#include "third_party/skia/include/core/SkSize.h"

// NOLINTBEGIN(google-objc-function-naming)

//------------------------------------------------------------------------------
// Equality
//------------------------------------------------------------------------------
Expand Down Expand Up @@ -576,4 +578,6 @@ inline FlutterRoundedRect FlutterRoundedRectMake(const SkRRect& rect) {
return r;
}

// NOLINTEND(google-objc-function-naming)

#endif // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_ASSERTIONS_H_
5 changes: 3 additions & 2 deletions shell/platform/embedder/tests/embedder_unittests_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define FML_USED_ON_EMBEDDER

#include <future>
#include <utility>

#include "flutter/fml/mapping.h"
#include "flutter/fml/message_loop.h"
Expand Down Expand Up @@ -104,8 +105,8 @@ class EmbedderTestTaskRunner {
EmbedderTestTaskRunner(fml::RefPtr<fml::TaskRunner> real_task_runner,
TaskExpiryCallback on_task_expired)
: identifier_(++sEmbedderTaskRunnerIdentifiers),
real_task_runner_(real_task_runner),
on_task_expired_(on_task_expired) {
real_task_runner_(std::move(real_task_runner)),
on_task_expired_(std::move(on_task_expired)) {
FML_CHECK(real_task_runner_);
FML_CHECK(on_task_expired_);

Expand Down