Skip to content

Commit 31fdf1e

Browse files
committed
Merge branch 'feature/editorconfig' into develop
2 parents f23f6ee + 19a49ff commit 31fdf1e

File tree

2 files changed

+35
-7
lines changed

2 files changed

+35
-7
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,6 +1749,38 @@ ij_properties_spaces_around_key_value_delimiter = false
17491749
[{*.qute.htm,*.qute.html,*.qute.json,*.qute.txt,*.qute.yaml,*.qute.yml}]
17501750
ij_qute_keep_indents_on_empty_lines = false
17511751

1752+
[{*.hcl,*.nomad}]
1753+
ij_hcl_indent_size = 2
1754+
ij_hcl_array_wrapping = normal
1755+
ij_hcl_keep_blank_lines_in_code = 1
1756+
ij_hcl_keep_indents_on_empty_lines = false
1757+
ij_hcl_keep_line_breaks = true
1758+
ij_hcl_object_wrapping = normal
1759+
ij_hcl_property_alignment = on_equals
1760+
ij_hcl_property_line_commenter_character = 1
1761+
ij_hcl_space_after_comma = true
1762+
ij_hcl_space_before_comma = false
1763+
ij_hcl_spaces_around_assignment_operators = true
1764+
ij_hcl_spaces_within_braces = false
1765+
ij_hcl_spaces_within_brackets = false
1766+
ij_hcl_wrap_long_lines = false
1767+
1768+
[{*.tf,*.tfvars}]
1769+
ij_hcl-terraform_indent_size = 2
1770+
ij_hcl-terraform_array_wrapping = normal
1771+
ij_hcl-terraform_keep_blank_lines_in_code = 1
1772+
ij_hcl-terraform_keep_indents_on_empty_lines = false
1773+
ij_hcl-terraform_keep_line_breaks = true
1774+
ij_hcl-terraform_object_wrapping = normal
1775+
ij_hcl-terraform_property_alignment = on_equals
1776+
ij_hcl-terraform_property_line_commenter_character = 1
1777+
ij_hcl-terraform_space_after_comma = true
1778+
ij_hcl-terraform_space_before_comma = false
1779+
ij_hcl-terraform_spaces_around_assignment_operators = true
1780+
ij_hcl-terraform_spaces_within_braces = false
1781+
ij_hcl-terraform_spaces_within_brackets = false
1782+
ij_hcl-terraform_wrap_long_lines = false
1783+
17521784
[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
17531785
ij_toml_keep_indents_on_empty_lines = false
17541786

@@ -1760,6 +1792,9 @@ ij_yaml_block_mapping_on_new_line = false
17601792
ij_yaml_indent_sequence_value = true
17611793
ij_yaml_keep_indents_on_empty_lines = false
17621794
ij_yaml_keep_line_breaks = true
1795+
ij_yaml_line_comment_add_space = true
1796+
ij_yaml_line_comment_add_space_on_reformat = true
1797+
ij_yaml_line_comment_at_first_column = false
17631798
ij_yaml_sequence_on_new_line = false
17641799
ij_yaml_space_before_colon = false
17651800
ij_yaml_spaces_within_braces = true

java/editorconfig/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)