Additional fix for DFL-3310, added some tests and fixed a regression.

Author: Chris K

src/repl/propertyfinder.js

@@ -61,32 +61,29 @@ window.cls.PropertyFinder = function(rt_id) {
   this._find_input_parts = function(input)
   {
     var tokens = [];
-
     this._parser.tokenize(input, function(token_type, token)
     {
       tokens.push([token_type, token]);
     });
-
     var last_bracket = this._get_last_token(tokens, PUNCTUATOR, '[');
     var last_brace = this._get_last_token(tokens, PUNCTUATOR, '(');
-
     last_brace = this._get_last_token(tokens, PUNCTUATOR, ')') <= last_brace
                ? last_brace
                : -1;
     last_bracket = this._get_last_token(tokens, PUNCTUATOR, ']') <= last_bracket
                  ? last_bracket
                  : -1;
-    input = input.slice(Math.max(last_brace,
-                                 last_bracket,
-                                 this._get_last_token(tokens, PUNCTUATOR, '='),
-                                 this._get_last_token(tokens, IDENTIFIER, 'in')));
+    var pos = Math.max(last_brace,
+                       last_bracket,
+                       this._get_last_token(tokens, PUNCTUATOR, '='),
+                       this._get_last_token(tokens, IDENTIFIER, 'in'));
+    if (pos > -1)
+      input = input.slice(pos);
     input = input.replace(/^\s+/, '');
-
     var last_dot = input.lastIndexOf('.');
     var new_path = '';
     var new_id = '';
     var ret = '';
-
     if(last_dot > -1)
     {
       new_path = input.slice(0, last_dot);
@@ -96,7 +93,6 @@ window.cls.PropertyFinder = function(rt_id) {
     {
       new_id = input;
     }
-
     return {scope: new_path, identifier: new_id, input: input};
   };
 

tests/propertyfinder.qunit.html

@@ -5,11 +5,14 @@
     <link rel="stylesheet" href="qunit/qunit.css" media="screen">
     <script src="qunit/qunit.js"></script>
     <script src="../src/lib/json.js"></script>
+    <script src="../src/syntaxhighlight/js/syntax.js"></script>
+    <script src="../src/syntaxhighlight/js/tokenizer.js"></script>
     <script src="../src/repl/propertyfinder.js"></script>
 <script>
 
 test("Input scope smoketest", function() {
-    var fp = new cls.PropertyFinder()._find_input_parts;
+    var propfinder = new cls.PropertyFinder();
+    var fp = propfinder._find_input_parts.bind(propfinder);
     var parts;
 
     parts = fp("foo");
@@ -40,6 +43,30 @@
     equal(parts.scope, "bar");
     equal(parts.identifier, "baz");
 
+    parts = fp("foo().bar.baz");
+    equal(parts.scope, "foo().bar");
+    equal(parts.identifier, "baz");
+
+    parts = fp("foo(bar.baz");
+    equal(parts.scope, "bar");
+    equal(parts.identifier, "baz");
+
+    parts = fp("foo = bar.baz");
+    equal(parts.scope, "bar");
+    equal(parts.identifier, "baz");
+
+    parts = fp("foo in baz");
+    equal(parts.scope, "");
+    equal(parts.identifier, "baz");
+
+    parts = fp("foo in bar.baz");
+    equal(parts.scope, "bar");
+    equal(parts.identifier, "baz");
+
+    parts = fp("foo = bar(baz");
+    equal(parts.scope, "");
+    equal(parts.identifier, "baz");
+
 });
 
 </script>