Skip to content

Commit 6e22039

Browse files
committed
fixed 'extends' formatting bug
1 parent 7bbcf56 commit 6e22039

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Fixed
66
- Formatting strings with hash inside
77
- Fixed getattr call formatting bug
8+
- Fixed 'extends' formatting bug
89

910
## [3.2.4] 2020-02-06
1011

gdtoolkit/formatter/block.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def format_block(
2323
blank_lines = reconstruct_blank_lines_in_range(
2424
previously_processed_line_number, statement.line, context,
2525
)
26-
if previously_processed_line_number == context.previously_processed_line_number:
26+
if previous_statement_name is None:
2727
blank_lines = _remove_empty_strings_from_begin(blank_lines)
2828
else:
2929
blank_lines = _add_extra_blanks_due_to_previous_statement(
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
class X:
22
func foo(result, end): # TODO: reconsider
33
var path: String = result.path.substr(0, end).replace("res://", "").replace("tests/", "").replace("/", " ").capitalize()
4+
5+
class Y extends X:
6+
func bar():
7+
pass
8+
9+
class Z extends X:
10+
11+
func bar():
12+
pass
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
11
class X:
22
func foo(result, end): # TODO: reconsider
33
var path: String = result.path.substr(0, end).replace("res://", "").replace("tests/", "").replace("/", " ").capitalize()
4+
5+
6+
class Y:
7+
extends X
8+
9+
func bar():
10+
pass
11+
12+
13+
class Z:
14+
extends X
15+
16+
func bar():
17+
pass

0 commit comments

Comments
 (0)