Half-indent public: and private: (#3139)

* Half-indent public: and private:

This improves the readability of unified diffs and
Github code reviews.  The diff format tries to tell
you the context of the change with a text appended
to the @@ line, like so:

@@ -22,7 +22,7 @@ bool contains(kj::StringPtr haystack, kj::StringPtr needle) {

However with our old public/private indentation style
we would often not see the class name, but rather just
whether we were in the public or private section, like so:

@@ -121,7 +121,7 @@ public:

Author: erikcorry

.clang-format

@@ -40,6 +40,11 @@ IndentCaseLabels: true
 PointerAlignment: Left
 DerivePointerAlignment: true
 
+# Move public and private in by a half-indentation.  This makes
+# diffs and Github code reviews more readable by letting you
+# see which class the diff snippet is part of.
+AccessModifierOffset: -1
+
 # Really "Attach" but empty braces aren't split.
 BreakBeforeBraces: Custom
 BraceWrapping:

src/workerd/api/actor-state-iocontext-test.c++

@@ -22,7 +22,7 @@ bool contains(kj::StringPtr haystack, kj::StringPtr needle) {
 }
 
 class MockActorId: public ActorIdFactory::ActorId {
-public:
+ public:
   MockActorId(kj::String id): id(kj::mv(id)) {}
   kj::String toString() const override {
     return kj::str("MockActorId<", id, ">");
@@ -42,7 +42,7 @@ public:
 
   virtual ~MockActorId() {};
 
-private:
+ private:
   kj::String id;
 };
 

src/workerd/api/actor-state.h

@@ -31,7 +31,7 @@ jsg::JsValue deserializeV8Value(
 // Common implementation of DurableObjectStorage and DurableObjectTransaction. This class is
 // designed to be used as a mixin.
 class DurableObjectStorageOperations {
-public:
+ public:
   struct GetOptions {
     jsg::Optional<bool> allowConcurrency;
     jsg::Optional<bool> noCache;
@@ -121,7 +121,7 @@ class DurableObjectStorageOperations {
       jsg::Lock& js, kj::Date scheduledTime, jsg::Optional<SetAlarmOptions> options);
   jsg::Promise<void> deleteAlarm(jsg::Lock& js, jsg::Optional<SetAlarmOptions> options);
 
-protected:
+ protected:
   typedef kj::StringPtr OpName;
   static constexpr OpName OP_GET = "get()"_kj;
   static constexpr OpName OP_GET_ALARM = "getAlarm()"_kj;
@@ -153,7 +153,7 @@ class DurableObjectStorageOperations {
     return kj::mv(options);
   }
 
-private:
+ private:
   jsg::Promise<jsg::JsRef<jsg::JsValue>> getOne(
       jsg::Lock& js, kj::String key, const GetOptions& options);
   jsg::Promise<jsg::JsRef<jsg::JsValue>> getMultiple(
@@ -172,7 +172,7 @@ class DurableObjectStorageOperations {
 class DurableObjectTransaction;
 
 class DurableObjectStorage: public jsg::Object, public DurableObjectStorageOperations {
-public:
+ public:
   DurableObjectStorage(IoPtr<ActorCacheInterface> cache, bool enableSql)
       : cache(kj::mv(cache)),
         enableSql(enableSql) {}
@@ -285,21 +285,21 @@ class DurableObjectStorage: public jsg::Object, public DurableObjectStorageOpera
     });
   }
 
-protected:
+ protected:
   ActorCacheOps& getCache(kj::StringPtr op) override;
 
   bool useDirectIo() override {
     return false;
   }
 
-private:
+ private:
   IoPtr<ActorCacheInterface> cache;
   bool enableSql;
   uint transactionSyncDepth = 0;
 };
 
 class DurableObjectTransaction final: public jsg::Object, public DurableObjectStorageOperations {
-public:
+ public:
   DurableObjectTransaction(IoOwn<ActorCacheInterface::Transaction> cacheTxn)
       : cacheTxn(kj::mv(cacheTxn)) {}
 
@@ -343,14 +343,14 @@ class DurableObjectTransaction final: public jsg::Object, public DurableObjectSt
     });
   }
 
-protected:
+ protected:
   ActorCacheOps& getCache(kj::StringPtr op) override;
 
   bool useDirectIo() override {
     return false;
   }
 
-private:
+ private:
   // Becomes null when committed or rolled back.
   kj::Maybe<IoOwn<ActorCacheInterface::Transaction>> cacheTxn;
 
@@ -364,7 +364,7 @@ class DurableObjectTransaction final: public jsg::Object, public DurableObjectSt
 // used for colo-local namespaces.
 class ActorState: public jsg::Object {
   // TODO(cleanup): Remove getPersistent method that isn't supported for colo-local actors anymore.
-public:
+ public:
   ActorState(Worker::Actor::Id actorId,
       kj::Maybe<jsg::JsRef<jsg::JsValue>> transient,
       kj::Maybe<jsg::Ref<DurableObjectStorage>> persistent);
@@ -402,14 +402,14 @@ class ActorState: public jsg::Object {
     tracker.trackField("persistent", persistent);
   }
 
-private:
+ private:
   Worker::Actor::Id id;
   kj::Maybe<jsg::JsRef<jsg::JsValue>> transient;
   kj::Maybe<jsg::Ref<DurableObjectStorage>> persistent;
 };
 
 class WebSocketRequestResponsePair: public jsg::Object {
-public:
+ public:
   WebSocketRequestResponsePair(kj::String request, kj::String response)
       : request(kj::mv(request)),
         response(kj::mv(response)) {};
@@ -436,14 +436,14 @@ class WebSocketRequestResponsePair: public jsg::Object {
     tracker.trackField("response", response);
   }
 
-private:
+ private:
   kj::String request;
   kj::String response;
 };
 
 // The type passed as the first parameter to durable object class's constructor.
 class DurableObjectState: public jsg::Object {
-public:
+ public:
   DurableObjectState(Worker::Actor::Id actorId, kj::Maybe<jsg::Ref<DurableObjectStorage>> storage);
 
   void waitUntil(kj::Promise<void> promise);
@@ -553,7 +553,7 @@ class DurableObjectState: public jsg::Object {
     tracker.trackField("storage", storage);
   }
 
-private:
+ private:
   Worker::Actor::Id id;
   kj::Maybe<jsg::Ref<DurableObjectStorage>> storage;
 

src/workerd/api/actor.c++

@@ -16,7 +16,7 @@
 namespace workerd::api {
 
 class LocalActorOutgoingFactory final: public Fetcher::OutgoingFactory {
-public:
+ public:
   LocalActorOutgoingFactory(uint channelId, kj::String actorId)
       : channelId(channelId),
         actorId(kj::mv(actorId)) {}
@@ -43,14 +43,14 @@ public:
           .operationName = kj::ConstString("actor_subrequest"_kjc)}));
   }
 
-private:
+ private:
   uint channelId;
   kj::String actorId;
   kj::Maybe<kj::Own<IoChannelFactory::ActorChannel>> actorChannel;
 };
 
 class GlobalActorOutgoingFactory final: public Fetcher::OutgoingFactory {
-public:
+ public:
   GlobalActorOutgoingFactory(uint channelId,
       jsg::Ref<DurableObjectId> id,
       kj::Maybe<kj::String> locationHint,
@@ -85,7 +85,7 @@ public:
           .operationName = kj::ConstString("actor_subrequest"_kjc)}));
   }
 
