Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
3079d6ca
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
Vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3079d6ca
编写于
7月 13, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mr: reload window when opening same workspace with different configuration path
上级
733864d9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
2 deletion
+21
-2
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+21
-2
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
3079d6ca
...
...
@@ -444,6 +444,24 @@ export class WindowsManager implements IWindowsMainService {
const
allWorkspacesToOpen
=
arrays
.
distinct
([...
workspacesToOpen
,
...
workspacesToRestore
],
workspace
=>
workspace
.
id
);
// prevent duplicates
if
(
allWorkspacesToOpen
.
length
>
0
)
{
// Check for existing instances that have same workspace ID but different configuration path
// For now we reload that window with the new configuration so that the configuration path change
// can travel properly.
// TODO@Ben multi root revisit this once we can better transition between workspaces of the same id
allWorkspacesToOpen
.
forEach
(
workspaceToOpen
=>
{
const
existingWindow
=
findWindowOnWorkspace
(
WindowsManager
.
WINDOWS
,
workspaceToOpen
);
if
(
existingWindow
&&
existingWindow
.
openedWorkspace
.
configPath
!==
workspaceToOpen
.
configPath
)
{
usedWindows
.
push
(
this
.
doOpenFolderOrWorkspace
(
openConfig
,
{
workspace
:
workspaceToOpen
},
false
,
filesToOpen
,
filesToCreate
,
filesToDiff
,
existingWindow
));
// Reset these because we handled them
filesToOpen
=
[];
filesToCreate
=
[];
filesToDiff
=
[];
openFolderInNewWindow
=
true
;
// any other folders to open must open in new window then
}
});
// Check for existing instances
const
windowsOnWorkspace
=
arrays
.
coalesce
(
allWorkspacesToOpen
.
map
(
workspaceToOpen
=>
findWindowOnWorkspace
(
WindowsManager
.
WINDOWS
,
workspaceToOpen
)));
if
(
windowsOnWorkspace
.
length
>
0
)
{
...
...
@@ -566,7 +584,7 @@ export class WindowsManager implements IWindowsMainService {
return
window
;
}
private
doOpenFolderOrWorkspace
(
openConfig
:
IOpenConfiguration
,
folderOrWorkspace
:
IWindowToOpen
,
openInNewWindow
:
boolean
,
filesToOpen
:
IPath
[],
filesToCreate
:
IPath
[],
filesToDiff
:
IPath
[]):
CodeWindow
{
private
doOpenFolderOrWorkspace
(
openConfig
:
IOpenConfiguration
,
folderOrWorkspace
:
IWindowToOpen
,
openInNewWindow
:
boolean
,
filesToOpen
:
IPath
[],
filesToCreate
:
IPath
[],
filesToDiff
:
IPath
[]
,
windowToUse
?:
CodeWindow
):
CodeWindow
{
const
browserWindow
=
this
.
openInBrowserWindow
({
userEnv
:
openConfig
.
userEnv
,
cli
:
openConfig
.
cli
,
...
...
@@ -576,7 +594,8 @@ export class WindowsManager implements IWindowsMainService {
filesToOpen
,
filesToCreate
,
filesToDiff
,
forceNewWindow
:
openInNewWindow
forceNewWindow
:
openInNewWindow
,
windowToUse
});
return
browserWindow
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录