Only add table candidates if we are inside a FROM clause

This will avoid suggesting tables when cursor is between SELECT and FROM. See new unit test

Author: the21st

packages/server/src/complete/complete.ts

@@ -257,8 +257,18 @@ class Completer {
     if (!addedSome) {
       this.addCandidatesForUnscopedColumns(fromNodes, schemaAndSubqueries)
     }
+
     this.addCandidatesForAliases(fromNodes)
-    this.addCandidatesForTables(schemaAndSubqueries, true)
+
+    const fromNodesContainingCursor = fromNodes.filter((tableNode) =>
+      isPosInLocation(tableNode.location, this.pos)
+    )
+    const isCursorInsideFromClause = fromNodesContainingCursor.length > 0
+    if (isCursorInsideFromClause) {
+      // only add table candidates if the cursor is inside a FROM clause or JOIN clause, etc.
+      this.addCandidatesForTables(schemaAndSubqueries, true)
+    }
+
     if (logger.isDebugEnabled())
       logger.debug(
         `candidates for error returns: ${JSON.stringify(this.candidates)}`

packages/server/test/complete.test.ts

@@ -189,6 +189,17 @@ describe('on blank space', () => {
     expect(result.candidates).toEqual(expect.arrayContaining(expected))
   })
 
+  test('complete after SELECT  FROM schema2.table2', () => {
+    const result = complete(
+      'SELECT  FROM schema2.table2',
+      { line: 0, column: 8 },
+      SIMPLE_NESTED_SCHEMA
+    )
+    expect(result.candidates).not.toContainEqual(
+      expect.objectContaining({ label: 'TABLE1' })
+    )
+  })
+
   test('complete function inside WHERE select star', () => {
     const result = complete(
       'SELECT * FROM tab1 WHERE arr',