fix member expression completions (#1758)

* fix member expression completions

* fix test (it cannot be seen in ide, so whatever)

* restore completions before property completion
restore completions in computed

* simplify code with parent a bit

* minor unintended change (added for syntax highlight)

Author: zardoy

src/adapter/completions.ts

@@ -145,16 +145,25 @@ export class Completions {
     let candidate: () => Promise<ICompletionWithSort[]> = () => Promise.resolve([]);
 
     traverse(source, {
-      enter: node => {
+      enter: (node, parent) => {
         const asAcorn = node as AcornNode;
         if (asAcorn.start < offset && offset <= asAcorn.end) {
-          if (node.type === 'Identifier') {
+          if (
+            node.type === 'MemberExpression' ||
+            (node.type === 'Identifier' &&
+              parent?.type === 'MemberExpression' &&
+              !parent.computed &&
+              parent.object !== node)
+          ) {
+            const memberExpression =
+              node.type === 'MemberExpression' ? node : (parent as MemberExpression);
+            candidate = memberExpression.computed
+              ? () => this.elementAccessCompleter(options, memberExpression, offset)
+              : () => this.propertyAccessCompleter(options, memberExpression, offset);
+          } else if (node.type === 'Identifier') {
             candidate = () => this.identifierCompleter(options, source, node, offset);
-          } else if (node.type === 'MemberExpression') {
-            candidate = node.computed
-              ? () => this.elementAccessCompleter(options, node, offset)
-              : () => this.propertyAccessCompleter(options, node, offset);
           }
+          parent = node;
         }
       },
     });

src/test/completion/completion.test.ts

@@ -9,6 +9,7 @@ import { itIntegrates } from '../testIntegrationUtils';
 describe('completion', () => {
   const tcases: [string, Dap.CompletionItem[]][] = [
     ['ar|', [{ label: 'arr', sortText: '~~arr', type: 'variable', detail: 'Array' }]],
+    ['ar|.length', [{ label: 'arr', sortText: '~~arr', type: 'variable', detail: 'Array' }]],
     [
       'arr.|',
       [
@@ -36,6 +37,27 @@ describe('completion', () => {
         },
       ],
     ],
+    [
+      'arr.len|',
+      [
+        {
+          label: '[index]',
+          text: '[index]',
+          type: 'property',
+          sortText: '~~[',
+          length: 1,
+          selectionLength: 5,
+          selectionStart: 1,
+          start: 3,
+        },
+        {
+          label: 'length',
+          detail: '3',
+          sortText: '~~length',
+          type: 'property',
+        },
+      ],
+    ],
     ['arr[|', []],
     [
       'arr[0].|',