diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2014-12-23 16:30:39 -0800 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-12-23 16:30:39 -0800 |
commit | a21db45cee5e68c17a09f0c0ebc715f24c870a43 (patch) | |
tree | 01035ef80c4b5bbfe1ef27f9969a7c216d0843bd /fish_indent.cpp | |
parent | 2e948d9d6d98a644a4fef83956a4835c1aef9b43 (diff) |
Improve indentation of blocks inside if/while headers
Fixes #1665
Diffstat (limited to 'fish_indent.cpp')
-rw-r--r-- | fish_indent.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fish_indent.cpp b/fish_indent.cpp index 68ed580c..32936106 100644 --- a/fish_indent.cpp +++ b/fish_indent.cpp @@ -84,10 +84,11 @@ static void prettify_node_recursive(const wcstring &source, const parse_node_tre const parse_node_t &node = tree.at(node_idx); const parse_token_type_t node_type = node.type; - /* Increment the indent if we are either a root job_list, or root case_item_list */ + /* Increment the indent if we are either a root job_list, or root case_item_list, or in an if or while header (#1665) */ const bool is_root_job_list = (node_type == symbol_job_list && parent_type != symbol_job_list); const bool is_root_case_item_list = (node_type == symbol_case_item_list && parent_type != symbol_case_item_list); - if (is_root_job_list || is_root_case_item_list) + const bool is_if_while_header = (node_type == symbol_job && (parent_type == symbol_if_clause || parent_type == symbol_while_header)); + if (is_root_job_list || is_root_case_item_list || is_if_while_header) { node_indent += 1; } |