Merge pull request godotengine#8319 from bojidar-bg/gdscript-inline-b…

…lock-indent Fixup godotengine#8123, seems like I forgot a few things
JulioJerez · Apr 9, 2017 · 2172765 · 2172765
2 parents 0029440 + 7cc561f
commit 2172765
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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();