Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d69d21c6
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,发现更多精彩内容 >>
提交
d69d21c6
编写于
12月 12, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
first cut of preventing untitled from reopening when hot exit is turned off (for #17080)
上级
a9b517fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
12 deletion
+22
-12
src/vs/workbench/browser/parts/editor/editor.contribution.ts
src/vs/workbench/browser/parts/editor/editor.contribution.ts
+12
-11
src/vs/workbench/services/textfile/common/textFileService.ts
src/vs/workbench/services/textfile/common/textFileService.ts
+5
-1
src/vs/workbench/services/textfile/common/textfiles.ts
src/vs/workbench/services/textfile/common/textfiles.ts
+5
-0
未找到文件。
src/vs/workbench/browser/parts/editor/editor.contribution.ts
浏览文件 @
d69d21c6
...
...
@@ -22,6 +22,7 @@ import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorIn
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
KeybindingsRegistry
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
TextDiffEditor
}
from
'
vs/workbench/browser/parts/editor/textDiffEditor
'
;
import
{
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
BinaryResourceDiffEditor
}
from
'
vs/workbench/browser/parts/editor/binaryDiffEditor
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
...
...
@@ -97,16 +98,20 @@ interface ISerializedUntitledEditorInput {
resource
:
string
;
}
let
untitledEditorServiceAccessor
:
UntitledEditorServiceAccessor
;
class
UntitledEditorServiceAccessor
{
constructor
(
@
IUntitledEditorService
public
untitledEditorService
:
IUntitledEditorService
)
{
}
}
// Register Editor Input Factory
class
UntitledEditorInputFactory
implements
IEditorInputFactory
{
constructor
(
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
ITextFileService
private
textFileService
:
ITextFileService
)
{
}
public
serialize
(
editorInput
:
EditorInput
):
string
{
if
(
!
this
.
textFileService
.
isHotExitEnabled
)
{
return
null
;
// never restore untitled unless hot exit is enabled
}
const
untitledEditorInput
=
<
UntitledEditorInput
>
editorInput
;
let
resource
=
untitledEditorInput
.
getResource
();
...
...
@@ -122,11 +127,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
public
deserialize
(
instantiationService
:
IInstantiationService
,
serializedEditorInput
:
string
):
EditorInput
{
const
deserialized
:
ISerializedUntitledEditorInput
=
JSON
.
parse
(
serializedEditorInput
);
if
(
!
untitledEditorServiceAccessor
)
{
untitledEditorServiceAccessor
=
instantiationService
.
createInstance
(
UntitledEditorServiceAccessor
);
}
return
untitledEditorServiceAccessor
.
untitledEditorService
.
createOrGet
(
URI
.
parse
(
deserialized
.
resource
));
return
this
.
untitledEditorService
.
createOrGet
(
URI
.
parse
(
deserialized
.
resource
));
}
}
...
...
src/vs/workbench/services/textfile/common/textFileService.ts
浏览文件 @
d69d21c6
...
...
@@ -141,7 +141,7 @@ export abstract class TextFileService implements ITextFileService {
if
(
dirty
.
length
)
{
// If hot exit is enabled, backup dirty files and allow to exit without confirmation
if
(
this
.
configuredHotExit
)
{
if
(
this
.
isHotExitEnabled
)
{
this
.
showHotExitMessage
();
return
this
.
backupBeforeShutdown
(
dirty
,
this
.
models
,
reason
).
then
(
result
=>
{
...
...
@@ -671,6 +671,10 @@ export abstract class TextFileService implements ITextFileService {
};
}
public
get
isHotExitEnabled
():
boolean
{
return
!
this
.
environmentService
.
isExtensionDevelopment
&&
this
.
configuredHotExit
;
}
public
dispose
():
void
{
this
.
toUnbind
=
dispose
(
this
.
toUnbind
);
...
...
src/vs/workbench/services/textfile/common/textfiles.ts
浏览文件 @
d69d21c6
...
...
@@ -339,4 +339,9 @@ export interface ITextFileService extends IDisposable {
* Convinient fast access to the raw configured auto save settings.
*/
getAutoSaveConfiguration
():
IAutoSaveConfiguration
;
/**
* Convinient fast access to the hot exit file setting.
*/
isHotExitEnabled
:
boolean
;
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录