Skip to content

Reorganising the logic of the sorting attributes function #1484

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

Merged
Janther merged 1 commit into from
Apr 4, 2026
+17 −16
Merged

Reorganising the logic of the sorting attributes function #1484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 17 additions & 16 deletions src/slang-utils/sort-function-attributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ export function sortFunctionAttributes(
const aIsString = aVariant instanceof TerminalNode;
const bIsString = bVariant instanceof TerminalNode;

if (aIsString && !bIsString) return -1;
if (bIsString && !aIsString) return 1;

// Both are strings
if (aIsString && bIsString) {
// Visibility First
Expand All @@ -31,21 +28,25 @@ export function sortFunctionAttributes(
if (mutabilityKeyWords.has(aVariant.value)) return -1;
if (mutabilityKeyWords.has(bVariant.value)) return 1;
// Virtual keyword last
return 0;
}

// Only one is a string
if (aIsString) return -1;
if (bIsString) return 1;

// Both are nodes
if (!aIsString && !bIsString) {
// OverrideSpecifiers before ModifierInvocation
if (
aVariant.kind === NonterminalKind.OverrideSpecifier &&
bVariant.kind === NonterminalKind.ModifierInvocation
)
return -1;
if (
bVariant.kind === NonterminalKind.OverrideSpecifier &&
aVariant.kind === NonterminalKind.ModifierInvocation
)
return 1;
}
// OverrideSpecifiers before ModifierInvocation
if (
aVariant.kind === NonterminalKind.OverrideSpecifier &&
bVariant.kind === NonterminalKind.ModifierInvocation
)
return -1;
if (
bVariant.kind === NonterminalKind.OverrideSpecifier &&
aVariant.kind === NonterminalKind.ModifierInvocation
)
return 1;

return 0;
}