Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -931,8 +931,8 @@ module.exports = grammar({
'provides',
field('provided', $._name),
'with',
$._name,
repeat(seq(',', (field('provider', $._name)))),
field('provider', $._name),
repeat(seq(',', field('provider', $._name))),
';',
),

Expand Down
8 changes: 6 additions & 2 deletions src/grammar.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 1 addition & 15 deletions src/node-types.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 63 additions & 61 deletions src/parser.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions test/unit/moduleProviders.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { fileURLToPath } from 'node:url';

import { Language, Parser, Query } from '@willbooster/web-tree-sitter';
import { expect, test } from 'vitest';

await Parser.init();
const language = await Language.load(fileURLToPath(new URL('../../tree-sitter-java.wasm', import.meta.url)));

test('exposes every module service implementation through the provider field', () => {
const parser = new Parser().setLanguage(language);
const query = new Query(language, '(provides_module_directive provider: (_) @provider)');
try {
for (const providers of [
['sample.First'],
['sample.First', 'sample.Second'],
['sample.First', 'sample.Second', 'sample.Third'],
]) {
const source = `module sample.providers { provides sample.Service with ${providers.join(', ')}; }`;
const tree = parser.parse(source)!;
try {
expect(tree.rootNode.hasError).toBe(false);
const [directive] = tree.rootNode.descendantsOfType('provides_module_directive');
expect(directive?.childForFieldName('provided')?.text).toBe('sample.Service');
expect(directive?.childForFieldName('provider')?.text).toBe(providers[0]);
const expected = providers.map((name) => [name, source.indexOf(name), source.indexOf(name) + name.length]);
expect(
directive?.childrenForFieldName('provider').map((node) => [node.text, node.startIndex, node.endIndex])
).toEqual(expected);
expect(query.captures(tree.rootNode).map(({ node }) => [node.text, node.startIndex, node.endIndex])).toEqual(
expected
);
} finally {
tree.delete();
}
}
} finally {
query.delete();
parser.delete();
}
});
Loading