feat: optimize suggestion (#231)

* feat: optimize the strategy of finding the right range

* test: apply commentOtherLine util to all suggestion tests

* test: decomment suggestion test cases

* test: add suggestion test cases in multiple statements

* chore: improve comments

* test: update log info in test

test/parser/pgsql/suggestion/fixtures/multipleStatement.sql

@@ -0,0 +1,21 @@
+CREATE TABLE  VALUES -- unfinished
+
+CREATE UNLOGGED TABLE table1 (col1 int) INHERITS (table_parent) WITHOUT OIDS ON COMMIT DROP;
+
+CREATE SCHEMA schemaname AUTHORIZATION username;
+
+ALTER TABLE products ADD FOREIGN KEY (product_group_id) REFERENCES product_groups;
+
+SELECT * FROM db. ; -- unfinished
+
+INSERT INTO weather (date, city, temp_hi, temp_lo) VALUES ('1994-11-29', 'Hayward', 54, 37);
+
+ANALYZE VERBOSE table_name ( column_name, column_name2);
+
+INSERT INTO  weather (date, city, temp_hi, temp_lo) VALUES ('1994-11-29', 'Hayward', 54, 37); -- unfinished
+
+DROP TABLE products CASCADE;
+
+DROP AGGREGATE aggname2(int);
+
+INSERT INTO products (product_no, name, price) SELECT * FROM db. ; -- unfinished

test/parser/pgsql/suggestion/multipleStatement.test.ts

@@ -0,0 +1,69 @@
+import fs from 'fs';
+import path from 'path';
+import { CaretPosition, SyntaxContextType } from '../../../../src/parser/common/basic-parser-types';
+import PgSQL from '../../../../src/parser/pgsql';
+
+const syntaxSql = fs.readFileSync(
+    path.join(__dirname, 'fixtures', 'multipleStatement.sql'),
+    'utf-8'
+);
+
+describe('PgSQL Multiple Statements Syntax Suggestion', () => {
+    const parser = new PgSQL();
+
+    test('Create table ', () => {
+        const pos: CaretPosition = {
+            lineNumber: 1,
+            column: 14,
+        };
+        const syntaxes = parser.getSuggestionAtCaretPosition(syntaxSql, pos)?.syntax;
+        const suggestion = syntaxes?.find(
+            (syn) => syn.syntaxContextType === SyntaxContextType.TABLE_CREATE
+        );
+
+        expect(suggestion).not.toBeUndefined();
+        expect(suggestion?.wordRanges.map((token) => token.text)).toEqual([]);
+    });
+
+    test('Select from table', () => {
+        const pos: CaretPosition = {
+            lineNumber: 9,
+            column: 18,
+        };
+        const syntaxes = parser.getSuggestionAtCaretPosition(syntaxSql, pos)?.syntax;
+        const suggestion = syntaxes?.find(
+            (syn) => syn.syntaxContextType === SyntaxContextType.TABLE
+        );
+
+        expect(suggestion).not.toBeUndefined();
+        expect(suggestion?.wordRanges.map((token) => token.text)).toEqual(['db', '.']);
+    });
+
+    test('Insert into table ', () => {
+        const pos: CaretPosition = {
+            lineNumber: 15,
+            column: 13,
+        };
+        const syntaxes = parser.getSuggestionAtCaretPosition(syntaxSql, pos)?.syntax;
+        const suggestion = syntaxes?.find(
+            (syn) => syn.syntaxContextType === SyntaxContextType.TABLE
+        );
+
+        expect(suggestion).not.toBeUndefined();
+        expect(suggestion?.wordRanges.map((token) => token.text)).toEqual([]);
+    });
+
+    test('Insert into select from table ', () => {
+        const pos: CaretPosition = {
+            lineNumber: 21,
+            column: 65,
+        };
+        const syntaxes = parser.getSuggestionAtCaretPosition(syntaxSql, pos)?.syntax;
+        const suggestion = syntaxes?.find(
+            (syn) => syn.syntaxContextType === SyntaxContextType.TABLE
+        );
+
+        expect(suggestion).not.toBeUndefined();
+        expect(suggestion?.wordRanges.map((token) => token.text)).toEqual(['db', '.']);
+    });
+});

test/parser/pgsql/suggestion/syntaxSuggestion.test.ts

@@ -638,29 +638,28 @@ describe('Postgre SQL Syntax Suggestion', () => {
             lineNumber: 59,
             column: 48,
         };
-        // const pos1: CaretPosition = {
-        //     lineNumber: 59,
-        //     column: 93,
-        // };
+        const pos1: CaretPosition = {
+            lineNumber: 59,
+            column: 93,
+        };
         const syntaxes = parser.getSuggestionAtCaretPosition(
             commentOtherLine(syntaxSql, pos.lineNumber),
             pos
         )?.syntax;
-        // const syntaxes1 = parser.getSuggestionAtCaretPosition(
-        //     commentOtherLine(syntaxSql, pos1.lineNumber),
-        //     pos1
-        // )?.syntax;
+        const syntaxes1 = parser.getSuggestionAtCaretPosition(
+            commentOtherLine(syntaxSql, pos1.lineNumber),
+            pos1
+        )?.syntax;
         const suggestion = syntaxes?.find(
             (syn) => syn.syntaxContextType === SyntaxContextType.COLUMN
         );
-        // const suggestion1 = syntaxes1?.find(
-        //     (syn) => syn.syntaxContextType === SyntaxContextType.FUNCTION
-        // );
+        const suggestion1 = syntaxes1?.find(
+            (syn) => syn.syntaxContextType === SyntaxContextType.FUNCTION
+        );
         expect(suggestion).not.toBeUndefined();
         expect(suggestion?.wordRanges.map((token) => token.text)).toEqual(['column_name']);
-        // TODO: fix bug of basic parser and decomment following case
-        // expect(suggestion1).not.toBeUndefined();
-        // expect(suggestion1?.wordRanges.map((token) => token.text)).toEqual(['function_name']);
+        expect(suggestion1).not.toBeUndefined();
+        expect(suggestion1?.wordRanges.map((token) => token.text)).toEqual(['function_name']);
     });
 
     test('GRANT With Column', () => {