Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
53c0599c
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
53c0599c
编写于
11月 27, 2015
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
inputs - some cleanup
上级
4a97fd5b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
5 addition
and
15 deletion
+5
-15
src/vs/workbench/browser/parts/editor/resourceEditorModel.ts
src/vs/workbench/browser/parts/editor/resourceEditorModel.ts
+0
-6
src/vs/workbench/browser/parts/editor/stringEditorModel.ts
src/vs/workbench/browser/parts/editor/stringEditorModel.ts
+2
-6
src/vs/workbench/browser/parts/editor/textEditorModel.ts
src/vs/workbench/browser/parts/editor/textEditorModel.ts
+1
-1
src/vs/workbench/parts/files/browser/editors/textFileEditorModel.ts
...kbench/parts/files/browser/editors/textFileEditorModel.ts
+1
-1
src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
...s/workbench/test/browser/parts/editor/editorModel.test.ts
+1
-1
未找到文件。
src/vs/workbench/browser/parts/editor/resourceEditorModel.ts
浏览文件 @
53c0599c
...
...
@@ -4,17 +4,11 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
BaseTextEditorModel
}
from
'
vs/workbench/browser/parts/editor/textEditorModel
'
;
import
{
IIdentifiedSingleEditOperation
}
from
'
vs/editor/common/editorCommon
'
;
import
{
EditorModel
}
from
'
vs/workbench/common/editor
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
URL
}
from
'
vs/base/common/network
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
/**
* An editor model whith an in-memory, readonly content that is backed by an existing editor model.
...
...
src/vs/workbench/browser/parts/editor/stringEditorModel.ts
浏览文件 @
53c0599c
...
...
@@ -100,10 +100,6 @@ export class StringEditorModel extends BaseTextEditorModel {
return
null
;
}
public
setMime
(
mime
:
string
):
void
{
this
.
mime
=
mime
;
}
public
getMime
():
string
{
return
this
.
mime
;
}
...
...
@@ -112,12 +108,12 @@ export class StringEditorModel extends BaseTextEditorModel {
// Create text editor model if not yet done
if
(
!
this
.
textEditorModel
)
{
return
this
.
createTextEditorModel
(
this
.
value
,
this
.
mime
,
this
.
resourc
e
);
return
this
.
createTextEditorModel
(
this
.
value
,
this
.
resource
,
this
.
mim
e
);
}
// Otherwise update
else
{
this
.
updateTextEditorModel
(
this
.
value
,
this
.
mime
);
this
.
updateTextEditorModel
(
this
.
value
);
}
return
TPromise
.
as
<
EditorModel
>
(
this
);
...
...
src/vs/workbench/browser/parts/editor/textEditorModel.ts
浏览文件 @
53c0599c
...
...
@@ -41,7 +41,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
/**
* Creates the text editor model with the provided value, mime (can be comma separated for multiple values) and optional resource URL.
*/
protected
createTextEditorModel
(
value
:
string
,
mime
?:
string
,
resource
?:
URI
):
TPromise
<
EditorModel
>
{
protected
createTextEditorModel
(
value
:
string
,
resource
?:
URI
,
mime
?:
string
):
TPromise
<
EditorModel
>
{
let
firstLineText
=
this
.
getFirstLineText
(
value
);
// To avoid flickering, give the mode at most 50ms to load. If the mode doesn't load in 50ms, proceed creating the model with a mode promise
...
...
src/vs/workbench/parts/files/browser/editors/textFileEditorModel.ts
浏览文件 @
53c0599c
...
...
@@ -289,7 +289,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin
else
{
diag
(
'
load() - created text editor model
'
,
this
.
resource
,
new
Date
());
this
.
createTextEditorModelPromise
=
this
.
createTextEditorModel
(
content
.
value
,
null
,
content
.
resource
).
then
(()
=>
{
this
.
createTextEditorModelPromise
=
this
.
createTextEditorModel
(
content
.
value
,
content
.
resource
).
then
(()
=>
{
this
.
createTextEditorModelPromise
=
null
;
this
.
setDirty
(
false
);
// Ensure we are not tracking a stale state
...
...
src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
浏览文件 @
53c0599c
...
...
@@ -35,7 +35,7 @@ suite("Workbench - EditorModel", () => {
let
m
=
new
MyTextEditorModel
(
modelService
,
modeService
);
m
.
load
().
then
(
function
(
model
:
any
)
{
assert
(
model
===
m
);
return
model
.
createTextEditorModel
(
"
foo
"
,
"
text/plain
"
).
then
(
function
()
{
return
model
.
createTextEditorModel
(
"
foo
"
,
null
,
"
text/plain
"
).
then
(
function
()
{
assert
.
strictEqual
(
m
.
isResolved
(),
true
);
});
}).
done
(()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录