clang-format: add InsertNewlineAtEOF (#14267)

Co-authored-by: nektro <[email protected]>
oven-sh · Oct 1, 2024 · e2f20d7 · e2f20d7
1 parent faa524b
commit e2f20d7
Show file tree

Hide file tree

Showing 49 changed files with 146 additions and 120 deletions.
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
     paths:
       - ".github/workflows/clang-format.yml"
-      - ".clang-format"
+      - "**.clang-format"
       - "package.json"
       - "scripts/**"
       - "cmake/**"
@@ -30,6 +30,7 @@ jobs:
     name: clang-format
     runs-on: ubuntu-latest
     steps:
+      - run: sudo rm /usr/bin/clang-format
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -48,12 +49,20 @@ jobs:
       - name: Install LLVM
         run: |
           curl -fsSL https://apt.llvm.org/llvm.sh | sudo bash -s -- ${{ env.LLVM_VERSION_MAJOR }} all
+      - run: ls -l /usr/lib/llvm-${LLVM_VERSION_MAJOR}/bin/
+      - run: echo "/usr/lib/llvm-${LLVM_VERSION_MAJOR}/bin/" >> $GITHUB_PATH
+      - name: Clang Format Version
+        env:
+          ENABLE_CCACHE: OFF
+          LLVM_VERSION: ${{ env.LLVM_VERSION }}
+        run: |
+          bun run clang-format:version
       - name: Clang Format
         env:
           ENABLE_CCACHE: OFF
           LLVM_VERSION: ${{ env.LLVM_VERSION }}
         run: |
-          bun run clang-format:diff
+          bun run clang-format
       - name: Commit
         uses: stefanzweifel/git-auto-commit-action@v5
         with:

diff --git a/cmake/analysis/RunClangFormat.cmake b/cmake/analysis/RunClangFormat.cmake
@@ -11,6 +11,17 @@ find_command(
 
 set(CLANG_FORMAT_SOURCES ${BUN_C_SOURCES} ${BUN_CXX_SOURCES})
 
+register_command(
+  TARGET
+    clang-format-version
+  COMMENT
+    "Print clang-format version"
+  COMMAND
+    ${CLANG_FORMAT_PROGRAM}
+      --version
+  ALWAYS_RUN
+)
+
 register_command(
   TARGET
     clang-format-check

diff --git a/package.json b/package.json
@@ -60,6 +60,7 @@
     "zig:check-windows": "bun run zig build check-windows --summary new",
     "cmake": "bun ./scripts/build.mjs -DCMAKE_BUILD_TYPE=Debug -B build/debug",
     "clang-format": "bun run cmake --target clang-format",
+    "clang-format:version": "bun run cmake --target clang-format-version",
     "clang-format:check": "bun run cmake --target clang-format-check",
     "clang-format:diff": "bun run cmake --target clang-format-diff",
     "clang-tidy": "bun run cmake --target clang-tidy",

diff --git a/src/bun.js/bindings/.clang-format b/src/bun.js/bindings/.clang-format
@@ -73,6 +73,7 @@ IncludeIsMainRegex: "(Test)?$"
 IndentCaseLabels: false
 IndentWidth: 4
 IndentWrappedFunctionNames: false
+InsertNewlineAtEOF: true
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true

diff --git a/src/bun.js/bindings/Base64Helpers.cpp b/src/bun.js/bindings/Base64Helpers.cpp
@@ -50,4 +50,4 @@ ExceptionOr<String> atob(const String& encodedString)
     return outString;
 }
 }
-}
+}
diff --git a/src/bun.js/bindings/BunClientData.cpp b/src/bun.js/bindings/BunClientData.cpp
@@ -94,4 +94,4 @@ void JSVMClientData::create(VM* vm, void* bunVM)
     clientData->builtinFunctions().exportNames();
 }
 
-} // namespace WebCore
+} // namespace WebCore
diff --git a/src/bun.js/bindings/BunCommonStrings.cpp b/src/bun.js/bindings/BunCommonStrings.cpp
@@ -36,4 +36,4 @@ void CommonStrings::visit(Visitor& visitor)
 template void CommonStrings::visit(JSC::AbstractSlotVisitor&);
 template void CommonStrings::visit(JSC::SlotVisitor&);
 
