maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format] Start formatting cpp code in raw strings in google style 

Summary: This adds some delimiters to detect cpp code in raw strings.

Reviewers: klimek

Reviewed By: klimek

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D46062

llvm-svn: 330832
This commit is contained in:
Krasimir Georgiev 2018-04-25 14:56:19 +00:00
parent 1f5d994119
commit 5559cc3b75
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
clang/lib/Format/Format.cpp
View File

@ -718,20 +718,39 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
GoogleStyle.ObjCSpaceAfterProperty = false; GoogleStyle.ObjCSpaceAfterProperty = false;
GoogleStyle.ObjCSpaceBeforeProtocolList = true; GoogleStyle.ObjCSpaceBeforeProtocolList = true;
GoogleStyle.PointerAlignment = FormatStyle::PAS_Left; GoogleStyle.PointerAlignment = FormatStyle::PAS_Left;
GoogleStyle.RawStringFormats = {{ GoogleStyle.RawStringFormats = {
FormatStyle::LK_TextProto,
/*Delimiters=*/
{ {
"pb", FormatStyle::LK_Cpp,
"PB", /*Delimiters=*/
"proto", {
"PROTO", "cc",
"CC",
"cpp",
"Cpp",
"CPP",
"c++",
"C++",
},
/*EnclosingFunctionNames=*/
{},
/*CanonicalDelimiter=*/"",
/*BasedOnStyle=*/"google",
}, },
/*EnclosingFunctionNames=*/ {
{}, FormatStyle::LK_TextProto,
/*CanonicalDelimiter=*/"", /*Delimiters=*/
/*BasedOnStyle=*/"google", {
}}; "pb",
"PB",
"proto",
"PROTO",
},
/*EnclosingFunctionNames=*/
{},
/*CanonicalDelimiter=*/"",
/*BasedOnStyle=*/"google",
},
};
GoogleStyle.SpacesBeforeTrailingComments = 2; GoogleStyle.SpacesBeforeTrailingComments = 2;
GoogleStyle.Standard = FormatStyle::LS_Auto; GoogleStyle.Standard = FormatStyle::LS_Auto;