UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/code] Do not autocomplete with arguments

Browse Source 
Eg : arr|ow(x,y,dx,dy) should give arrow(|,,,)
This commit is contained in:
Léa Saviot
2020-05-04 14:28:49 +02:00
committed by Émilie Feral
parent e4aac3f9c6
commit c915eb0b27
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/code/python_text_area.cpp
View File

@@ -356,7 +356,7 @@ void PythonTextArea::addAutocompletion() {
// First load variables and functions that complete the textToAutocomplete
const int scriptIndex = m_contentView.pythonDelegate()->menuController()->editedScriptIndex();
m_contentView.pythonDelegate()->variableBoxController()->loadFunctionsAndVariables(scriptIndex, autocompletionTokenBeginning, autocompletionLocation - autocompletionTokenBeginning);
m_contentView.pythonDelegate()->variableBoxController()->loadFunctionsAndVariables(scriptIndex, autocompletionTokenBeginning, autocompletionLocation - autocompletionTokenBeginning);
if (addAutocompletionTextAtIndex(0)) {
m_contentView.setAutocompleting(true);
@@ -403,12 +403,21 @@ void PythonTextArea::cycleAutocompletion(bool downwards) {
void PythonTextArea::acceptAutocompletion(bool moveCursorToEndOfAutocompletion) {
assert(m_contentView.isAutocompleting());
const char * autocompEnd = m_contentView.autocompletionEnd();
m_contentView.setAutocompleting(false);
m_contentView.setAutocompletionEnd(nullptr);
// Save the cursor location
const char * previousCursorLocation = cursorLocation();
removeAutocompletion();
m_contentView.pythonDelegate()->variableBoxController()->setSender(this);
m_contentView.pythonDelegate()->variableBoxController()->insertAutocompletionResultAtIndex(m_autocompletionResultIndex);
/* Add the autocompletion if we moved the cursor. If we did not want to move
* the cursor, restore its position. */
if (moveCursorToEndOfAutocompletion) {
setCursorLocation(autocompEnd);
addAutocompletion();
} else {
setCursorLocation(previousCursorLocation);
}
}