-private:
+ private:
   uint channelId;
   jsg::Ref<DurableObjectId> id;
   kj::Maybe<kj::String> locationHint;

src/workerd/api/actor.h

@@ -26,7 +26,7 @@ namespace workerd::api {
 
 // A capability to an ephemeral Actor namespace.
 class ColoLocalActorNamespace: public jsg::Object {
-public:
+ public:
   ColoLocalActorNamespace(uint channel): channel(channel) {}
 
   jsg::Ref<Fetcher> get(kj::String actorId);
@@ -35,15 +35,15 @@ class ColoLocalActorNamespace: public jsg::Object {
     JSG_METHOD(get);
   }
 
-private:
+ private:
   uint channel;
 };
 
 class DurableObjectNamespace;
 
 // DurableObjectId type seen by JavaScript.
 class DurableObjectId: public jsg::Object {
-public:
+ public:
   DurableObjectId(kj::Own<ActorIdFactory::ActorId> id): id(kj::mv(id)) {}
 
   const ActorIdFactory::ActorId& getInner() {
@@ -75,7 +75,7 @@ class DurableObjectId: public jsg::Object {
     tracker.trackFieldWithSize("id", sizeof(ActorIdFactory::ActorId));
   }
 
-private:
+ private:
   kj::Own<ActorIdFactory::ActorId> id;
 
   friend class DurableObjectNamespace;
@@ -84,7 +84,7 @@ class DurableObjectId: public jsg::Object {
 // Stub object used to send messages to a remote durable object.
 class DurableObject final: public Fetcher {
 
-public:
+ public:
   DurableObject(jsg::Ref<DurableObjectId> id,
       IoOwn<OutgoingFactory> outgoingFactory,
       RequiresHostAndProtocol requiresHost)
@@ -127,7 +127,7 @@ class DurableObject final: public Fetcher {
     tracker.trackField("id", id);
   }
 
-private:
+ private:
   jsg::Ref<DurableObjectId> id;
 
   void visitForGc(jsg::GcVisitor& visitor) {
@@ -138,7 +138,7 @@ class DurableObject final: public Fetcher {
 // Global durable object class binding type.
 class DurableObjectNamespace: public jsg::Object {
 
-public:
+ public:
   DurableObjectNamespace(uint channel, kj::Own<ActorIdFactory> idFactory)
       : channel(channel),
         idFactory(kj::mv(idFactory)) {}
@@ -219,7 +219,7 @@ class DurableObjectNamespace: public jsg::Object {
     }
   }
 
-private:
+ private:
   uint channel;
   kj::Own<ActorIdFactory> idFactory;
 

src/workerd/api/analytics-engine.h

@@ -26,7 +26,7 @@ namespace workerd::api {
 //
 // https://blog.cloudflare.com/workers-analytics-engine/
 class AnalyticsEngine: public jsg::Object {
-public:
+ public:
   explicit AnalyticsEngine(
       uint logfwdrChannel, kj::String dataset, int64_t version, uint32_t ownerId)
       : logfwdrChannel(logfwdrChannel),
@@ -66,7 +66,7 @@ class AnalyticsEngine: public jsg::Object {
     tracker.trackField("dataset", dataset);
   }
 
-private:
+ private:
   double millisToNanos(double m) {
     return m * 1000000;
   }