feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,105 Commits 108 Branches 368 Tags
96475f95530b6362e870950e352d0d847b705eea
Commit Graph

167 Commits

Author SHA1 Message Date
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
Thorbjørn Lindeijer
a6e5298591 Fixed handling of text wrapping and a text layout corner case 
Due to using QTextCursor::columnNumber() instead of
QTextCursor::positionInBlock(), a lot of code would not work correctly
when used with wrapped lines.

In addition, there was an issue with columnNumber() returning 0 right
after inserting a character before the last character of a line.

Reviewed-by: mae
 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
Erik Verbruggen
297b281ced Added infrastructure to change multiple files at once. 2010-06-14 15:03:10 +02:00
Roberto Raggi
726c3345c4 Moved qmljsmodelmanagerinterface.h 2010-06-10 11:59:27 +02:00
hjk
0ee6115998 qmljshighlighter: un-templatize setFormats() 
This is used excatly once.

ReviewedBy: Kai Koehne
 2010-06-04 11:17:55 +02:00
Roberto Raggi
21073563a4 Introduced quickfix support for QML/JS files. 2010-06-03 15:52:50 +02:00
mae
7c82944750 Fix qml autocompletion on Enter 
Only insert necessary newlines

Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476
 2010-05-26 19:21:32 +02:00
mae
154b312de6 Fix qml autocompletion on Enter 
Only insert necessary newlines

Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476
 2010-05-26 19:19:42 +02:00
Christian Kamm
62141475e3 QmlJS: Potentially fix hard-to-reproduce crash in JS completion. 
* Context::build was potentially dangerous. Link and ScopeBuilder
  went out of scope before their results stopped being used.
* ScopeBuilder: If no function scope object was found, don't add it.

Reviewed-by: Erik Verbruggen
 2010-05-19 14:23:08 +02:00
Lasse Holmstedt
fe48286ecc Made Qt Quick Designer editor opening modal 
If you're in Design mode, any new editors will open in design mode
as well. If you're in Edit mode, new editors will open in Edit mode.

Task-number: BAUHAUS-609
 2010-04-26 14:27:49 +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
Christian Kamm
3067f441df QmlJS: Fix switch statement indentation. 
Task-number: QTCREATORBUG-756
 2010-04-21 10:52:07 +02:00
Erik Verbruggen
124bb7aad7 Emit extra signals to have the task manager show issues on project-load. 2010-04-16 13:09: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
9220929375 QmlJSEditor: Prevent an infinite parsing loop with invalid qml/js files. 
Reviewed-by: Erik Verbruggen
 2010-04-16 11:32:49 +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
9408378a24 QmlJSEditor: Fix file/directory imports for qml files not in a project. 
Reviewed-by: Roberto Raggi
 2010-03-31 14:55:35 +02:00
Roberto Raggi
4ee8a199af Introduced Document::isQmlDocument() and Document::isJSDocument(). 2010-03-29 12:56:25 +02:00
Erik Verbruggen
ca6f735204 Fixed renaming when the cursor is at the end of the ID. 
Task-number: QTCREATORBUG-909.
Reviewed-by: Thorbjørn
 2010-03-25 14:57:15 +01:00
Lasse Holmstedt
b14a208273 Made debugger menu items disabled in QML inspector mode 2010-03-18 17:02:26 +01:00
Robert Loehning
f2ce73bfe3 Compile fix. 
Wrote down what Christian Kamm told me.
 2010-03-18 12:20:05 +01: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
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
Friedemann Kleint
3e750afc73 DesignMode: Do not open .js-files in Design mode. 2010-03-17 10:55:43 +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
c3578f307d Fix parsing errors not showing for the QmlJS editor. 
Done-with: Erik Verbruggen
 2010-02-23 16:12:19 +01:00
Christian Kamm
08cfc8f28c Pass in the whole AST path for scope creation. 
Just the declaring member isn't enough.
 2010-02-22 10:22:23 +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
Erik Verbruggen
5e449a80c4 Fixed diagnostic underlining to take the location length into account. 
Done-with: Christian Kamm
 2010-02-19 15:11:03 +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
45efd5b5b1 Don't show 'invalid property name' errors if we can't resolve the type. 
The idea is that it may be a plugin-provided type. We don't want user
code to be riddled with error markers in that case.

Reviewed-by: Roberto Raggi
 2010-02-16 13:30:40 +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
fd26a8c8ec Get rid of the QmlJS prefix. 2010-02-15 12:56:03 +01:00
Roberto Raggi
8fb82ef792 Merge qmljshighlighter.* with qmlhighlighter.*. 2010-02-15 12:39:30 +01:00
Christian Kamm
b23fc0c572 Rename QmlJS::Check -> QmlJS::Evaluate. 
It is used to evaluate expressions to values.
Done to make room for a real 'check' pass.
 2010-02-15 11:52:39 +01:00
Roberto Raggi
4d7444e6cd Fixed the insertion of matching braces when the token at the left of the cursor is a string literal. 2010-02-10 16:24:23 +01:00
Roberto Raggi
3d44c5621d Improved completion of JavaScript expressions. 2010-02-09 11:37:58 +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
f8ed5c58f0 Check the document's revision when creating links. 2010-02-02 13:19:26 +01:00
Roberto Raggi
0bb575b1f2 Create a link for the QML/JS expression under cursor. 2010-02-01 16:18:27 +01:00
Roberto Raggi
460c47f5c6 Introduced SemanticInfo::declaringMember(pos). 2010-02-01 16:18:26 +01:00