diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-02 19:56:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-02 19:56:35 +0200 |
| commit | 85955c5f25032f546aaccd7820a63ca009e1fef1 (patch) | |
| tree | 4ea1710375864db6501f9ca8c8d2a50b08724d0a | |
| parent | 2beea262bee317d3d566d475f46f45c8d7a7f94e (diff) | |
| parent | dbd253d7a26b2720f92d5372398cc0086f49c5b5 (diff) | |
Merge pull request #31843 from 2shady4u/parserCtrlClick
Solves ctrl+click on functions by ignoring the cursor
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 14d8a3f4a2..9c5b78c8f3 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -252,6 +252,16 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s } } + // Check that the next token is not TK_CURSOR and if it is, the offset should be incremented. + int next_valid_offset = 1; + if (tokenizer->get_token(next_valid_offset) == GDScriptTokenizer::TK_CURSOR) { + next_valid_offset++; + // There is a chunk of the identifier that also needs to be ignored (not always there!) + if (tokenizer->get_token(next_valid_offset) == GDScriptTokenizer::TK_IDENTIFIER) { + next_valid_offset++; + } + } + if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN) { //subexpression () tokenizer->advance(); @@ -668,7 +678,7 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s expr = cn; } - } else if (tokenizer->get_token(1) == GDScriptTokenizer::TK_PARENTHESIS_OPEN && tokenizer->is_token_literal()) { + } else if (tokenizer->get_token(next_valid_offset) == GDScriptTokenizer::TK_PARENTHESIS_OPEN && tokenizer->is_token_literal()) { // We check with is_token_literal, as this allows us to use match/sync/etc. as a name //function or constructor |