From 31150e4af1e0b3fb43a5db305c3a3e30f8d5f1ac Mon Sep 17 00:00:00 2001
From: Matthew Bastien <mbastien@blackberry.com>
Date: Tue, 24 Nov 2015 13:59:46 -0500
Subject: [PATCH] Bug 481126 - QML Scoping Issues

Fixed the following issues with QML:
  -The parent scope of a QML Object is the file's root Object scope
  -Content assist for an Object Property should only display the
immediate Object's properties, not it's parent(s)
  -Content assist for an incomplete property binding should display
JavaScript hints as well

Added missing license headers and new tests.  Had to modify the
acorn-qml parser plugin in order to make some of the changes.  Added
tests for those as well.

Change-Id: I289167cbaacd8088f87dfafc689e67c0110d942f
Signed-off-by: Matthew Bastien <mbastien@blackberry.com>
---
 qt/org.eclipse.cdt.qt.core/acorn-qml/index.js |   3 +-
 .../acorn-qml/inject.js                       |  40 +-
 .../acorn-qml/loose/index.js                  |   3 +-
 .../acorn-qml/loose/inject.js                 |  92 ++-
 .../acorn-qml/test/driver.js                  |   1 +
 .../acorn-qml/test/run.js                     |   3 +-
 .../acorn-qml/test/tests-qml.js               | 574 +++++++++++-------
 .../acorn-qml/walk/index.js                   |  18 +-
 .../tern-qml/demo/qml-demo.html               |   6 +-
 qt/org.eclipse.cdt.qt.core/tern-qml/qml.js    | 568 ++++++++++++-----
 .../tern-qml/test/driver.js                   |  47 +-
 .../tern-qml/test/ecma5-defs.js               |  10 +
 .../tern-qml/test/run.js                      |  12 +
 .../tern-qml/test/test-completions.js         | 422 +++++++++++--
 .../tern-qml/test/test-finddef.js             | 207 ++++++-
 15 files changed, 1491 insertions(+), 515 deletions(-)

diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/index.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/index.js
index ce774dcf2b9..f724fad6cb1 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/index.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/index.js
@@ -8,7 +8,6 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
-'use strict';
 
 // This will only be visible globally if we are in a browser environment
 var acornQML;
@@ -20,5 +19,7 @@ var acornQML;
 		return define(["./inject.js", "acorn/dist/acorn"], mod);
 	acornQML = mod(injectQML, acorn); // Plain browser env
 })(function (injectQML, acorn) {
+	'use strict';
+
 	return injectQML(acorn);
 })
\ No newline at end of file
diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/inject.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/inject.js
index 38b94bf26cf..25ed656b34c 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/inject.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/inject.js
@@ -8,7 +8,6 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
-'use strict';
 
 // This will only be visible globally if we are in a browser environment
 var injectQML;