-} // namespace Bun
+} // namespace Bun
diff --git a/src/bun.js/bindings/BunInjectedScriptHost.cpp b/src/bun.js/bindings/BunInjectedScriptHost.cpp
@@ -174,4 +174,4 @@ JSValue BunInjectedScriptHost::getInternalProperties(VM& vm, JSGlobalObject* exe
     return {};
 }
 
-}
+}
diff --git a/src/bun.js/bindings/BunPlugin.cpp b/src/bun.js/bindings/BunPlugin.cpp
@@ -936,4 +936,4 @@ BUN_DEFINE_HOST_FUNCTION(jsFunctionBunPluginClear, (JSC::JSGlobalObject * global
 BUN_DEFINE_HOST_FUNCTION(jsFunctionBunPlugin, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callframe))
 {
     return Bun::setupBunPlugin(globalObject, callframe, BunPluginTargetBun);
-}
+}
diff --git a/src/bun.js/bindings/BunProcess.cpp b/src/bun.js/bindings/BunProcess.cpp
@@ -383,7 +383,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionDlopen,
         return JSValue::encode(jsUndefined());
     }
 
-    JSC::EncodedJSValue (*napi_register_module_v1)(JSC::JSGlobalObject * globalObject,
+    JSC::EncodedJSValue (*napi_register_module_v1)(JSC::JSGlobalObject* globalObject,
         JSC::EncodedJSValue exports);
 #if OS(WINDOWS)
 #define dlsym GetProcAddress
@@ -697,82 +697,82 @@ static void loadSignalNumberMap()
         signalNameToNumberMap->add(signalNames[9], SIGKILL);
         signalNameToNumberMap->add(signalNames[15], SIGTERM);
 #else
-            signalNameToNumberMap->add(signalNames[0], SIGHUP);
-            signalNameToNumberMap->add(signalNames[1], SIGINT);
-            signalNameToNumberMap->add(signalNames[2], SIGQUIT);
-            signalNameToNumberMap->add(signalNames[3], SIGILL);
+        signalNameToNumberMap->add(signalNames[0], SIGHUP);
+        signalNameToNumberMap->add(signalNames[1], SIGINT);
+        signalNameToNumberMap->add(signalNames[2], SIGQUIT);
+        signalNameToNumberMap->add(signalNames[3], SIGILL);
 #ifdef SIGTRAP
-            signalNameToNumberMap->add(signalNames[4], SIGTRAP);
+        signalNameToNumberMap->add(signalNames[4], SIGTRAP);
 #endif
-            signalNameToNumberMap->add(signalNames[5], SIGABRT);
+        signalNameToNumberMap->add(signalNames[5], SIGABRT);
 #ifdef SIGIOT
-            signalNameToNumberMap->add(signalNames[6], SIGIOT);
+        signalNameToNumberMap->add(signalNames[6], SIGIOT);
 #endif
 #ifdef SIGBUS
-            signalNameToNumberMap->add(signalNames[7], SIGBUS);
+        signalNameToNumberMap->add(signalNames[7], SIGBUS);
 #endif
-            signalNameToNumberMap->add(signalNames[8], SIGFPE);
-            signalNameToNumberMap->add(signalNames[9], SIGKILL);
+        signalNameToNumberMap->add(signalNames[8], SIGFPE);
+        signalNameToNumberMap->add(signalNames[9], SIGKILL);
 #ifdef SIGUSR1
-            signalNameToNumberMap->add(signalNames[10], SIGUSR1);
+        signalNameToNumberMap->add(signalNames[10], SIGUSR1);
 #endif
-            signalNameToNumberMap->add(signalNames[11], SIGSEGV);
+        signalNameToNumberMap->add(signalNames[11], SIGSEGV);
 #ifdef SIGUSR2
-            signalNameToNumberMap->add(signalNames[12], SIGUSR2);
+        signalNameToNumberMap->add(signalNames[12], SIGUSR2);
 #endif
 #ifdef SIGPIPE
-            signalNameToNumberMap->add(signalNames[13], SIGPIPE);
+        signalNameToNumberMap->add(signalNames[13], SIGPIPE);
 #endif
 #ifdef SIGALRM
-            signalNameToNumberMap->add(signalNames[14], SIGALRM);
+        signalNameToNumberMap->add(signalNames[14], SIGALRM);
 #endif
-            signalNameToNumberMap->add(signalNames[15], SIGTERM);
+        signalNameToNumberMap->add(signalNames[15], SIGTERM);
 #ifdef SIGCHLD
-            signalNameToNumberMap->add(signalNames[16], SIGCHLD);
+        signalNameToNumberMap->add(signalNames[16], SIGCHLD);
 #endif
 #ifdef SIGCONT
-            signalNameToNumberMap->add(signalNames[17], SIGCONT);
+        signalNameToNumberMap->add(signalNames[17], SIGCONT);
 #endif
 #ifdef SIGSTOP
-            signalNameToNumberMap->add(signalNames[18], SIGSTOP);
+        signalNameToNumberMap->add(signalNames[18], SIGSTOP);
 #endif
 #ifdef SIGTSTP
-            signalNameToNumberMap->add(signalNames[19], SIGTSTP);
+        signalNameToNumberMap->add(signalNames[19], SIGTSTP);
 #endif
 #ifdef SIGTTIN
-            signalNameToNumberMap->add(signalNames[20], SIGTTIN);
+        signalNameToNumberMap->add(signalNames[20], SIGTTIN);
 #endif
 #ifdef SIGTTOU
-            signalNameToNumberMap->add(signalNames[21], SIGTTOU);
+        signalNameToNumberMap->add(signalNames[21], SIGTTOU);
 #endif
 #ifdef SIGURG
-            signalNameToNumberMap->add(signalNames[22], SIGURG);
+        signalNameToNumberMap->add(signalNames[22], SIGURG);
 #endif
 #ifdef SIGXCPU
-            signalNameToNumberMap->add(signalNames[23], SIGXCPU);
+        signalNameToNumberMap->add(signalNames[23], SIGXCPU);
 #endif
 #ifdef SIGXFSZ
-            signalNameToNumberMap->add(signalNames[24], SIGXFSZ);
+        signalNameToNumberMap->add(signalNames[24], SIGXFSZ);
 #endif
 #ifdef SIGVTALRM
-            signalNameToNumberMap->add(signalNames[25], SIGVTALRM);
+        signalNameToNumberMap->add(signalNames[25], SIGVTALRM);
 #endif
 #ifdef SIGPROF
-            signalNameToNumberMap->add(signalNames[26], SIGPROF);
+        signalNameToNumberMap->add(signalNames[26], SIGPROF);
 #endif
-            signalNameToNumberMap->add(signalNames[27], SIGWINCH);
+        signalNameToNumberMap->add(signalNames[27], SIGWINCH);
 #ifdef SIGIO
-            signalNameToNumberMap->add(signalNames[28], SIGIO);
+        signalNameToNumberMap->add(signalNames[28], SIGIO);
 #endif
 #ifdef SIGINFO
-            signalNameToNumberMap->add(signalNames[29], SIGINFO);
+        signalNameToNumberMap->add(signalNames[29], SIGINFO);
 #endif
 
 #ifndef SIGINFO
-            signalNameToNumberMap->add(signalNames[29], 255);
+        signalNameToNumberMap->add(signalNames[29], 255);
 #endif
 #ifdef SIGSYS
-            signalNameToNumberMap->add(signalNames[30], SIGSYS);
+        signalNameToNumberMap->add(signalNames[30], SIGSYS);
 #endif
 #endif
     });

