feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't waste time rehighlighting all the files opened in Creator.

Browse Source
This commit is contained in:
Roberto Raggi
2010-12-14 15:04:46 +01:00
parent 6e17e7a3ab
commit ea5d923fe0
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -803,9 +803,6 @@ void QmlJSTextEditor::onDocumentUpdated(QmlJS::Document::Ptr doc)
{ {
if (file()->fileName() != doc->fileName() if (file()->fileName() != doc->fileName()
|| doc->editorRevision() != document()->revision()) { || doc->editorRevision() != document()->revision()) {
// didn't get the currently open, or an up to date document.
// trigger a semantic rehighlight anyway, after a time
m_semanticRehighlightTimer->start();
return; return;
} }

2
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -158,6 +158,7 @@ public:
static QVector<QString> highlighterFormatCategories(); static QVector<QString> highlighterFormatCategories();
public slots: public slots:
void forceSemanticRehighlight();
void followSymbolUnderCursor(); void followSymbolUnderCursor();
void findUsages(); void findUsages();
void showContextPane(); void showContextPane();
@@ -187,7 +188,6 @@ private slots:
void renameIdUnderCursor(); void renameIdUnderCursor();
void semanticRehighlight(); void semanticRehighlight();
void forceSemanticRehighlight();
void updateSemanticInfo(const QmlJSEditor::SemanticInfo &semanticInfo); void updateSemanticInfo(const QmlJSEditor::SemanticInfo &semanticInfo);
void onCursorPositionChanged(); void onCursorPositionChanged();
void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker); void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker);

12
src/plugins/qmljseditor/qmljseditorplugin.cpp
View File

@@ -241,6 +241,8 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
addAutoReleasedObject(new QuickToolBar); addAutoReleasedObject(new QuickToolBar);
addAutoReleasedObject(new Internal::QuickToolBarSettingsPage); addAutoReleasedObject(new Internal::QuickToolBarSettingsPage);
connect(core->editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)), SLOT(currentEditorChanged(Core::IEditor*)));
return true; return true;
} }
@@ -340,4 +342,14 @@ void QmlJSEditorPlugin::quickFixNow()
} }
} }
void QmlJSEditorPlugin::currentEditorChanged(Core::IEditor *editor)
{
if (! editor)
return;
else if (QmlJSTextEditor *textEditor = qobject_cast<QmlJSTextEditor *>(editor->widget())) {
textEditor->forceSemanticRehighlight();
}
}
Q_EXPORT_PLUGIN(QmlJSEditorPlugin) Q_EXPORT_PLUGIN(QmlJSEditorPlugin)

2
src/plugins/qmljseditor/qmljseditorplugin.h
View File

@@ -45,6 +45,7 @@ namespace Core {
class Command; class Command;
class ActionContainer; class ActionContainer;
class ActionManager; class ActionManager;
class IEditor;
} }
namespace TextEditor { namespace TextEditor {
@@ -95,6 +96,7 @@ public Q_SLOTS:
private Q_SLOTS: private Q_SLOTS:
void quickFix(TextEditor::ITextEditable *editable); void quickFix(TextEditor::ITextEditable *editable);
void quickFixNow(); void quickFixNow();
void currentEditorChanged(Core::IEditor *editor);
private: private:
Core::Command *addToolAction(QAction *a, Core::ActionManager *am, Core::Context &context, const QString &name, Core::Command *addToolAction(QAction *a, Core::ActionManager *am, Core::Context &context, const QString &name,