Skip to content

Commit a38f163

Browse files
committed
Fixes annotation provider clear/show on setting change
1 parent c2a352f commit a38f163

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1313
- Removes properties (symbol `Property`) from being included in the `Blocks` option of the `gitlens.codeLens.locations` setting -- can be easily re-added by setting `"gitlens.codeLens.customLocationSymbols": [ "Property" ]` if desired
1414

1515
### Fixed
16+
- Fixes issue where changing `gitlens.blame.file.annotationType` wouldn't correctly update the blame annotations if they were currently active
1617
- Fixes issue where `isBlameable` context could be set incorrectly leading to blame icon showing up on invalid documents
1718

1819
## [5.5.0] - 2017-10-09

src/annotations/annotationController.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,12 @@ export class AnnotationController extends Disposable {
178178
provider.reset(Decorations.recentChangesAnnotation, Decorations.recentChangesHighlight);
179179
}
180180
else {
181-
provider.reset(Decorations.blameAnnotation, Decorations.blameHighlight);
181+
if (provider.annotationType === this._config.blame.file.annotationType) {
182+
provider.reset(Decorations.blameAnnotation, Decorations.blameHighlight);
183+
}
184+
else {
185+
this.showAnnotations(provider.editor, cfg.blame.file.annotationType);
186+
}
182187
}
183188
}
184189
}

0 commit comments

Comments
 (0)