[clang] e8cc0c3 - [clang-format]: Fix JSON casing (#168156)
via cfe-commits
cfe-commits at lists.llvm.org
Sun Nov 16 08:01:11 PST 2025
Author: Anton Kesy
Date: 2025-11-16T16:01:06Z
New Revision: e8cc0c3eb82789c9d2a22e094a941be180e9ab4b
URL: https://github.com/llvm/llvm-project/commit/e8cc0c3eb82789c9d2a22e094a941be180e9ab4b
DIFF: https://github.com/llvm/llvm-project/commit/e8cc0c3eb82789c9d2a22e094a941be180e9ab4b.diff
LOG: [clang-format]: Fix JSON casing (#168156)
This commit aligns the user clang-format output to always show JSON, not Json.
Added:
Modified:
clang/docs/ClangFormat.rst
clang/tools/clang-format/ClangFormat.cpp
clang/tools/clang-format/git-clang-format
Removed:
################################################################################
diff --git a/clang/docs/ClangFormat.rst b/clang/docs/ClangFormat.rst
index 92af06e5083d6..26490f9c15bb8 100644
--- a/clang/docs/ClangFormat.rst
+++ b/clang/docs/ClangFormat.rst
@@ -50,7 +50,7 @@ to format C/C++/Java/JavaScript/JSON/Objective-C/Protobuf/C# code.
CSharp: .cs
Java: .java
JavaScript: .js .mjs .cjs .ts
- Json: .json .ipynb
+ JSON: .json .ipynb
Objective-C: .m .mm
Proto: .proto .protodevel
TableGen: .td
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp
index 5f6502f7f18a8..12ac8a31f24ab 100644
--- a/clang/tools/clang-format/ClangFormat.cpp
+++ b/clang/tools/clang-format/ClangFormat.cpp
@@ -88,7 +88,7 @@ static cl::opt<std::string> AssumeFileName(
" CSharp: .cs\n"
" Java: .java\n"
" JavaScript: .js .mjs .cjs .ts\n"
- " Json: .json .ipynb\n"
+ " JSON: .json .ipynb\n"
" Objective-C: .m .mm\n"
" Proto: .proto .protodevel\n"
" TableGen: .td\n"
@@ -489,7 +489,7 @@ static bool format(StringRef FileName, bool ErrorOnIncompleteFormat = false) {
auto Err =
Replaces.add(tooling::Replacement(AssumedFileName, 0, 0, "x = "));
if (Err)
- llvm::errs() << "Bad Json variable insertion\n";
+ llvm::errs() << "Bad JSON variable insertion\n";
}
auto ChangedCode = tooling::applyAllReplacements(Code->getBuffer(), Replaces);
diff --git a/clang/tools/clang-format/git-clang-format b/clang/tools/clang-format/git-clang-format
index fe2dd283d403e..dcc0a5347f5d2 100755
--- a/clang/tools/clang-format/git-clang-format
+++ b/clang/tools/clang-format/git-clang-format
@@ -115,7 +115,7 @@ def main():
"ts", # TypeScript
"cs", # C Sharp
"json",
- "ipynb", # Json
+ "ipynb", # JSON
"sv",
"svh",
"v",
More information about the cfe-commits
mailing list