diff --git a/src/bun.js/bindings/BunWorkerGlobalScope.cpp b/src/bun.js/bindings/BunWorkerGlobalScope.cpp
@@ -41,4 +41,4 @@ void WorkerGlobalScope::onDidChangeListenerImpl(EventTarget& self, const AtomStr
     }
 };
 
-}
+}
diff --git a/src/bun.js/bindings/CPUFeatures.cpp b/src/bun.js/bindings/CPUFeatures.cpp
@@ -107,4 +107,4 @@ extern "C" uint8_t bun_cpu_features()
 #else
     return 0;
 #endif
-}
+}
diff --git a/src/bun.js/bindings/ConsoleObject.cpp b/src/bun.js/bindings/ConsoleObject.cpp
@@ -132,4 +132,4 @@ void ConsoleObject::profileEnd(JSC::JSGlobalObject* globalObject, const String&
     }
 }
 
-}
+}
diff --git a/src/bun.js/bindings/ErrorStackFrame.cpp b/src/bun.js/bindings/ErrorStackFrame.cpp
@@ -88,4 +88,4 @@ ZigStackFramePosition getAdjustedPositionForBytecode(JSC::CodeBlock* code, JSC::
     return pos;
 }
 
-} // namespace Bun
+} // namespace Bun
diff --git a/src/bun.js/bindings/InternalModuleRegistry.cpp b/src/bun.js/bindings/InternalModuleRegistry.cpp
@@ -169,4 +169,4 @@ JSC_DEFINE_HOST_FUNCTION(InternalModuleRegistry::jsCreateInternalModuleById, (JS
 } // namespace Bun
 
 #undef INTERNAL_MODULE_REGISTRY_GENERATE_
-#undef INTERNAL_MODULE_REGISTRY_GENERATE
+#undef INTERNAL_MODULE_REGISTRY_GENERATE
diff --git a/src/bun.js/bindings/JS2Native.cpp b/src/bun.js/bindings/JS2Native.cpp
@@ -36,4 +36,4 @@ JSC_DEFINE_HOST_FUNCTION(jsDollarLazy, (JSC::JSGlobalObject * lexicalGlobalObjec
 }
 
 } // namespace JS2Native
-} // namespace Bun
+} // namespace Bun
diff --git a/src/bun.js/bindings/JSCTestingHelpers.cpp b/src/bun.js/bindings/JSCTestingHelpers.cpp
@@ -68,4 +68,4 @@ JSC::JSValue createJSCTestingHelpers(Zig::GlobalObject* globalObject)
     return object;
 }
 
