From 40a902c9cfa9ed79c6255aace8d6d818477a0f91 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Sun, 22 Nov 2020 13:52:38 -0800 Subject: [PATCH] Multiline markdownEnumDescription should not break split json settings editor Fix #110840 --- .../services/preferences/common/preferencesModels.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts index f4bd140d3b8..50611fa179d 100644 --- a/src/vs/workbench/services/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts @@ -996,7 +996,9 @@ class SettingsContentBuilder { `${displayEnum}: ${fixSettingLink(desc)}` : displayEnum; - this._contentByLines.push(`${indent}// - ${line}`); + const lines = line.split(/\n/g); + lines[0] = ' - ' + lines[0]; + this._contentByLines.push(...lines.map(l => `${indent}// ${l}`)); setting.descriptionRanges.push({ startLineNumber: this.lineCountWithOffset, startColumn: this.lastLine.indexOf(line) + 1, endLineNumber: this.lineCountWithOffset, endColumn: this.lastLine.length }); }); -- GitLab