Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 31, 2022
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/preferences/browser/settingsTree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member

@roblourens roblourens Jan 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's fine for a candidate but it might be more clear to do this differently - you could write the regex using a backreference like (`|')#...#\1, or even just have parameters like (match, settingKey1, settingKey2) => ... settingKey = settingKey1 ?? settingKey2...

const targetDisplayFormat = settingKeyToDisplayFormat(settingKey);
const targetName = `${targetDisplayFormat.category}: ${targetDisplayFormat.label}`;
return linkify ?
Expand Down