Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1349f0a0
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,发现更多精彩内容 >>
提交
1349f0a0
编写于
5月 27, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
grid - fix npe when closing editor
上级
31694f7a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
15 deletion
+5
-15
src/vs/editor/browser/widget/diffNavigator.ts
src/vs/editor/browser/widget/diffNavigator.ts
+0
-8
src/vs/workbench/browser/parts/editor/editorCommands.ts
src/vs/workbench/browser/parts/editor/editorCommands.ts
+5
-1
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+0
-6
未找到文件。
src/vs/editor/browser/widget/diffNavigator.ts
浏览文件 @
1349f0a0
...
...
@@ -76,7 +76,6 @@ export class DiffNavigator {
if
(
this
.
_options
.
alwaysRevealFirst
)
{
this
.
_disposables
.
push
(
this
.
_editor
.
getModifiedEditor
().
onDidChangeModel
((
e
)
=>
{
this
.
revealFirst
=
true
;
console
.
log
(
'
diff model changed. revealFirst
'
,
this
.
revealFirst
);
}));
}
...
...
@@ -95,16 +94,12 @@ export class DiffNavigator {
this
.
_init
();
this
.
_compute
(
this
.
_editor
.
getLineChanges
());
console
.
log
(
'
_onDiffUpdated, revealFirst
'
,
this
.
revealFirst
);
if
(
this
.
revealFirst
)
{
// Only reveal first on first non-null changes
if
(
this
.
_editor
.
getLineChanges
()
!==
null
)
{
this
.
revealFirst
=
false
;
this
.
nextIdx
=
-
1
;
this
.
next
(
ScrollType
.
Immediate
);
console
.
log
(
'
having line changes, going to next
'
);
}
else
{
console
.
log
(
'
not having any line changes!
'
);
}
}
}
...
...
@@ -174,10 +169,8 @@ export class DiffNavigator {
private
_move
(
fwd
:
boolean
,
scrollType
:
ScrollType
):
void
{
assert
.
ok
(
!
this
.
disposed
,
'
Illegal State - diff navigator has been disposed
'
);
console
.
log
(
'
_move
'
);
if
(
!
this
.
canNavigate
())
{
console
.
log
(
'
!this.canNavigate()
'
);
return
;
}
...
...
@@ -200,7 +193,6 @@ export class DiffNavigator {
this
.
ignoreSelectionChange
=
true
;
try
{
let
pos
=
info
.
range
.
getStartPosition
();
console
.
log
(
'
setting new position:
'
,
pos
);
this
.
_editor
.
setPosition
(
pos
);
this
.
_editor
.
revealPositionInCenter
(
pos
,
scrollType
);
}
finally
{
...
...
src/vs/workbench/browser/parts/editor/editorCommands.ts
浏览文件 @
1349f0a0
...
...
@@ -267,7 +267,11 @@ function getCommandsContext(resourceOrContext: URI | IEditorCommandsContext, con
return
context
;
}
return
resourceOrContext
;
if
(
typeof
resourceOrContext
.
groupId
===
'
number
'
)
{
return
resourceOrContext
;
}
return
void
0
;
}
function
registerOpenEditorAtIndexCommands
():
void
{
...
...
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
浏览文件 @
1349f0a0
...
...
@@ -122,17 +122,12 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
optionsGotApplied
=
(
<
TextEditorOptions
>
options
).
apply
(
diffEditor
,
ScrollType
.
Immediate
);
}
console
.
log
(
'
Diff Editor: setInput()
'
);
// Otherwise restore View State
let
hasPreviousViewState
=
false
;
if
(
!
optionsGotApplied
)
{
hasPreviousViewState
=
this
.
restoreTextDiffEditorViewState
(
input
);
}
console
.
log
(
'
optionsGotApplied
'
,
optionsGotApplied
);
console
.
log
(
'
hasPreviousViewState
'
,
hasPreviousViewState
);
this
.
diffNavigator
=
new
DiffNavigator
(
diffEditor
,
{
alwaysRevealFirst
:
!
optionsGotApplied
&&
!
hasPreviousViewState
// only reveal first change if we had no options or viewstate
});
...
...
@@ -174,7 +169,6 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
if
(
resource
)
{
const
viewState
=
this
.
loadTextEditorViewState
(
resource
);
if
(
viewState
)
{
console
.
log
(
'
restoring viewState
'
,
viewState
);
this
.
getControl
().
restoreViewState
(
viewState
);
return
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录