@@ -1322,14 +1322,8 @@ export class ViewCommands implements Disposable {
13221322
13231323 return executeCommand < DiffWithCommandArgs , void > ( 'gitlens.diffWith' , {
13241324 repoPath : repoPath ,
1325- lhs : {
1326- sha : lhsRef ,
1327- uri : lhsUri ,
1328- } ,
1329- rhs : {
1330- sha : rhsRef ,
1331- uri : rhsUri ?? lhsUri ,
1332- } ,
1325+ lhs : { sha : lhsRef , uri : lhsUri } ,
1326+ rhs : { sha : rhsRef , uri : rhsUri ?? lhsUri } ,
13331327 } ) ;
13341328 }
13351329
@@ -1356,11 +1350,7 @@ export class ViewCommands implements Disposable {
13561350 private selectFileForCompare ( node : ViewRefFileNode ) {
13571351 if ( ! ( node instanceof ViewRefFileNode ) || node . ref == null ) return ;
13581352
1359- void setContext ( 'gitlens:views:canCompare:file' , {
1360- ref : node . ref . ref ,
1361- repoPath : node . repoPath ,
1362- uri : node . uri ,
1363- } ) ;
1353+ void setContext ( 'gitlens:views:canCompare:file' , { ref : node . ref . ref , repoPath : node . repoPath , uri : node . uri } ) ;
13641354 }
13651355
13661356 @command ( 'gitlens.views.openChangedFileDiffs' , { args : ( n , o ) => [ n , o ] } )
@@ -1404,14 +1394,8 @@ export class ViewCommands implements Disposable {
14041394 private openChanges ( node : ViewRefFileNode | MergeConflictFileNode ) {
14051395 if ( node . is ( 'conflict-file' ) ) {
14061396 void executeCommand < DiffWithCommandArgs > ( 'gitlens.diffWith' , {
1407- lhs : {
1408- sha : node . status . HEAD . ref ,
1409- uri : GitUri . fromFile ( node . file , node . repoPath , undefined , true ) ,
1410- } ,
1411- rhs : {
1412- sha : 'HEAD' ,
1413- uri : GitUri . fromFile ( node . file , node . repoPath ) ,
1414- } ,
1397+ lhs : { sha : node . status . HEAD . ref , uri : GitUri . fromFile ( node . file , node . repoPath , undefined , true ) } ,
1398+ rhs : { sha : 'HEAD' , uri : GitUri . fromFile ( node . file , node . repoPath ) } ,
14151399 repoPath : node . repoPath ,
14161400 range : editorLineToDiffRange ( 0 ) ,
14171401 showOptions : { preserveFocus : false , preview : false } ,
@@ -1497,11 +1481,7 @@ export class ViewCommands implements Disposable {
14971481 const nodeUri = await repo . git . getBestRevisionUri ( node . file . path , node . ref . ref ) ;
14981482 if ( nodeUri == null ) return Promise . resolve ( ) ;
14991483
1500- const input1 : MergeEditorInputs [ 'input1' ] = {
1501- uri : nodeUri ,
1502- title : `Incoming` ,
1503- detail : ` ${ node . ref . name } ` ,
1504- } ;
1484+ const input1 : MergeEditorInputs [ 'input1' ] = { uri : nodeUri , title : `Incoming` , detail : ` ${ node . ref . name } ` } ;
15051485
15061486 const [ mergeBaseResult , workingUriResult ] = await Promise . allSettled ( [
15071487 repo . git . refs . getMergeBase ( node . ref . ref , 'HEAD' ) ,
@@ -1514,11 +1494,7 @@ export class ViewCommands implements Disposable {
15141494 return Promise . resolve ( ) ;
15151495 }
15161496
1517- const input2 : MergeEditorInputs [ 'input2' ] = {
1518- uri : workingUri ,
1519- title : 'Current' ,
1520- detail : ' Working Tree' ,
1521- } ;
1497+ const input2 : MergeEditorInputs [ 'input2' ] = { uri : workingUri , title : 'Current' , detail : ' Working Tree' } ;
15221498
15231499 const headUri = await repo . git . getBestRevisionUri ( node . file . path , 'HEAD' ) ;
15241500 if ( headUri != null ) {
@@ -1554,11 +1530,7 @@ export class ViewCommands implements Disposable {
15541530 return CommitActions . openChanges (
15551531 node . file ,
15561532 { repoPath : node . repoPath , lhs : mergeBase , rhs : node . ref1 } ,
1557- {
1558- preserveFocus : true ,
1559- preview : true ,
1560- lhsTitle : `${ basename ( node . uri . fsPath ) } (Base)` ,
1561- } ,
1533+ { preserveFocus : true , preview : true , lhsTitle : `${ basename ( node . uri . fsPath ) } (Base)` } ,
15621534 ) ;
15631535 }
15641536
0 commit comments