fix #3731

texstudio-org · Jul 15, 2024 · 64f4125 · 64f4125
1 parent 1169528
commit 64f4125
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/latexcompleter.cpp b/src/latexcompleter.cpp
@@ -451,7 +451,7 @@ class CompleterInputBinding: public QEditorInputBinding
 				} else if (getCurWord() == "") {
 					maxWritten = curStart + 1;
 				} else {
-					if (LatexCompleter::config && LatexCompleter::config->eowCompletes) {
+                    if (LatexCompleter::config && LatexCompleter::config->eowCompletes && !completer->isCurrentWordUserConstruct()) {
 						insertCompletedWord();
 					}
 					QDocumentCursor edc = editor->cursor();
@@ -1970,6 +1970,17 @@ void LatexCompleter::setTab(int index)
 		tbAbove->setCurrentIndex(index);
 }
 
+bool LatexCompleter::isCurrentWordUserConstruct()
+{
+    if (list->isVisible() && list->currentIndex().isValid()){
+        QVariant v = list->model()->data(list->currentIndex(), Qt::DisplayRole);
+        if (!v.isValid() || !v.canConvert<CompletionWord>()) return false;
+        CompletionWord cw = v.value<CompletionWord>();
+        return cw.type == CompletionWord::userConstruct;
+    }
+    return false;
+}
+
 void LatexCompleter::filterList(QString word, int showMostUsed)
 {
 	QString cur = ""; //needed to preserve selection

diff --git a/src/latexcompleter.h b/src/latexcompleter.h
@@ -84,6 +84,8 @@ class LatexCompleter : public QObject
 	int countWords();
 	void setTab(int index); ///< bring given 'tab' to front
 
+    bool isCurrentWordUserConstruct(); ///< check if current word is a user construct
+
 	void insertText(QString txt); ///< insert 'txt'
 
 	void showTooltip(QString text); ///< show tooltip