Fix #87

ppadovani · Aug 11, 2018 · c09d746 · c09d746
1 parent d033f2d
commit c09d746
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nested-fields-support",
-  "version": "6.3.1-1.0.2",
+  "version": "6.3.1-1.0.3",
   "description": "Nested Support Plugin",
   "license": "Apache-2.0",
   "authors": [

diff --git a/public/nested_support/parse_query/lib/from_user.js b/public/nested_support/parse_query/lib/from_user.js
@@ -83,6 +83,9 @@ export function fromUser(text, model) {
       }
     } catch (e) {
       if (query !== undefined) {
+        const cursorPos = ngModel.$parent.queryBarForm.$$element[0][0].selectionEnd;
+        const start = text.substr(0, cursorPos).lastIndexOf(' ') + 1;
+        const fieldPart = text.substr(text.substr(0, cursorPos).lastIndexOf(' ') + 1)
         query.suggestions = buildSuggestions(fieldPart, start, cursorPos, e.message);
         query.parseError = e.message;
         query.query = text;
@@ -110,11 +113,11 @@ function buildSuggestions(fieldPart, start, end, errMsg) {
   // }
 
   if (parser.yy.possibleFields[fieldPart]) {
-    suggestions.concat(parser.yy.possibleFields[fieldPart].map(field => {
+    suggestions = parser.yy.possibleFields[fieldPart].map(field => {
       const text = field.name;
       const description = getDescription(field.name);
       return {type, text, description, start, end};
-    }));
+    });
   }
   return suggestions;
 }