Skip to content

Commit

Permalink
Merge pull request #175 from TheDragonCode/3.x
Browse files Browse the repository at this point in the history 
Update rules and bump dependencies
  • Loading branch information
@andrey-helldar
andrey-helldar authored Jul 11, 2023
2 parents edcc7d4 + 613514c commit 7931a87
Show file tree
Hide file tree
Showing 5 changed files with 185 additions and 48 deletions.
6 changes: 2 additions & 4 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ ij_css_use_double_quotes = true
ij_css_value_alignment = do_not_align

[*.less]
indent_size = 2
ij_less_align_closing_brace_with_properties = false
ij_less_blank_lines_around_nested_selector = 1
ij_less_blank_lines_between_blocks = 1
Expand All @@ -63,7 +62,6 @@ ij_less_use_double_quotes = true
ij_less_value_alignment = 0

[*.sass]
indent_size = 2
ij_sass_align_closing_brace_with_properties = false
ij_sass_blank_lines_around_nested_selector = 1
ij_sass_blank_lines_between_blocks = 1
Expand Down Expand Up @@ -502,7 +500,7 @@ ij_php_align_assignments = true
ij_php_align_class_constants = true
ij_php_align_enum_cases = true
ij_php_align_group_field_declarations = false
ij_php_align_inline_comments = true
ij_php_align_inline_comments = false
ij_php_align_key_value_pairs = true
ij_php_align_match_arm_bodies = true
ij_php_align_multiline_array_initializer_expression = true
Expand Down Expand Up @@ -773,7 +771,7 @@ ij_html_text_wrap = off
[{*.http,*.rest}]
indent_size = 0
ij_continuation_indent_size = 4
ij_http request_call_parameters_wrap = normal
ij_http request_call_parameters_wrap = on_every_item

[{*.markdown,*.md}]
ij_markdown_force_one_space_after_blockquote_symbol = true
Expand Down
145 changes: 142 additions & 3 deletions The_Dragon_Code_phpStorm.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<code_scheme name="The Dragon Code copy" version="173">
<code_scheme name="The Dragon Code" version="173">
<option name="LINE_SEPARATOR" value="&#10;" />
<option name="ENABLE_SECOND_REFORMAT" value="true" />
<CssCodeStyleSettings>
Expand Down Expand Up @@ -43,7 +43,6 @@
<PHPCodeStyleSettings>
<option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
<option name="ALIGN_ASSIGNMENTS" value="true" />
<option name="ALIGN_INLINE_COMMENTS" value="true" />
<option name="ALIGN_NAMED_ARGUMENTS" value="true" />
<option name="ALIGN_MATCH_ARM_BODIES" value="true" />
<option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
Expand Down Expand Up @@ -103,9 +102,11 @@
<SqlCodeStyleSettings version="6">
<option name="KEYWORD_CASE" value="2" />
<option name="IDENTIFIER_CASE" value="1" />
<option name="ALIAS_CASE" value="1" />
<option name="TYPE_CASE" value="3" />
<option name="ALIAS_CASE" value="4" />
<option name="QUOTED_IDENTIFIER_CASE" value="1" />
<option name="QUOTE_IDENTIFIER" value="2" />
<option name="QUERY_EL_LINE" value="101" />
</SqlCodeStyleSettings>
<TypeScriptCodeStyleSettings version="0">
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
Expand Down Expand Up @@ -154,6 +155,9 @@
<rules />
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="HTTP Request">
<option name="CALL_PARAMETERS_WRAP" value="5" />
</codeStyleSettings>
<codeStyleSettings language="JSON">
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
<option name="SPACE_WITHIN_BRACES" value="true" />
Expand All @@ -170,6 +174,11 @@
<option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
</codeStyleSettings>
<codeStyleSettings language="LESS">
<indentOptions>
<option name="INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="PHP">
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
Expand Down Expand Up @@ -574,6 +583,11 @@
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="SASS">
<indentOptions>
<option name="INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="SCSS">
<option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
Expand Down Expand Up @@ -609,6 +623,131 @@
<option name="INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>v-model</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>(v-bind:|:|v-)?is</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>v-for</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>v-(if|else-if|else|show|cloak)</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>v-(pre|once)</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>(v-bind:|:)?id</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>(v-bind:|:)?(ref|key|slot|slot-scope)|v-slot</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>v-(?!on:|bind:|(html|text|bind|on)$).+</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>(?!v-on:|@|v-on$|v-html$|v-text$).+</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>((v-on:|@)\\w+)|v-on$</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>v-html|v-text</NAME>
<XML_ATTRIBUTE />
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="XML">
<option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
Expand Down
Binary file modified builds/codestyle
View file
Binary file not shown.
Loading

0 comments on commit 7931a87

Please sign in to comment.