Repository: freemarker Updated Branches: refs/heads/2.3-gae 42450882c -> 022714ad6
IntelliJ IDE setting improvements Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/db4cb244 Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/db4cb244 Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/db4cb244 Branch: refs/heads/2.3-gae Commit: db4cb2443d6e1c79cf469a663008da7536028719 Parents: 4245088 Author: ddekany <ddek...@apache.org> Authored: Sun Oct 21 19:44:15 2018 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sun Oct 21 19:44:15 2018 +0200 ---------------------------------------------------------------------- .../Java-code-style-FreeMarker.xml | 71 ++++++++------------ 1 file changed, 27 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/freemarker/blob/db4cb244/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml ---------------------------------------------------------------------- diff --git a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml index 983f742..e5b49d0 100644 --- a/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml +++ b/src/ide-settings/IntelliJ-IDEA/Java-code-style-FreeMarker.xml @@ -1,55 +1,37 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<code_scheme name="FreeMarker"> +<code_scheme name="FreeMarker" version="173"> <option name="LINE_SEPARATOR" value="
" /> - <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> - <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1" /> - <option name="IMPORT_LAYOUT_TABLE"> - <value> - <package name="" withSubpackages="true" static="true" /> - <emptyLine /> - <package name="java" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="javax" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="org" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="com" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="" withSubpackages="true" static="false" /> - <emptyLine /> - </value> - </option> <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" /> - <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" /> - <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" /> - <option name="JD_KEEP_EMPTY_PARAMETER" value="false" /> - <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" /> - <option name="JD_KEEP_EMPTY_RETURN" value="false" /> - <option name="JD_PARAM_DESCRIPTION_ON_NEW_LINE" value="true" /> - <option name="WRAP_COMMENTS" value="true" /> <JavaCodeStyleSettings> <option name="ANNOTATION_PARAMETER_WRAP" value="1" /> <option name="CLASS_NAMES_IN_JAVADOC" value="3" /> + <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> + <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1" /> + <option name="IMPORT_LAYOUT_TABLE"> + <value> + <package name="" withSubpackages="true" static="true" /> + <emptyLine /> + <package name="java" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="javax" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="org" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="com" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="" withSubpackages="true" static="false" /> + <emptyLine /> + </value> + </option> + <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" /> + <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" /> + <option name="JD_KEEP_EMPTY_PARAMETER" value="false" /> + <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" /> + <option name="JD_KEEP_EMPTY_RETURN" value="false" /> + <option name="JD_PARAM_DESCRIPTION_ON_NEW_LINE" value="true" /> </JavaCodeStyleSettings> <codeStyleSettings language="JAVA"> <option name="RIGHT_MARGIN" value="120" /> + <option name="ALIGN_MULTILINE_PARAMETERS" value="false" /> <option name="CALL_PARAMETERS_WRAP" value="1" /> <option name="EXTENDS_LIST_WRAP" value="1" /> <option name="THROWS_LIST_WRAP" value="1" /> @@ -59,6 +41,7 @@ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" /> <option name="ARRAY_INITIALIZER_WRAP" value="1" /> <option name="ASSIGNMENT_WRAP" value="1" /> + <option name="WRAP_COMMENTS" value="true" /> <option name="WRAP_LONG_LINES" value="true" /> <option name="PARAMETER_ANNOTATION_WRAP" value="1" /> <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
