Merge branch 'master' of git.246060.ru:f1x1t/uncrustify
This commit is contained in:
		
							
								
								
									
										10
									
								
								default.cfg
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								default.cfg
									
									
									
									
									
								
							@@ -1238,13 +1238,13 @@ nl_func_leave_one_liners        = true     # true/false
 | 
				
			|||||||
nl_cpp_lambda_leave_one_liners  = true     # true/false
 | 
					nl_cpp_lambda_leave_one_liners  = true     # true/false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Don't split one-line if/else statements, as in 'if(...) b++;'.
 | 
					# Don't split one-line if/else statements, as in 'if(...) b++;'.
 | 
				
			||||||
nl_if_leave_one_liners          = false    # true/false
 | 
					nl_if_leave_one_liners          = true     # true/false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Don't split one-line while statements, as in 'while(...) b++;'.
 | 
					# Don't split one-line while statements, as in 'while(...) b++;'.
 | 
				
			||||||
nl_while_leave_one_liners       = false    # true/false
 | 
					nl_while_leave_one_liners       = true     # true/false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Don't split one-line for statements, as in 'for(...) b++;'.
 | 
					# Don't split one-line for statements, as in 'for(...) b++;'.
 | 
				
			||||||
nl_for_leave_one_liners         = false    # true/false
 | 
					nl_for_leave_one_liners         = true     # true/false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# (OC) Don't split one-line Objective-C messages.
 | 
					# (OC) Don't split one-line Objective-C messages.
 | 
				
			||||||
nl_oc_msg_leave_one_liner       = false    # true/false
 | 
					nl_oc_msg_leave_one_liner       = false    # true/false
 | 
				
			||||||
@@ -1410,7 +1410,7 @@ nl_brace_square                 = ignore   # ignore/add/remove/force
 | 
				
			|||||||
nl_brace_fparen                 = ignore   # ignore/add/remove/force
 | 
					nl_brace_fparen                 = ignore   # ignore/add/remove/force
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Add or remove newline between 'while' and '{'.
 | 
					# Add or remove newline between 'while' and '{'.
 | 
				
			||||||
nl_while_brace                  = ignore   # ignore/add/remove/force
 | 
					nl_while_brace                  = add      # ignore/add/remove/force
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# (D) Add or remove newline between 'scope (x)' and '{'.
 | 
					# (D) Add or remove newline between 'scope (x)' and '{'.
 | 
				
			||||||
nl_scope_brace                  = ignore   # ignore/add/remove/force
 | 
					nl_scope_brace                  = ignore   # ignore/add/remove/force
 | 
				
			||||||
@@ -1435,7 +1435,7 @@ nl_do_brace                     = ignore   # ignore/add/remove/force
 | 
				
			|||||||
nl_brace_while                  = ignore   # ignore/add/remove/force
 | 
					nl_brace_while                  = ignore   # ignore/add/remove/force
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Add or remove newline between 'switch' and '{'.
 | 
					# Add or remove newline between 'switch' and '{'.
 | 
				
			||||||
nl_switch_brace                 = ignore   # ignore/add/remove/force
 | 
					nl_switch_brace                 = add      # ignore/add/remove/force
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Add or remove newline between 'synchronized' and '{'.
 | 
					# Add or remove newline between 'synchronized' and '{'.
 | 
				
			||||||
nl_synchronized_brace           = ignore   # ignore/add/remove/force
 | 
					nl_synchronized_brace           = ignore   # ignore/add/remove/force
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user