Git - remove the use of in (#277077)

This commit is contained in:
Ladislau Szomoru
2025-11-13 08:51:35 +00:00
committed by GitHub
parent 5a8ee1f2fc
commit ffcd44e6a1
3 changed files with 8 additions and 8 deletions

View File

@@ -192,8 +192,6 @@ export default tseslint.config(
'extensions/debug-auto-launch/src/extension.ts', 'extensions/debug-auto-launch/src/extension.ts',
'extensions/emmet/src/updateImageSize.ts', 'extensions/emmet/src/updateImageSize.ts',
'extensions/emmet/src/util.ts', 'extensions/emmet/src/util.ts',
'extensions/git/src/blame.ts',
'extensions/github/src/links.ts',
'extensions/github-authentication/src/node/fetch.ts', 'extensions/github-authentication/src/node/fetch.ts',
'extensions/terminal-suggest/src/fig/figInterface.ts', 'extensions/terminal-suggest/src/fig/figInterface.ts',
'extensions/terminal-suggest/src/fig/fig-autocomplete-shared/mixins.ts', 'extensions/terminal-suggest/src/fig/fig-autocomplete-shared/mixins.ts',

View File

@@ -196,7 +196,9 @@ export class GitBlameController {
} satisfies BlameInformationTemplateTokens; } satisfies BlameInformationTemplateTokens;
return template.replace(/\$\{(.+?)\}/g, (_, token) => { return template.replace(/\$\{(.+?)\}/g, (_, token) => {
return token in templateTokens ? templateTokens[token as keyof BlameInformationTemplateTokens] : `\${${token}}`; return templateTokens.hasOwnProperty(token)
? templateTokens[token as keyof BlameInformationTemplateTokens]
: `\${${token}}`;
}); });
} }

View File

@@ -47,12 +47,12 @@ interface EditorLineNumberContext {
export type LinkContext = vscode.Uri | EditorLineNumberContext | undefined; export type LinkContext = vscode.Uri | EditorLineNumberContext | undefined;
function extractContext(context: LinkContext): { fileUri: vscode.Uri | undefined; lineNumber: number | undefined } { function extractContext(context: LinkContext): { fileUri: vscode.Uri | undefined; lineNumber: number | undefined } {
if (context instanceof vscode.Uri) { if (context === undefined) {
return { fileUri: context, lineNumber: undefined };
} else if (context !== undefined && 'lineNumber' in context && 'uri' in context) {
return { fileUri: context.uri, lineNumber: context.lineNumber };
} else {
return { fileUri: undefined, lineNumber: undefined }; return { fileUri: undefined, lineNumber: undefined };
} else if (context instanceof vscode.Uri) {
return { fileUri: context, lineNumber: undefined };
} else {
return { fileUri: context.uri, lineNumber: context.lineNumber };
} }
} }