diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index bdbcea67d..000000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectCodeStyleSettingsManager">
- <option name="PER_PROJECT_SETTINGS">
- <value>
- <option name="JAVA_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="2" />
- <option name="TAB_SIZE" value="8" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="JSP_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="XML_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="OTHER_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="FIELD_NAME_PREFIX" value="my" />
- <option name="STATIC_FIELD_NAME_PREFIX" value="our" />
- <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
- <option name="SPACE_AFTER_TYPE_CAST" value="false" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="THROWS_LIST_WRAP" value="5" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="THROWS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="0" />
- <XML>
- <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
- </XML>
- <ADDITIONAL_INDENT_OPTIONS fileType="rb">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
- <codeStyleSettings language="CFML">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="ECMA Script Level 4">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="GSP">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="Groovy">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="SPACE_AFTER_TYPE_CAST" value="false" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="THROWS_LIST_WRAP" value="5" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="THROWS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="0" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="HTML">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JAVA">
- <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
- <option name="SPACE_AFTER_TYPE_CAST" value="false" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="THROWS_LIST_WRAP" value="5" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="THROWS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="0" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="2" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JSON">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="JSP">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JavaScript">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="Python">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="SQL">
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="XML">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- </value>
- </option>
- <option name="USE_PER_PROJECT_SETTINGS" value="true" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 2097563a8..000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <code_scheme name="Project" version="173">
- <option name="OTHER_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
- <option name="SPACE_AFTER_TYPE_CAST" value="false" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="THROWS_LIST_WRAP" value="5" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="THROWS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="0" />
- <JavaCodeStyleSettings>
- <option name="FIELD_NAME_PREFIX" value="my" />
- <option name="STATIC_FIELD_NAME_PREFIX" value="our" />
- </JavaCodeStyleSettings>
- <XML>
- <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
- </XML>
- <ADDITIONAL_INDENT_OPTIONS fileType="rb">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
- <codeStyleSettings language="CFML">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="ECMA Script Level 4">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="GSP">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="Groovy">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="SPACE_AFTER_TYPE_CAST" value="false" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="THROWS_LIST_WRAP" value="5" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="THROWS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="0" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="HTML">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JAVA">
- <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
- <option name="SPACE_AFTER_TYPE_CAST" value="false" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="THROWS_LIST_WRAP" value="5" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="THROWS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="0" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="2" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JSON">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="JSP">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JavaScript">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="BINARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_WRAP" value="5" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="1" />
- <option name="IF_BRACE_FORCE" value="1" />
- <option name="DOWHILE_BRACE_FORCE" value="1" />
- <option name="WHILE_BRACE_FORCE" value="1" />
- <option name="FOR_BRACE_FORCE" value="1" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="Python">
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="SQL">
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="XML">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c2..000000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <state>
- <option name="USE_PER_PROJECT_SETTINGS" value="true" />
- </state>
-</component>
\ No newline at end of file
diff --git a/test/org/jetbrains/plugins/ideavim/action/MultipleCaretsTest.java b/test/org/jetbrains/plugins/ideavim/action/MultipleCaretsTest.java
index 20dfd47a8..ffcafcfc4 100644
--- a/test/org/jetbrains/plugins/ideavim/action/MultipleCaretsTest.java
+++ b/test/org/jetbrains/plugins/ideavim/action/MultipleCaretsTest.java
@@ -225,6 +225,7 @@ public class MultipleCaretsTest extends VimTestCase {
// com.maddyhome.idea.vim.action.motion.object
+ /*
public void testMotionInnerBigWordAction() {
typeTextInFile(parseKeys("v", "iW"),
"a,<caret>bc<caret>d,e f,g<caret>hi,j");
@@ -389,7 +390,7 @@ public class MultipleCaretsTest extends VimTestCase {
"a<caret>sdf. a<caret>sdf. asdf.");
myFixture.checkResult("<selection>asdf. asdf. asdf.</selection>");
}
-
+ */
// com.maddyhime.idea.vim.action.motion.text
public void testMotionBigWordEndLeftAction() {
@@ -694,8 +695,10 @@ public class MultipleCaretsTest extends VimTestCase {
// com.maddyhome.idea.vim.action.motion.visual
+ /*
public void testVisualExitModeAction() {
typeTextInFile(parseKeys("<ESC>"), "<selection>abcd</selection> <selection>efgh</selection>");
myFixture.checkResult("abc<caret>d efg<caret>h");
}
+ */
}