Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
14a9e0b0
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,发现更多精彩内容 >>
提交
14a9e0b0
编写于
5月 31, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Installer should reopen all last opened folders (fixes #6316)
上级
0e812241
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
51 addition
and
10 deletion
+51
-10
src/vs/code/electron-main/lifecycle.ts
src/vs/code/electron-main/lifecycle.ts
+34
-5
src/vs/code/electron-main/update-manager.ts
src/vs/code/electron-main/update-manager.ts
+1
-1
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+16
-4
未找到文件。
src/vs/code/electron-main/lifecycle.ts
浏览文件 @
14a9e0b0
...
...
@@ -11,7 +11,8 @@ import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
import
{
ReadyState
,
VSCodeWindow
}
from
'
vs/code/electron-main/window
'
;
import
{
IEnvironmentService
}
from
'
vs/code/electron-main/env
'
;
import
{
ServiceIdentifier
,
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ILogService
}
from
'
./log
'
;
import
{
ILogService
}
from
'
vs/code/electron-main/log
'
;
import
{
IStorageService
}
from
'
vs/code/electron-main/storage
'
;
const
EventTypes
=
{
BEFORE_QUIT
:
'
before-quit
'
...
...
@@ -21,31 +22,56 @@ export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleSe
export
interface
ILifecycleService
{
serviceId
:
ServiceIdentifier
<
any
>
;
/**
* Will be true if an update was applied. Will only be true for each update once.
*/
wasUpdated
:
boolean
;
onBeforeQuit
(
clb
:
()
=>
void
):
()
=>
void
;
ready
():
void
;
registerWindow
(
vscodeWindow
:
VSCodeWindow
):
void
;
unload
(
vscodeWindow
:
VSCodeWindow
):
TPromise
<
boolean
/* veto */
>
;
quit
():
TPromise
<
boolean
/* veto */
>
;
quit
(
fromUpdate
?:
boolean
):
TPromise
<
boolean
/* veto */
>
;
}
export
class
LifecycleService
implements
ILifecycleService
{
serviceId
=
ILifecycleService
;
private
static
QUIT_FROM_UPDATE_MARKER
=
'
quit.from.update
'
;
// use a marker to find out if an update was applied in the previous session
private
eventEmitter
=
new
EventEmitter
();
private
windowToCloseRequest
:
{
[
windowId
:
string
]:
boolean
};
private
quitRequested
:
boolean
;
private
pendingQuitPromise
:
TPromise
<
boolean
>
;
private
pendingQuitPromiseComplete
:
TValueCallback
<
boolean
>
;
private
oneTimeListenerTokenGenerator
:
number
;
private
_wasUpdated
:
boolean
;
constructor
(
@
IEnvironmentService
private
envService
:
IEnvironmentService
,
@
ILogService
private
logService
:
ILogService
@
ILogService
private
logService
:
ILogService
,
@
IStorageService
private
storageService
:
IStorageService
)
{
this
.
windowToCloseRequest
=
Object
.
create
(
null
);
this
.
quitRequested
=
false
;
this
.
oneTimeListenerTokenGenerator
=
0
;
this
.
_wasUpdated
=
false
;
this
.
handleUpdated
();
}
private
handleUpdated
():
void
{
this
.
_wasUpdated
=
!!
this
.
storageService
.
getItem
(
LifecycleService
.
QUIT_FROM_UPDATE_MARKER
);
if
(
this
.
_wasUpdated
)
{
this
.
storageService
.
removeItem
(
LifecycleService
.
QUIT_FROM_UPDATE_MARKER
);
// remove the marker right after if found
}
}
public
get
wasUpdated
():
boolean
{
return
this
.
_wasUpdated
;
}
/**
...
...
@@ -157,17 +183,20 @@ export class LifecycleService implements ILifecycleService {
* A promise that completes to indicate if the quit request has been veto'd
* by the user or not.
*/
public
quit
():
TPromise
<
boolean
/* veto */
>
{
public
quit
(
fromUpdate
?:
boolean
):
TPromise
<
boolean
/* veto */
>
{
this
.
logService
.
log
(
'
Lifecycle#quit()
'
);
if
(
!
this
.
pendingQuitPromise
)
{
this
.
pendingQuitPromise
=
new
TPromise
<
boolean
>
(
(
c
)
=>
{
this
.
pendingQuitPromise
=
new
TPromise
<
boolean
>
(
c
=>
{
// Store as field to access it from a window cancellation
this
.
pendingQuitPromiseComplete
=
c
;
app
.
once
(
'
will-quit
'
,
()
=>
{
if
(
this
.
pendingQuitPromiseComplete
)
{
if
(
fromUpdate
)
{
this
.
storageService
.
setItem
(
LifecycleService
.
QUIT_FROM_UPDATE_MARKER
,
true
);
}
this
.
pendingQuitPromiseComplete
(
false
/* no veto */
);
this
.
pendingQuitPromiseComplete
=
null
;
this
.
pendingQuitPromise
=
null
;
...
...
src/vs/code/electron-main/update-manager.ts
浏览文件 @
14a9e0b0
...
...
@@ -143,7 +143,7 @@ export class UpdateManager extends EventEmitter implements IUpdateService {
}
private
quitAndUpdate
(
rawQuitAndUpdate
:
()
=>
void
):
void
{
this
.
lifecycleService
.
quit
().
done
(
vetod
=>
{
this
.
lifecycleService
.
quit
(
true
/* from update */
).
done
(
vetod
=>
{
if
(
vetod
)
{
return
;
}
...
...
src/vs/code/electron-main/windows.ts
浏览文件 @
14a9e0b0
...
...
@@ -21,7 +21,7 @@ import { ICommandLineArguments, IProcessEnvironment, IEnvironmentService, IParse
import
{
ILifecycleService
}
from
'
vs/code/electron-main/lifecycle
'
;
import
{
ISettingsService
}
from
'
vs/code/electron-main/settings
'
;
import
{
IUpdateService
,
IUpdate
}
from
'
vs/code/electron-main/update-manager
'
;
import
{
ILogService
}
from
'
.
/log
'
;
import
{
ILogService
}
from
'
vs/code/electron-main/
/log
'
;
import
{
ServiceIdentifier
,
createDecorator
,
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
const
EventTypes
=
{
...
...
@@ -74,6 +74,12 @@ interface INativeOpenDialogOptions {
forceNewWindow
?:
boolean
;
}
const
ReopenFoldersSetting
=
{
ALL
:
'
all
'
,
ONE
:
'
one
'
,
NONE
:
'
none
'
};
export
const
IWindowsService
=
createDecorator
<
IWindowsService
>
(
'
windowsService
'
);
export
interface
IWindowsService
{
...
...
@@ -841,11 +847,17 @@ export class WindowsManager implements IWindowsService {
// No path argument, check settings for what to do now
else
{
let
reopenFolders
=
this
.
settingsService
.
getValue
(
'
window.reopenFolders
'
,
'
one
'
);
let
reopenFolders
:
string
;
if
(
this
.
lifecycleService
.
wasUpdated
)
{
reopenFolders
=
ReopenFoldersSetting
.
ALL
;
// always reopen all folders when an update was applied
}
else
{
reopenFolders
=
this
.
settingsService
.
getValue
(
'
window.reopenFolders
'
,
ReopenFoldersSetting
.
ONE
);
}
let
lastActiveFolder
=
this
.
windowsState
.
lastActiveWindow
&&
this
.
windowsState
.
lastActiveWindow
.
workspacePath
;
// Restore all
if
(
reopenFolders
===
'
all
'
)
{
if
(
reopenFolders
===
ReopenFoldersSetting
.
ALL
)
{
let
lastOpenedFolders
=
this
.
windowsState
.
openedFolders
.
map
(
o
=>
o
.
workspacePath
);
// If we have a last active folder, move it to the end
...
...
@@ -858,7 +870,7 @@ export class WindowsManager implements IWindowsService {
}
// Restore last active
else
if
(
lastActiveFolder
&&
(
reopenFolders
===
'
one
'
||
reopenFolders
!==
'
none
'
))
{
else
if
(
lastActiveFolder
&&
(
reopenFolders
===
ReopenFoldersSetting
.
ONE
||
reopenFolders
!==
ReopenFoldersSetting
.
NONE
))
{
candidates
.
push
(
lastActiveFolder
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录