From 645ce1c9cea60f75e7abe526cc167fc36c1c7e5b Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Thu, 10 Aug 2023 14:14:25 +0200 Subject: [PATCH 1/2] ignoring the error when cancelled --- .../contrib/stickyScroll/browser/stickyScrollModelProvider.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts index cf549710a754f..92f1ae7aa98f7 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts @@ -120,6 +120,9 @@ export class StickyModelProvider implements IStickyModelProvider { } } return null; + }).catch(() => { + // error thrown when cancel is called on _updateScheduler while previous promise has not completed + return null; }); } } From 20d5e4e3f246015570e3cc7b175f0e7298d7690c Mon Sep 17 00:00:00 2001 From: Aiday Marlen Kyzy Date: Thu, 10 Aug 2023 15:22:39 +0200 Subject: [PATCH 2/2] chaning to on unexpected error --- .../contrib/stickyScroll/browser/stickyScrollModelProvider.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts index 92f1ae7aa98f7..13051e8005836 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts @@ -120,8 +120,8 @@ export class StickyModelProvider implements IStickyModelProvider { } } return null; - }).catch(() => { - // error thrown when cancel is called on _updateScheduler while previous promise has not completed + }).catch((error) => { + onUnexpectedError(error); return null; }); }