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

258 Commits

Author SHA1 Message Date
Christian Kamm
24d0f694d1 QmlJS: Remove unused functions from Snapshot. 
Reviewed-by: Erik Verbruggen
 2010-06-21 13:03:30 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
 2010-06-18 16:54:37 +02:00
Christian Kamm
b7cb1feb4b QmlJS: Ignore .pragma library for now. 
Task-number: QTCREATORBUG-1421
Reviewed-by: Erik Verbruggen
 2010-06-15 14:50:16 +02:00
Erik Verbruggen
e5b9c76f27 Added C-style comment folding. 
This is a "back-port" for 57f2b3e44d from master
into 2.0.

Done-with: ckamm
 2010-06-15 11:27:07 +02:00
con
b0040dc858 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
 2010-06-10 15:00:16 +02:00
Roberto Raggi
726c3345c4 Moved qmljsmodelmanagerinterface.h 2010-06-10 11:59:27 +02:00
Christian Kamm
45415783e7 QmlJS: Get rid of xml file describing qml builtin types. 
The type information is now generated at runtime.
 2010-06-10 11:33:04 +02:00
Robert Loehning
0aaa9a82b1 Compile fix for MSVC 2010-06-09 15:46:54 +02:00
Christian Kamm
e307bc2506 QmlJS: Store plugin metatypes in LibraryInfo. Rework type loading. 2010-06-09 14:36:54 +02:00
Christian Kamm
649cebda32 QmlJS: Fix windows namespace issue with ComponentVersion. 
Done-with: owolff
 2010-06-09 14:36:54 +02:00
Christian Kamm
fa79add293 QmlJS: Check for existance of qmldump binary before using it. 2010-06-09 14:36:54 +02:00
Christian Kamm
f9d7872761 QmlJS: Use ComponentVersion everywhere. 2010-06-09 14:36:53 +02:00
Christian Kamm
822520c304 QmlJS: Get at types defined in plugins by running qmldump on them. 
Task-number: QTCREATORBUG-1021
Reviewed-by: Roberto Raggi
 2010-06-09 14:36:53 +02:00
Christian Kamm
ea5ca79900 QmlJS: Add ComponentVersion class to simplify dealing with versions. 2010-06-09 14:36:53 +02:00
Christian Kamm
0d5d6344bd QmlJS: Collect import version numbers in Bind. 2010-06-09 14:36:53 +02:00
Christian Kamm
313d30654e QmlJS: Avoid infinite recursion when encountering property loops. 
Such as
property int foo: bar
property int bar: foo.

Task-number: QTCREATORBUG-1389
Reviewed-by: Roberto Raggi
 2010-06-08 15:37:16 +02:00
Christian Kamm
3b8b6e89cc QmlJS: Autocomplete dot and colon for properties. 
Reviewed-by: Roberto Raggi
 2010-06-07 17:37:45 +02:00
Erik Verbruggen
ea2054a945 Fixed uninitialized members. 2010-06-04 11:15:38 +02:00
Erik Verbruggen
eed0241d97 Fixed a couple of null-checks/-returns. 2010-06-04 11:15:38 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
 2010-06-02 09:57:23 +02:00
Erik Verbruggen
112df597db Fixed default property discovery for custom QML components. 
Reviewed-by: Christian Kamm
 2010-05-31 12:21:12 +02:00
Christian Kamm
57f2b3e44d QmlJS: Allow folding of multi-line comments. 
This also makes the editor auto-fold the license comment.

Task-number: QTCREATORBUG-1455
Reviewed-by: Erik Verbruggen
 2010-05-27 12:56:44 +02:00
Christian Kamm
70291f457a QmlJS: Add null checks when accessing Bind::rootObjectValue. 
If a document wasn't parsed correctly the binder won't be run - and
rootObjectValue will be null.

Task-number: QTCREATORBUG-1449
 2010-05-20 14:02:25 +02:00
Erik Verbruggen
ef66bc98e2 Fixed QTCREATORBUG-1397. 
When adding a new file, refreshing semantic errors in the open editor should
have worked. It now also works for removing existing files.

Done-with: Christian Kamm
 2010-05-19 14:46:08 +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
Christian Kamm
da6b372575 QmlJS: Move Q_DECLARE_TR_FUNCTIONS to the start of class declarations. 
The documentation requires having it there.
 2010-05-19 13:42:56 +02:00
Christian Kamm
4e498caf30 Fix the build. 
50cc55af80 broke it.
 2010-05-19 13:39:54 +02:00
Christian Kamm
50cc55af80 QmlJS: Change to a nicer way of marking strings for translation. 
Reviewed-by: ossi
 2010-05-19 13:32:11 +02:00