-} // namespace Bun
+} // namespace Bun
diff --git a/src/bun.js/bindings/JSCUSocketsLoopIntegration.cpp b/src/bun.js/bindings/JSCUSocketsLoopIntegration.cpp
@@ -27,4 +27,4 @@ extern "C" void bun_on_tick_after(JSC::VM* vm)
 #if ACQUIRE_RELEASE_HEAP_ACCESS
     // vm->heap.acquireAccess();
 #endif
-}
+}
diff --git a/src/bun.js/bindings/JSDOMFile.cpp b/src/bun.js/bindings/JSDOMFile.cpp
@@ -110,4 +110,4 @@ JSC::JSObject* createJSDOMFileConstructor(JSC::VM& vm, JSC::JSGlobalObject* glob
     return JSDOMFile::create(vm, globalObject);
 }
 
-}
+}
diff --git a/src/bun.js/bindings/JSDOMGlobalObject.cpp b/src/bun.js/bindings/JSDOMGlobalObject.cpp
@@ -84,4 +84,4 @@ Zig::GlobalObject* toJSDOMGlobalObject(ScriptExecutionContext& ctx, DOMWrapperWo
 //     return callerGlobalObject(lexicalGlobalObject, callFrame, skipFirstFrame, lookUpFromVMEntryScope);
 // }
 
-}
+}
diff --git a/src/bun.js/bindings/JSMockFunction.cpp b/src/bun.js/bindings/JSMockFunction.cpp
@@ -1585,4 +1585,4 @@ BUN_DEFINE_HOST_FUNCTION(JSMock__jsMockFn, (JSC::JSGlobalObject * lexicalGlobalO
     return JSValue::encode(thisObject);
 }
 
-#undef CHECK_IS_MOCK_FUNCTION
+#undef CHECK_IS_MOCK_FUNCTION
diff --git a/src/bun.js/bindings/JSNextTickQueue.cpp b/src/bun.js/bindings/JSNextTickQueue.cpp
@@ -93,4 +93,4 @@ void JSNextTickQueue::drain(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
     }
 }
 
-}
+}
diff --git a/src/bun.js/bindings/KeyObject.cpp b/src/bun.js/bindings/KeyObject.cpp
@@ -3113,7 +3113,7 @@ static EncodedJSValue doAsymmetricSign(JSGlobalObject* globalObject, CallFrame*
         // We may classify the key as RSA_OAEP, but it can still be used for signing. RSA_PSS relies
         // on an incompatible scheme, and must be used via the generic crypto.sign function.
         || (cryptoKey.algorithmIdentifier() != CryptoAlgorithmIdentifier::RSA_OAEP
-        && cryptoKey.algorithmIdentifier() != CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5)) {
+            && cryptoKey.algorithmIdentifier() != CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5)) {
         return Bun::throwError(globalObject, scope, Bun::ErrorCode::ERR_INVALID_ARG_VALUE,
             "unsupported key type for asymmetric signing"_s);
     }
