daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git - use same icon for comparing as core diff editor 

//cc @lszomoru
pull/146588/head
Benjamin Pasero 2022-04-01 17:20:26 +02:00
parent 1adebec08e
commit e8f26b998e
No known key found for this signature in database
GPG Key ID: E6380CC4C8219E65
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/git/src/commands.ts
View File

@ -2670,7 +2670,7 @@ export class CommandCenter {
else if (item.previousRef === 'HEAD' && item.ref === '~') { else if (item.previousRef === 'HEAD' && item.ref === '~') {
title = localize('git.title.index', '{0} (Index)', basename); title = localize('git.title.index', '{0} (Index)', basename);
} else { } else {
title = localize('git.title.diffRefs', '{0} ({1}) ⟷ {0} ({2})', basename, item.shortPreviousRef, item.shortRef); title = localize('git.title.diffRefs', '{0} ({1}) ↔ {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
} }
return { return {
@ -2740,7 +2740,7 @@ export class CommandCenter {
} }
const title = localize('git.title.diff', '{0} ⟷ {1}', leftTitle, rightTitle); const title = localize('git.title.diff', '{0} ↔ {1}', leftTitle, rightTitle);
await commands.executeCommand('vscode.diff', selected.ref === '' ? uri : toGitUri(uri, selected.ref), item.ref === '' ? uri : toGitUri(uri, item.ref), title); await commands.executeCommand('vscode.diff', selected.ref === '' ? uri : toGitUri(uri, selected.ref), item.ref === '' ? uri : toGitUri(uri, item.ref), title);
} }

2
extensions/merge-conflict/src/commandHandler.ts
View File

@ -134,7 +134,7 @@ export default class CommandHandler implements vscode.Disposable {
const docPath = editor.document.uri.path; const docPath = editor.document.uri.path;
const fileName = docPath.substring(docPath.lastIndexOf('/') + 1); // avoid NodeJS path to keep browser webpack small const fileName = docPath.substring(docPath.lastIndexOf('/') + 1); // avoid NodeJS path to keep browser webpack small
const title = localize('compareChangesTitle', '{0}: Current Changes ⟷ Incoming Changes', fileName); const title = localize('compareChangesTitle', '{0}: Current Changes ↔ Incoming Changes', fileName);
const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict'); const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
const openToTheSide = mergeConflictConfig.get<string>('diffViewPosition'); const openToTheSide = mergeConflictConfig.get<string>('diffViewPosition');
const opts: vscode.TextDocumentShowOptions = { const opts: vscode.TextDocumentShowOptions = {