Skip to content

Fix missing space between binary and unary operators in reconstruction #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kkozik-amplify wants to merge 1 commit into
base: release/8.x
Choose a base branch
from
Open

Fix missing space between binary and unary operators in reconstruction #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions hcl2/reconstructor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ def _should_add_space_before(
elif isinstance(current_node, Tree):
rule_name = current_node.data

# Space after binary operator tokens before a tree node (e.g. && !foo)
if self._last_token_name in self._binary_op_types:
return True

if parent_rule_name == BlockRule.lark_name():
# Add space between multiple string/identifier labels in blocks
if rule_name in [
Expand Down
10 changes: 10 additions & 0 deletions test/integration/hcl2_original/smoke.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ block multiline_binary_ops {
}
}

block binary_op_before_unary {
dedup_keys_layer7 = {
for k, v in local.action_keys_layer7 :
k => v
if !contains(keys(local.dedup_keys_layer8), k)
&& !contains(keys(local.dedup_keys_layer9), k)
&& !contains(keys(local.dedup_keys_layer10), k)
}
}

block {
route53_forwarding_rule_shares = {
for forwarding_rule_key in keys(var.route53_resolver_forwarding_rule_shares) :
Expand Down
9 changes: 9 additions & 0 deletions test/integration/hcl2_reconstructed/smoke.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ block multiline_binary_ops {
}


block binary_op_before_unary {
dedup_keys_layer7 = {
for k, v in local.action_keys_layer7 :
k => v
if !contains(keys(local.dedup_keys_layer8), k) && !contains(keys(local.dedup_keys_layer9), k) && !contains(keys(local.dedup_keys_layer10), k)
}
}


block {
route53_forwarding_rule_shares = {
for forwarding_rule_key in keys(var.route53_resolver_forwarding_rule_shares) :
Expand Down
6 changes: 6 additions & 0 deletions test/integration/json_reserialized/smoke.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@
"__is_block__": true
}
},
{
"binary_op_before_unary": {
"dedup_keys_layer7": "${{for k, v in local.action_keys_layer7 : k => v if !contains(keys(local.dedup_keys_layer8), k) && !contains(keys(local.dedup_keys_layer9), k) && !contains(keys(local.dedup_keys_layer10), k)}}",
"__is_block__": true
}
},
{
"route53_forwarding_rule_shares": "${{for forwarding_rule_key in keys(var.route53_resolver_forwarding_rule_shares) : \"${forwarding_rule_key}\" => {aws_account_ids = [for account_name in var.route53_resolver_forwarding_rule_shares[forwarding_rule_key].aws_account_names : module.remote_state_subaccounts.map[account_name].outputs[\"aws_account_id\"]]}... if substr(bucket_name, 0, 1) == \"l\"}}",
"__is_block__": true
Expand Down
6 changes: 6 additions & 0 deletions test/integration/json_serialized/smoke.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@
"__is_block__": true
}
},
{
"binary_op_before_unary": {
"dedup_keys_layer7": "${{for k, v in local.action_keys_layer7 : k => v if !contains(keys(local.dedup_keys_layer8), k) && !contains(keys(local.dedup_keys_layer9), k) && !contains(keys(local.dedup_keys_layer10), k)}}",
"__is_block__": true
}
},
{
"route53_forwarding_rule_shares": "${{for forwarding_rule_key in keys(var.route53_resolver_forwarding_rule_shares) : \"${forwarding_rule_key}\" => {aws_account_ids = [for account_name in var.route53_resolver_forwarding_rule_shares[forwarding_rule_key].aws_account_names : module.remote_state_subaccounts.map[account_name].outputs[\"aws_account_id\"]]}... if substr(bucket_name, 0, 1) == \"l\"}}",
"__is_block__": true
Expand Down
Loading