Christian Kamm
fadfe9c64e QmlJS: Generalize EasingCurve name check to all enums. 
Reviewed-by: Erik Verbruggen
 2010-05-19 12:24:32 +02:00
Christian Kamm
b7b50edad5 QmlJS: Allow numbers to be assigned to easing.type. 
Task-number: QTCREATORBUG-1439
 2010-05-19 11:21:01 +02:00
Christian Kamm
088bdb29db QmlJS: Provide good completion for PropertyChanges with a target again. 
Task-number: QTCREATORBUG-1413
Reviewed-by: Erik Verbruggen
 2010-05-19 11:15:57 +02:00
Christian Kamm
735f908382 QmlJS: Remove unimplemented functions from CompletionContextFinder. 2010-05-19 10:49:26 +02:00
Christian Kamm
fc3628098b QmlJS: Fix completion context finder if cursor is on empty line. 
It would calculate an incorrect start token in this case as the
linizer skips past the empty line.

Task-number: QTCREATORBUG-1412
 2010-05-19 10:09:13 +02:00
Christian Kamm
6f4b864487 QmlJS: Make Snapshot discard outdated Documents. 
Previously, fresh versions of a Document would be added to the
_documentsByPath QMultiHash without removing the old version first.
This means Link could pick up old versions of a Document.

Task-number: QTCREATORBUG-1418
 2010-05-17 12:05:18 +02:00
Christian Kamm
28ec223314 QmlJS: Fix completion for grouped property bindings. 
Task-number: QTCREATORBUG-1388
Reviewed-by: Roberto Raggi
 2010-05-12 14:11:23 +02:00
Christian Kamm
259007f5e6 QmlJS: Fix potential crash when a document doesn't have a type env yet. 
Reviewed-by: Roberto Raggi
 2010-05-11 15:28:18 +02:00
Christian Kamm
44a155c612 QmlJS: Fix completion context when cursor is to the right of inserted ; 
Done-with: Erik Verbruggen
 2010-04-30 14:22:55 +02:00
Erik Verbruggen
0970a8e6d2 Moved quick-exit check back to the indenter. 
Reviewed-by: ckamm
 2010-04-30 13:36:09 +02:00
Christian Kamm
0e12240613 QmlJS: Completion for enums. 
Done-with: Erik Verbruggen
 2010-04-29 16:05:25 +02:00
Christian Kamm
a48032b616 QmlJS: Improve completion for object bindings with 'on'. 
Done-with: Erik Verbruggen
 2010-04-29 16:05:25 +02:00
Christian Kamm
953f0daa50 QmlJS: Add a check to disallow recursive type definitions in xml file. 
At least direct recursion with name="Foo" extends="Foo" is detected
and rejected.

Done-with: Erik Verbruggen
 2010-04-29 16:05:24 +02:00
Christian Kamm
61c1ac37a0 QmlJS: Don't put automatic semicolons directly after colons. 
Done-with: Erik Verbruggen
 2010-04-29 16:05:24 +02:00
Christian Kamm
f48df24737 QmlJS: Improve property and Type completion in Qml object members. 
Done-with: Erik Verbruggen
 2010-04-29 16:05:24 +02:00
Christian Kamm
722ba33770 QmlJS: Add CompletionContextFinder to allow context sensitive completion 
The plan is to use this to reduce the number of applicable
completion options, for instance for enum completion or property
names.

Done-with: Erik Verbruggen
 2010-04-29 16:05:24 +02:00
Christian Kamm
bd71243407 QmlJS: Move parts of the indenter to the new LineInfo. 
LineInfo can tell whether lines are finished or not.

Done-with: Erik Verbruggen
 2010-04-29 16:05:24 +02:00
Christian Kamm
bbf5bf611c QmlJS: Change way to translate strings to nicer one. 
Done-with: Erik Verbruggen
 2010-04-28 10:32:45 +02:00
Christian Kamm
9af4f2c64f QmlJS: Remove unused function environment from binder. 
This used to contain all functions declared in Script blocks. With them
gone, there's no reason to keep it.
 2010-04-28 10:01:36 +02:00
Christian Kamm
71b9057b0b QmlJS: The qml document's path is no longer an implicit import path. 2010-04-26 10:43:59 +02:00
Lasse Holmstedt
4d0ac7c77e qml inspector now shows correct categories for custom properties 
Also, a class name is added in qmjs::bind so that we have a class name
for custom properties defined inside a component.
 2010-04-23 09:58:29 +02:00
Christian Kamm
3096b2a06f QmlJS: Set importing scopes for scripts correctly. 
They had not yet been updated to the new way of importing javascript.

Reviewed-by: Erik Verbruggen
 2010-04-22 16:36:43 +02:00