feat(completion): expand INSERT all-columns with VALUES tab stops
This commit is contained in:
3 files changed
+26
-12
No files matched your search
@@ -417,7 +417,17 @@ WHERE a.id = b.fk_kpi_set_score_id`,
|
||||
const { context, items } = semanticCompletion("INSERT INTO users (|", { columnsByTable });
|
||||
|
||||
expect(context.insertTable).toBe("users");
|
||||
expect(items.find((item) => item.type === "snippet" && item.label === "users.*")?.apply).toBe("id, name, email");
|
||||
const allColumns = items.find((item) => item.type === "snippet" && item.label === "users.*");
|
||||
expect(allColumns?.apply).toBe("id, name, email) VALUES (${1:value}, ${2:value}, ${3:value})");
|
||||
expect(allColumns?.detail).toBe("3 columns: id, name, email) VALUES (value, value, value)");
|
||||
});
|
||||
|
||||
it("uses the configured keyword case for INSERT all-column snippets", () => {
|
||||
const columnsByTable = new Map<string, SqlCompletionColumn[]>([["users", ["id", "name"].map((name) => ({ name, table: "users" }))]]);
|
||||
|
||||
const { items } = semanticCompletion("insert into users (|", { columnsByTable, keywordCase: "lower" });
|
||||
|
||||
expect(items.find((item) => item.type === "snippet" && item.label === "users.*")?.apply).toBe("id, name) values (${1:value}, ${2:value})");
|
||||
});
|
||||
|
||||
it("keeps partial INSERT INTO targets in table completion context", () => {
|
||||
|
||||
@@ -1412,7 +1412,7 @@ class SqlCompletionProvider {
|
||||
if (!context.exclusiveTableSuggestions && context.suggestColumns) {
|
||||
this.items.push(...buildColumnItems(context, this.input.columnsByTable, this.dialect));
|
||||
this.items.push(...buildSelectAllColumnItems(context, this.input.columnsByTable, this.t, this.dialect));
|
||||
this.items.push(...buildInsertAllColumnItems(context, this.input.columnsByTable, this.t, this.dialect));
|
||||
this.items.push(...buildInsertAllColumnItems(context, this.input.columnsByTable, this.t, this.dialect, this.input.keywordCase));
|
||||
}
|
||||
|
||||
const emptyTableNameCompletion = !context.prefix && (context.suggestTables || context.exclusiveTableSuggestions);
|
||||
@@ -3308,7 +3308,7 @@ function buildSelectAllColumnItems(context: SqlCompletionContext, columnsByTable
|
||||
return items;
|
||||
}
|
||||
|
||||
function buildInsertAllColumnItems(context: SqlCompletionContext, columnsByTable: Map<string, SqlCompletionColumn[]>, t?: SqlCompletionTranslations, dialect?: "mysql" | "postgres" | "sqlserver"): SqlCompletionItem[] {
|
||||
function buildInsertAllColumnItems(context: SqlCompletionContext, columnsByTable: Map<string, SqlCompletionColumn[]>, t?: SqlCompletionTranslations, dialect?: "mysql" | "postgres" | "sqlserver", keywordCase?: SqlKeywordCase): SqlCompletionItem[] {
|
||||
if (!context.insertTable) return [];
|
||||
const columns = uniqueColumnsByName(columnsForInsertTarget(context, columnsByTable));
|
||||
if (columns.length === 0) return [];
|
||||
@@ -3316,13 +3316,17 @@ function buildInsertAllColumnItems(context: SqlCompletionContext, columnsByTable
|
||||
const label = `${context.insertTable}.*`;
|
||||
if (!selectAllColumnItemMatchesPrefix(label, { name: context.insertTable, schema: context.insertSchema }, columns, context.prefix)) return [];
|
||||
|
||||
const expansion = columns.map((column) => quoteSqlIdentifier(column.name, dialect)).join(", ");
|
||||
const columnList = columns.map((column) => quoteSqlIdentifier(column.name, dialect)).join(", ");
|
||||
const valuesKeyword = applySqlKeywordCase("VALUES", keywordCase);
|
||||
const valueList = columns.map((_, index) => `\${${index + 1}:value}`).join(", ");
|
||||
const expansion = `${columnList}) ${valuesKeyword} (${valueList})`;
|
||||
const preview = `${columnList}) ${valuesKeyword} (${columns.map(() => "value").join(", ")})`;
|
||||
const countText = (t?.starExpansionColumns ?? "{count} columns").replace("{count}", String(columns.length));
|
||||
return [
|
||||
{
|
||||
label,
|
||||
type: "snippet" as const,
|
||||
detail: `${countText}: ${expansion.length > 60 ? expansion.slice(0, 57) + "..." : expansion}`,
|
||||
detail: `${countText}: ${preview.length > 60 ? preview.slice(0, 57) + "..." : preview}`,
|
||||
apply: expansion,
|
||||
boost: 2450 + selectAllColumnItemPrefixBoost(label, { name: context.insertTable, schema: context.insertSchema }, columns, context.prefix),
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user