Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
521cebb1
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,发现更多精彩内容 >>
提交
521cebb1
编写于
6月 19, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
some TS 2.4 fixes
上级
1f820512
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
9 deletion
+9
-9
src/vs/workbench/common/editor/untitledEditorModel.ts
src/vs/workbench/common/editor/untitledEditorModel.ts
+5
-5
src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
...s/workbench/parts/files/common/editors/fileEditorInput.ts
+3
-3
src/vs/workbench/services/textfile/common/textfiles.ts
src/vs/workbench/services/textfile/common/textfiles.ts
+1
-1
未找到文件。
src/vs/workbench/common/editor/untitledEditorModel.ts
浏览文件 @
521cebb1
...
...
@@ -6,7 +6,7 @@
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
EditorModel
,
IEncodingSupport
}
from
'
vs/workbench/common/editor
'
;
import
{
IEncodingSupport
}
from
'
vs/workbench/common/editor
'
;
import
{
BaseTextEditorModel
}
from
'
vs/workbench/common/editor/textEditorModel
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
PLAINTEXT_MODE_ID
}
from
'
vs/editor/common/modes/modesRegistry
'
;
...
...
@@ -153,7 +153,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
this
.
contentChangeEventScheduler
.
schedule
();
}
public
load
():
TPromise
<
EditorModel
>
{
public
load
():
TPromise
<
Untitled
EditorModel
>
{
// Check for backups first
return
this
.
backupFileService
.
loadBackupResource
(
this
.
resource
).
then
(
backupResource
=>
{
...
...
@@ -183,11 +183,11 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
});
}
private
doLoad
(
content
:
string
):
TPromise
<
EditorModel
>
{
private
doLoad
(
content
:
string
):
TPromise
<
Untitled
EditorModel
>
{
// Create text editor model if not yet done
if
(
!
this
.
textEditorModel
)
{
return
this
.
createTextEditorModel
(
content
,
this
.
resource
,
this
.
modeId
);
return
this
.
createTextEditorModel
(
content
,
this
.
resource
,
this
.
modeId
)
.
then
(
model
=>
this
)
;
}
// Otherwise update
...
...
@@ -195,7 +195,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
this
.
updateTextEditorModel
(
content
);
}
return
TPromise
.
as
<
EditorModel
>
(
this
);
return
TPromise
.
as
<
Untitled
EditorModel
>
(
this
);
}
private
onModelContentChanged
():
void
{
...
...
src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
浏览文件 @
521cebb1
...
...
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
paths
=
require
(
'
vs/base/common/paths
'
);
import
labels
=
require
(
'
vs/base/common/labels
'
);
import
URI
from
'
vs/base/common/uri
'
;
import
{
EncodingMode
,
ConfirmResult
,
EditorInput
,
IFileEditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
EncodingMode
,
ConfirmResult
,
EditorInput
,
IFileEditorInput
,
ITextEditorModel
}
from
'
vs/workbench/common/editor
'
;
import
{
TextFileEditorModel
}
from
'
vs/workbench/services/textfile/common/textFileEditorModel
'
;
import
{
BinaryEditorModel
}
from
'
vs/workbench/common/editor/binaryEditorModel
'
;
import
{
IFileOperationResult
,
FileOperationResult
}
from
'
vs/platform/files/common/files
'
;
...
...
@@ -29,7 +29,7 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
export
class
FileEditorInput
extends
EditorInput
implements
IFileEditorInput
{
private
forceOpenAsBinary
:
boolean
;
private
textModelReference
:
TPromise
<
IReference
<
TextFile
EditorModel
>>
;
private
textModelReference
:
TPromise
<
IReference
<
IText
EditorModel
>>
;
private
name
:
string
;
private
description
:
string
;
...
...
@@ -212,7 +212,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
this
.
textModelReference
=
this
.
textModelResolverService
.
createModelReference
(
this
.
resource
);
}
return
this
.
textModelReference
.
then
(
ref
=>
ref
.
object
);
return
this
.
textModelReference
.
then
(
ref
=>
ref
.
object
as
TextFileEditorModel
);
},
error
=>
{
// In case of an error that indicates that the file is binary or too large, just return with the binary editor model
...
...
src/vs/workbench/services/textfile/common/textfiles.ts
浏览文件 @
521cebb1
...
...
@@ -167,7 +167,7 @@ export interface ITextFileEditorModelManager {
getAll
(
resource
?:
URI
):
ITextFileEditorModel
[];
loadOrCreate
(
resource
:
URI
,
options
?:
IModelLoadOrCreateOptions
):
TPromise
<
ITextEditorModel
>
;
loadOrCreate
(
resource
:
URI
,
options
?:
IModelLoadOrCreateOptions
):
TPromise
<
IText
File
EditorModel
>
;
disposeModel
(
model
:
ITextFileEditorModel
):
void
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录