Merge pull request #1326 from microsoft/fix/scope-completions

fix: completions not returning stack variables

Author: connor4312

CHANGELOG.md

@@ -5,6 +5,7 @@ This changelog records changes to stable releases since 1.50.2. "TBA" changes he
 ## Nightly (only)
 
 - fix: performance improvements for setting breakpoints in large projects ([vscode#153470](https://github.com/microsoft/vscode/issues/153470))
+- fix: completions not returning stack variables ([vscode#153651](https://github.com/microsoft/vscode/issues/153651))
 
 ## v1.69 (June 2022)
 

src/adapter/completions.ts

@@ -376,15 +376,18 @@ export class Completions {
         isInGlobalScope: true,
       });
 
-      if (!items.length) {
-        continue;
-      }
-
       if (options.stackFrame) {
         // When evaluating on a call frame, also autocomplete with scope variables.
+        const lowerPrefix = prefix.toLowerCase();
         const names = new Set(items.map(item => item.label));
         for (const completion of await options.stackFrame.completions()) {
-          if (names.has(completion.label)) continue;
+          if (
+            names.has(completion.label) ||
+            !completion.label.toLowerCase().includes(lowerPrefix)
+          ) {
+            continue;
+          }
+
           names.add(completion.label);
           items.push(completion as ICompletionWithSort);
         }

src/test/completion/completion.test.ts

@@ -196,6 +196,41 @@ describe('completion', () => {
     }
   });
 
+  itIntegrates('completes in scope (vscode#153651)', async ({ r }) => {
+    const p = await r.launch(`
+      <script>
+        function foo() {
+          const helloWorld = '';
+          debugger;
+        }
+
+        foo();
+      </script>
+    `);
+
+    const untilStopped = p.dap.once('stopped');
+    p.load();
+
+    const frame = (
+      await p.dap.stackTrace({
+        threadId: (await untilStopped).threadId!,
+      })
+    ).stackFrames[0];
+
+    const actual = await p.dap.completions({
+      text: 'helloW',
+      column: 7,
+      frameId: frame.id,
+    });
+
+    expect(actual.targets).to.deep.equal([
+      {
+        label: 'helloWorld',
+        type: 'property',
+      },
+    ]);
+  });
+
   itIntegrates('$returnValue', async ({ r }) => {
     const getFrameId = async () =>
       (