Skip to content

feat: partial attribute completion #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

feat: partial attribute completion #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41ed2e3
wip(feat): partial attribute completion
luckasRanarison Mar 15, 2024
7cb53c1
Merge branch 'master' into completion
nikeee Apr 2, 2024
2804172
Merge branch 'master' into completion
nikeee Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/service/completion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,27 @@ export function getCompletions(
}
}

if (node.kind === syntaxKind.TextIdentifier && parent?.kind === syntaxKind.NodeId) {
const exclusions = node.symbol ? [node.symbol.name] : undefined;
return getNodeCompletions(symbols, exclusions);
}
const prevNodeNi = findNodeAtOffset(g, node.pos - 1, false);

if (
node.kind === syntaxKind.AttributeContainer ||
// FIXME: conflitcs with #issue 17 9 (last test of nodeCompletion.spec.ts)
// || (node.kind === SyntaxKind.TextIdentifier && prevNodeNi?.kind === SyntaxKind.AttributeContainer)
(node.kind === syntaxKind.TextIdentifier && prevNodeNi?.kind === syntaxKind.CommaToken) ||
(node.kind === syntaxKind.CommaToken && parent?.kind === syntaxKind.Assignment)
) {
return getAttributeCompletions(position);
}

if (node.kind === SyntaxKind.TextIdentifier && parent?.kind === SyntaxKind.NodeId) {
const exclusions = node.symbol ? [node.symbol.name] : undefined;
return getNodeCompletions(symbols, exclusions);
}

const prevNode = findNodeAtOffset(g, node.pos - 1, true);
if (!prevNode) return [];
if (!prevNode) {
return [];
}

if (isIdentifierNode(prevNode)) {
const p = prevNode.parent;
Expand Down
41 changes: 41 additions & 0 deletions tests/completion/attributeCompletion.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,47 @@ describe("Attribute completion", () => {
expect(completions).toHaveLength(attributes.length);
});

// FIXME: currently failing
test("should provide completion for attributes (partial input)", () => {
const content = `graph {
node_name_a -- node_name_b [no];
}`;
const requestOffset = invokeIndex(content)("[no");

const [doc, sf] = ensureDocAndSourceFile(content);

const completions = getCompletions(doc, sf, doc.positionAt(requestOffset));

expect(completions).toBeDefined();
assertExists(completions);

expect(completions.length).toBeGreaterThan(0);
expect(completions.map(getLabel)).not.toContain("node_name_a");
expect(completions.map(getLabel)).not.toContain("node_name_b");
expect(completions.map(getLabel)).toEqual(attributes);
expect(completions).toHaveLength(attributes.length);
});

test("should provide completion for attributes (partial input, preceding item)", () => {
const content = `graph {
node_name_a -- node_name_b [color=blue, no];
}`;
const requestOffset = invokeIndex(content)(", no");

const [doc, sf] = ensureDocAndSourceFile(content);

const completions = getCompletions(doc, sf, doc.positionAt(requestOffset));

expect(completions).toBeDefined();
assertExists(completions);

expect(completions.length).toBeGreaterThan(0);
expect(completions.map(getLabel)).not.toContain("node_name_a");
expect(completions.map(getLabel)).not.toContain("node_name_b");
expect(completions.map(getLabel)).toEqual(attributes);
expect(completions).toHaveLength(attributes.length);
});

test("should provide completion for attributes (preceding item)", () => {
const content = `graph {
node_name_a -- node_name_b [color=blue,];
Expand Down