From f714c2a03b058bf83fe6d86816dcdcd0a5b212e0 Mon Sep 17 00:00:00 2001 From: thakis Date: Wed, 26 Nov 2014 10:03:15 -0800 Subject: [PATCH] clang-format/java: Allow one-line empty functions. Before: void f() { } int g() { return 0; } Now: void f() {} int g() { return 0; } Do this by removing the explicit setting for AllowShortFunctionsOnSingleLine, as of recently [1] it defaults to "Empty" for Java, a new setting that does what we want. Chromium style used to unconditionally override AllowShortFunctionsOnSingleLine to the wrong thing, so I taught clang-format to not do that for Java files, and while there also made -style=Chromium do the right thing for most of the settings [2], so remove most explicit settings from this file. Except for AllowShortFunctionsOnSingleLine, this doesn't change behavior. 1: http://llvm.org/viewvc/llvm-project?view=revision&revision=222819 2: http://llvm.org/viewvc/llvm-project?view=revision&revision=222839 BUG=429372 NOTRY=true Review URL: https://codereview.chromium.org/757313002 Cr-Commit-Position: refs/heads/master@{#305830} --- .clang-format | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.clang-format b/.clang-format index d969a08e948dcc..cd49686f81a2a9 100644 --- a/.clang-format +++ b/.clang-format @@ -10,14 +10,4 @@ Standard: Cpp11 --- Language: Java # See http://crbug.com/429372 for information about this section. -IndentWidth: 4 -ContinuationIndentWidth: 8 -ColumnLimit: 100 -AllowShortBlocksOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -AllowShortIfStatementsOnASingleLine: true -AllowShortLoopsOnASingleLine: true -BinPackArguments: true -BinPackParameters: true -BreakBeforeBinaryOperators: NonAssignment Cpp11BracedListStyle: false # but see http://llvm.org/PR21457