Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
314564c5
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,发现更多精彩内容 >>
提交
314564c5
编写于
3月 04, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null check diffEditorModel
上级
d52d4bb0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
8 deletion
+16
-8
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+2
-0
src/vs/workbench/common/editor/diffEditorModel.ts
src/vs/workbench/common/editor/diffEditorModel.ts
+14
-8
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
314564c5
...
...
@@ -141,6 +141,7 @@
"./vs/workbench/common/editor.ts"
,
"./vs/workbench/common/editor/binaryEditorModel.ts"
,
"./vs/workbench/common/editor/dataUriEditorInput.ts"
,
"./vs/workbench/common/editor/diffEditorInput.ts"
,
"./vs/workbench/common/editor/diffEditorModel.ts"
,
"./vs/workbench/common/editor/editorGroup.ts"
,
"./vs/workbench/common/editor/resourceEditorInput.ts"
,
...
...
@@ -251,6 +252,7 @@
"./vs/workbench/contrib/output/common/output.ts"
,
"./vs/workbench/contrib/output/common/outputLinkComputer.ts"
,
"./vs/workbench/contrib/output/common/outputLinkProvider.ts"
,
"./vs/workbench/contrib/output/electron-browser/outputServices.ts"
,
"./vs/workbench/contrib/output/node/outputAppender.ts"
,
"./vs/workbench/contrib/preferences/browser/settingsWidgets.ts"
,
"./vs/workbench/contrib/preferences/common/smartSnippetInserter.ts"
,
...
...
src/vs/workbench/common/editor/diffEditorModel.ts
浏览文件 @
314564c5
...
...
@@ -11,33 +11,39 @@ import { IEditorModel } from 'vs/platform/editor/common/editor';
* and the modified version.
*/
export
class
DiffEditorModel
extends
EditorModel
{
protected
_originalModel
:
IEditorModel
;
protected
_modifiedModel
:
IEditorModel
;
protected
_originalModel
:
IEditorModel
|
null
;
protected
_modifiedModel
:
IEditorModel
|
null
;
constructor
(
originalModel
:
IEditorModel
,
modifiedModel
:
IEditorMode
l
)
{
constructor
(
originalModel
:
IEditorModel
|
null
,
modifiedModel
:
IEditorModel
|
nul
l
)
{
super
();
this
.
_originalModel
=
originalModel
;
this
.
_modifiedModel
=
modifiedModel
;
}
get
originalModel
():
EditorModel
{
get
originalModel
():
EditorModel
|
null
{
if
(
!
this
.
_originalModel
)
{
return
null
;
}
return
this
.
_originalModel
as
EditorModel
;
}
get
modifiedModel
():
EditorModel
{
get
modifiedModel
():
EditorModel
|
null
{
if
(
!
this
.
_modifiedModel
)
{
return
null
;
}
return
this
.
_modifiedModel
as
EditorModel
;
}
load
():
Promise
<
EditorModel
>
{
return
Promise
.
all
([
this
.
_originalModel
.
load
(
),
this
.
_modifiedModel
.
load
()
this
.
_originalModel
?
this
.
_originalModel
.
load
()
:
Promise
.
resolve
(
undefined
),
this
.
_modifiedModel
?
this
.
_modifiedModel
.
load
()
:
Promise
.
resolve
(
undefined
),
]).
then
(()
=>
this
);
}
isResolved
():
boolean
{
return
this
.
originalModel
.
isResolved
()
&&
this
.
modifiedModel
.
isResolved
();
return
!!
this
.
originalModel
&&
this
.
originalModel
.
isResolved
()
&&
!!
this
.
modifiedModel
&&
this
.
modifiedModel
.
isResolved
();
}
dispose
():
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录