From 37b4114ee567fd71dcfaf766b957932653fe36a9 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 10 Dec 2020 04:31:12 -0500 Subject: [PATCH] Fixes #1246 - bad encoding caused missing fallback --- CHANGELOG.md | 1 + src/annotations/gutterBlameAnnotationProvider.ts | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee39622..24a8024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed +- Fixes [#1246](https://github.com/eamodio/vscode-gitlens/issues/1246) - Gutter Blame avatar does not use Gravatar fallback style - Fixes [#1208](https://github.com/eamodio/vscode-gitlens/issues/1208) - Connect to Github notification is noisy - Fixes [#526](https://github.com/eamodio/vscode-gitlens/issues/526) - FAILED in gitlens.outputLevel=verbose; likely due to regex not in quotes - Fixes [#1222](https://github.com/eamodio/vscode-gitlens/issues/1222) - GitLens: Open Associated Pull Request doesn't work diff --git a/src/annotations/gutterBlameAnnotationProvider.ts b/src/annotations/gutterBlameAnnotationProvider.ts index 4d92af6..efe72d1 100644 --- a/src/annotations/gutterBlameAnnotationProvider.ts +++ b/src/annotations/gutterBlameAnnotationProvider.ts @@ -210,13 +210,14 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase { ) { let avatarDecoration = map.get(commit.email!); if (avatarDecoration == null) { + const url = (await commit.getAvatarUri({ defaultStyle: gravatarDefault, size: 16 })).toString(true); avatarDecoration = { contentText: '', height: '16px', width: '16px', - textDecoration: `none;position:absolute;top:1px;left:5px;background:url(${( - await commit.getAvatarUri({ defaultStyle: gravatarDefault }) - ).toString()});background-size:16px 16px;margin-left: 0 !important`, + textDecoration: `none;position:absolute;top:1px;left:5px;background:url(${encodeURI( + url, + )});background-size:16px 16px;margin-left: 0 !important`, }; map.set(commit.email!, avatarDecoration); }