diff options
| author | Overblob <xavier.patricelli@gmail.com> | 2018-07-14 19:59:11 +0200 |
|---|---|---|
| committer | Overblob <xavier.patricelli@gmail.com> | 2018-07-14 19:59:11 +0200 |
| commit | 7a74d310aac3bd980d1bffe9b3cd13de2539d356 (patch) | |
| tree | 59b95b647c79dac566860f913ccd0783fe493e67 | |
| parent | 1fc7973a00e17025441b6b8333e38d1606c1d304 (diff) | |
Fixed error due to bad cursor handling when parsing shader code
Fixed completion error log thrown on "no auto-completion found" for typings with no completion.
| -rw-r--r-- | servers/visual/shader_language.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 2069e64c43..abfc6d6a8a 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2545,7 +2545,9 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons TkPos pos = _get_tkpos(); tk = _get_token(); - if (tk.type == TK_PERIOD) { + if (tk.type == TK_CURSOR) { + //do nothing + } else if (tk.type == TK_PERIOD) { StringName identifier; if (_get_completable_identifier(p_block, COMPLETION_INDEX, identifier)) { @@ -4130,8 +4132,8 @@ Error ShaderLanguage::complete(const String &p_code, const Map<StringName, Funct switch (completion_type) { case COMPLETION_NONE: { - //do none - return ERR_PARSE_ERROR; + //do nothing + return OK; } break; case COMPLETION_RENDER_MODE: { for (const Set<String>::Element *E = p_render_modes.front(); E; E = E->next()) { |