Skip to content

Sort columns numerically when all non-empty values are numeric #8

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

Open
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Sort columns numerically when all non-empty values are numeric #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0686927
Add intelligent numeric vs. alphabetic column sorting
Copilot Apr 1, 2026
a71d11f
Use locale-aware decimal parsing in column sort (honour csvConfig.dec…
Copilot Apr 1, 2026
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
38 changes: 35 additions & 3 deletions Table Tool/Document.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,12 +1268,44 @@ -(void)tableView:(NSTableView *)tableView sortDescriptorsDidChange:(NSArray *)ol
NSSortDescriptor *sd = tableView.sortDescriptors.firstObject;
if (!sd) return;
NSInteger colIndex = sd.key.integerValue;

// Use the same regex the editor uses for numeric detection, so that the
// configured decimal separator (e.g. ',' for European locales) is honoured.
NSString *decimalMark = self.csvConfig.decimalMark;
NSDictionary *locale = @{NSLocaleDecimalSeparator: decimalMark};
NSRegularExpression *numberRegex = [NSRegularExpression regularExpressionWithPattern:
[NSString stringWithFormat:@"^\\s*[+-]?(\\d+\\%@?\\d*|\\d*\\%@?\\d+)([eE][+-]?\\d+)?\\s*$", decimalMark, decimalMark]
options:0 error:NULL];

// Determine whether all non-empty values in the column are numeric so we
// can choose between a numeric and an alphabetic sort.
BOOL sortNumerically = YES;
for (NSMutableArray *row in _data) {
id val = colIndex < (NSInteger)row.count ? row[colIndex] : @"";
if ([val isKindOfClass:[NSDecimalNumber class]]) continue;
NSString *str = (NSString *)val;
if (str.length == 0) continue;
if ([numberRegex numberOfMatchesInString:str options:0 range:NSMakeRange(0, str.length)] != 1) {
sortNumerically = NO;
break;
}
}

[_data sortUsingComparator:^NSComparisonResult(NSMutableArray *row1, NSMutableArray *row2) {
id val1 = colIndex < (NSInteger)row1.count ? row1[colIndex] : @"";
id val2 = colIndex < (NSInteger)row2.count ? row2[colIndex] : @"";
NSString *str1 = [val1 isKindOfClass:[NSDecimalNumber class]] ? [(NSDecimalNumber *)val1 description] : (NSString *)val1;
NSString *str2 = [val2 isKindOfClass:[NSDecimalNumber class]] ? [(NSDecimalNumber *)val2 description] : (NSString *)val2;
NSComparisonResult result = [str1 localizedCaseInsensitiveCompare:str2];
NSComparisonResult result;
if (sortNumerically) {
NSDecimalNumber *num1 = [val1 isKindOfClass:[NSDecimalNumber class]] ? val1 :
([(NSString *)val1 length] > 0 ? [NSDecimalNumber decimalNumberWithString:(NSString *)val1 locale:locale] : [NSDecimalNumber zero]);
NSDecimalNumber *num2 = [val2 isKindOfClass:[NSDecimalNumber class]] ? val2 :
([(NSString *)val2 length] > 0 ? [NSDecimalNumber decimalNumberWithString:(NSString *)val2 locale:locale] : [NSDecimalNumber zero]);
result = [num1 compare:num2];
} else {
NSString *str1 = [val1 isKindOfClass:[NSDecimalNumber class]] ? [(NSDecimalNumber *)val1 descriptionWithLocale:locale] : (NSString *)val1;
NSString *str2 = [val2 isKindOfClass:[NSDecimalNumber class]] ? [(NSDecimalNumber *)val2 descriptionWithLocale:locale] : (NSString *)val2;
result = [str1 localizedCaseInsensitiveCompare:str2];
}
return sd.ascending ? result : -result;
}];
[self.tableView reloadData];
Expand Down