@@ -20,6 +19,8 @@ var injectQML;
 		return define([], mod);
 	injectQML = mod(); // Plain browser env
 })(function () {
+	'use strict';
+
 	return function (acorn) {
 		// Acorn token types
 		var tt = acorn.tokTypes;
@@ -93,11 +94,9 @@ var injectQML;
 			var loop = true;
 			while (loop) {
 				if (this.isContextual(qtt._import)) {
-					var qmlImport = this.qml_parseImportStatement();
-					node.statements.push(qmlImport);
+					node.statements.push(this.qml_parseImportStatement());
 				} else if (this.isContextual(qtt._pragma)) {
-					var qmlPragma = this.qml_parsePragmaStatement();
-					node.statements.push(qmlPragma);
+					node.statements.push(this.qml_parsePragmaStatement());
 				} else {
 					loop = false;
 				}
@@ -293,7 +292,7 @@ var injectQML;
 				node.id = this.qml_parseQualifiedId(false);
 			}
 			this.expect(tt.colon);
-			node.expr = this.qml_parsePropertyAssignment();
+			node.binding = this.qml_parseBinding();
 			return this.finishNode(node, "QMLPropertyBinding");
 		}
 
@@ -401,10 +400,10 @@ var injectQML;
 			node.kind = this.qml_parseKind();
 			node.id = this.qml_parseIdent(false);
 			if (!this.eat(tt.colon)) {
-				node.init = null;
+				node.binding = null;
 				this.semicolon();
 			} else {
-				node.init = this.qml_parsePropertyAssignment();
+				node.binding = this.qml_parseBinding();
 			}
 
 			return this.finishNode(node, "QMLPropertyDeclaration");
@@ -412,24 +411,35 @@ var injectQML;
 
 		/*
 		 * Parses one of the following possibilities for a QML Property assignment:
-		 *    - JavaScript Expression
-		 *    - QML JavaScript Statement Block
 		 *    - QML Object Literal
+		 *    - QML Script Binding
 		 */
-		pp.qml_parsePropertyAssignment = function () {
+		pp.qml_parseBinding = function () {
 			// TODO: solve ambiguity where a QML Object Literal starts with a
 			// Qualified Id that looks very similar to a MemberExpression in
 			// JavaScript.  For now, we just won't parse statements like:
 			//      test: QMLObject {  }
 			//      test: QMLObject.QualifiedId {  }
 
+			return this.qml_parseScriptBinding();
+		}
+
+		/*
+		 * Parses one of the following Script Bindings:
+		 *    - Single JavaScript Expression
+		 *    - QML Statement Block (A block of JavaScript statements)
+		 */
+		pp.qml_parseScriptBinding = function () {
+			var node = this.startNode();
+			node.block = false;
 			if (this.type === tt.braceL) {
-				return this.qml_parseStatementBlock();
+				node.block = true;
+				node.script = this.qml_parseStatementBlock();
 			} else {
-				var node = this.parseExpression(false);
+				node.script = this.parseExpression(false);
 				this.semicolon();
-				return node;
 			}
+			return this.finishNode(node, "QMLScriptBinding");
 		}
 
 		/*
@@ -576,7 +586,7 @@ var injectQML;
 						this.raise(this.pos, "Expected EOF after QML Root Object");
 					}
 
-					return this.finishNode(node, "Program");
+					return this.finishNode(node, "QMLProgram");
 				};
 			});
 		}
diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/index.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/index.js
index 26073abe7bf..db2d6f5d249 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/index.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/index.js
@@ -8,7 +8,6 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
-'use strict';
 
 // This will only be visible globally if we are in a browser environment
 var acornQMLLoose;
@@ -20,5 +19,7 @@ var acornQMLLoose;
 		return define(["./inject.js", "acorn", "acorn/dist/acorn_loose"], mod);
 	acornQMLLoose = mod(injectQMLLoose, acorn, acorn); // Plain browser env
 })(function (injectQMLLoose, acorn, acorn_loose) {
+	"use strict";
+
 	return injectQMLLoose(acorn);
 })
\ No newline at end of file
diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/inject.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/inject.js
index a181eacc7e2..40f732711b9 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/inject.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/loose/inject.js
@@ -8,7 +8,6 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
-'use strict';
 
 // This will only be visible globally if we are in a browser environment
 var injectQMLLoose;
@@ -20,6 +19,8 @@ var injectQMLLoose;
 		return define([], mod);
 	injectQMLLoose = mod(); // Plain browser env
 })(function () {
+	"use strict";
+
 	return function (acorn) {
 		// Acorn token types
 		var tt = acorn.tokTypes;
@@ -43,11 +44,9 @@ var injectQMLLoose;
 			var loop = true;
 			while (loop) {
 				if (this.isContextual(qtt._import)) {
-					var qmlImport = this.qml_parseImportStatement();
-					node.statements.push(qmlImport);
+					node.statements.push(this.qml_parseImportStatement());
 				} else if (this.isContextual(qtt._pragma)) {
-					var qmlPragma = this.qml_parsePragmaStatement();
-					node.statements.push(qmlPragma);
+					node.statements.push(this.qml_parsePragmaStatement());
 				} else {
 					loop = false;
 				}
@@ -292,8 +291,9 @@ var injectQMLLoose;
 		lp.qml_parsePropertyBinding = function () {
 			var node = this.startNode();
 			node.id = this.qml_parseQualifiedId(false);
+			var start = this.storeCurrentPos();
 			this.expect(tt.colon);
-			node.expr = this.qml_parsePropertyAssignment();
+			node.binding = this.qml_parseBinding(start);
 			return this.finishNode(node, "QMLPropertyBinding");
 		}
 
@@ -399,10 +399,11 @@ var injectQMLLoose;
 			node.kind = this.qml_parseKind();
 			node.id = this.qml_parseIdent(false);
 
+			var start = this.storeCurrentPos();
 			if (this.eat(tt.colon)) {
-				node.init = this.qml_parsePropertyAssignment();
+				node.binding = this.qml_parseBinding(start);
 			} else {
-				node.init = null;
+				node.binding = null;
 				this.semicolon();
 			}
 
@@ -411,35 +412,64 @@ var injectQMLLoose;
 
 		/*
 		 * Parses one of the following possibilities for a QML Property assignment:
-		 *    - JavaScript Expression
-		 *    - QML JavaScript Statement Block
 		 *    - QML Object Literal
+		 *    - QML Script Binding
 		 */
-		lp.qml_parsePropertyAssignment = function () {
+		lp.qml_parseBinding = function (start) {
 			if (this.tok.type === tt.braceL) {
-				return this.qml_parseStatementBlock();
-			} else {
-				// Perform look ahead to determine whether this is an expression or
-				// a QML Object Literal
-				var i = 1, la = this.tok;
+				return this.qml_parseScriptBinding(start);
+			}
+			// Perform look ahead to determine whether this is an expression or
+			// a QML Object Literal
+			var i = 1, la = this.tok;
+			if (this.qml_isIdent(la.type, la.value)) {
+				la = this.lookAhead(i++);
+			}
+			while (la.type === tt.dot) {
+				la = this.lookAhead(i++);
 				if (this.qml_isIdent(la.type, la.value)) {
 					la = this.lookAhead(i++);
 				}
-				while (la.type === tt.dot) {
-					la = this.lookAhead(i++);
-					if (this.qml_isIdent(la.type, la.value)) {
-						la = this.lookAhead(i++);
-					}
-				}
-
-				if (la.type === tt.braceL) {
-					return this.qml_parseObjectLiteral();
-				} else {
-					var node = this.parseExpression(false);
-					this.semicolon();
-					return node;
-				}
 			}
+
+			if (la.type === tt.braceL) {
+				return this.qml_parseObjectLiteral();
+			} else {
+				return this.qml_parseScriptBinding(start);
+			}
+		}
+
+		/*
+		 * Parses one of the following Script Bindings:
+		 *    - Single JavaScript Expression
+		 *    - QML Statement Block (A block of JavaScript statements)
+		 */
+		lp.qml_parseScriptBinding = function (start) {
+			// Help out Tern a little by starting the Script Binding at the end of
+			// the colon token (only if we consume invalid syntax).
+			var node = this.startNodeAt(start);
+			node.block = false;
+			if (this.tok.type === tt.braceL) {
+				node.block = true;
+				node.script = this.qml_parseStatementBlock();
+			} else {
+				node.script = this.parseExpression(false);
+				this.semicolon();
+			}
+
+			// If this node consumed valid syntax, reset its start position
+			if (!node.script.type === "Identifier" || node.script.name !== "✖") {
+				if (node.loc) {
+					node.loc.start = node.script.loc.start;
+				}
+				if (node.range) {
+					node.range = node.script.range;
+				}
+				node.start = node.script.start;
+				node.end = node.script.end;
+			}
+
+			return this.finishNode(node, "QMLScriptBinding");
 		}
 
 		/*
@@ -559,7 +589,7 @@ var injectQMLLoose;
 						node.rootObject = this.qml_parseObjectLiteral();
 					}
 
-					return this.finishNode(node, "Program");
+					return this.finishNode(node, "QMLProgram");
 				};
 			});
 		}
diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/test/driver.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/test/driver.js
index a9fe8990c5d..cfa2c1a3164 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/test/driver.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/test/driver.js
@@ -8,6 +8,7 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
+"use-strict";
 
 var tests = [];
 
diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/test/run.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/test/run.js
index fa87a5e8fbf..fb56196c428 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/test/run.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/test/run.js
@@ -8,6 +8,7 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
+"use-strict";
 
 var driver = require("./driver.js");
 require("./tests-qml.js");
@@ -48,7 +49,7 @@ var stats, modes = {
 				return opts.loose !== false;
 			}
 		}
-	}
+	},
 };
 
 function report(state, code, message) {
diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/test/tests-qml.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/test/tests-qml.js
index d0d066b5f1c..d50df7a4208 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/test/tests-qml.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/test/tests-qml.js
@@ -8,6 +8,7 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
+"use-strict";
 
 var test = require("./driver.js").test;
 var testFail = require("./driver.js").testFail;
@@ -794,14 +795,17 @@ test('a{ readonly property var w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 28 },
 			end: { line: 1, column: 29 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -822,14 +826,17 @@ test('a{ default property var w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 27 },
 			end: { line: 1, column: 28 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -858,14 +865,17 @@ test('a{ property var w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 19 },
 			end: { line: 1, column: 20 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -886,14 +896,17 @@ test('a{ property boolean w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 23 },
 			end: { line: 1, column: 24 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -914,14 +927,17 @@ test('a{ property double w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 22 },
 			end: { line: 1, column: 23 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -942,14 +958,17 @@ test('a{ property int w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 19 },
 			end: { line: 1, column: 20 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -970,14 +989,17 @@ test('a{ property list w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 20 },
 			end: { line: 1, column: 21 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -998,14 +1020,17 @@ test('a{ property color w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 21 },
 			end: { line: 1, column: 22 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1026,14 +1051,17 @@ test('a{ property real w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 20 },
 			end: { line: 1, column: 21 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1054,14 +1082,17 @@ test('a{ property string w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 22 },
 			end: { line: 1, column: 23 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1082,14 +1113,17 @@ test('a{ property url w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 19 },
 			end: { line: 1, column: 20 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1119,14 +1153,17 @@ test('a{ property QtObject w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 24 },
 			end: { line: 1, column: 25 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1147,14 +1184,17 @@ test('a{ property alias w: 3 }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 21 },
 			end: { line: 1, column: 22 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1173,14 +1213,17 @@ test('a{ w: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "w" }],
 		name: "w"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 6 },
 			end: { line: 1, column: 7 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1203,14 +1246,17 @@ test('a{ x.y.z: 3 }', rootObjectMembers([{
 		],
 		name: "x.y.z"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 10 },
 			end: { line: 1, column: 11 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1253,14 +1299,17 @@ test('a{ alias: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "alias" }],
 		name: "alias"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 10 },
 			end: { line: 1, column: 11 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1279,14 +1328,17 @@ test('a{ list: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "list" }],
 		name: "list"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 9 },
 			end: { line: 1, column: 10 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1305,14 +1357,17 @@ test('a{ property: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "property" }],
 		name: "property"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 13 },
 			end: { line: 1, column: 14 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1331,14 +1386,17 @@ test('a{ readonly: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "readonly" }],
 		name: "readonly"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 13 },
 			end: { line: 1, column: 14 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1357,14 +1415,17 @@ test('a{ signal: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "signal" }],
 		name: "signal"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 11 },
 			end: { line: 1, column: 12 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1383,14 +1444,17 @@ test('a{ color: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "color" }],
 		name: "color"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 10 },
 			end: { line: 1, column: 11 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1409,14 +1473,17 @@ test('a{ real: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "real" }],
 		name: "real"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 9 },
 			end: { line: 1, column: 10 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1435,14 +1502,17 @@ test('a{ string: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "string" }],
 		name: "string"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 11 },
 			end: { line: 1, column: 12 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1461,14 +1531,17 @@ test('a{ url: 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "url" }],
 		name: "url"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 8 },
 			end: { line: 1, column: 9 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -1487,45 +1560,48 @@ test('a{ onClicked: Qt.quit(0) }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "onClicked" }],
 		name: "onClicked"
 	},
-	expr: {
-		type: "CallExpression",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 14 },
 			end: { line: 1, column: 24 }
 		},
-		callee: {
-			type: "MemberExpression",
-			loc: {
-				start: { line: 1, column: 14 },
-				end: { line: 1, column: 21 }
-			},
-			object: {
-				type: "Identifier",
+		script: {
+			type: "CallExpression",
+			callee: {
+				type: "MemberExpression",
 				loc: {
 					start: { line: 1, column: 14 },
-					end: { line: 1, column: 16 }
-				},
-				name: "Qt"
-			},
-			property: {
-				type: "Identifier",
-				loc: {
-					start: { line: 1, column: 17 },
 					end: { line: 1, column: 21 }
 				},
-				name: "quit"
+				object: {
+					type: "Identifier",
+					loc: {
+						start: { line: 1, column: 14 },
+						end: { line: 1, column: 16 }
+					},
+					name: "Qt"
+				},
+				property: {
+					type: "Identifier",
+					loc: {
+						start: { line: 1, column: 17 },
+						end: { line: 1, column: 21 }
+					},
+					name: "quit"
+				},
+				computed: false
 			},
-			computed: false
-		},
-		arguments: [{
-			type: "Literal",
-			loc: {
-				start: { line: 1, column: 22 },
-				end: { line: 1, column: 23 }
-			},
-			value: 0,
-			raw: "0"
-		}]
+			arguments: [{
+				type: "Literal",
+				loc: {
+					start: { line: 1, column: 22 },
+					end: { line: 1, column: 23 }
+				},
+				value: 0,
+				raw: "0"
+			}]
+		}
 	}
 }]));
 
@@ -1862,20 +1938,23 @@ test('a{ id: test }', rootObjectMembers([{
 		}],
 		name: "id"
 	},
-	expr: {
-		type: "Identifier",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 7 },
 			end: { line: 1, column: 11 }
 		},
-		name: "test"
+		script: {
+			type: "Identifier",
+			name: "test"
+		}
 	}
 }]));
 
 /*
 * Test the base QML Hello World program created by Eclipse CDT.
 */
-test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true\n\n\tMouseArea {\n\t\tanchors.fill: parent\n\t\tonClicked: {\n\t\t\tQt.quit();\n\t\t}\n\t}\n\t\tText {\n\t\t\ttext: qsTr("Hello World")\n\t\t\tanchors.centerIn: parent\n\t}\n}',
+test('import QtQuick 2.3\nimport QtQuick.Window 2.2\nWindow {\n\tvisible: true\n\n\tMouseArea {\n\t\tanchors.fill: parent\n\t\tonClicked: {\n\t\t\tQt.quit();\n\t\t}\n\t}\n\tText {\n\t\ttext: qsTr("Hello World")\n\t\tanchors.centerIn: parent\n\t}\n}',
 	program([{
 		type: "QMLImportStatement",
 		loc: {
@@ -1950,14 +2029,14 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 	}],{
 		type: "QMLObjectLiteral",
 		loc: {
-			start: { line: 3, column: 1 },
+			start: { line: 3, column: 0 },
 			end: { line: 16, column: 1 }
 		},
 		id: {
 			type: "QMLQualifiedID",
 			loc: {
-				start: { line: 3, column: 1 },
-				end: { line: 3, column: 7 }
+				start: { line: 3, column: 0 },
+				end: { line: 3, column: 6 }
 			},
 			parts: [{ type: "Identifier", name: "Window" }],
 			name: "Window"
@@ -1965,7 +2044,7 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 		body: {
 			type: "QMLMemberBlock",
 			loc: {
-				start: { line: 3, column: 8 },
+				start: { line: 3, column: 7 },
 				end: { line: 16, column: 1 }
 			},
 			members: [
@@ -1984,14 +2063,17 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 						parts: [{ type: "Identifier", name: "visible" }],
 						name: "visible"
 					},
-					expr: {
-						type: "Literal",
+					binding: {
+						type: "QMLScriptBinding",
 						loc: {
 							start: { line: 4, column: 10 },
 							end: { line: 4, column: 14 }
 						},
-						value: true,
-						raw: "true"
+						script: {
+							type: "Literal",
+							value: true,
+							raw: "true"
+						}
 					}
 				},
 				{
@@ -2034,13 +2116,16 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 									],
 									name: "anchors.fill"
 								},
-								expr: {
-									type: "Identifier",
+								binding: {
+									type: "QMLScriptBinding",
 									loc: {
 										start: { line: 7, column: 16 },
 										end: { line: 7, column: 22 }
 									},
-									name: "parent"
+									script: {
+										type: "Identifier",
+										name: "parent"
+									}
 								}
 							},
 							{
@@ -2058,31 +2143,34 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 									parts: [{ type: "Identifier", name: "onClicked" }],
 									name: "onClicked"
 								},
-								expr: {
-									type: "QMLStatementBlock",
+								binding: {
+									type: "QMLScriptBinding",
 									loc: {
 										start: { line: 8, column: 13 },
 										end: { line: 10, column: 3 }
 									},
-									statements: [{
-										type: "ExpressionStatement",
-										expression: {
-											type: "CallExpression",
-											callee: {
-												type: "MemberExpression",
-												object: {
-													type: "Identifier",
-													name: "Qt"
+									script: {
+										type: "QMLStatementBlock",
+										statements: [{
+											type: "ExpressionStatement",
+											expression: {
+												type: "CallExpression",
+												callee: {
+													type: "MemberExpression",
+													object: {
+														type: "Identifier",
+														name: "Qt"
+													},
+													property: {
+														type: "Identifier",
+														name: "quit"
+													},
+													computed: false
 												},
-												property: {
-													type: "Identifier",
-													name: "quit"
-												},
-												computed: false
-											},
-											arguments: []
-										}
-									}]
+												arguments: []
+											}
+										}]
+									}
 								}
 							}
 						]
@@ -2091,14 +2179,14 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 				{
 					type: "QMLObjectLiteral",
 					loc: {
-						start: { line: 12, column: 2 },
+						start: { line: 12, column: 1 },
 						end: { line: 15, column: 2 }
 					},
 					id: {
 						type: "QMLQualifiedID",
 						loc: {
-							start: { line: 12, column: 2 },
-							end: { line: 12, column: 6 }
+							start: { line: 12, column: 1 },
+							end: { line: 12, column: 5 }
 						},
 						parts: [{ type: "Identifier", name: "Text" }],
 						name: "Text"
@@ -2106,53 +2194,56 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 					body: {
 						type: "QMLMemberBlock",
 						loc: {
-							start: { line: 12, column: 7 },
+							start: { line: 12, column: 6 },
 							end: { line: 15, column: 2 }
 						},
 						members: [
 							{
 								type: "QMLPropertyBinding",
 								loc: {
-									start: { line: 13, column: 3 },
-									end: { line: 13, column: 28 }
+									start: { line: 13, column: 2 },
+									end: { line: 13, column: 27 }
 								},
 								id: {
 									type: "QMLQualifiedID",
 									loc: {
-										start: { line: 13, column: 3 },
-										end: { line: 13, column: 7 }
+										start: { line: 13, column: 2 },
+										end: { line: 13, column: 6 }
 									},
 									parts: [{ type: "Identifier", name: "text" }],
 									name: "text"
 								},
-								expr: {
-									type: "CallExpression",
+								binding: {
+									type: "QMLScriptBinding",
 									loc: {
-										start: { line: 13, column: 9 },
-										end: { line: 13, column: 28 }
+										start: { line: 13, column: 8 },
+										end: { line: 13, column: 27 }
 									},
-									callee: {
-										type: "Identifier",
-										name: "qsTr"
-									},
-									arguments: [{
-										type: "Literal",
-										value: "Hello World",
-										raw: "\"Hello World\""
-									}]
+									script: {
+										type: "CallExpression",
+										callee: {
+											type: "Identifier",
+											name: "qsTr"
+										},
+										arguments: [{
+											type: "Literal",
+											value: "Hello World",
+											raw: "\"Hello World\""
+										}]
+									}
 								}
 							},
 							{
 								type: "QMLPropertyBinding",
 								loc: {
-									start: { line: 14, column: 3 },
-									end: { line: 14, column: 27 }
+									start: { line: 14, column: 2 },
+									end: { line: 14, column: 26 }
 								},
 								id: {
 									type: "QMLQualifiedID",
 									loc: {
-										start: { line: 14, column: 3 },
-										end: { line: 14, column: 19 }
+										start: { line: 14, column: 2 },
+										end: { line: 14, column: 18 }
 									},
 									parts: [
 										{ type: "Identifier", name: "anchors" },
@@ -2160,9 +2251,12 @@ test('import QtQuick 2.3\nimport QtQuick.Window 2.2\n\tWindow {\n\tvisible: true
 									],
 									name: "anchors.centerIn"
 								},
-								expr: {
-									type: "Identifier",
-									name: "parent"
+								binding: {
+									type: "QMLScriptBinding",
+									script: {
+										type: "Identifier",
+										name: "parent"
+									}
 								}
 							}
 						]
@@ -2451,6 +2545,18 @@ testLoose('Window {\n\tprop: 3', rootObject({
 				},
 				parts: [{ type: "Identifier", name: "prop" }],
 				name: "prop"
+			},
+			binding: {
+				type: "QMLScriptBinding",
+				loc: {
+					start: { line: 2, column: 7 },
+					end: { line: 2, column: 8 }
+				},
+				script: {
+					type: "Literal",
+					value: 3,
+					raw: "3"
+				}
 			}
 		}]
 	}
@@ -2545,7 +2651,8 @@ testLoose('a{ property var  }', rootObjectMembers([{
 			end: { line: 1, column: 17 }
 		},
 		name: "✖"
-	}
+	},
+	binding: null
 }]));
 
 testLoose('a{ w }', rootObjectMembers([{
@@ -2563,13 +2670,16 @@ testLoose('a{ w }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "w" }],
 		name: "w"
 	},
-	expr: {
-		type: "Identifier",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 5 },
 			end: { line: 1, column: 5 }
 		},
-		name: "✖"
+		script: {
+			type: "Identifier",
+			name: "✖"
+		}
 	}
 }]));
 
@@ -2588,13 +2698,16 @@ testLoose('a{ w:  }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "w" }],
 		name: "w"
 	},
-	expr: {
-		type: "Identifier",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
-			start: { line: 1, column: 7 },
+			start: { line: 1, column: 4 },
 			end: { line: 1, column: 7 }
 		},
-		name: "✖"
+		script: {
+			type: "Identifier",
+			name: "✖"
+		}
 	}
 }]));
 
@@ -2613,14 +2726,17 @@ testLoose('a{ : 3 }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "✖" }],
 		name: "✖"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 5 },
 			end: { line: 1, column: 6 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -2642,14 +2758,17 @@ testLoose('a{ anchors.: 3 }', rootObjectMembers([{
 		],
 		name: "anchors.✖"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 13 },
 			end: { line: 1, column: 14 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -2672,14 +2791,17 @@ testLoose('a{ anchors..: 3 }', rootObjectMembers([{
 		],
 		name: "anchors.✖.✖"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 14 },
 			end: { line: 1, column: 15 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -2702,14 +2824,17 @@ testLoose('a{ ..: 3 }', rootObjectMembers([{
 		],
 		name: "✖.✖.✖"
 	},
-	expr: {
-		type: "Literal",
+	binding: {
+		type: "QMLScriptBinding",
 		loc: {
 			start: { line: 1, column: 7 },
 			end: { line: 1, column: 8 }
 		},
-		value: 3,
-		raw: "3"
+		script: {
+			type: "Literal",
+			value: 3,
+			raw: "3"
+		}
 	}
 }]));
 
@@ -2730,7 +2855,7 @@ testLoose('a{ var }', rootObjectMembers([{
 		},
 		name: "✖"
 	},
-	init: null
+	binding: null
 }]));
 
 testLoose('a{ var w }', rootObjectMembers([{
@@ -2750,7 +2875,7 @@ testLoose('a{ var w }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: null
+	binding: null
 }]));
 
 testLoose('a{ obj w }', rootObjectMembers([{
@@ -2778,7 +2903,7 @@ testLoose('a{ obj w }', rootObjectMembers([{
 		},
 		name: "w"
 	},
-	init: null
+	binding: null
 }]));
 
 // TODO: Allow this to run with the normal parser once the ambiguity is solved
@@ -2799,7 +2924,7 @@ testLoose('a{ property var b: Window {} }', rootObjectMembers([{
 		},
 		name: "b"
 	},
-	init: {
+	binding: {
 		type: "QMLObjectLiteral",
 		loc: {
 			start: { line: 1, column: 19 },
@@ -2841,7 +2966,7 @@ testLoose('a{ b: Window {} }', rootObjectMembers([{
 		parts: [{ type: "Identifier", name: "b" }],
 		name: "b"
 	},
-	expr: {
+	binding: {
 		type: "QMLObjectLiteral",
 		loc: {
 			start: { line: 1, column: 6 },
@@ -2999,7 +3124,7 @@ testLoose('Window {\n\tfunction\n\tproperty var prop\n}', rootObjectMembers([
 			},
 			name: "prop"
 		},
-		init: null
+		binding: null
 	}
 ]));
 
@@ -3054,7 +3179,7 @@ testLoose('Window {\n\tfunction (something)\n\tproperty var prop\n}', rootObject
 			},
 			name: "prop"
 		},
-		init: null
+		binding: null
 	}
 ]));
 
@@ -3100,7 +3225,7 @@ testLoose('Window {\n\tfunction (\n\tproperty var prop\n}', rootObjectMembers([
 			},
 			name: "prop"
 		},
-		init: null
+		binding: null
 	}
 ]));
 
@@ -3110,7 +3235,7 @@ testLoose('Window {\n\tfunction (\n\tproperty var prop\n}', rootObjectMembers([
 */
 function program(headerStatements, rootObject) {
 	return {
-		type: "Program",
+		type: "QMLProgram",
 		headerStatements: {
 			type: "QMLHeaderStatements",
 			statements: headerStatements || []
@@ -3165,7 +3290,10 @@ function rootObjectMembers(members, obj) {
 function javaScript(expr, objMembers) {
 	objMembers = objMembers || rootObjectMembers([{
 		type: "QMLPropertyBinding",
-		expr: expr
+		binding: {
+			type: "QMLScriptBinding",
+			script: expr
+		}
 	}]);
 	return objMembers;
 }
\ No newline at end of file
diff --git a/qt/org.eclipse.cdt.qt.core/acorn-qml/walk/index.js b/qt/org.eclipse.cdt.qt.core/acorn-qml/walk/index.js
index aad79857d53..4ff5a0769b5 100644
--- a/qt/org.eclipse.cdt.qt.core/acorn-qml/walk/index.js
+++ b/qt/org.eclipse.cdt.qt.core/acorn-qml/walk/index.js
@@ -8,15 +8,15 @@
  * Contributors:
  * QNX Software Systems - Initial API and implementation
  *******************************************************************************/
-'use strict';
-
 (function (mod) {
 	if (typeof exports == "object" && typeof module == "object") // CommonJS
-		return mod(require("acorn/dist/walk"));
+		return module.exports = mod(require("acorn/dist/walk"));
 	if (typeof define == "function" && define.amd) // AMD
 		return define(["acorn/dist/walk"], mod);
 	mod(acorn.walk); // Plain browser env
 })(function (walk) {
+	"use strict";
+
 	function skipThrough(node, st, c) {
 		c(node, st)
 	}
@@ -24,7 +24,7 @@
 	function ignore(node, st, c) {}
 
 	var base = walk.base;
-	base["Program"] = function (node, st, c) {
+	base["QMLProgram"] = function (node, st, c) {
 		c(node.headerStatements, st);
 		if (node.rootObject) {
 			c(node.rootObject, st, "QMLRootObject");
@@ -49,18 +49,22 @@
 	};
 	base["QMLMember"] = skipThrough;
 	base["QMLPropertyDeclaration"] = function (node, st, c) {
-		if (node.init) {
-			c(node.init, st);
+		if (node.binding) {
+			c(node.binding, st);
 		}
 	};
 	base["QMLSignalDefinition"] = ignore;
 	base["QMLPropertyBinding"] = function (node, st, c) {
-		c(node.expr, st);
+		c(node.binding, st);
 	};
+	base["QMLScriptBinding"] = function (node, st, c) {
+		c(node.script, st);
+	}
 	base["QMLQualifiedID"] = ignore;
 	base["QMLStatementBlock"] = function (node, st, c) {
 		for (var i = 0; i < node.statements.length; i++) {
 			c(node.statements[i], st, "Statement");
 		}
 	};
+	return walk;
 })
\ No newline at end of file
diff --git a/qt/org.eclipse.cdt.qt.core/tern-qml/demo/qml-demo.html b/qt/org.eclipse.cdt.qt.core/tern-qml/demo/qml-demo.html
index 1349e002b97..ddb97e23118 100644
--- a/qt/org.eclipse.cdt.qt.core/tern-qml/demo/qml-demo.html
+++ b/qt/org.eclipse.cdt.qt.core/tern-qml/demo/qml-demo.html
@@ -21,7 +21,9 @@
 		<script src="../node_modules/acorn/dist/walk.js"></script>
         <script src="../node_modules/acorn-qml/inject.js"></script>
         <script src="../node_modules/acorn-qml/index.js"></script>
-        <script src="../node_modules/acorn-qml/walk/walk.js"></script>
+		<script src="../node_modules/acorn-qml/loose/inject.js"></script>
+        <script src="../node_modules/acorn-qml/loose/index.js"></script>
+        <script src="../node_modules/acorn-qml/walk/index.js"></script>
 
 		<!-- Tern JS -->
 		<script src="../node_modules/tern/lib/signal.js"></script>
@@ -57,7 +59,9 @@
 	</head>
 	<body>
 		<h1>Demo with QML Tern plugin </h1>
+		<div style="border: solid 1px #AAAAAA;">
 		<form><textarea id="code" name="code">import QtQuick 2.3&#10;Window {&#10;&#09;prop: {&#10;&#09;&#09;Qt.quit();&#10;&#09;}&#10;}&#10;</textarea></form>
+		</div>
 		<script type="text/javascript">
 			function passAndHint(cm) {
 				setTimeout(function() {cm.execCommand("autocomplete");}, 100);
diff --git a/qt/org.eclipse.cdt.qt.core/tern-qml/qml.js b/qt/org.eclipse.cdt.qt.core/tern-qml/qml.js
index 3c25a4e84b3..6f2ca438aca 100644
--- a/qt/org.eclipse.cdt.qt.core/tern-qml/qml.js
+++ b/qt/org.eclipse.cdt.qt.core/tern-qml/qml.js
@@ -10,11 +10,13 @@
  *******************************************************************************/
 (function (mod) {
 	if (typeof exports === "object" && typeof module === "object") // CommonJS
-		return mod(require("acorn"), require("acorn/dist/acorn_loose"), require("tern/lib/infer"), require("tern/lib/tern"));
+		return mod(require("acorn"), require("acorn/dist/acorn_loose"), require("acorn/dist/walk"), require("acorn-qml"),
+				   require("acorn-qml/loose"), require("acorn-qml/walk"), require("tern/lib/infer"), require("tern"));
 	if (typeof define === "function" && define.amd) // AMD
-		return define([ "acorn", "acorn/dist/acorn_loose", "tern/lib/infer", "tern/lib/tern", "tern/lib/def"], mod);
-	mod(acorn, acorn, tern, tern, tern.def); // Plain browser env
-})(function (acorn, acornLoose, infer, tern, def) {
+		return define([ "acorn", "acorn/dist/acorn_loose", "acorn/dist/walk", "acorn-qml", "acorn-qml/loose", "acorn-qml/walk",
+					   "tern/lib/infer", "tern"], mod);
+	mod(acorn, acorn, acorn.walk, acorn, acorn, acorn.walk, tern, tern, tern.def); // Plain browser env
+})(function (acorn, acornLoose, walk, acornQML, acornQMLLoose, acornQMLWalk, infer, tern, def) {
 	'use strict';
 
 	// Outside of the browser environment we have to grab 'def' from 'infer'
@@ -22,33 +24,137 @@
 		def = infer.def;
 	}
 
+	// QML Scope Builder
+	var ScopeBuilder = function (file, jsDefs) {
+		this.file = file;
+		this.file.qmlIDScope = new infer.Scope();
+		this.file.qmlIDScope.name = "<qml-id>";
+		this.jsDefs = jsDefs;
+		this.scopes = [];
+		this.jsScopes = [];
+		this.propScopes = [];
+		this.sigScopes = [];
+	};
+
+	ScopeBuilder.prototype.getRootScope = function () {
+		return this.scopes.length > 0 ? this.scopes[0] : null;
+	};
+
+	ScopeBuilder.prototype.isRootScope = function (scope) {
+		return scope === this.rootScope();
+	};
+
+	ScopeBuilder.prototype.newObjScope = function (node) {
+		var rootScope = this.getRootScope(), scope;
+		if (!rootScope) {
+			scope = new infer.Scope(this.file.scope, node);
+		} else {
+			scope = new infer.Scope(rootScope, node);
+		}
+		scope.name = "<qml-obj>";
+		this.scopes.push(scope);
+		return scope;
+	};
+
+	ScopeBuilder.prototype.forEachObjScope = function (callback) {
+		for (var i = 0; i < this.scopes.length; i++) {
+			var scope = this.scopes[i];
+			if (scope.name === "<qml-obj>") {
+				callback(scope);
+			}
+		}
+	};
+
+	ScopeBuilder.prototype.getObjScope = function (scope) {
+		while (scope && scope.name != "<qml-obj>") {
+			scope = scope.prev;
+		}
+		return scope;
+	};
+
+	ScopeBuilder.prototype.getIDScope = function () {
+		return this.file.qmlIDScope;
+	};
+
+	ScopeBuilder.prototype.newPropertyScope = function (objScope, node) {
+		var propScope = new infer.Scope(null, node);
+		propScope.name = "<qml-prop>";
+		propScope.objScope = objScope;
+		this.propScopes.push(propScope);
+		return propScope;
+	};
+
+	ScopeBuilder.prototype.forEachPropertyScope = function (callback) {
+		for (var i = 0; i < this.propScopes.length; i++) {
+			callback(this.propScopes[i], this.propScopes[i].objScope);
+		}
+	};
+
+	ScopeBuilder.prototype.newJSScope = function (scope, node) {
+		var jsScope = new infer.Scope(scope, node);
+		jsScope.name = "<qml-js>";
+		var curOrigin = infer.cx().curOrigin;
+		for (var i = 0; i < this.jsDefs.length; ++i)
+			def.load(this.jsDefs[i], jsScope);
+		infer.cx().curOrigin = curOrigin;
+		this.jsScopes.push(jsScope);
+		return jsScope;
+	};
+
+	ScopeBuilder.prototype.forEachJSScope = function (callback) {
+		for (var i = 0; i < this.jsScopes.length; i++) {
+			callback(this.jsScopes[i]);
+		}
+	};
+
+	ScopeBuilder.prototype.newSignalScope = function (scope, node) {
+		var sigScope = new infer.Scope(scope, node);
+		sigScope.name = "<qml-signal>";
+		this.sigScopes.push(sigScope);
+		return sigScope
+	};
+
+	ScopeBuilder.prototype.hasFunctionScope = function (objScope) {
+		var found = null;
+		this.forEachFunctionScope(function (scope) {
+			if (scope.objScope == objScope) {
+				found = scope;
+			}
+		});
+		return found;
+	};
+
 	// Helper for adding a property to a scope.
 	function addVar(scope, node) {
-		if (node.type === "QMLQualifiedID") {
-			var currScope = scope;
-			for (var i = 1; i < node.parts.length; i++) {
-				var name = node.parts[i].name;
-				curr = curr.hasProp(name);
-			}
-			return prop;
-		} else if (node.type === "Identifier") {
-			return scope.defProp(node.name, node);
-		}
-		return null;
+		return scope.defProp(node.name, node);
 	}
 
 	// Helper for finding a property in a scope.
-	function findProp(node, scope) {
+	function findProp(node, scope, pos) {
+		if (pos == null || pos < 0) {
+			pos = Number.MAX_VALUE;
+		}
 		if (node.type === "QMLQualifiedID") {
-			var curr = scope;
-			for (var i = 0; i < node.parts.length; i++) {
-				var name = node.parts[i].name;
-				curr = curr.hasProp(name);
-				if (!curr) {
-					return null;
+			return (function recurse(i, prop) {
+				if (i >= node.parts.length || pos < node.parts[i].start) {
+					return prop;
 				}
-			}
-			return curr;
+				if (!prop) {
+					prop = scope.hasProp(node.parts[i].name);
+					if (prop) {
+						return recurse(i + 1, prop);
+					}
+				} else {
+					var obj = prop.getType();
+					if (obj) {
+						var p = obj.hasProp(node.parts[i].name);
+						if (p) {
+							return recurse(i + 1, p);
+						}
+					}
+				}
+				return null;
+			})(0, null);
 		} else if (node.type === "Identifier") {
 			return scope.hasProp(node.name);
 		}
@@ -61,109 +167,168 @@
 		return parent instanceof tern.Server ? parent : null;
 	}
 
-	function preParse(text, options) {
-		// Force ECMA Version to 5
-		options.ecmaVersion = 5;
+	// Helper for getting the current file's scope builder
+	function getScopeBuilder() {
+		return infer.cx().qmlScopeBuilder;
+	}
 
-		// Register qml plugin with main parser
-		var plugins = options.plugins;
-		if (!plugins) plugins = options.plugins = {};
-		plugins["qml"] = true;
-
-		// Register qml plugin with loose parser
-		var pluginsLoose = options.pluginsLoose;
-		if (!pluginsLoose) pluginsLoose = options.pluginsLoose = {};
-		pluginsLoose["qml"] = true;
+	// Object which holds two scopes
+	function Scopes(object, property) {
+		this.object = object;
+		this.property = property || object;
 	}
 
 	function extendTernScopeGatherer(scopeGatherer) {
-		scopeGatherer["QMLImportStatement"] = function (node, scope, c) {
-			if (node.qualifier) {
-				addVar(scope, node.qualifier.id);
-			}
-		};
+		// Build up the scopes in the QML document using the scopeGatherer.  A second
+		// pass will be done after the scopeGatherer executes in order to finalize a
+		// few of the extra scopes such as the JavaScript, ID, Property, and Signal
+		// Handler scopes.
 		scopeGatherer["QMLObjectLiteral"] = function (node, scope, c) {
-			var inner = node.scope = new infer.Scope(scope, node);
+			var inner = node.scope = getScopeBuilder().newObjScope(node);
 			c(node.body, inner);
 		};
-		scopeGatherer["QMLPropertyDeclaration"] = function (node, scope, c) {
-			var prop = addVar(scope, node.id);
-			var inner = scope;
-			if (node.init) {
-				// Create a JavaScript scope if init is a JavaScript environment
-				if (!node.init.type.startsWith("QML")) {
-					inner = node.scope = getServer().createJSScope(scope, node);
+		scopeGatherer["QMLMemberBlock"] = function (node, scope, c) {
+			var s = infer.cx().curOrigin;
+			var propertyScope = node.scope = getScopeBuilder().newPropertyScope(scope, node);
+			var scopes = new Scopes(scope, propertyScope);
+			for (var i = 0; i < node.members.length; i++) {
+				var member = node.members[i];
+				if (member.type === "FunctionDeclaration") {
+					c(member, scope);
+
+					// Insert the JavaScript scope after the Function has had a chance to build it's own scope
+					var jsScope = getScopeBuilder().newJSScope(scope, member);
+					member.scope.prev = member.scope.proto = jsScope;
+
+					// Indicate that the property is a function
+					var prop = scope.hasProp(member.id.name);
+					if (prop) {
+						prop.isFunction = true;
+					}
+				} else if (member.type === "QMLPropertyDeclaration" || member.type === "QMLPropertyBinding") {
+					c(member, scopes);
+				} else {
+					c(member, scope);
 				}
-				c(node.init, inner);
 			}
 		};
-		scopeGatherer["QMLPropertyBinding"] = function (node, scope, c) {
-			// Check for the 'id' property being set
-			var idParts = node.id.parts;
-			if (idParts.length == 1 && idParts[0].name === "id") {
-				if (node.expr.type === "Identifier") {
-					node.prop = scope.prev.defProp(node.expr.name, node.expr);
-				}
+		scopeGatherer["QMLPropertyDeclaration"] = function (node, scopes, c) {
+			var inner = scopes.object;
+			var prop = addVar(inner, node.id);
+			if (node.binding) {
+				node.binding.scope = inner;
+				c(node.binding, inner);
 			}
-
+		};
+		scopeGatherer["QMLPropertyBinding"] = function (node, scopes, c) {
 			// Create a JavaScript scope if init is a JavaScript environment
-			var inner = scope;
-			if (!node.expr.type.startsWith("QML")) {
-				inner = node.scope = getServer().createJSScope(scope, node);
+			var inner = node.binding.scope = scopes.object;
+			// Check for the 'id' property being set
+			if (node.id.name == "id") {
+				if (node.binding.type === "QMLScriptBinding") {
+					var binding = node.binding;
+					if (!binding.block && binding.script.type === "Identifier") {
+						node.prop = addVar(getScopeBuilder().getIDScope(), binding.script);
+					}
+				}
 			} else {
 				// If this appears to be a signal handler, pre-emptively create a new scope that
 				// will store references to the signal's arguments
-				var last = getLastIndex(idParts).name;
-				if (last.startsWith("on")) {
-					inner = node.scope = new infer.Scope(scope, node);
+				if (node.id.name.startsWith("on")) {
+					inner = node.binding.scope = new infer.Scope(inner, node);
 				}
 			}
 
 			// Delegate down to the expression
-			c(node.expr, inner);
+			c(node.binding, inner);
+		};
+		scopeGatherer["QMLScriptBinding"] = function (node, scope, c) {
+			var inner = node.scope = getScopeBuilder().newJSScope(node.scope || scope, node);
+			c(node.script, inner);
 		};
 		scopeGatherer["QMLStatementBlock"] = function (node, scope, c) {
-			var inner = node.scope = getServer().createJSScope(scope, node);
+			var inner = getScopeBuilder().newJSScope(node.scope || scope, node);
+			node.scope = inner;
 			for (var i = 0; i < node.statements.length; i++) {
 				c(node.statements[i], inner, "Statement");
 			}
 		};
 		scopeGatherer["QMLSignalDefinition"] = function (node, scope, c) {
+			// Scope Builder
+			var sb = getScopeBuilder();
+
 			// Define the signal arguments in their own separate scope
 			var argNames = [],
 				argVals = [];
-			var fnScope = new infer.Scope(scope, node);
+			var sigScope = sb.newSignalScope(scope, node);
 			for (var i = 0; i < node.params.length; i++) {
 				var param = node.params[i];
 				argNames.push(param.id.name);
-				argVals.push(addVar(fnScope, param.id));
+				argVals.push(addVar(sigScope, param.id));
 			}
 
 			// Define the signal function type which can be referenced from JavaScript
 			var sig = addVar(scope, node.id);
-			sig.fnType = new infer.Fn(node.id.name, new infer.AVal, argVals, argNames, infer.ANull);
-			sig.fnType.fnScope = fnScope;
+			sig.isFunction = true;
+			sig.sigType = new infer.Fn(node.id.name, new infer.AVal, argVals, argNames, infer.ANull);
+			sig.sigType.sigScope = sigScope;
 
 			// Define the signal handler property
 			var handler = scope.defProp(getSignalHandlerName(node.id.name), node.id);
-			handler.sig = sig.fnType;
+			handler.sig = sig.sigType;
 		}
 	}
 
-	function extendTernInferExprVisitor(inferExprVisitor) {
-		// ret' taken from infer.js
-		function ret(f) {
-			return function (node, scope, out, name) {
-				var r = f(node, scope, name);
-				if (out) r.propagate(out);
-				return r;
-			};
-		}
+	// 'infer' taken from infer.js
+	function inf(node, scope, out, name) {
+		var handler = infer.inferExprVisitor[node.type];
+		return handler ? handler(node, scope, out, name) : infer.ANull;
+	}
 
+	// Infers the property's type from its given primitive value
+	function infKind(kind, out) {
+		switch (kind) {
+			case "int":
+			case "double":
+			case "real":
+				infer.cx().num.propagate(out);
+				break;
+			case "string":
+			case "color":
+				infer.cx().str.propagate(out);
+				break;
+			case "boolean":
+				infer.cx().bool.propagate(out);
+				break;
+			}
+	}
+
+	// 'ret' taken from infer.js
+	function ret(f) {
+		return function (node, scope, out, name) {
+			var r = f(node, scope, name);
+			if (out) r.propagate(out);
+			return r;
+		};
+	}
+
+	// 'fill' taken from infer.js
+	function fill(f) {
+		return function(node, scope, out, name) {
+			if (!out) out = new AVal;
+			f(node, scope, out, name);
+			return out;
+		};
+	}
+
+	function extendTernInferExprVisitor(inferExprVisitor) {
 		// Extend the inferExprVisitor methods
 		inferExprVisitor["QMLStatementBlock"] = ret(function (node, scope, name) {
 			return infer.ANull; // Statement blocks have no type
 		});
+		inferExprVisitor["QMLScriptBinding"] = fill(function (node, scope, out, name) {
+			return inf(node.script, node.scope || scope, out, name);
+		});
 		inferExprVisitor["QMLObjectLiteral"] = ret(function (node, scope, name) {
 			return node.scope.objType;
 		});
@@ -178,12 +343,6 @@
 	}
 
 	function extendTernInferWrapper(inferWrapper) {
-		// 'infer' taken from infer.js
-		function inf(node, scope, out, name) {
-			var handler = infer.inferExprVisitor[node.type];
-			return handler ? handler(node, scope, out, name) : infer.ANull;
-		}
-
 		// Extend the inferWrapper methods
 		inferWrapper["QMLObjectLiteral"] = function (node, scope, c) {
 			// Define a new Obj which represents this Object Literal
@@ -198,50 +357,50 @@
 			});
 			c(node.body, node.scope);
 		};
-		inferWrapper["QMLPropertyDeclaration"] = function (node, scope, c) {
-			var prop = findProp(node.id, scope);
-			// Infer the property's type from its assigned type
-			switch (node.kind) {
-			case "int":
-			case "double":
-			case "real":
-				infer.cx().num.propagate(prop);
-				break;
-			case "string":
-			case "color":
-				infer.cx().str.propagate(prop);
-				break;
-			case "boolean":
-				infer.cx().bool.propagate(prop);
-				break;
-			}
-			// Also infer the type from its init expression
-			if (node.init) {
-				c(node.init, scope);
-				inf(node.init, scope, prop, node.id.name);
+		inferWrapper["QMLMemberBlock"] = function (node, scope, c) {
+			var scopes = new Scopes(scope, node.scope);
+			for (var i = 0; i < node.members.length; i++) {
+				var member = node.members[i];
+				if (member.type === "QMLPropertyDeclaration" || member.type === "QMLPropertyBinding") {
+					c(member, scopes);
+				} else {
+					c(member, scope);
+				}
 			}
 		};
-		inferWrapper["QMLPropertyBinding"] = function (node, scope, c) {
-			c(node.expr, node.scope || scope);
-			var prop = findProp(node.id, scope);
+		inferWrapper["QMLPropertyDeclaration"] = function (node, scopes, c) {
+			var prop = findProp(node.id, scopes.property);
 			if (prop) {
-				if (prop.sig) {
-					// This is a signal handler and we should populate its scope with
-					// the arguments from its parent function.
-					prop.sig.fnScope.forAllProps(function (name, prop, curr) {
-						if (curr) {
-							node.scope.props[name] = prop;
-						}
-					});
-				} else {
-					inf(node.expr, scope, prop, getLastIndex(node.id.parts));
+				infKind(node.kind, prop);
+				if (node.binding) {
+					c(node.binding, scopes.object);
+					inf(node.binding, scopes.object, prop, node.id.name);
+				}
+			}
+		};
+		inferWrapper["QMLPropertyBinding"] = function (node, scopes, c) {
+			c(node.binding, scopes.object);
+			// Check for the 'id' property being set
+			if (node.id.name === "id") {
+				if (node.binding.type === "QMLScriptBinding") {
+					var binding = node.binding;
+					if (binding.script.type === "Identifier") {
+						scopes.object.objType.propagate(node.prop);
+					}
 				}
 			} else {
-				// Check for the 'id' property being set
-				var idParts = node.id.parts;
-				if (idParts.length == 1 && idParts[0].name === "id") {
-					if (node.expr.type === "Identifier") {
-						scope.objType.propagate(node.prop);
+				var prop = findProp(node.id, scopes.property);
+				if (prop) {
+					if (prop.sig) {
+						// This is a signal handler and we should populate its scope with
+						// the arguments from its parent function.
+						prop.sig.sigScope.forAllProps(function (name, prop, curr) {
+							if (curr) {
+								node.binding.scope.props[name] = prop;
+							}
+						});
+					} else {
+						inf(node.binding, node.binding.scope, prop, getLastIndex(node.id.parts));
 					}
 				}
 			}
@@ -253,9 +412,12 @@
 		};
 		inferWrapper["QMLSignalDefinition"] = function (node, scope, c) {
 			var sig = scope.getProp(node.id.name);
-			var retval = new infer.Obj(true, "Signal");
-			sig.fnType.retval = retval;
-			sig.fnType.propagate(sig);
+			for (var i = 0; i < node.params.length; i++) {
+				var param = node.params[i];
+				infKind(param.kind.name, sig.sigType.args[i]);
+			}
+			sig.sigType.retval = infer.ANull;
+			sig.sigType.propagate(sig);
 
 			var handler = scope.getProp(getSignalHandlerName(node.id.name));
 			var obj = new infer.Obj(true, "Signal Handler");
@@ -268,12 +430,26 @@
 		typeFinder["QMLObjectLiteral"] = function (node, scope) {
 			return node.scope.objType;
 		};
-		typeFinder["QMLStatementBlock"] = function (node, scope) {
+		typeFinder["QMLMemberBlock"] = function (node, scope) {
+			return infer.ANull;
+		};
+		typeFinder["FunctionDeclaration"] = function (node, scope) {
+			return scope.name === "<qml-obj>" ? infer.ANull : undefined;
+		};
+		typeFinder["QMLScriptBinding"] = function (node, scope) {
+			// Trick Tern into thinking this node is a type so that it will use
+			// this node's scope when handling improperly written script bindings
 			return infer.ANull;
 		};
 		typeFinder["QMLQualifiedID"] = function (node, scope) {
-			return findProp(node, scope);
-		}
+			return findProp(node, scope) || infer.ANull;
+		};
+		typeFinder["QML_ID"] = function (node, scope) {
+			// Reverse the hack from search visitor before finding the property in
+			// the id scope
+			node.type = "Identifier";
+			return findProp(node, getScopeBuilder().getIDScope());
+		};
 	}
 
 	function extendTernSearchVisitor(searchVisitor) {
@@ -281,11 +457,46 @@
 		searchVisitor["QMLObjectLiteral"] = function (node, scope, c) {
 			c(node.body, node.scope);
 		};
-		searchVisitor["QMLPropertyBinding"] = function (node, scope, c) {
-			c(node.id, scope);
-			// A binding that is referencing a signal holds a scope.  Other property bindings do not.
-			c(node.expr, node.scope || scope);
+		searchVisitor["QMLMemberBlock"] = function (node, scope, c) {
+			var scopes = new Scopes(scope, node.scope);
+			for (var i = 0; i < node.members.length; i++) {
+				var member = node.members[i];
+				if (member.type === "QMLPropertyDeclaration" || member.type === "QMLPropertyBinding") {
+					c(member, scopes);
+				} else {
+					c(member, scope);
+				}
+			}
 		};
+		searchVisitor["QMLSignalDefinition"] = function (node, scope, c) {
+			c(node.id, scope);
+		};
+		searchVisitor["QMLPropertyDeclaration"] = function (node, scopes, c) {
+			if (node.binding) {
+				c(node.binding, node.binding.scope);
+			}
+		};
+		searchVisitor["QMLPropertyBinding"] = function (node, scopes, c) {
+			if (node.id.name === "id") {
+				if (node.binding.type === "QMLScriptBinding") {
+					var binding = node.binding;
+					if (binding.script.type === "Identifier") {
+						// Hack to bypass Tern's type finding algorithm which uses node.type instead
+						// of the overriden type.
+						binding.script.type = "QML_ID";
+						c(binding.script, binding.scope, "QML_ID");
+						binding.script.type = "Identifier";
+					}
+				}
+				var prop = findProp(node.id, scopes.property);
+				if (!prop) {
+					return;
+				}
+			}
+			c(node.id, scopes.property);
+			c(node.binding, node.binding.scope);
+		};
+		searchVisitor["QML_ID"] = function(node, st, c) {};
 		searchVisitor["QMLStatementBlock"] = function (node, scope, c) {
 			for (var i = 0; i < node.statements.length; i++) {
 				c(node.statements[i], node.scope, "Statement");
@@ -293,40 +504,83 @@
 		};
 	}
 
+	/*
+	* Prepares acorn to consume QML syntax rather than standard JavaScript
+	*/
+	function preParse(text, options) {
+		// Force ECMA Version to 5
+		options.ecmaVersion = 5;
+
+		// Register qml plugin with main parser
+		var plugins = options.plugins;
+		if (!plugins) plugins = options.plugins = {};
+		plugins["qml"] = true;
+
+		// Register qml plugin with loose parser
+		var pluginsLoose = options.pluginsLoose;
+		if (!pluginsLoose) pluginsLoose = options.pluginsLoose = {};
+		pluginsLoose["qml"] = true;
+	}
+
+	/*
+	* Performs a second pass over the generated scopes directly after the scopeGatherer
+	* executes and before type inferral begins.  This pass is used to finalize any
+	* scopes that require information from other scopes created during the scope
+	* gatherer's pass.  This includes the JavaScript scopes which require information
+	* from the QML ID scope, as well as the Property scopes which require information
+	* from their respective Object Literal scopes.
+	*/
+	function scopeGatheringSecondPass(ast, scope) {
+		var scopeBuilder = getScopeBuilder();
+
+		// Aggregate IDs and Signal Handlers for the JavaScript scopes
+		scopeBuilder.forEachJSScope(function (scope) {
+			// Merge any QML IDs into all JavaScript scopes
+			scopeBuilder.getIDScope().forAllProps(function (name, prop, curr) {
+				if (curr) {
+					// Since QML checks the idScope before all others, we can safely over-write
+					// conflicting property names as they will be hidden anyway.
+					scope.props[name] = prop;
+				}
+			});
+		});
+
+		// Aggregate properties for the property scopes
+		scopeBuilder.forEachPropertyScope(function (scope, objScope) {
+			objScope.forAllProps(function (name, prop, curr) {
+				if (curr && !prop.isFunction) {
+					scope.props[name] = prop;
+				}
+			});
+		});
+	}
+
 	// Register the QML plugin in Tern
 	tern.registerPlugin("qml", function (server) {
 		// First we want to replace the top-level defs array with our own and save the
 		// JavaScript specific defs to a new array 'jsDefs'.  In order to make sure no
-		// other plugins mess with the new defs after us, we override addDefs and add
-		// a new method called 'addQMLDefs' to facilitate adding QML specific definitions.
+		// other plugins mess with the new defs after us, we override addDefs.
 		server.jsDefs = server.defs;
 		server.defs = [];
-		server.addQMLDefs = function (defs, toFront) {
-			if (toFront) this.defs.unshift(defs)
-			else this.defs.push(defs)
-			if (this.cx) this.reset()
-		}
 		server.addDefs = function (defs, toFront) {
-			if (toFront) this.jsDefs.unshift(defs)
-			else this.jsDefs.push(defs)
-			if (this.cx) this.reset()
+			if (toFront) this.jsDefs.unshift(defs);
+			else this.jsDefs.push(defs);
+			if (this.cx) this.reset();
 		}
 
-		// Add a new method to server which creates a js scope based on jsDefs
-		server.createJSScope = function (prev, node, isBlock) {
-			var scope = new infer.Scope(prev, node, isBlock);
-			if (this.jsDefs) for (var i = 0; i < this.jsDefs.length; ++i)
-        		def.load(this.jsDefs[i], scope);
-			return scope;
-		};
-
-		// Force Tern to use the QML plugin for Acorn
+		// Hook into server signals
 		server.on("preParse", preParse);
-
-		// Add a new scope to a file which will hold its root Object and such
+		server.on("preInfer", scopeGatheringSecondPass);
 		server.on("beforeLoad", function(file) {
+			// Create the file's top scope
 			file.scope = new infer.Scope(infer.cx().topScope);
-			file.scope.name = file.name;
+			var name = file.name;
+			var end = file.name.lastIndexOf(".qml");
+			file.scope.name = end > 0 ? name.substring(0, end) : name;
+
+			// Create the ScopeBuilder
+			var sb = new ScopeBuilder(file, server.jsDefs);
+			infer.cx().qmlScopeBuilder = sb;
 		});
 
 		// Extend Tern's inferencing system to include QML syntax
diff --git a/qt/org.eclipse.cdt.qt.core/tern-qml/test/driver.js b/qt/org.eclipse.cdt.qt.core/tern-qml/test/driver.js
index fc29b01aa3a..5681747c39d 100644
--- a/qt/org.eclipse.cdt.qt.core/tern-qml/test/driver.js
+++ b/qt/org.eclipse.cdt.qt.core/tern-qml/test/driver.js
@@ -1,18 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2015 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
 "use strict";
 
 var fs = require("fs"), path = require("path");
-
-// Acorn and Acorn-QML
-var acorn = require("acorn"),
-	acorn_loose = require("acorn/dist/acorn_loose"),
-	walk = require("acorn/dist/walk"),
-	acornQML = require("acorn-qml"),
-	acornQML_loose = require("acorn-qml/loose"),
-	acornQML_walk = require("acorn-qml/walk");
-
-// Tern and Tern-QML
-var tern = require("tern"),
-	ternQML = require("../qml.js");
+var ternQML = require("../qml.js");
+var tern = require("tern");
 
 var projectDir = path.resolve(__dirname, "..");
 var resolve = function(pth) {
@@ -22,17 +22,28 @@ var testCases = [];
 var groupName;
 
 function TestCase(group, code, run) {
+	this.code = code;
 	this.group = group;
 	this.runTest = run || function (server, callback) {
 		callback("fail", code, "runTest function was not provided.");
 	};
 }
 
-exports.groupStart = function(group) {
+exports.isolate = function (code) {
+	for (var i = 0; i < testCases.length; i++) {
+		var test = testCases[i];
+		if (test.group === groupName && test.code !== code) {
+			testCases.splice(i, 1);
+			i--;
+		}
+	}
+}
+
+exports.groupStart = function (group) {
 	groupName = group;
 }
 
-exports.groupEnd = function() {
+exports.groupEnd = function () {
 	groupName = undefined;
 }
 
@@ -82,7 +93,7 @@ exports.testDefinition = function (code, expected, beforeTest) {
 	}, beforeTest));
 }
 
-exports.runTests = function(config, callback) {
+exports.runTests = function (config, callback) {
 	for (var i = 0; i < testCases.length; ++i) {
 		var test = testCases[i];
 		if (test.group === config.group) {
@@ -103,7 +114,7 @@ function createServer(defs) {
 	return server;
 }
 
-function assertCompletion (server, code, expected, pos, callback) {
+function assertCompletion(server, code, expected, pos, callback) {
 	server.addFile("test1.qml", code);
 	server.request({
 		query : {
@@ -128,7 +139,7 @@ function assertCompletion (server, code, expected, pos, callback) {
 	});
 };
 
-function assertDefinition (server, code, expected, pos, callback) {
+function assertDefinition(server, code, expected, pos, callback) {
 	server.addFile("test1.qml", code);
 	server.request({
 		query : {
@@ -163,7 +174,7 @@ function addPath(str, pt) {
 	return str + " (" + pt + ")";
 }
 
-var misMatch = exports.misMatch = function(exp, act) {
+var misMatch = exports.misMatch = function (exp, act) {
 	if (!exp || !act || (typeof exp != "object") || (typeof act != "object")) {
 		if (exp !== act) return ppJSON(exp) + " !== " + ppJSON(act);
 	} else if (exp instanceof RegExp || act instanceof RegExp) {
diff --git a/qt/org.eclipse.cdt.qt.core/tern-qml/test/ecma5-defs.js b/qt/org.eclipse.cdt.qt.core/tern-qml/test/ecma5-defs.js
index 82b7d1a103e..952c6fbc27b 100644
--- a/qt/org.eclipse.cdt.qt.core/tern-qml/test/ecma5-defs.js
+++ b/qt/org.eclipse.cdt.qt.core/tern-qml/test/ecma5-defs.js
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
 module.exports = {
 	"!name": "ecma5",
 	"!define": {
diff --git a/qt/org.eclipse.cdt.qt.core/tern-qml/test/run.js b/qt/org.eclipse.cdt.qt.core/tern-qml/test/run.js
index abd67c4f515..0af2df252c1 100644
--- a/qt/org.eclipse.cdt.qt.core/tern-qml/test/run.js
+++ b/qt/org.eclipse.cdt.qt.core/tern-qml/test/run.js
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2015 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+"use-strict";
+
 var driver = require("./driver.js");
 
 function group(name) {
diff --git a/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-completions.js b/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-completions.js
index 0bbc1a56657..50b1502703c 100644
--- a/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-completions.js
+++ b/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-completions.js
@@ -1,58 +1,67 @@
-var testCompletion = require("./driver.js").testCompletion
-var groupStart = require("./driver.js").groupStart;
-var groupEnd = require("./driver.js").groupEnd;
+/*******************************************************************************
+ * Copyright (c) 2015 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+"use-strict";
+
+var driver = require("./driver.js");
+var test = driver.test;
+var testCompletion = driver.testCompletion;
+var groupStart = driver.groupStart;
+var groupEnd = driver.groupEnd;
 
 var group = exports.group = "Code Completion"
 groupStart(group);
 
 // Import Completions
-testCompletion("import QtQu|", {
-	start: { line: 0, ch: 7 },
-	end: { line: 0, ch: 11 },
-	isProperty: false,
-	isObjectKey: false,
-	completions: [{ name: "QtQuick", type: "", origin: "QML" }]
-});
+//testCompletion("import QtQu|", {
+//	start: { line: 0, ch: 7 },
+//	end: { line: 0, ch: 11 },
+//	isProperty: false,
+//	isObjectKey: false,
+//	completions: [{ name: "QtQuick", type: "", origin: "QML" }]
+//});
+//
+//testCompletion("import QtQuick 2.|", {
+//	start: { line: 0, ch: 17 },
+//	end: { line: 0, ch: 17 },
+//	isProperty: false,
+//	isObjectKey: false,
+//	completions: [
+//		{ name: "0", type: "number", origin: "QML" },
+//		{ name: "1", type: "number", origin: "QML" },
+//		{ name: "2", type: "number", origin: "QML" },
+//		{ name: "3", type: "number", origin: "QML" },
+//		{ name: "4", type: "number", origin: "QML" },
+//		{ name: "5", type: "number", origin: "QML" }
+//	]
+//});
+//
+//testCompletion('import "other.qml" as Other\n|', {
+//	start: { line: 1, ch: 0 },
+//	end: { line: 1, ch: 0 },
+//	isProperty: false,
+//	isObjectKey: false,
+//	completions: [{ name: "Other", type: "?", origin: "test1.qml" }]
+//})
+//
+//testCompletion('My|', {
+//	start: { line: 0, ch: 2 },
+//	end: { line: 0, ch: 2 },
+//	isProperty: false,
+//	isObjectKey: false,
+//	completions: [{ name: "MyObject", type: "Button", origin: "MyObject.qml" }]
+//}, function (server) {
+//	server.addFile("MyObject.qml", "Button {\n\tproperty int width\n}");
+//});
 
-testCompletion("import QtQuick 2.|", {
-	start: { line: 0, ch: 17 },
-	end: { line: 0, ch: 17 },
-	isProperty: false,
-	isObjectKey: false,
-	completions: [
-		{ name: "0", type: "number", origin: "QML" },
-		{ name: "1", type: "number", origin: "QML" },
-		{ name: "2", type: "number", origin: "QML" },
-		{ name: "3", type: "number", origin: "QML" },
-		{ name: "4", type: "number", origin: "QML" },
-		{ name: "5", type: "number", origin: "QML" }
-	]
-});
-
-testCompletion('import "other.qml" as Other\n|', {
-	start: { line: 1, ch: 0 },
-	end: { line: 1, ch: 0 },
-	isProperty: false,
-	isObjectKey: false,
-	completions: [{ name: "Other", type: "?", origin: "test1.qml" }]
-})
-
-testCompletion('import "test2.qml" as Other\nWindow {\n\tOther {\n\t\t|\n\t}\n}', {
-	start: { line: 3, ch: 2 },
-	end: { line: 3, ch: 2 },
-	isProperty: false,
-	isObjectKey: false,
-	completions: [{ name: "width", type: "number", origin: "test2.qml" }]
-}, function (server) {
-	server.options.getFile = function (name, callback) {
-		if (name == "test2.qml") {
-			return callback(null, "Button {\n\tproperty int width\n}");
-		}
-		return callback(null, null);
-	}
-});
-
-// Property Binding Completions
+// QML Object Property Completions
 testCompletion("Window {\n\tproperty int height\n\the|\n}", {
 	start: { line: 2, ch: 1 },
 	end: { line: 2, ch: 3 },
@@ -73,9 +82,121 @@ testCompletion("Window {\n\tproperty int height\n\tproperty int width\n\tpropert
 	]
 });
 
-testCompletion("Window {\n\ttest: |\n}", {
-	start: { line: 1, ch: 7 },
-	end: { line: 1, ch: 7 },
+testCompletion("Window {\n\tproperty int height\n\tObject {\n\t\t|\n\t}\n}", {
+	start: { line: 3, ch: 2 },
+	end: { line: 3, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: []
+});
+
+testCompletion("Window {\n\tproperty var prop\n\tfunction test() {\n\t\t|\n\t}\n}", {
+	start: { line: 3, ch: 2 },
+	end: { line: 3, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "prop", type: "?", origin: "test1.qml" },
+		{ name: "test", type: "fn()", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+// QML ID Property Completions
+testCompletion("Window {\n\tid: btn\n\t|\n}", {
+	start: { line: 2, ch: 1 },
+	end: { line: 2, ch: 1 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: []
+});
+
+testCompletion("Window {\n\tButton {\n\t\tid: btn\n\t\tproperty int height\n\t}\n\ttest: btn.|\n}", {
+	start: { line: 5, ch: 11 },
+	end: { line: 5, ch: 11 },
+	isProperty: true,
+	isObjectKey: false,
+	completions: [{ name: "height", type: "number", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tproperty var btn\n\tButton {\n\t\tid: btn\n\t\tproperty int height\n\t}\n\ttest: btn.|\n}", {
+	start: { line: 6, ch: 11 },
+	end: { line: 6, ch: 11 },
+	isProperty: true,
+	isObjectKey: false,
+	completions: [{ name: "height", type: "number", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tButton {\n\t\tproperty var id\n\t\tid: btn\n\t}\n\ts: bt|\n}", {
+	start: { line: 5, ch: 4 },
+	end: { line: 5, ch: 6 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [{ name: "btn", type: "Button", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tButton {\n\t\tproperty var id\n\t\tid: btn\n\t\ts: i|\n\t}\n}", {
+	start: { line: 4, ch: 5 },
+	end: { line: 4, ch: 6 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [{ name: "id", type: "?", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tButton {\n\t\tproperty var id: 34\n\t\tid: btn\n\t\ts: i|\n\t}\n}", {
+	start: { line: 4, ch: 5 },
+	end: { line: 4, ch: 6 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [{ name: "id", type: "number", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tButton {\n\t\tproperty string id\n\t\tid: btn\n\t\ts: i|\n\t}\n}", {
+	start: { line: 4, ch: 5 },
+	end: { line: 4, ch: 6 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [{ name: "id", type: "string", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tButton {\n\t\tproperty var id\n\t\ts: i|\n\t}\n}", {
+	start: { line: 3, ch: 5 },
+	end: { line: 3, ch: 6 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [{ name: "id", type: "?", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tButton {\n\t\tproperty var id: 34\n\t\ts: i|\n\t}\n}", {
+	start: { line: 3, ch: 5 },
+	end: { line: 3, ch: 6 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [{ name: "id", type: "number", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tButton {\n\t\tproperty string id\n\t\ts: i|\n\t}\n}", {
+	start: { line: 3, ch: 5 },
+	end: { line: 3, ch: 6 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [{ name: "id", type: "string", origin: "test1.qml" }]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tid: wind\n\tfunction test() {\n\t\t|\n\t}\n}", {
+	start: { line: 3, ch: 2 },
+	end: { line: 3, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "test", type: "fn()", origin: "test1.qml" },
+		{ name: "wind", type: "Window", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+// JavaScript Completions
+testCompletion("Window {\n\tproperty var test: |\n}", {
+	start: { line: 1, ch: 20 },
+	end: { line: 1, ch: 20 },
 	isProperty: false,
 	isObjectKey: false,
 	completions: [
@@ -88,6 +209,7 @@ testCompletion("Window {\n\ttest: |\n}", {
 		{ name: "isNaN", type: "fn(value: number) -> bool", origin: "ecma5" },
 		{ name: "parseFloat", type: "fn(string: string) -> number", origin: "ecma5" },
 		{ name: "parseInt", type: "fn(string: string, radix?: number) -> number", origin: "ecma5" },
+		{ name: "test", type: "?", origin: "test1.qml" },
 		{ name: "undefined", type: "?", origin: "ecma5" },
 		{ name: "Array", type: "fn(size: number)", origin: "ecma5" },
 		{ name: "Boolean", type: "fn(value: ?) -> bool", origin: "ecma5" },
@@ -111,9 +233,9 @@ testCompletion("Window {\n\ttest: |\n}", {
 	]
 });
 
-testCompletion("Window {\n\ttest:| \n}", {
-	start: { line: 1, ch: 6 },
-	end: { line: 1, ch: 6 },
+testCompletion("Window {\n\ttest: |\n}", {
+	start: { line: 1, ch: 7 },
+	end: { line: 1, ch: 7 },
 	isProperty: false,
 	isObjectKey: false,
 	completions: [
@@ -187,16 +309,202 @@ testCompletion("Window {\n\ttest: {\n\t\t|\n\t}\n}", {
 	]
 });
 
-// Signal Completions
+testCompletion("Window {\n\tfunction test() {\n\t\t|\n\t}\n}", {
+	start: { line: 2, ch: 2 },
+	end: { line: 2, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "decodeURI", type: "fn(uri: string) -> string", origin: "ecma5" },
+		{ name: "decodeURIComponent", type: "fn(uri: string) -> string", origin: "ecma5" },
+		{ name: "encodeURI", type: "fn(uri: string) -> string", origin: "ecma5" },
+		{ name: "encodeURIComponent", type: "fn(uri: string) -> string", origin: "ecma5" },
+		{ name: "eval", type: "fn(code: string)", origin: "ecma5" },
+		{ name: "isFinite", type: "fn(value: number) -> bool", origin: "ecma5" },
+		{ name: "isNaN", type: "fn(value: number) -> bool", origin: "ecma5" },
+		{ name: "parseFloat", type: "fn(string: string) -> number", origin: "ecma5" },
+		{ name: "parseInt", type: "fn(string: string, radix?: number) -> number", origin: "ecma5" },
+		{ name: "test", type: "fn()", origin: "test1.qml" },
+		{ name: "undefined", type: "?", origin: "ecma5" },
+		{ name: "Array", type: "fn(size: number)", origin: "ecma5" },
+		{ name: "Boolean", type: "fn(value: ?) -> bool", origin: "ecma5" },
+		{ name: "Date", type: "fn(ms: number)", origin: "ecma5" },
+		{ name: "Error", type: "fn(message: string)", origin: "ecma5" },
+		{ name: "EvalError", type: "fn(message: string)", origin: "ecma5" },
+		{ name: "Function", type: "fn(body: string) -> fn()", origin: "ecma5" },
+		{ name: "Infinity", type: "number", origin: "ecma5" },
+		{ name: "JSON", type: "JSON", origin: "ecma5" },
+		{ name: "Math", type: "Math", origin: "ecma5" },
+		{ name: "NaN", type: "number", origin: "ecma5" },
+		{ name: "Number", type: "fn(value: ?) -> number", origin: "ecma5" },
+		{ name: "Object", type: "fn()", origin: "ecma5" },
+		{ name: "RangeError", type: "fn(message: string)", origin: "ecma5" },
+		{ name: "ReferenceError", type: "fn(message: string)", origin: "ecma5" },
+		{ name: "RegExp", type: "fn(source: string, flags?: string)", origin: "ecma5" },
+		{ name: "String", type: "fn(value: ?) -> string", origin: "ecma5" },
+		{ name: "SyntaxError", type: "fn(message: string)", origin: "ecma5" },
+		{ name: "TypeError", type: "fn(message: string)", origin: "ecma5" },
+		{ name: "URIError", type: "fn(message: string)", origin: "ecma5" }
+	]
+});
+
+// Signal and Signal Handler Completions
 testCompletion("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\t|\n}", {
 	start: { line: 2, ch: 1 },
 	end: { line: 2, ch: 1 },
 	isProperty: false,
 	isObjectKey: false,
 	completions: [
-		/* TODO: Should not include this line */ { name: "clicked", type: "fn(mouseX: ?, mouseY: ?) -> Signal", origin: "test1.qml" },
 		{ name: "onClicked", type: "Signal Handler", origin: "test1.qml" }
 	]
 });
 
+testCompletion("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\tButton {\n\t\t|\n\t}\n}", {
+	start: { line: 3, ch: 2 },
+	end: { line: 3, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: []
+});
+
+testCompletion("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\ts: |\n}", {
+	start: { line: 2, ch: 4 },
+	end: { line: 2, ch: 4 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "clicked", type: "fn(mouseX: number, mouseY: number)", origin: "test1.qml" },
+		{ name: "onClicked", type: "Signal Handler", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tsignal error(string msg, boolean flag)\n\ts: |\n}", {
+	start: { line: 2, ch: 4 },
+	end: { line: 2, ch: 4 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "error", type: "fn(msg: string, flag: bool)", origin: "test1.qml" },
+		{ name: "onError", type: "Signal Handler", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tid: wind\n\tsignal error(string msg, boolean flag)\n\ts: wind.|\n}", {
+	start: { line: 3, ch: 9 },
+	end: { line: 3, ch: 9 },
+	isProperty: true,
+	isObjectKey: false,
+	completions: [
+		{ name: "error", type: "fn(msg: string, flag: bool)", origin: "test1.qml" },
+		{ name: "onError", type: "Signal Handler", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tsignal error(string msg, boolean flag)\n\tonError: |\n}", {
+	start: { line: 2, ch: 10 },
+	end: { line: 2, ch: 10 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "error", type: "fn(msg: string, flag: bool)", origin: "test1.qml" },
+		{ name: "flag", type: "bool", origin: "test1.qml" },
+		{ name: "msg", type: "string", origin: "test1.qml" },
+		{ name: "onError", type: "Signal Handler", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tsignal error(string msg, boolean flag)\n\tonError: {\n\t\t|\n\t}\n}", {
+	start: { line: 3, ch: 2 },
+	end: { line: 3, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "error", type: "fn(msg: string, flag: bool)", origin: "test1.qml" },
+		{ name: "flag", type: "bool", origin: "test1.qml" },
+		{ name: "msg", type: "string", origin: "test1.qml" },
+		{ name: "onError", type: "Signal Handler", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tproperty int msg\n\tsignal error(string msg, boolean flag)\n\tonError: {\n\t\t|\n\t}\n}", {
+	start: { line: 4, ch: 2 },
+	end: { line: 4, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "error", type: "fn(msg: string, flag: bool)", origin: "test1.qml" },
+		{ name: "flag", type: "bool", origin: "test1.qml" },
+		{ name: "msg", type: "string", origin: "test1.qml" },
+		{ name: "onError", type: "Signal Handler", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+// Function Declarations
+testCompletion("Window {\n\tfunction test() {}\n\t|\n}", {
+	start: { line: 2, ch: 1 },
+	end: { line: 2, ch: 1 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: []
+});
+
+testCompletion("Window {\n\tfunction test(a, b, c) {\n\t\t|\n\t}\n}", {
+	start: { line: 2, ch: 2 },
+	end: { line: 2, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "a", type: "?", origin: "test1.qml" },
+		{ name: "b", type: "?", origin: "test1.qml" },
+		{ name: "c", type: "?", origin: "test1.qml" },
+		{ name: "test", type: "fn(a: ?, b: ?, c: ?)", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion("Window {\n\tfunction test(a) {\n\t\ta = 3\n\t\t|\n\t}\n}", {
+	start: { line: 3, ch: 2 },
+	end: { line: 3, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "a", type: "number", origin: "test1.qml" },
+		{ name: "test", type: "fn(a: number)", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion('Window {\n\tfunction test(a) {\n\t\ttest("something")\n\t\t|\n\t}\n}', {
+	start: { line: 3, ch: 2 },
+	end: { line: 3, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "a", type: "string", origin: "test1.qml" },
+		{ name: "test", type: "fn(a: string)", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+testCompletion('Window {\n\tfunction test(a) {\n\t\t|\n\t\treturn 7\n\t}\n}', {
+	start: { line: 2, ch: 2 },
+	end: { line: 2, ch: 2 },
+	isProperty: false,
+	isObjectKey: false,
+	completions: [
+		{ name: "a", type: "?", origin: "test1.qml" },
+		{ name: "test", type: "fn(a: ?) -> number", origin: "test1.qml" }
+	]
+}, function (server) { server.jsDefs = []; });
+
+// TODO: Uncomment once this is fixed.  The find defs version of this test does find the right definition
+//       so it seems the problem is related to Tern and not the QML plugin.
+//testCompletion('Window {\n\tproperty int a\n\tfunction test(a) {\n\t\t|\n\t}\n}', {
+//	start: { line: 3, ch: 2 },
+//	end: { line: 3, ch: 2 },
+//	isProperty: false,
+//	isObjectKey: false,
+//	completions: [
+//		{ name: "a", type: "?", origin: "test1.qml" },
+//		{ name: "test", type: "fn()", origin: "test1.qml" }
+//	]
+//}, function (server) { server.jsDefs = []; });
+
 groupEnd();
\ No newline at end of file
diff --git a/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-finddef.js b/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-finddef.js
index 3ee1a99d8fc..626b7d08afe 100644
--- a/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-finddef.js
+++ b/qt/org.eclipse.cdt.qt.core/tern-qml/test/test-finddef.js
@@ -1,10 +1,24 @@
-var testDefinition = require("./driver.js").testDefinition;
-var groupStart = require("./driver.js").groupStart;
-var groupEnd = require("./driver.js").groupEnd;
+/*******************************************************************************
+ * Copyright (c) 2015 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+"use-strict";
+
+var driver = require("./driver.js");
+var testDefinition = driver.testDefinition;
+var groupStart = driver.groupStart;
+var groupEnd = driver.groupEnd;
 
 var group = exports.group = "Find Definition";
 groupStart(group);
 
+// ID Property
 testDefinition("QtObject {\n\tid: obj\n\tproperty var prop: {\n\t\tob|j\n\t}\n}", {
 	origin: "test1.qml",
 	start: { line: 1, ch: 5 },
@@ -13,6 +27,31 @@ testDefinition("QtObject {\n\tid: obj\n\tproperty var prop: {\n\t\tob|j\n\t}\n}"
 	contextOffset: 16
 });
 
+testDefinition("Window {\n\tButton {\n\t\tid: btn\n\t\tproperty int height\n\t}\n\ttest: bt|n\n}", {
+	origin: "test1.qml",
+	start: { line: 2, ch: 6 },
+	end: { line: 2, ch: 9 },
+	file: "test1.qml",
+	contextOffset: 25
+});
+
+testDefinition("Window {\n\tproperty var btn\n\tButton {\n\t\tid: btn\n\t\tproperty int height\n\t}\n\ttest: bt|n\n}", {
+	origin: "test1.qml",
+	start: { line: 3, ch: 6 },
+	end: { line: 3, ch: 9 },
+	file: "test1.qml",
+	contextOffset: 43
+});
+
+testDefinition("Window {\n\tproperty var btn\n\tButton {\n\t\tid: bt|n\n\t\tproperty int height\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 3, ch: 6 },
+	end: { line: 3, ch: 9 },
+	file: "test1.qml",
+	contextOffset: 43
+});
+
+// Property Declarations
 testDefinition("QtObject {\n\tproperty var prop\n\tpr|op: 3\n}", {
 	origin: "test1.qml",
 	start: { line: 1, ch: 14 },
@@ -21,4 +60,166 @@ testDefinition("QtObject {\n\tproperty var prop\n\tpr|op: 3\n}", {
 	contextOffset: 25
 });
 
+testDefinition("Window {\n\tproperty var btn\n\tButton {\n\t\tprop: b|tn\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 14 },
+	end: { line: 1, ch: 17 },
+	file: "test1.qml",
+	contextOffset: 23
+});
+
+testDefinition("Window {\n\tproperty var btn\n\tButton {\n\t\tButton {\n\t\t\tprop: b|tn\n\t\t}\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 14 },
+	end: { line: 1, ch: 17 },
+	file: "test1.qml",
+	contextOffset: 23
+});
+
+testDefinition("Window {\n\tButton {\n\t\tproperty var btn\n\t\tbt|n: 3\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 2, ch: 15 },
+	end: { line: 2, ch: 18 },
+	file: "test1.qml",
+	contextOffset: 34
+});
+
+testDefinition("Window {\n\tButton {\n\t\tproperty var btn\n\t\tButton {\n\t\t\tprop: b|tn\n\t\t}\n\t}\n}", {
+	origin: undefined,
+	start: undefined,
+	end: undefined,
+	file: undefined,
+	contextOffset: undefined
+});
+
+// Signals and Signal Handlers
+testDefinition("Window {\n\tsignal clic|ked(int mouseX, int mouseY)\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 8 },
+	end: { line: 1, ch: 15 },
+	file: "test1.qml",
+	contextOffset: 17
+});
+
+testDefinition("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\tonCli|cked: 3\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 8 },
+	end: { line: 1, ch: 15 },
+	file: "test1.qml",
+	contextOffset: 17
+});
+
+testDefinition("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\tonClicked: mou|seX\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 20 },
+	end: { line: 1, ch: 26 },
+	file: "test1.qml",
+	contextOffset: 29
+});
+
+testDefinition("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\tonClicked: cli|cked(3,4)\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 8 },
+	end: { line: 1, ch: 15 },
+	file: "test1.qml",
+	contextOffset: 17
+});
+
+testDefinition("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\tonClicked: onCli|cked\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 8 },
+	end: { line: 1, ch: 15 },
+	file: "test1.qml",
+	contextOffset: 17
+});
+
+testDefinition("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\tid: wind\n\tonClicked: wind.onCli|cked\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 8 },
+	end: { line: 1, ch: 15 },
+	file: "test1.qml",
+	contextOffset: 17
+});
+
+testDefinition("Window {\n\tsignal clicked(int mouseX, int mouseY)\n\tid: wind\n\tonClicked: wind.cli|cked(3,4)\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 8 },
+	end: { line: 1, ch: 15 },
+	file: "test1.qml",
+	contextOffset: 17
+});
+
+testDefinition("Window {\n\tproperty int msg\n\tsignal error(string msg, boolean flag)\n\tonError: {\n\t\tms|g\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 2, ch: 21 },
+	end: { line: 2, ch: 24 },
+	file: "test1.qml",
+	contextOffset: 48
+}, function (server) { server.jsDefs = []; });
+
+// Function Declarations
+testDefinition("Window {\n\tfunction te|st(a) {}\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 10 },
+	end: { line: 1, ch: 14 },
+	file: "test1.qml",
+	contextOffset: 19
+});
+
+testDefinition("Window {\n\tfunction test(a) {\n\t\ta|\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 15 },
+	end: { line: 1, ch: 16 },
+	file: "test1.qml",
+	contextOffset: 24
+});
+
+testDefinition("Window {\n\tfunction test(a) {\n\t\tte|st(3)\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 10 },
+	end: { line: 1, ch: 14 },
+	file: "test1.qml",
+	contextOffset: 19
+});
+
+testDefinition("Window {\n\tfunction test(a) {}\n\ts: te|st(3)\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 10 },
+	end: { line: 1, ch: 14 },
+	file: "test1.qml",
+	contextOffset: 19
+});
+
+testDefinition("Window {\n\tfunction test(a) {}\n\ts: {\n\t\tte|st(3)\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 10 },
+	end: { line: 1, ch: 14 },
+	file: "test1.qml",
+	contextOffset: 19
+});
+
+testDefinition("Window {\n\tfunction test(a) {}\n\tid: wind\n\ts: {\n\t\twind.te|st(3)\n\t}\n}", {
+	origin: "test1.qml",
+	start: { line: 1, ch: 10 },
+	end: { line: 1, ch: 14 },
+	file: "test1.qml",
+	contextOffset: 19
+});
+
+testDefinition("Window {\n\tfunction test(a) {}\n\tte|st: 3;\n}", {
+	origin: undefined,
+	start: undefined,
+	end: undefined,
+	file: undefined,
+	contextOffset: undefined
+});
+
+testDefinition('Window {\n\tfunction test(a) {\n\t\ta|\n\t}\n}\n\tproperty int a', {
+	origin: "test1.qml",
+	start: { line: 1, ch: 15 },
+	end: { line: 1, ch: 16 },
+	file: "test1.qml",
+	contextOffset: 24
+});
+
 groupEnd();
\ No newline at end of file