fix(syntaxSuggestion): resolve conflicts and move tests

Author: ekazakas

test/parser/flink/suggestion/fixtures/syntaxSuggestion.sql

@@ -40,6 +40,8 @@ CREATE TABLE yourTable (ts TIMESTAMP(3), WATERMARK FOR  );
 
 CREATE TABLE newTable (  );
 
+CREATE TABLE tmp_table (col INT) WITH ('connector'='kafka');
+
 SELECT SUM(amount) FROM Orders GROUP BY length(users) HAVING SUM(amount) > 50;
 
 SELECT * FROM Orders ORDER BY orderTime LIMIT length(order_id);

test/parser/flink/suggestion/fixtures/tokenSuggestion.sql

@@ -13,5 +13,3 @@ CREATE TABLE IF NOT EXISTS
 CREATE TABLE tb (id 
 
 );
-
-CREATE TABLE tmp_table (col INT) WITH ('connector'='kafka');

test/parser/flink/suggestion/syntaxSuggestion.test.ts

@@ -469,4 +469,32 @@ describe('Flink SQL Syntax Suggestion', () => {
         expect(suggestion).not.toBeUndefined();
         expect(suggestion?.wordRanges.map((token) => token.text)).toEqual(['age']);
     });
+
+    test('Create Statement table properties', () => {
+        const scenarios = [
+            {
+                caretPosition: {
+                    lineNumber: 9,
+                    column: 45,
+                },
+                entityContextType: EntityContextType.TABLE_PROPERTY_KEY,
+            },
+            {
+                caretPosition: {
+                    lineNumber: 9,
+                    column: 55,
+                },
+                entityContextType: EntityContextType.TABLE_PROPERTY_VALUE,
+            },
+        ];
+
+        scenarios.forEach((scenario) => {
+            const suggestion = flink.getSuggestionAtCaretPosition(
+                commentOtherLine(syntaxSql, scenario.caretPosition.lineNumber),
+                scenario.caretPosition
+            )?.syntax;
+
+            expect(suggestion[0].syntaxContextType).toBe(scenario.entityContextType);
+        });
+    });
 });

test/parser/flink/suggestion/tokenSuggestion.test.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { FlinkSQL } from 'src/parser/flink';
-import { CaretPosition, EntityContextType } from 'src/parser/common/types';
+import { CaretPosition } from 'src/parser/common/types';
 import { commentOtherLine } from 'test/helper';
 
 const tokenSql = fs.readFileSync(path.join(__dirname, 'fixtures', 'tokenSuggestion.sql'), 'utf-8');
@@ -94,62 +94,6 @@ describe('Flink SQL Token Suggestion', () => {
         expect(suggestion).toContain('NOT EXISTS');
     });
 
-    test('Create Statement table properties', () => {
-        const scenarios = [
-            {
-                caretPosition: {
-                    lineNumber: 9,
-                    column: 45,
-                },
-                entityContextType: EntityContextType.TABLE_PROPERTY_KEY,
-            },
-            {
-                caretPosition: {
-                    lineNumber: 9,
-                    column: 55,
-                },
-                entityContextType: EntityContextType.TABLE_PROPERTY_VALUE,
-            },
-        ];
-
-        scenarios.forEach((scenario) => {
-            const suggestion = flink.getSuggestionAtCaretPosition(
-                commentOtherLine(tokenSql, scenario.caretPosition.lineNumber),
-                scenario.caretPosition
-            )?.syntax;
-
-            expect(suggestion[0].syntaxContextType).toBe(scenario.entityContextType);
-        });
-    });
-
-    test('Create Statement table properties', () => {
-        const scenarios = [
-            {
-                caretPosition: {
-                    lineNumber: 9,
-                    column: 45,
-                },
-                entityContextType: EntityContextType.TABLE_PROPERTY_KEY,
-            },
-            {
-                caretPosition: {
-                    lineNumber: 9,
-                    column: 55,
-                },
-                entityContextType: EntityContextType.TABLE_PROPERTY_VALUE,
-            },
-        ];
-
-        scenarios.forEach((scenario) => {
-            const suggestion = flink.getSuggestionAtCaretPosition(
-                commentOtherLine(tokenSql, scenario.caretPosition.lineNumber),
-                scenario.caretPosition
-            )?.syntax;
-
-            expect(suggestion[0].syntaxContextType).toBe(scenario.entityContextType);
-        });
-    });
-  
     test('Suggestion in new line', () => {
         const pos: CaretPosition = {
             lineNumber: 13,