From c69c1719bb2dc24c33e2e5348b2a93fb1c3a2ea6 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 28 May 2019 14:54:29 -0700 Subject: [PATCH] Add enumDescriptions for merge-conflict.diffViewPosition Fixes #74500 --- extensions/merge-conflict/package.json | 5 +++++ extensions/merge-conflict/package.nls.json | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json index 727bd67ac28..e017edebf7b 100644 --- a/extensions/merge-conflict/package.json +++ b/extensions/merge-conflict/package.json @@ -123,6 +123,11 @@ "Below" ], "description": "%config.diffViewPosition%", + "enumDescriptions": [ + "%config.diffViewPosition.current%", + "%config.diffViewPosition.beside%", + "%config.diffViewPosition.below%" + ], "default": "Current" } } diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json index b73b0196bda..3310dac7e21 100644 --- a/extensions/merge-conflict/package.nls.json +++ b/extensions/merge-conflict/package.nls.json @@ -16,5 +16,8 @@ "config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.", "config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.", "config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.", - "config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts." + "config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.", + "config.diffViewPosition.current": "Open the diff view in the current editor group.", + "config.diffViewPosition.beside": "Open the diff view next to the current editor group.", + "config.diffViewPosition.below": "Open the diff view below the current editor group." } \ No newline at end of file