fix(elasticsearch): complete json keys without stray quote

This commit is contained in:
onenewcode authored and GitHub committed 2026-09-01 01:17:59 +08:00
1 parent b41dac4617
commit cb3de0ef49
3 files changed
+165 -14

No files matched your search

+71 -1
View File
@@ -9,7 +9,11 @@ function applyCompletion(text: string, cursor: number, label: string): string {
const context = getElasticsearchCompletionContext(text, cursor);
const item = buildElasticsearchCompletionItems(text, cursor, { indices }).find((candidate) => candidate.label === label);
assert.ok(item, `Expected completion item ${label}`);
return `${text.slice(0, context.from)}${item.apply ?? item.label}${text.slice(cursor)}`;
// Mirrors the editor: the auto-closed quote at the cursor is part of the
// replaced range, and snippet fields expand to their placeholder text.
const to = item.replaceClosingQuote && text[cursor] === item.replaceClosingQuote ? cursor + 1 : cursor;
const insert = (item.apply ?? item.label).replace(/\$\{([^}]*)\}/g, "$1");
return `${text.slice(0, context.from)}${insert}${text.slice(to)}`;
}
test("suggests Elasticsearch HTTP methods for empty and prefix input", () => {
@@ -73,6 +77,72 @@ test("suggests Elasticsearch JSON DSL keys and snippets", () => {
assert.doesNotThrow(() => JSON.parse(`{${matchAll?.apply}}`));
});
test("Elasticsearch JSON key completion replaces the auto-closed quote", () => {
const text = 'GET /orders/_search\n{\n "query": {\n "bool":{\n "f"\n }\n }\n}';
const cursor = text.indexOf('"f"') + 2;
const context = getElasticsearchCompletionContext(text, cursor);
assert.equal(context.replaceClosingQuote, '"');
assert.equal(buildElasticsearchCompletionItems(text, cursor).find((item) => item.label === '"fields"')?.replaceClosingQuote, '"');
const applied = applyCompletion(text, cursor, '"fields"');
assert.ok(applied.includes('"fields": []'));
assert.equal(applied.includes('""'), false);
});
test("Elasticsearch JSON keys bring their value brackets along", () => {
const objectKey = 'GET /orders/_search\n{\n "qu';
assert.equal(applyCompletion(objectKey, objectKey.length, '"query"'), 'GET /orders/_search\n{\n "query": {}');
assert.equal(buildElasticsearchCompletionItems(objectKey, objectKey.length).find((item) => item.label === '"query"')?.applyAsSnippet, true);
const arrayKey = 'GET /orders/_search\n{\n "query": {\n "bool": {\n "mu';
assert.ok(applyCompletion(arrayKey, arrayKey.length, '"must"').endsWith('"must": []'));
const scalarKey = 'GET /orders/_search\n{\n "si';
assert.equal(applyCompletion(scalarKey, scalarKey.length, '"size"'), 'GET /orders/_search\n{\n "size": ');
});
test("Elasticsearch JSON keys keep the scaffold out when a separator already exists", () => {
const text = 'GET /orders/_search\n{\n "qu": {}';
const cursor = 'GET /orders/_search\n{\n "qu'.length;
assert.equal(getElasticsearchCompletionContext(text, cursor).hasKeySeparator, true);
assert.equal(applyCompletion(text, cursor, '"query"'), 'GET /orders/_search\n{\n "query": {}');
// The caret may also sit inside an existing key, past its own separator.
const inside = 'GET /orders/_search\n{\n "size": 10\n}';
assert.equal(getElasticsearchCompletionContext(inside, inside.indexOf('"size"') + 3).hasKeySeparator, true);
});
test("Elasticsearch JSON slot survives comments and earlier requests", () => {
const commented = 'GET /orders/_search\n# the "orders body\n{\n "bo';
assert.equal(getElasticsearchCompletionContext(commented, commented.length).jsonSlot, "key");
const secondRequest = 'GET /orders/_search\n{\n "query": {\n\nGET /users/_search\n{\n "bo';
assert.equal(getElasticsearchCompletionContext(secondRequest, secondRequest.length).jsonSlot, "key");
});
test("Elasticsearch JSON value slots are not completed as keys", () => {
const text = 'GET /orders/_search\n{\n "sort": [\n "fi';
const items = buildElasticsearchCompletionItems(text, text.length);
assert.equal(getElasticsearchCompletionContext(text, text.length).jsonSlot, "value");
assert.equal(items.find((item) => item.label === '"fields"')?.apply, '"fields"');
assert.equal(
items.some((item) => item.label === "bool"),
false,
);
});
test("Elasticsearch JSON snippets stay reachable after an opening quote", () => {
const quoted = 'GET /orders/_search\n{\n "bo';
assert.equal(buildElasticsearchCompletionItems(quoted, quoted.length).find((item) => item.label === "bool")?.filterText, '"bool"');
const bare = 'GET /orders/_search\n{\n "query": {bo';
assert.equal(getElasticsearchCompletionContext(bare, bare.length).mode, "json");
assert.equal(buildElasticsearchCompletionItems(bare, bare.length).find((item) => item.label === "bool")?.filterText, undefined);
});
test("Elasticsearch completion auto trigger ignores structural JSON punctuation", () => {
assert.equal(shouldAutoOpenElasticsearchCompletion("GET /", "GET /".length), true);
assert.equal(shouldAutoOpenElasticsearchCompletion("GET /_", "GET /_".length), true);