Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/docs/ClangFormat.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions clang/tools/clang-format/ClangFormat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion clang/tools/clang-format/git-clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def main():
"ts", # TypeScript
"cs", # C Sharp
"json",
"ipynb", # Json
"ipynb", # JSON
"sv",
"svh",
"v",
Expand Down
Loading