Skip to content

Commit 9d0cfd8

Browse files
committed
style(lint): lint pass on all newly converted new architecture files
Apply google-java-format and clang-format (Google style) to migrated TurboModule native shells so yarn lint exits 0 repo-wide on the NA branch.
1 parent 50c58a0 commit 9d0cfd8

18 files changed

Lines changed: 89 additions & 68 deletions

File tree

packages/app-check/android/src/main/java/io/invertase/firebase/appcheck/NativeRNFBTurboAppCheck.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,7 @@ public void getLimitedUseToken(String appName, Promise promise) {
230230
Tasks.call(
231231
getExecutor(),
232232
() ->
233-
Tasks.await(
234-
FirebaseAppCheck.getInstance(firebaseApp).getLimitedUseAppCheckToken()))
233+
Tasks.await(FirebaseAppCheck.getInstance(firebaseApp).getLimitedUseAppCheckToken()))
235234
.addOnCompleteListener(
236235
getExecutor(),
237236
(task) -> {

packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ - (void)invalidate {
5252
}
5353

5454
- (void)activate:(NSString *)appName
55-
siteKeyProvider:(NSString *)siteKeyProvider
55+
siteKeyProvider:(NSString *)siteKeyProvider
5656
isTokenAutoRefreshEnabled:(BOOL)isTokenAutoRefreshEnabled
57-
resolve:(RCTPromiseResolveBlock)resolve
58-
reject:(RCTPromiseRejectBlock)reject {
57+
resolve:(RCTPromiseResolveBlock)resolve
58+
reject:(RCTPromiseRejectBlock)reject {
5959
FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
6060
DLog(@"deprecated API, provider will be deviceCheck / token refresh %d for app %@",
6161
isTokenAutoRefreshEnabled, firebaseApp.name);

packages/crashlytics/ios/RNFBCrashlytics/RNFBCrashlyticsModule.mm

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,9 @@ - (void)recordJavaScriptError:(JS::NativeRNFBTurboCrashlytics::JavaScriptErrorOb
193193
BOOL isUnhandledPromiseRejection = jsErrorDict.isUnhandledRejection();
194194

195195
for (const auto &stackFrame : stackFrames) {
196-
FIRStackFrame *customFrame =
197-
[FIRStackFrame stackFrameWithSymbol:stackFrame.fn()
198-
file:stackFrame.file()
199-
line:(uint32_t)stackFrame.line()];
196+
FIRStackFrame *customFrame = [FIRStackFrame stackFrameWithSymbol:stackFrame.fn()
197+
file:stackFrame.file()
198+
line:(uint32_t)stackFrame.line()];
200199
[stackTrace addObject:customFrame];
201200
}
202201

packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/NativeRNFBTurboFirestoreCollection.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.getQueryForFirestore;
2727

2828
import android.util.SparseArray;
29+
import com.facebook.fbreact.specs.NativeRNFBTurboFirestoreCollectionSpec;
2930
import com.facebook.react.bridge.*;
3031
import com.google.android.gms.tasks.Tasks;
3132
import com.google.firebase.firestore.*;
3233
import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
33-
import com.facebook.fbreact.specs.NativeRNFBTurboFirestoreCollectionSpec;
3434
import java.util.ArrayList;
3535

3636
public class NativeRNFBTurboFirestoreCollection extends NativeRNFBTurboFirestoreCollectionSpec {
37-
private final FirestoreTurboModuleSupport turboSupport = new FirestoreTurboModuleSupport("RNFBCollection");
37+
private final FirestoreTurboModuleSupport turboSupport =
38+
new FirestoreTurboModuleSupport("RNFBCollection");
3839
private static final String SERVICE_NAME = "FirestoreCollection";
3940
private static SparseArray<ListenerRegistration> collectionSnapshotListeners =
4041
new SparseArray<>();
@@ -372,7 +373,8 @@ private void handleQueryOnSnapshot(
372373
final EventListener<QuerySnapshot> listener =
373374
(querySnapshot, exception) -> {
374375
if (exception != null) {
375-
ListenerRegistration listenerRegistration = collectionSnapshotListeners.get((int) listenerId);
376+
ListenerRegistration listenerRegistration =
377+
collectionSnapshotListeners.get((int) listenerId);
376378
if (listenerRegistration != null) {
377379
listenerRegistration.remove();
378380
collectionSnapshotListeners.remove((int) listenerId);

packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/NativeRNFBTurboFirestoreDocument.java

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.getFirestoreForApp;
2424

2525
import android.util.SparseArray;
26+
import com.facebook.fbreact.specs.NativeRNFBTurboFirestoreDocumentSpec;
2627
import com.facebook.react.bridge.*;
2728
import com.google.android.gms.tasks.Task;
2829
import com.google.android.gms.tasks.Tasks;
2930
import com.google.firebase.firestore.*;
3031
import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
31-
import com.facebook.fbreact.specs.NativeRNFBTurboFirestoreDocumentSpec;
3232
import java.util.ArrayList;
3333
import java.util.List;
3434
import java.util.Map;
3535
import java.util.Objects;
3636

3737
public class NativeRNFBTurboFirestoreDocument extends NativeRNFBTurboFirestoreDocumentSpec {
38-
private final FirestoreTurboModuleSupport turboSupport = new FirestoreTurboModuleSupport("RNFBDocument");
38+
private final FirestoreTurboModuleSupport turboSupport =
39+
new FirestoreTurboModuleSupport("RNFBDocument");
3940
private static final String SERVICE_NAME = "FirestoreDocument";
4041
private static SparseArray<ListenerRegistration> documentSnapshotListeners = new SparseArray<>();
4142

@@ -57,7 +58,11 @@ public void invalidate() {
5758

5859
@Override
5960
public void documentOnSnapshot(
60-
String appName, String databaseId, String path, double listenerId, ReadableMap listenerOptions) {
61+
String appName,
62+
String databaseId,
63+
String path,
64+
double listenerId,
65+
ReadableMap listenerOptions) {
6166
if (documentSnapshotListeners.get((int) listenerId) != null) {
6267
return;
6368
}
@@ -68,7 +73,8 @@ public void documentOnSnapshot(
6873
final EventListener<DocumentSnapshot> listener =
6974
(documentSnapshot, exception) -> {
7075
if (exception != null) {
71-
ListenerRegistration listenerRegistration = documentSnapshotListeners.get((int) listenerId);
76+
ListenerRegistration listenerRegistration =
77+
documentSnapshotListeners.get((int) listenerId);
7278
if (listenerRegistration != null) {
7379
listenerRegistration.remove();
7480
documentSnapshotListeners.remove((int) listenerId);
@@ -176,7 +182,9 @@ public void documentSet(
176182
FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
177183
DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
178184

179-
Tasks.call(turboSupport.getTransactionalExecutor(), () -> parseReadableMap(firebaseFirestore, data))
185+
Tasks.call(
186+
turboSupport.getTransactionalExecutor(),
187+
() -> parseReadableMap(firebaseFirestore, data))
180188
.continueWithTask(
181189
turboSupport.getTransactionalExecutor(),
182190
task -> {
@@ -216,7 +224,9 @@ public void documentUpdate(
216224
FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
217225
DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
218226

219-
Tasks.call(turboSupport.getTransactionalExecutor(), () -> parseReadableMap(firebaseFirestore, data))
227+
Tasks.call(
228+
turboSupport.getTransactionalExecutor(),
229+
() -> parseReadableMap(firebaseFirestore, data))
220230
.continueWithTask(
221231
turboSupport.getTransactionalExecutor(),
222232
task -> documentReference.update(Objects.requireNonNull(task.getResult())))
@@ -235,7 +245,9 @@ public void documentBatch(
235245
String appName, String databaseId, ReadableArray writes, Promise promise) {
236246
FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
237247

238-
Tasks.call(turboSupport.getTransactionalExecutor(), () -> parseDocumentBatches(firebaseFirestore, writes))
248+
Tasks.call(
249+
turboSupport.getTransactionalExecutor(),
250+
() -> parseDocumentBatches(firebaseFirestore, writes))
239251
.continueWithTask(
240252
turboSupport.getTransactionalExecutor(),
241253
task -> {
@@ -302,7 +314,9 @@ public void documentBatch(
302314
private void sendOnSnapshotEvent(
303315
String appName, String databaseId, double listenerId, DocumentSnapshot documentSnapshot) {
304316
try {
305-
Tasks.call(turboSupport.getExecutor(), () -> snapshotToWritableMap(appName, databaseId, documentSnapshot))
317+
Tasks.call(
318+
turboSupport.getExecutor(),
319+
() -> snapshotToWritableMap(appName, databaseId, documentSnapshot))
306320
.addOnCompleteListener(
307321
task -> {
308322
if (task.isSuccessful()) {

packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/NativeRNFBTurboFirestoreTransaction.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@
2727

2828
import android.os.AsyncTask;
2929
import android.util.SparseArray;
30+
import com.facebook.fbreact.specs.NativeRNFBTurboFirestoreTransactionSpec;
3031
import com.facebook.react.bridge.*;
3132
import com.google.android.gms.tasks.Tasks;
3233
import com.google.firebase.firestore.*;
3334
import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
34-
import com.facebook.fbreact.specs.NativeRNFBTurboFirestoreTransactionSpec;
3535
import java.util.ArrayList;
3636
import java.util.List;
3737
import java.util.Map;
3838
import java.util.Objects;
3939

4040
public class NativeRNFBTurboFirestoreTransaction extends NativeRNFBTurboFirestoreTransactionSpec {
41-
private final FirestoreTurboModuleSupport turboSupport = new FirestoreTurboModuleSupport("RNFBTransaction");
41+
private final FirestoreTurboModuleSupport turboSupport =
42+
new FirestoreTurboModuleSupport("RNFBTransaction");
4243
private static final String SERVICE_NAME = "FirestoreTransaction";
4344
private SparseArray<ReactNativeFirebaseFirestoreTransactionHandler> transactionHandlers =
4445
new SparseArray<>();
@@ -113,7 +114,8 @@ public void transactionDispose(String appName, String databaseId, double transac
113114
@Override
114115
public void transactionApplyBuffer(
115116
String appName, String databaseId, double transactionId, ReadableArray commandBuffer) {
116-
ReactNativeFirebaseFirestoreTransactionHandler handler = transactionHandlers.get((int) transactionId);
117+
ReactNativeFirebaseFirestoreTransactionHandler handler =
118+
transactionHandlers.get((int) transactionId);
117119

118120
if (handler != null) {
119121
handler.signalBufferReceived(commandBuffer);

packages/firestore/ios/RNFBFirestore/RNFBFirestoreCollectionModule.mm

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
// directory. See firebase-ios-sdk#12611 for more context.
2828
#import "RNFBFirestore-Swift.h"
2929
#endif
30-
#import "RNFBApp/RCTConvert+FIRApp.h"
3130
#import <RNFBApp/RNFBSharedUtils.h>
3231
#import <React/RCTUtils.h>
32+
#import "RNFBApp/RCTConvert+FIRApp.h"
3333

3434
#import "RNFBFirestoreCollectionModule.h"
3535
#import "RNFBFirestoreCommon.h"
@@ -38,7 +38,8 @@
3838
static __strong NSMutableDictionary *collectionSnapshotListeners;
3939
static NSString *const RNFB_FIRESTORE_COLLECTION_SYNC = @"firestore_collection_sync_event";
4040

41-
@interface RNFBFirestoreCollectionModule () <NativeRNFBTurboFirestoreCollectionSpec, RCTBridgeModule>
41+
@interface RNFBFirestoreCollectionModule () <NativeRNFBTurboFirestoreCollectionSpec,
42+
RCTBridgeModule>
4243
@end
4344

4445
@implementation RNFBFirestoreCollectionModule
@@ -287,8 +288,10 @@ - (void)aggregateQuery:(NSString *)appName
287288
[RNFBFirestoreCommon
288289
promiseRejectFirestoreException:reject
289290
error:[NSError errorWithDomain:@"RNFB Firestore"
290-
code:0
291-
userInfo:@{NSLocalizedDescriptionKey : reason}]];
291+
code:0
292+
userInfo:@{
293+
NSLocalizedDescriptionKey : reason
294+
}]];
292295
return;
293296
}
294297
}

packages/firestore/ios/RNFBFirestore/RNFBFirestoreDocumentModule.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717

1818
#import <RNFBApp/RNFBRCTEventEmitter.h>
19-
#import "RNFBApp/RCTConvert+FIRApp.h"
2019
#import <React/RCTUtils.h>
20+
#import "RNFBApp/RCTConvert+FIRApp.h"
2121

2222
#import "RNFBFirestoreDocumentModule.h"
2323
#import "RNFBFirestoreTurboModules.h"
@@ -71,8 +71,8 @@ - (void)documentOnSnapshot:(NSString *)appName
7171
databaseId:(NSString *)databaseId
7272
path:(NSString *)path
7373
listenerId:(double)listenerId
74-
snapshotListenOptions:
75-
(JS::NativeRNFBTurboFirestoreDocument::FirestoreSnapshotListenOptions &)snapshotListenOptions {
74+
snapshotListenOptions:(JS::NativeRNFBTurboFirestoreDocument::FirestoreSnapshotListenOptions &)
75+
snapshotListenOptions {
7676
FIRApp *firebaseApp = [RCTConvert firAppFromString:appName];
7777
NSNumber *listenerIdNumber = @(listenerId);
7878

packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.mm

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
*/
1717

1818
#import "RNFBFirestoreModule.h"
19-
#import "RNFBApp/RCTConvert+FIRApp.h"
2019
#import <RNFBApp/RNFBRCTEventEmitter.h>
2120
#import <RNFBApp/RNFBSharedUtils.h>
2221
#import <React/RCTUtils.h>
2322
#import "FirebaseFirestoreInternal/FIRPersistentCacheIndexManager.h"
23+
#import "RNFBApp/RCTConvert+FIRApp.h"
2424
#import "RNFBFirestoreCommon.h"
25-
#import "RNFBPreferences.h"
2625
#import "RNFBFirestoreTurboModules.h"
26+
#import "RNFBPreferences.h"
2727

2828
NSMutableDictionary *emulatorConfigs;
2929
static __strong NSMutableDictionary *snapshotsInSyncListeners;
@@ -264,14 +264,13 @@ - (void)addSnapshotsInSync:(NSString *)appName
264264
databaseId:databaseId];
265265

266266
id<FIRListenerRegistration> listener = [firestore addSnapshotsInSyncListener:^{
267-
[[RNFBRCTEventEmitter shared]
268-
sendEventWithName:RNFB_FIRESTORE_SNAPSHOTS_IN_SYNC
269-
body:@{
270-
@"appName" : appName,
271-
@"databaseId" : databaseId,
272-
@"listenerId" : listenerIdNumber,
273-
@"body" : @{}
274-
}];
267+
[[RNFBRCTEventEmitter shared] sendEventWithName:RNFB_FIRESTORE_SNAPSHOTS_IN_SYNC
268+
body:@{
269+
@"appName" : appName,
270+
@"databaseId" : databaseId,
271+
@"listenerId" : listenerIdNumber,
272+
@"body" : @{}
273+
}];
275274
}];
276275

277276
snapshotsInSyncListeners[listenerIdNumber] = listener;

packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.mm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616
*/
1717

1818
#import <RNFBApp/RNFBRCTEventEmitter.h>
19-
#import "RNFBApp/RCTConvert+FIRApp.h"
2019
#import <RNFBApp/RNFBSharedUtils.h>
2120
#import <React/RCTUtils.h>
21+
#import "RNFBApp/RCTConvert+FIRApp.h"
2222

2323
#import "RNFBFirestoreTransactionModule.h"
2424
#import "RNFBFirestoreTurboModules.h"
2525

2626
static __strong NSMutableDictionary *transactions;
2727
static NSString *const RNFB_FIRESTORE_TRANSACTION_EVENT = @"firestore_transaction_event";
2828

29-
@interface RNFBFirestoreTransactionModule () <NativeRNFBTurboFirestoreTransactionSpec, RCTBridgeModule>
29+
@interface RNFBFirestoreTransactionModule () <NativeRNFBTurboFirestoreTransactionSpec,
30+
RCTBridgeModule>
3031
@end
3132

3233
@implementation RNFBFirestoreTransactionModule

0 commit comments

Comments
 (0)