Trim characters off match instead to get key, fixes microsoft#141614 (microsoft#141818)

rzhao271 · web-flow · commit 61b42a3bf8b6 · 2022-01-31T09:46:37.000-08:00
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -2130,7 +2130,8 @@ function cleanRenderedMarkdown(element: Node): void {
 }
 
 function fixSettingLinks(text: string, linkify = true): string {
-	return text.replace(/`#([^#]*)#`|'#([^#]*)#'/g, (match, settingKey) => {
+	return text.replace(/`#([^#]*)#`|'#([^#]*)#'/g, (match) => {
+		const settingKey = match.substring(2, match.length - 2);
 		const targetDisplayFormat = settingKeyToDisplayFormat(settingKey);
 		const targetName = `${targetDisplayFormat.category}: ${targetDisplayFormat.label}`;
 		return linkify ?

Original file line number	Diff line number	Diff line change
`@@ -2130,7 +2130,8 @@ function cleanRenderedMarkdown(element: Node): void {`
`2130`	`2130`	`}`
`2131`	`2131`
`2132`	`2132`	`function fixSettingLinks(text: string, linkify = true): string {`
`2133`		- return text.replace(/`#([^#])#`\|'#([^#])#'/g, (match, settingKey) => {
	`2133`	+ return text.replace(/`#([^#])#`\|'#([^#])#'/g, (match) => {
	`2134`	`+ const settingKey = match.substring(2, match.length - 2);`
`2134`	`2135`	`const targetDisplayFormat = settingKeyToDisplayFormat(settingKey);`
`2135`	`2136`	const targetName = `${targetDisplayFormat.category}: ${targetDisplayFormat.label}`;
`2136`	`2137`	`return linkify ?`