AST object is always an array

Author: worksofliam

src/language/provider.js

@@ -5,7 +5,7 @@ const { Parser } = require(`node-sql-parser`);
 const Store = require(`./store`);
 const Configuration = require(`../configuration`);
 
-/** @type {{[path: string]: object}} */
+/** @type {{[path: string]: object[]}} */
 const workingAst = {}
 
 /**
@@ -36,12 +36,26 @@ exports.initialise = async (context) => {
           });
 
           if (sqlAst) {
-            workingAst[document.uri.path] = sqlAst;
+            const astArray = Array.isArray(sqlAst) ? sqlAst : [sqlAst];
+            workingAst[document.uri.path] = astArray;
           }
 
           linterDiagnostics.set(document.uri, []);
         } catch (e) {
-          const location = e.location;
+          let location = e.location;
+
+          if (!location) {
+            location = {
+              start: {
+                line: 1,
+                column: 1,
+              },
+              end: {
+                line: 1,
+                column: 1,
+              },
+            };
+          }
 
           if (Configuration.get(`validator`)) {
             editTimeout = setTimeout(async () => {
@@ -61,16 +75,16 @@ exports.initialise = async (context) => {
         ///** @type vscode.CompletionItem[] */
         const items = [];
 
-        const ast = workingAst[document.uri.path];
-        if (ast) {
+        const astList = workingAst[document.uri.path];
+        astList.forEach((ast) => {
           if (ast.from && ast.from.length > 0) {
             ast.from.forEach(definedAs => {
               const item = new vscode.CompletionItem(definedAs.as || definedAs.table, vscode.CompletionItemKind.Struct);
               item.detail = `${definedAs.db}.${definedAs.table}`;
               items.push(item);
             });
           }
-        };
+        });
 
         return items;
       }
@@ -91,11 +105,7 @@ exports.initialise = async (context) => {
 
       let fallbackLookup = false;
 
-      const baseAst = workingAst[document.uri.path];
-
-      let astList = [];
-      if (Array.isArray(baseAst)) astList = baseAst;
-      else if (baseAst) astList = [baseAst];
+      const astList = workingAst[document.uri.path];
 
       if (prefix) {
         for (const ast of astList) {