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

171 Commits

Author SHA1 Message Date
Christiaan Janssen
f5039a4a02 QmlJsInspector: implemented Property Inspector 
Reviewed-by: Kai Koehne
 2011-01-20 15:11:39 +01:00
Christian Kamm
ef5dc8c699 QmlJS: Avoid frequent libraryInfoUpdated emissions. 
Also don't require a rehighlight of every open document when the
signal is emitted.

Reviewed-by: Roberto Raggi
 2011-01-12 14:03:01 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
mae
4226538ac3 Fix QML to UTF-8, unless changed in editor 
Task-id: QTCREATORBUG-3424
 2010-12-20 18:11:44 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Roberto Raggi
ea5d923fe0 Don't waste time rehighlighting all the files opened in Creator. 2010-12-14 15:06:01 +01:00
Leandro Melo
7528c6d617 Snippets: Feature enhancement start... 
Provide an interface so users can create/edit/remove snippets.
 2010-12-08 17:22:07 +01:00
Christian Kamm
5f196cf5b8 QmlJS: Make follow symbol work with member properties. 
A full evaluate() call resolves the property and continues to the
underlying type. If we use Evaluate::reference() instead, we only the
first step is done and we can get at the source location if a
ASTPropertyReference is returned.

Reviewed-by: Erik Verbruggen
 2010-11-16 15:30:54 +01:00
Christian Kamm
f7a077b1fa QmlJS: Avoid infinite loop with recursive prototypes. 2010-11-15 10:36:22 +01:00
Christian Kamm
f366754462 Move shared code to a new QmlJSTools plugin. 
Reviewed-by: Thomas Hartmann
 2010-11-11 11:49:10 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
Leandro Melo
fb46c31934 Plain text editor: Make sure user setting about folding markers is used 
It was being reset based on the highlighter definitions.

Consider some refactoring with the related options as well to avoid
overriding user's settings.

Done-with: Thorbjorn Lindeijer
 2010-11-10 16:05:10 +01:00
Leandro Melo
36fa1de4c6 Editors: Refactor auto-complete code out of the editors for better reusability. 
Reviewed-by: Thorbjorn Lindeijer
 2010-11-09 11:01:47 +01:00
Leandro Melo
3a684586fa Editors: Refactor indenters out of the editors for better reusability. 
Reviewed-by: ckamm
 2010-11-05 14:28:38 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
Friedemann Kleint
77008bc45f Exported Header cleanup: QmlJSEditor 
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2010-11-02 11:10:27 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor. 
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
 2010-11-01 16:29:45 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
 2010-11-01 12:11:03 +01:00
Friedemann Kleint
722e48c2b3 TextEditor: Some exported header cleanup. 
Remove internal markers from exported headers,
introduce private class for BaseTextDocument.

Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2010-10-29 15:20:10 +02:00
Christian Kamm
592396c254 QmlJS: Fix member completion at the end of a nested object definition. 
The parser's error recovery generates three nested object definitions
for code like
Item { Item { font } }
where the innermost definition corresponds to 'font }' and has an empty
lbrace token.

If we create a Range for this recovered definition, code completion will
fail for 'font.'.

Task-number: QTCREATORBUG-2767
Reviewed-by: Roberto Raggi
 2010-10-27 11:32:24 +02:00
Thomas Hartmann
0a043df690 QmlJsEditor: fixes warning 
Reviewed-by: Lasse Holmstedt
 2010-10-21 16:12:57 +02:00
Thomas Hartmann
408214486f QuickToolBar: reduce usage of lookup context 
Getting the lookup context is expensive. So it is now done only
on user interaction.




Reviewed-by: Roberto Raggi
 2010-10-21 15:42:26 +02:00
Thomas Hartmann
ff5eb00643 QuickToolBar: do not show QuickToolBar as tooltip anymore. 
Most users perceived this as a bug and found it annoying in
practice. So this feature gets removed.

Reviewed-by: Roberto Raggi
 2010-10-21 15:42:26 +02:00
Christian Kamm
5e4fe5260b QmlJS: Fix newly parsed document not being added to the snapshot copy. 
This was the root cause of several issues with scoping and import
resolution. For instance, finding the components that instantiate a
component that's opened in the editor failed; leading to code
completion missing valid entries.

Reviewed-by: Erik Verbruggen
Reviewed-by: Roberto Raggi
 2010-10-19 11:57:42 +02:00
Christian Kamm
836366c187 QmlJS: Force a semantic check when library information changes. 
Task-number: QTCREATORBUG-2640
Reviewed-by: Roberto Raggi
 2010-10-15 10:09:40 +02:00