@@ -3141,7 +3141,7 @@ static EncodedJSValue doAsymmetricSign(JSGlobalObject* globalObject, CallFrame*
 
     const auto& rsaKey = downcast<CryptoKeyRSA>(cryptoKey);
     auto operation = encrypt ? CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSignNoAlgorithm
-        : CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerifyRecover;
+                             : CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerifyRecover;
     auto result = operation(rsaKey, padding, buffer);
     if (result.hasException()) {
         WebCore::propagateException(*globalObject, scope, result.releaseException());
@@ -3151,12 +3151,12 @@ static EncodedJSValue doAsymmetricSign(JSGlobalObject* globalObject, CallFrame*
     return JSValue::encode(WebCore::createBuffer(globalObject, outBuffer));
 }
 
-JSC_DEFINE_HOST_FUNCTION(KeyObject__privateEncrypt, (JSGlobalObject* globalObject, CallFrame* callFrame))
+JSC_DEFINE_HOST_FUNCTION(KeyObject__privateEncrypt, (JSGlobalObject * globalObject, CallFrame* callFrame))
 {
     return doAsymmetricSign(globalObject, callFrame, true);
 }
 
-JSC_DEFINE_HOST_FUNCTION(KeyObject__publicDecrypt, (JSGlobalObject* globalObject, CallFrame* callFrame))
+JSC_DEFINE_HOST_FUNCTION(KeyObject__publicDecrypt, (JSGlobalObject * globalObject, CallFrame* callFrame))
 {
     return doAsymmetricSign(globalObject, callFrame, false);
 }

diff --git a/src/bun.js/bindings/NodeAsyncHooks.cpp b/src/bun.js/bindings/NodeAsyncHooks.cpp
@@ -48,4 +48,4 @@ JSC::JSValue createAsyncHooksBinding(Zig::GlobalObject* globalObject)
     return binding;
 }
 
-}
+}
diff --git a/src/bun.js/bindings/NodeFetch.cpp b/src/bun.js/bindings/NodeFetch.cpp
@@ -47,4 +47,4 @@ JSC::JSValue createNodeFetchInternalBinding(Zig::GlobalObject* globalObject)
     return obj;
 }
 
-}
+}
diff --git a/src/bun.js/bindings/NodeTLS.cpp b/src/bun.js/bindings/NodeTLS.cpp
@@ -37,4 +37,4 @@ JSC::JSValue createNodeTLSBinding(Zig::GlobalObject* globalObject)
     return obj;
 }
 
-} // namespace Bun
+} // namespace Bun
diff --git a/src/bun.js/bindings/ProcessBindingTTYWrap.cpp b/src/bun.js/bindings/ProcessBindingTTYWrap.cpp
@@ -517,4 +517,4 @@ JSValue createNodeTTYWrapObject(JSC::JSGlobalObject* globalObject)
 
     return obj;
 }
-}
+}
diff --git a/src/bun.js/bindings/ProcessBindingUV.cpp b/src/bun.js/bindings/ProcessBindingUV.cpp
@@ -171,4 +171,4 @@ JSObject* create(VM& vm, JSGlobalObject* globalObject)
 }
 
 } // namespace ProcessBindingUV
-} // namespace Bun
+} // namespace Bun
diff --git a/src/bun.js/bindings/RegularExpression.cpp b/src/bun.js/bindings/RegularExpression.cpp
@@ -38,4 +38,4 @@ extern "C" int Yarr__RegularExpression__searchRev(RegularExpression* re, BunStri
 extern "C" int Yarr__RegularExpression__matches(RegularExpression* re, BunString string)
 {
     return re->match(string.toWTFString(BunString::ZeroCopy), 0, 0);
-}
+}
diff --git a/src/bun.js/bindings/Serialization.cpp b/src/bun.js/bindings/Serialization.cpp
@@ -56,4 +56,4 @@ extern "C" EncodedJSValue Bun__JSValue__deserialize(JSGlobalObject* globalObject
     /// ?! did i just give ownership of these bytes to JSC?
     auto scriptValue = SerializedScriptValue::createFromWireBytes(WTFMove(vector));
     return JSValue::encode(scriptValue->deserialize(*globalObject, globalObject));
-}
+}