Merge pull request #254 from codefori/fix/host_parameters_confused

Fix/host_parameters_confused

Author: worksofliam

src/language/json.ts

@@ -1,5 +1,5 @@
 
-import vscode from "vscode";
+import * as vscode from "vscode";
 
 import Statement from "../database/statement";
 
@@ -11,11 +11,11 @@ export async function initialise(context: vscode.ExtensionContext) {
         const parsedData = JSON.parse(clipboard_content);
 
         const sql = generateSQL(parsedData);
-        const formatted = Statement.format(sql);
+        // const formatted = Statement.format(sql);
 
         if (vscode.window.activeTextEditor) {
           vscode.window.activeTextEditor.edit((edit) => {
-            edit.insert(vscode.window.activeTextEditor.selection.active, formatted);
+            edit.insert(vscode.window.activeTextEditor.selection.active, sql);
           });
         }
       } catch (e) {

src/language/sql/statement.ts

@@ -546,6 +546,7 @@ export default class Statement {
 		let declareStmt: Token|undefined;
 
 		for (let i = 0; i < this.tokens.length; i++) {
+			const prevToken = this.tokens[i-1];
 			const currentToken = this.tokens[i];
 
 			switch (currentToken.type) {
@@ -593,6 +594,7 @@ export default class Statement {
 				case `colon`:
 					if (intoClause) continue;
 					if (declareStmt) continue;
+					if (prevToken && prevToken.type === `string`) continue;
 
 					let nextMustBe: "word"|"dot" = `word`;
 					let followingTokenI = i+1;

src/language/sql/tests/statements.test.ts

@@ -1264,6 +1264,17 @@ describe(`Parameter statement tests`, () => {
     expect(markerRanges.length).toBe(2);
   });
 
+  test('JSON_OBJECT parameters should not mark as embedded', () => {
+    const document = new Document(`values json_object('model_id': 'meta-llama/llama-2-13b-chat', 'input': 'TEXT', 'parameters': json_object('max_new_tokens': 100, 'time_limit': 1000), 'space_id': 'SPACEID')`);
+    const statements = document.statements;
+    expect(statements.length).toBe(1);
+
+    const statement = statements[0];
+
+    const markerRanges = statement.getEmbeddedStatementAreas();
+    expect(markerRanges.length).toBe(0);
+  });
+
   test(`Single questionmark parameter content test`, () => {
     const sql = `select * from sample where x = ?`;
     const document = new Document(sql);