Thomas Hartmann
81c521eb01 QtQuickToolBar: enabling by hovering (ToolTip) 
The Quick ToolBar now also gets enabled by hovering on
an item defintion.
It is shown 1 second after the tooltip.


Reviewed-by: Christian Kamm
 2010-10-08 15:28:59 +02:00
Thomas Hartmann
864ebf5bcd QtQuickToolbar: disabling tooltip hoovering 
This feature is not polished enough for the beta

Reviewed-by: dt
 2010-10-06 15:04:52 +02:00
Christian Kamm
70c189e2bd QmlJS: Fix instances of using lookupContext() on invalid info. 
Task-number: QTCREATORBUG-2594
Done-with: Thomas Hartmann
 2010-10-04 14:36:09 +02:00
Thomas Hartmann
4c185a9ac4 QmlDesigner.model: rename id is now a proper refactoring operation 
I an id is now changed in the navaigator or property editor,
we now use the qmljseditor to properly refactor.

Also I changed dynamic_cast to qobject_cast

Reviewed-by: Erik Verbruggen
 2010-09-30 17:43:19 +02:00
Daniel Molkentin
5cf1aaf67d Fix compilation and initialization compile warnings. 
Reviewed-by: Alessandro Portale
 2010-09-29 19:35:25 +02:00
Thomas Hartmann
f5b4668fa5 QmlJsEditor: combine the Quick ToolBar with the toolTip 
1000ms after a tooltip is shown we now also show the quick toolbar

Reviewed-by: Erik Verbruggen
 2010-09-29 16:58:54 +02:00
Christian Kamm
3f505e9982 QmlJS: Add initial 'Find Usages' support. 2010-09-24 14:11:06 +02:00
Christian Kamm
c7b3e3c81c QmlJS: Speed up Link significantly, provide more info on imports. 
Link now caches imports. That means importing the same library (say, Qt)
from more than one file no longer creates an importing namespace for
each one. Instead, a single one is created for the instance of Link.

To make this work, the type environment in ScopeChain has been given its
own type: Interpreter::TypeEnvironment. That has the added benefit of
being able to carry meta-information about imports. You can use
TypeEnvironment::importInfo(qmlComponentName) to get information about
the import node that caused the import of the component.
 2010-09-16 15:51:21 +02:00
Christian Kamm
97c07292aa Qml: Make import classification in Bind less verbose. 2010-09-16 15:51:21 +02:00
Erik Verbruggen
0c98d830b8 QML: brought context menu in sync with C++ editor. 2010-09-16 12:57:45 +02:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching 
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
 2010-09-14 15:23:11 +02:00
Thomas Hartmann
edebca70ed QmlJSEditor: changing behaivour of text markers 
The delay was increased to 500 ms and the marker only
appears now, if the cursor is directly on the type name.

This way the text marker creates less visual noise.
 2010-09-08 16:36:19 +02:00
Roberto Raggi
7df679c019 Increased the interval to update QML/JS documents to 100ms. 2010-09-08 12:53:22 +02:00
Roberto Raggi
e33767205b Introduced SemanticInfo::isValid(). 2010-09-08 11:39:24 +02:00
Roberto Raggi
23a5f173b1 Check the traling text before inserting closing braces. 2010-09-03 14:54:52 +02:00
Kai Koehne
2bbc9643ff Fixes crash when opening a .qml file from command line 
Hopefully fixes crash when opening a .qml file from the command line
(mac os x).
 2010-09-03 14:37:52 +02:00
Thomas Hartmann
70e658680b QuickToolBar: bugfix 
If we stay inside the node we keep the text marker
 2010-09-01 11:55:04 +02:00
Thomas Hartmann
36a955fa1e QuickToolbar: unifies naming to Quick ToolBar and clarifies tooltips 2010-09-01 11:55:03 +02:00
Christian Kamm
f3f3b96c85 QmlJS: Improve performance by avoiding two links in SemanticHighlighter. 
Reviewed-by: Roberto Raggi
 2010-08-31 10:39:07 +02:00
Christian Kamm
f49a85953b QmlJS: Compute link in SemanticHightlighter thread instead of lazily. 
It's used very often, so lazy computation (potentially in the gui
thread) was too expensive.

Reviewed-by: Kai Koehne
 2010-08-30 13:49:23 +02:00
Christian Kamm
654d94a8c1 QmlJS: Fix uses of ids not being updated correctly. 
updateUses() has to be called for cursor position changes.

Done-with: Kai Koehne
 2010-08-30 12:11:22 +02:00
Lasse Holmstedt
1f1dcfdec1 QML Observer: Fixed updating of selected items 2010-08-27 13:12:05 +02:00
Lasse Holmstedt
2fe7317981 Fixed typo 2010-08-27 13:12:05 +02:00