Skip to content
Open
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
27 changes: 27 additions & 0 deletions server/src/test/ChainedPropertyResolver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,31 @@ suite('ClassMemberResolver.extractClassName', () => {
test('LIKE alone (no parens) — returns null', () => {
assert.strictEqual(ClassMemberResolver.extractClassName('LIKE'), null);
});

test('GROUP(TypeName) — returns the referenced type name', () => {
assert.strictEqual(ClassMemberResolver.extractClassName('GROUP(ConnectionSettingsType)'), 'ConnectionSettingsType');
});

test('GROUP(TypeName) with trailing " END" (verbatim scanned declaration text) — real repro shape', () => {
// scanClassBodyForMember captures the whole line after the label, e.g.
// "Settings GROUP(ConnectionSettingsType) END" -> typeStr is
// "GROUP(ConnectionSettingsType) END", not just the paren part.
assert.strictEqual(ClassMemberResolver.extractClassName('GROUP(ConnectionSettingsType) END'), 'ConnectionSettingsType');
});

test('QUEUE(TypeName) — returns the referenced type name', () => {
assert.strictEqual(ClassMemberResolver.extractClassName('QUEUE(BaseQueueType)'), 'BaseQueueType');
});

test('RECORD(TypeName) — returns the referenced type name', () => {
assert.strictEqual(ClassMemberResolver.extractClassName('RECORD(SomeRecordType)'), 'SomeRecordType');
});

test('GROUP(TypeName) with trailing attributes after the paren', () => {
assert.strictEqual(ClassMemberResolver.extractClassName('GROUP(FooType),DIM(2)'), 'FooType');
});

test('GROUP keyword alone still returns null (unaffected by GROUP(TypeName) handling)', () => {
assert.strictEqual(ClassMemberResolver.extractClassName('GROUP'), null);
});
});
9 changes: 9 additions & 0 deletions server/src/utils/ClassMemberResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,15 @@ export class ClassMemberResolver {
const likeMatch = name.match(/^LIKE\s*\(\s*([\w:]+)\s*\)/i);
if (likeMatch) return likeMatch[1];

// GROUP(TypeName) / QUEUE(TypeName) / RECORD(TypeName) — structured-type property
// (e.g. "Settings GROUP(ConnectionSettingsType) END"): resolve to the referenced
// type name, same treatment as LIKE(TypeName) above. Without this, the comma/paren
// split below strips down to the bare keyword ("GROUP"), which then matches
// CLARION_PRIMITIVES and gets rejected as "not navigable" — breaking chained
// hover/member resolution (e.g. SELF.Settings.Address) one level too early.
const structRefMatch = name.match(/^(?:GROUP|QUEUE|RECORD)\s*\(\s*([\w:]+)\s*\)/i);
if (structRefMatch) return structRefMatch[1];

// Take only the part before comma or parenthesis (attributes/dimensions)
name = name.split(/[,(]/)[0].trim();

Expand Down