liteeditor golangcode fix prefix min setup

visualfc · visualfc · commit 579d998055be · 2016-12-09T09:50:55.000+08:00
diff --git a/liteidex/src/api/liteeditorapi/liteeditorapi.h b/liteidex/src/api/liteeditorapi/liteeditorapi.h
@@ -123,6 +123,8 @@ class ICompleter : public QObject
     virtual void updateCompleterModel() = 0;
     virtual void updateCompleteInfo(QModelIndex index) = 0;
     virtual void setImportList(const QStringList &importList) = 0;
+    virtual void setPrefixMin(int min) = 0;
+    virtual int prefixMin() const = 0;
 signals:
     void prefixChanged(QTextCursor,QString,bool force);
     void wordCompleted(const QString &func, const QString &kind, const QString &info);
diff --git a/liteidex/src/plugins/golangcode/golangcode.cpp b/liteidex/src/plugins/golangcode/golangcode.cpp
@@ -453,7 +453,7 @@ void GolangCode::prefixChanged(QTextCursor cur,QString pre,bool force)
     if (pre.endsWith('.')) {
         m_preWord = pre;
         offset = 0;
-    } else if (pre.length() == 1) {
+    } else if (pre.length() == m_completer->prefixMin()) {
         m_preWord.clear();
     } else {
         if (!force) {
diff --git a/liteidex/src/plugins/liteeditor/codecompleter.cpp b/liteidex/src/plugins/liteeditor/codecompleter.cpp
@@ -474,6 +474,7 @@ int CodeCompleterProxyModel::filter(const QString &filter, int cs, LiteApi::Comp
     if (!m_model) {
         return 0;
     }
+
     clearItems();
     if (ctx == LiteApi::CompleterImportContext) {
         QIcon icon("icon:liteeditor/images/keyword.png");
diff --git a/liteidex/src/plugins/liteeditor/litecompleter.cpp b/liteidex/src/plugins/liteeditor/litecompleter.cpp
@@ -85,6 +85,7 @@ LiteCompleter::LiteCompleter(QObject *parent) :
     m_completer->setCaseSensitivity(Qt::CaseSensitive);
     m_completer->setSeparator(".");
     m_stop = '(';
+    m_prefixMin = 1;
     QObject::connect(m_completer, SIGNAL(activated(QModelIndex)),
                      this, SLOT(insertCompletion(QModelIndex)));
 }
@@ -343,6 +344,16 @@ void LiteCompleter::setImportList(const QStringList &importList)
     this->m_completer->setImportList(importList);
 }
 
+void LiteCompleter::setPrefixMin(int min)
+{
+    m_prefixMin = min;
+}
+
+int LiteCompleter::prefixMin() const
+{
+    return m_prefixMin;
+}
+
 void LiteCompleter::setSearchSeparator(bool b)
 {
     m_bSearchSeparator = b;
diff --git a/liteidex/src/plugins/liteeditor/litecompleter.h b/liteidex/src/plugins/liteeditor/litecompleter.h
@@ -73,6 +73,8 @@ class LiteCompleter : public LiteApi::ICompleter
     virtual bool startCompleter(const QString &completionPrefix);
     virtual void updateCompleterModel();
     virtual void setImportList(const QStringList &importList);
+    virtual void setPrefixMin(int min);
+    virtual int prefixMin() const;
 public slots:
     virtual void completionPrefixChanged(QString,bool force);
     virtual void insertCompletion(QModelIndex);
@@ -87,6 +89,7 @@ public slots:
     QChar           m_stop;
     bool            m_bSearchSeparator;
     bool            m_bExternalMode;
+    int             m_prefixMin;
 };
 
 #endif // LITECOMPLETER_H
diff --git a/liteidex/src/plugins/liteeditor/liteeditor.cpp b/liteidex/src/plugins/liteeditor/liteeditor.cpp
@@ -1003,7 +1003,6 @@ void LiteEditor::applyOption(QString id)
     bool visualizeWhitespace = m_liteApp->settings()->value(EDITOR_VISUALIZEWHITESPACE,false).toBool();
     int rightLineWidth = m_liteApp->settings()->value(EDITOR_RIGHTLINEWIDTH,80).toInt();
     int min = m_liteApp->settings()->value(EDITOR_PREFIXLENGTH,1).toInt();
-    m_editorWidget->setPrefixMin(min);
 
     m_cleanCompleterCache = m_liteApp->settings()->value(EDITOR_CLEAN_COMPLETERCACHE_SAVE,false).toBool();
     m_cleanWhiteSpace = m_liteApp->settings()->value(EDITOR_CLEANWHITESPACEONSAVE,false).toBool();
@@ -1029,6 +1028,7 @@ void LiteEditor::applyOption(QString id)
     if (m_completer) {
         m_completer->setCaseSensitivity(caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
         m_completer->setFuzzy(fuzzyCompleter);
+        m_completer->setPrefixMin(min);
     }
 
     updateFont();
diff --git a/liteidex/src/plugins/liteeditor/liteeditorwidget.cpp b/liteidex/src/plugins/liteeditor/liteeditorwidget.cpp
@@ -52,7 +52,6 @@ LiteEditorWidget::LiteEditorWidget(LiteApi::IApplication *app, QWidget *parent)
     LiteEditorWidgetBase(app,parent),
     m_completer(0),
     m_contextMenu(0),
-    m_completionPrefixMin(3),
     m_scrollWheelZooming(true),
     m_bSpellCheckZoneDontComplete(false)
 {
@@ -258,9 +257,10 @@ void LiteEditorWidget::keyPressEvent(QKeyEvent *e)
         completionPrefix.insert(0,'@');
     }
 
-    if (hasModifier || e->text().isEmpty()||
-                        ( completionPrefix.length() < m_completionPrefixMin && completionPrefix.right(1) != ".")
-                        || eow.contains(e->text().right(1))) {
+    if (hasModifier ||
+            e->text().isEmpty() ||
+            ( (completionPrefix.length() < m_completer->prefixMin()) && (completionPrefix.right(1) != ".") ) ||
+            eow.contains(e->text().right(1))) {
         if (m_completer->popup()->isVisible()) {
             m_completer->popup()->hide();
             //fmt.Print( -> Print
@@ -282,6 +282,7 @@ void LiteEditorWidget::keyPressEvent(QKeyEvent *e)
         }
         return;
     }
+
     m_completer->setCompletionContext(LiteApi::CompleterCodeContext);
     emit completionPrefixChanged(completionPrefix,false);
     m_completer->startCompleter(completionPrefix);
diff --git a/liteidex/src/plugins/liteeditor/liteeditorwidget.h b/liteidex/src/plugins/liteeditor/liteeditorwidget.h
@@ -33,11 +33,7 @@ class LiteEditorWidget : public LiteEditorWidgetBase
     explicit LiteEditorWidget(LiteApi::IApplication *app, QWidget *parent = 0);
     void setContextMenu(QMenu *contextMenu);
     void setCompleter(LiteApi::ICompleter *completer);
-    void setPrefixMin(int min) {m_completionPrefixMin = min; }
     void setSpellCheckZoneDontComplete(bool b) {m_bSpellCheckZoneDontComplete = b; }
-    int prefixMin() const{
-        return m_completionPrefixMin;
-    }
     void setScrollWheelZooming(bool b) {
         m_scrollWheelZooming = b;
     }
@@ -69,7 +65,6 @@ public slots:
 protected:
     LiteApi::ICompleter *m_completer;
     QMenu      *m_contextMenu;
-    int m_completionPrefixMin;
     bool m_scrollWheelZooming;
     bool m_bSpellCheckZoneDontComplete;
 };

Original file line number	Diff line number	Diff line change
`@@ -474,6 +474,7 @@ int CodeCompleterProxyModel::filter(const QString &filter, int cs, LiteApi::Comp`
`474`	`474`	`if (!m_model) {`
`475`	`475`	`return 0;`
`476`	`476`	`}`
	`477`	`+`
`477`	`478`	`clearItems();`
`478`	`479`	`if (ctx == LiteApi::CompleterImportContext) {`
`479`	`480`	`QIcon icon("icon:liteeditor/images/keyword.png");`