From a80115c7bf819f6ef932beb5b185bcde8bf37be0 Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Wed, 11 Nov 2020 13:50:58 -0800 Subject: [PATCH 1/2] Workaround VSCode bug for process picker --- src/client/debugger/extension/attachQuickPick/picker.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/debugger/extension/attachQuickPick/picker.ts b/src/client/debugger/extension/attachQuickPick/picker.ts index db1d4a8a8a74..7e6c074d3d52 100644 --- a/src/client/debugger/extension/attachQuickPick/picker.ts +++ b/src/client/debugger/extension/attachQuickPick/picker.ts @@ -75,6 +75,7 @@ export class AttachPicker implements IAttachPicker { ); quickPick.show(); + quickPick.show(); }); } } From bc36f297ca0409f2f2067f4a92a8a51d0aa938c4 Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Thu, 12 Nov 2020 11:26:04 -0800 Subject: [PATCH 2/2] Fix how we pass in icons to VSCode --- src/client/common/utils/icons.ts | 6 +++--- src/client/debugger/extension/attachQuickPick/picker.ts | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/client/common/utils/icons.ts b/src/client/common/utils/icons.ts index 3d312818e058..6b0a8175c6d5 100644 --- a/src/client/common/utils/icons.ts +++ b/src/client/common/utils/icons.ts @@ -10,9 +10,9 @@ import { EXTENSION_ROOT_DIR } from '../../constants'; const darkIconsPath = path.join(EXTENSION_ROOT_DIR, 'resources', 'dark'); const lightIconsPath = path.join(EXTENSION_ROOT_DIR, 'resources', 'light'); -export function getIcon(fileName: string): { light: string | Uri; dark: string | Uri } { +export function getIcon(fileName: string): { light: Uri; dark: Uri } { return { - dark: path.join(darkIconsPath, fileName), - light: path.join(lightIconsPath, fileName) + dark: Uri.file(path.join(darkIconsPath, fileName)), + light: Uri.file(path.join(lightIconsPath, fileName)) }; } diff --git a/src/client/debugger/extension/attachQuickPick/picker.ts b/src/client/debugger/extension/attachQuickPick/picker.ts index 7e6c074d3d52..db1d4a8a8a74 100644 --- a/src/client/debugger/extension/attachQuickPick/picker.ts +++ b/src/client/debugger/extension/attachQuickPick/picker.ts @@ -75,7 +75,6 @@ export class AttachPicker implements IAttachPicker { ); quickPick.show(); - quickPick.show(); }); } }