[start] to find parent folder use right file in diff

MarekLew · Jun 24, 2018 · 5008209 · MarekLew · Jun 24, 2018 · MarekLew
1 parent a3cde05
commit 5008209
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
@@ -503,7 +503,7 @@ export class WindowsManager implements IWindowsMainService {
  if (potentialWindowsCount === 0 && (filesToOpen.length > 0 || filesToCreate.length > 0 || filesToDiff.length > 0)) {
 
  // Find suitable window or folder path to open files in
- const fileToCheck = filesToOpen[0] || filesToCreate[0] || filesToDiff[0];
+ const fileToCheck = filesToOpen[0] || filesToCreate[0] || (filesToDiff.length > 1 ? filesToDiff[1] : filesToDiff[0]);
  let bestWindowOrFolder = findBestWindowOrFolderForFile({
  windows: WindowsManager.WINDOWS,
  newWindow: openFilesInNewWindow,

diff --git a/src/vs/workbench/parts/stats/node/workspaceStats.ts b/src/vs/workbench/parts/stats/node/workspaceStats.ts
@@ -350,8 +350,8 @@ export class WorkspaceStats implements IWorkbenchContribution {
  return this.parentURI(URI.file(filesToOpen[0].filePath));
  } else if (filesToCreate && filesToCreate.length) {
  return this.parentURI(URI.file(filesToCreate[0].filePath));
- } else if (filesToDiff && filesToDiff.length) {
- return this.parentURI(URI.file(filesToDiff[0].filePath));
+ } else if (filesToDiff && filesToDiff.length > 1) {
+ return this.parentURI(URI.file(filesToDiff[1].filePath));
  }
  return undefined;
  }