Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e4358ff2
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e4358ff2
编写于
2月 14, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null workspaceEditingService
上级
b7932c78
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
6 deletion
+6
-6
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
...kbench/services/workspace/node/workspaceEditingService.ts
+6
-6
未找到文件。
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
浏览文件 @
e4358ff2
...
@@ -62,7 +62,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -62,7 +62,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
}
}
// Add Folders
// Add Folders
if
(
wantsToAdd
&&
!
wantsToDelete
)
{
if
(
wantsToAdd
&&
!
wantsToDelete
&&
Array
.
isArray
(
foldersToAdd
)
)
{
return
this
.
doAddFolders
(
foldersToAdd
,
index
,
donotNotifyError
);
return
this
.
doAddFolders
(
foldersToAdd
,
index
,
donotNotifyError
);
}
}
...
@@ -78,16 +78,16 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -78,16 +78,16 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
// other folders, we handle this specially and just enter workspace
// other folders, we handle this specially and just enter workspace
// mode with the folders that are being added.
// mode with the folders that are being added.
if
(
this
.
includesSingleFolderWorkspace
(
foldersToDelete
))
{
if
(
this
.
includesSingleFolderWorkspace
(
foldersToDelete
))
{
return
this
.
createAndEnterWorkspace
(
foldersToAdd
);
return
this
.
createAndEnterWorkspace
(
foldersToAdd
!
);
}
}
// if we are not in workspace-state, we just add the folders
// if we are not in workspace-state, we just add the folders
if
(
this
.
contextService
.
getWorkbenchState
()
!==
WorkbenchState
.
WORKSPACE
)
{
if
(
this
.
contextService
.
getWorkbenchState
()
!==
WorkbenchState
.
WORKSPACE
)
{
return
this
.
doAddFolders
(
foldersToAdd
,
index
,
donotNotifyError
);
return
this
.
doAddFolders
(
foldersToAdd
!
,
index
,
donotNotifyError
);
}
}
// finally, update folders within the workspace
// finally, update folders within the workspace
return
this
.
doUpdateFolders
(
foldersToAdd
,
foldersToDelete
,
index
,
donotNotifyError
);
return
this
.
doUpdateFolders
(
foldersToAdd
!
,
foldersToDelete
,
index
,
donotNotifyError
);
}
}
}
}
...
@@ -176,7 +176,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -176,7 +176,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
const
windows
=
await
this
.
windowsService
.
getWindows
();
const
windows
=
await
this
.
windowsService
.
getWindows
();
// Prevent overwriting a workspace that is currently opened in another window
// Prevent overwriting a workspace that is currently opened in another window
if
(
windows
.
some
(
window
=>
window
.
workspace
&&
isEqual
(
window
.
workspace
.
configPath
,
path
)))
{
if
(
windows
.
some
(
window
=>
!!
window
.
workspace
&&
isEqual
(
window
.
workspace
.
configPath
,
path
)))
{
const
options
:
MessageBoxOptions
=
{
const
options
:
MessageBoxOptions
=
{
type
:
'
info
'
,
type
:
'
info
'
,
buttons
:
[
nls
.
localize
(
'
ok
'
,
"
OK
"
)],
buttons
:
[
nls
.
localize
(
'
ok
'
,
"
OK
"
)],
...
@@ -256,7 +256,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -256,7 +256,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
// Reinitialize backup service
// Reinitialize backup service
if
(
this
.
backupFileService
instanceof
BackupFileService
)
{
if
(
this
.
backupFileService
instanceof
BackupFileService
)
{
this
.
backupFileService
.
initialize
(
result
.
backupPath
);
this
.
backupFileService
.
initialize
(
result
.
backupPath
!
);
}
}
// Reinitialize configuration service
// Reinitialize configuration service
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录