diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-09 11:24:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 11:24:44 +0200 |
| commit | 21727657ff6df8ebbf5860547ecd3c48f22eefe5 (patch) | |
| tree | a7d4be8d445c4b64ad72e955cf43ea7d07d8659d | |
| parent | 0029440955f6d500a0c97bf7348a7b5353db0cea (diff) | |
| parent | 7cc561fe0e2d2bdece2485f38d68d6c9a6d6fd88 (diff) | |
Merge pull request #8319 from bojidar-bg/gdscript-inline-block-indent
Fixup #8123, seems like I forgot a few things
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 9033b51d28..cd16fef6b3 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -2265,6 +2265,7 @@ void GDParser::_parse_block(BlockNode *p_block, bool p_static) { if (!is_first_line && tab_level.back()->prev() && tab_level.back()->prev()->get() == indent_level) { // pythonic single-line expression, don't parse future lines tab_level.pop_back(); + p_block->end_line = tokenizer->get_token_line(); return; } is_first_line = false; @@ -2436,9 +2437,8 @@ void GDParser::_parse_block(BlockNode *p_block, bool p_static) { while (true) { - while (tokenizer->get_token() == GDTokenizer::TK_NEWLINE) { - tokenizer->advance(); - } + while (tokenizer->get_token() == GDTokenizer::TK_NEWLINE && _parse_newline()) + ; if (tab_level.back()->get() < indent_level) { //not at current indent level p_block->end_line = tokenizer->get_token_line(); |