Skip to main content
summaryrefslogtreecommitdiffstats
path: root/qt
diff options
context:
space:
mode:
authorAndrew Eidsness2014-01-28 06:48:14 -0500
committerDoug Schaefer2014-01-28 11:06:40 -0500
commitd613b149a06e728ffd000fc9b5f398a542a4e80f (patch)
tree8a8e91c7bb230fe3638a6646b1c327adf6dd6eba /qt
parent8d09935cafd0ff550a72aa525b20eb7a6406bad3 (diff)
downloadorg.eclipse.cdt-d613b149a06e728ffd000fc9b5f398a542a4e80f.tar.gz
org.eclipse.cdt-d613b149a06e728ffd000fc9b5f398a542a4e80f.tar.xz
org.eclipse.cdt-d613b149a06e728ffd000fc9b5f398a542a4e80f.zip
Bug 426781: Qt content assist is too aggressive
In Content Assist cases like: q-> (when the cursor is to the right of the arrow operator) the name that is returned by the content assist context is the empty string. This was used to check if the QObject::connect function applied. Since the empt string matches all bindings the Qt assistant incorrectly continued. I've added a check to stop processing when the current name is the empty string. Change-Id: I4e5bf52f4ca1ddc33d88a48917213adbbeb81836 Signed-off-by: Andrew Eidsness <eclipse@jfront.com> Reviewed-on: https://git.eclipse.org/r/21188 Reviewed-by: Doug Schaefer <dschaefer@qnx.com> IP-Clean: Doug Schaefer <dschaefer@qnx.com> Tested-by: Doug Schaefer <dschaefer@qnx.com>
Diffstat (limited to 'qt')
-rw-r--r--qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtFunctionCallUtil.java12
1 files changed, 3 insertions, 9 deletions
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtFunctionCallUtil.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtFunctionCallUtil.java
index 7b652028ae..1e050cb51e 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtFunctionCallUtil.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtFunctionCallUtil.java
@@ -66,7 +66,9 @@ public class QtFunctionCallUtil {
* and false otherwise.
*/
public static boolean isQObjectFunctionCall(IASTCompletionContext astContext, boolean isPrefix, IASTName name) {
- if (name == null)
+ if (name == null
+ || name.getSimpleID() == null
+ || name.getSimpleID().length <= 0)
return false;
// Bug332201: Qt content assist should always be applied to the most specific part of
@@ -81,14 +83,6 @@ public class QtFunctionCallUtil {
}
/**
- * Returns true if the given function call argument is a SIGNAL or SLOT expansion
- * and false otherwise.
- public static boolean isQtMethodExpansion(IASTInitializerClause arg) {
- return MethodRegex.matcher(arg.getRawSignature()).matches();
- }
- */
-
- /**
* If the given argument is a SIGNAL or SLOT expansion then find and return the node in the AST
* that will be used for this method. Returns null if the argument is not a Qt method call or
* if the associated node cannot be found.

Back to the top