https://github.com/antonkesy updated https://github.com/llvm/llvm-project/pull/168156
>From 939082edc7dd4e10aa85f7741a7250983179af44 Mon Sep 17 00:00:00 2001 From: Anton Kesy <[email protected]> Date: Sat, 15 Nov 2025 00:52:42 +0100 Subject: [PATCH] [clang-format]: Fix JSON casing Aligns user output to always show JSON --- clang/docs/ClangFormat.rst | 2 +- clang/tools/clang-format/ClangFormat.cpp | 4 ++-- clang/tools/clang-format/git-clang-format | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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", _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
