feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
11,924 Commits 108 Branches 368 Tags
d34c3368194ecea70ac12fcf4335c6712aa4788b
Commit Graph

41 Commits

Author SHA1 Message Date
Kai Koehne
2e1a36963e QmlJSEditor: Delay synchronization of cursor2outline selection by 150ms 2010-07-12 17:03:49 +02:00
Kai Koehne
503f720f85 Outline: Make recalculation of current model index more robust 2010-07-12 16:40:43 +02:00
Kai Koehne
94264617bf QmlJSEditor: Use QmlOutline model also in combo box 
The drop down combo box and the Outline in the sidebar now share
the same model.
 2010-07-12 14:46:29 +02:00
Kai Koehne
ebe388ee92 QmlJSEditor: Signal that new semanticInfo is available 
Will be used in QmlJSOutline.
 2010-07-08 14:02:51 +02:00
Thomas Hartmann
5a971334ef qmlsjeditor: activate context pane 2010-07-07 13:09:57 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
Thorbjørn Lindeijer
173cdff56c Merge branch '2.0' 
Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-15 13:22:33 +02:00
Thorbjørn Lindeijer
83dba068ce Avoid triggering indent for electric characters in comments and strings 
In comments and strings, electric characters have no syntactical
significance and the unnecessary automatic reindent can be annoying.

Reviewed-by: Erik Verbruggen
 2010-06-15 12:25:01 +02:00
Erik Verbruggen
05639e4688 Merge branch 'origin/2.0' (early part) 2010-06-15 11:30:51 +02:00
Thorbjørn Lindeijer
6875a50d27 Don't pass QChar as const & since it's just a unsigned short 
Reviewed-by: ogoffart
 2010-06-14 16:10:35 +02:00
Roberto Raggi
726c3345c4 Moved qmljsmodelmanagerinterface.h 2010-06-10 11:59:27 +02:00
Roberto Raggi
21073563a4 Introduced quickfix support for QML/JS files. 2010-06-03 15:52:50 +02:00
Lasse Holmstedt
1358619cf0 removed missing implementation for slot 2010-04-23 13:59:40 +02:00
Lasse Holmstedt
21fbbc2c15 Added preview menu and shortcuts for qt quick (Ctrl+Alt+R) 
This was needed since we cannot start stuff otherwise without a project

Task-number: BAUHAUS-450
Reviewed-by: kkoehne
 2010-04-23 13:20:44 +02:00
Erik Verbruggen
d88eaff481 Hooked up the QML task manager again. 
The QML task manager behaviour is to show warnings/errors for _saved_ files
only.
 2010-04-16 12:55:00 +02:00
Christian Kamm
173fad0d3f QmlJSEditor: Force a semantic rehighlight when a dependency changes. 
Since the revision of the current document doesn't change, we don't
get rid of errors due to missing dependencies otherwise.

Reviewed-by: Kai Koehne
 2010-04-06 12:38:07 +02:00
Christian Kamm
5ae67214a1 QmlJSEditor: Don't trigger a reparse when dependencies change. 
A semantic rehighlight suffices. This should avoid some parsing cycles
introduced earlier.

Reviewed-by: Roberto Raggi
 2010-04-01 15:49:02 +02:00
Christian Kamm
9ea01cf5fb Improve Qml code model import handling. 
* Fill the snapshot with files that could be imported.
* Implement package imports.

* The qmldir file is not parsed yet.

Reviewed-by: Erik Verbruggen
 2010-03-18 11:25:37 +01:00
Lasse Holmstedt
90abf1bf2d Highlighting and more sensible watchers to qml inspector 2010-03-17 11:38:09 +01:00
Friedemann Kleint
2edcc7ef33 Design mode: Give IEditor a 'preferred mode'. 
... and switch to it in EditorManager::activateEditor.
There no longer is a need for special currentEditorChanged()
handling in the editor that use a special mode.

QmlDesigner receives an additional setting specifying the
desired edit mode. QmlJSEditor detects whether QmlDesigner
is present by checking the registered mimetypes of the
Design mode and retrieves the settings via keys.

Remove some obsolete code and clean up includes
on qmldesignerconstants.h

Reviewed-by: con
 2010-03-16 16:51:45 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Christian Kamm
8274197366 Implement function to get the QmlJS AST path to a given location. 
Will be useful for improved scope chain building.
 2010-02-22 10:22:23 +01:00
Christian Kamm
ced28c7090 Use the fully qualified name when registering the SemanticInfos. 
Both for CppEditor::Internal::SemanticInfo and QmlJSEditor::Internal::
SemanticInfo.
 2010-02-16 15:29:21 +01:00
Christian Kamm
da3679066e Add QmlJS semantic checker. 
* Add SemanticHighlighter to QmlJSTextEditor to update the semantic info
  in a background thread.
* Add QmlJS::Check to run semantic checks on qml and js documents.
* Add a check for incorrect property names.
* Fix hoverhandler to show tool tips from extra selections over help
  tooltips.
 2010-02-16 10:38:56 +01:00
Roberto Raggi
2a63387085 Renamed qmlmodelmanager. 2010-02-15 13:49:00 +01:00
Roberto Raggi
8fb82ef792 Merge qmljshighlighter.* with qmlhighlighter.*. 2010-02-15 12:39:30 +01:00
Roberto Raggi
967ed09c29 Initial support of `Follow symbol under cursor' for QML/JS. 2010-02-09 11:37:58 +01:00
Roberto Raggi
14ffb1e465 Some refactoring needed to create ranges for JavaScript functions. 2010-02-02 16:36:14 +01:00
Roberto Raggi
fac977a5bd Try to get the type from a qualified-id. 2010-02-02 15:02:21 +01:00
Roberto Raggi
d22de18fae Introduced SemanticInfo::nodeUnderCursor(). 2010-02-02 13:19:27 +01:00
Roberto Raggi
460c47f5c6 Introduced SemanticInfo::declaringMember(pos). 2010-02-01 16:18:26 +01:00
Roberto Raggi
39c2575ab3 Removed obsolete code 
Done with: Erik
 2010-01-27 14:37:24 +01:00
Roberto Raggi
1e6a0523a1 Moved QmlJSTextEditor::m_declarations. 2010-01-26 14:26:26 +01:00
Roberto Raggi
5cff896fa8 Get rid off QmlJSEditor::m_idRevisions & co. 2010-01-26 14:14:01 +01:00
Roberto Raggi
e622d70617 There's no need to store the diagnostic messages in the editor. 
Store the error message in the QTextCharFormat of the extra selection.
 2010-01-26 14:03:37 +01:00
Roberto Raggi
c9efafcb98 Introduced ranges and versioning of QML/JS documents. 2010-01-25 14:18:53 +01:00
Roberto Raggi
60ad6c478c Moved QmlJSScanner::Token in the QmlJS namespace. 2010-01-19 12:54:17 +01:00
Roberto Raggi
c943d8e4f1 Renamed classes and files to use the QmlJS prefix. 2010-01-18 16:59:20 +01:00
Erik Verbruggen
ed4118628d Changed the QScriptHighlighter & QScriptIndenter namespaces. 2010-01-18 14:12:45 +01:00
Erik Verbruggen
062fa8e783 Added mime-type for JS files to the QMLJS text editor. 2010-01-15 17:41:39 +01:00
Erik Verbruggen
96e31c2a0f Started merging the JS and QML editor plug-ins. 2010-01-15 17:20:19 +01:00