MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

touchbar: make native code more exception-safe

Browse Source 
Scrubber item of touchbar can throw NSInternalInconsistencyException during
items update. This is undocumented behaviour (so the reason is unknown) and it's better to suppress such exceptions now.

fixed IDEA-223539 Crash on Alt+Enter

GitOrigin-RevId: 7297e7f3eabb02d83d18558ff91052a7699387fd
This commit is contained in:
Artem Bochkarev
2019-09-25 14:32:26 +00:00
committed by intellij-monorepo-bot
parent cc18cbfc1f
commit e883f16a2d
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/mac/libnst64.dylib
BIN
View File
Binary file not shown.
native/MacTouchBar/src/Scrubber.m
+41 -30
View File
@@ -222,10 +222,17 @@ void updateScrubberItems(id scrubObj, void* packedItems, int byteCount, int from
NSScrubberContainer *container = scrubObj;
nstrace(@"scrubber [%@]: called updateScrubberItems", container.identifier);
void (^doUpdate)() = ^{
_fillCache(container.itemsCache, container.visibleItems, packedItems, byteCount, fromIndex);
if (packedItems != NULL)
free(packedItems);
_recalculatePositions(scrubObj);
@try {
_fillCache(container.itemsCache, container.visibleItems, packedItems, byteCount, fromIndex);
_recalculatePositions(scrubObj);
}
@catch (NSException *exception) {
nserror(@"%@", exception.reason);
}
@finally {
if (packedItems != NULL)
free(packedItems);
}
};
if ([NSThread isMainThread]) {
doUpdate();
@@ -277,32 +284,36 @@ void showScrubberItems(id scrubObj, void* itemIndices, int count, bool show, boo
int * indices = itemIndices;
dispatch_async(dispatch_get_main_queue(), ^{
// 1. mark items
if (inverseOthers) {
for (int c = 0; c < container.itemsCache.count; ++c) {
ScrubberItem *itemData = [container.itemsCache objectAtIndex:c];
if (itemData == nil)
continue;
itemData.visible = !show;
}
}
if (indices != NULL) {
for (int c = 0; c < count; ++c) {
ScrubberItem *itemData = [container.itemsCache objectAtIndex:indices[c]];
if (itemData == nil) {
nserror(@"scrubber [%@]: called showScrubberItems %d, but item-data at this index is null", container.identifier, indices[c]);
continue;
}
itemData.visible = show;
}
}
// 2. recalc positions
_recalculatePositions(scrubObj);
if (indices != NULL)
free(indices);
@try {
// 1. mark items
if (inverseOthers) {
for (int c = 0; c < container.itemsCache.count; ++c) {
ScrubberItem *itemData = [container.itemsCache objectAtIndex:c];
if (itemData == nil)
continue;
itemData.visible = !show;
}
}
if (indices != NULL) {
for (int c = 0; c < count; ++c) {
ScrubberItem *itemData = [container.itemsCache objectAtIndex:indices[c]];
if (itemData == nil) {
nserror(@"scrubber [%@]: called showScrubberItems %d, but item-data at this index is null", container.identifier, indices[c]);
continue;
}
itemData.visible = show;
}
}
// 2. recalc positions
_recalculatePositions(scrubObj);
}
@catch (NSException *exception) {
nserror(@"%@", exception.reason);
}
@finally {
if (indices != NULL)
free(indices);
}
});
}