Revert "build: upgrade clang-format to v18"

legendecas · targos · commit c8b7a645ae02 · 2024-10-04T10:20:08.000+02:00
This reverts commit c3e1c31. PR-URL: #54994 Refs: #53957 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
diff --git a/.clang-format b/.clang-format
@@ -9,11 +9,11 @@ AlignEscapedNewlines: Right
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Never
+AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: false
+AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
diff --git a/tools/clang-format/package-lock.json b/tools/clang-format/package-lock.json
diff --git a/tools/clang-format/package.json b/tools/clang-format/package.json
@@ -1,6 +1,9 @@
 {
+  "name": "node-core-clang-format",
+  "version": "1.0.0",
   "description": "Formatting C++ files for Node.js core",
+  "license": "MIT",
   "dependencies": {
-    "@wasm-fmt/clang-format": "^18.1.8"
+    "clang-format": "^1.8.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`{`
	`2`	`+ "name": "node-core-clang-format",`
	`3`	`+ "version": "1.0.0",`
`2`	`4`	`"description": "Formatting C++ files for Node.js core",`
	`5`	`+ "license": "MIT",`
`3`	`6`	`"dependencies": {`
`4`		`- "@wasm-fmt/clang-format": "^18.1.8"`
	`7`	`+ "clang-format": "^1.8.0"`
`5`	`8`	`}`
`6`	`9`	`}`