Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
eb2a8e12
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,发现更多精彩内容 >>
提交
eb2a8e12
编写于
10月 19, 2016
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some empty workspace edge cases on Mac
上级
30bb0b77
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
4 deletion
+11
-4
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+5
-2
src/vs/workbench/services/textfile/browser/textFileService.ts
...vs/workbench/services/textfile/browser/textFileService.ts
+6
-2
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
eb2a8e12
...
...
@@ -632,6 +632,9 @@ export class WindowsManager implements IWindowsService {
});
// Get rid of duplicates
iPathsToOpen
=
arrays
.
distinct
(
iPathsToOpen
,
path
=>
{
if
(
!
(
'
workspacePath
'
in
path
))
{
return
path
.
workspacePath
;
}
return
platform
.
isLinux
?
path
.
workspacePath
:
path
.
workspacePath
.
toLowerCase
();
});
}
...
...
@@ -764,8 +767,8 @@ export class WindowsManager implements IWindowsService {
// Emit events
iPathsToOpen
.
forEach
(
iPath
=>
this
.
eventEmitter
.
emit
(
EventTypes
.
OPEN
,
iPath
));
//
Add to
backups
this
.
backupService
.
pushWorkspaceBackupPathsSync
(
iPathsToOpen
.
map
((
path
)
=>
{
//
Start tracking workspace
backups
this
.
backupService
.
pushWorkspaceBackupPathsSync
(
iPathsToOpen
.
filter
(
path
=>
'
workspacePath
'
in
path
).
map
(
path
=>
{
return
Uri
.
file
(
path
.
workspacePath
);
}));
...
...
src/vs/workbench/services/textfile/browser/textFileService.ts
浏览文件 @
eb2a8e12
...
...
@@ -117,7 +117,7 @@ export abstract class TextFileService implements ITextFileService {
private
beforeShutdown
():
boolean
|
TPromise
<
boolean
>
{
// If hot exit is enabled then save the dirty files in the workspace and then exit
if
(
this
.
configuredHotExit
)
{
if
(
this
.
configuredHotExit
&&
this
.
contextService
.
getWorkspace
()
)
{
// If there are no dirty files, clean up and exit
if
(
this
.
getDirty
().
length
===
0
)
{
return
this
.
cleanupBackupsBeforeShutdown
();
...
...
@@ -190,7 +190,11 @@ export abstract class TextFileService implements ITextFileService {
}
private
cleanupBackupsBeforeShutdown
():
boolean
|
TPromise
<
boolean
>
{
return
this
.
backupService
.
removeWorkspaceBackupPath
(
this
.
contextService
.
getWorkspace
().
resource
).
then
(()
=>
{
const
workspace
=
this
.
contextService
.
getWorkspace
();
if
(
!
workspace
)
{
return
TPromise
.
as
(
false
);
// no backups to cleanup, no eto
}
return
this
.
backupService
.
removeWorkspaceBackupPath
(
workspace
.
resource
).
then
(()
=>
{
return
this
.
fileService
.
discardBackups
().
then
(()
=>
{
return
false
;
// no veto
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录