Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
179829e6
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,发现更多精彩内容 >>
提交
179829e6
编写于
12月 08, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #16881
上级
e0871329
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
19 addition
and
8 deletion
+19
-8
src/vs/workbench/services/history/browser/history.ts
src/vs/workbench/services/history/browser/history.ts
+19
-8
未找到文件。
src/vs/workbench/services/history/browser/history.ts
浏览文件 @
179829e6
...
...
@@ -275,7 +275,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
private
stack
:
IStackEntry
[];
private
index
:
number
;
private
blockStackChanges
:
boolean
;
private
navigatingInStack
:
boolean
;
private
currentFileEditorState
:
EditorState
;
private
history
:
(
IEditorInput
|
IResourceInput
)[];
...
...
@@ -389,7 +389,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
options
=
{
revealIfVisible
:
true
};
}
this
.
blockStackChanges
=
true
;
this
.
navigatingInStack
=
true
;
let
openEditorPromise
:
TPromise
<
IBaseEditor
>
;
if
(
entry
.
input
instanceof
EditorInput
)
{
...
...
@@ -399,9 +399,9 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
}
openEditorPromise
.
done
(()
=>
{
this
.
blockStackChanges
=
false
;
this
.
navigatingInStack
=
false
;
},
error
=>
{
this
.
blockStackChanges
=
false
;
this
.
navigatingInStack
=
false
;
errors
.
onUnexpectedError
(
error
);
});
}
...
...
@@ -462,11 +462,22 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
}
private
handleEditorEventInStack
(
editor
:
IBaseEditor
):
void
{
if
(
this
.
blockStackChanges
)
{
return
;
// while we open an editor due to a navigation, we do not want to update our stack
const
control
=
getCodeEditor
(
editor
);
// treat editor changes that happen as part of stack navigation specially
// we do not want to add a new stack entry as a matter of navigating the
// stack but we need to keep our currentFileEditorState up to date with
// the navigtion that occurs.
if
(
this
.
navigatingInStack
)
{
if
(
control
&&
editor
.
input
)
{
this
.
currentFileEditorState
=
new
EditorState
(
editor
.
input
,
control
.
getSelection
());
}
else
{
this
.
currentFileEditorState
=
null
;
// we navigated to a non file editor
}
return
;
}
const
control
=
getCodeEditor
(
editor
);
if
(
control
&&
editor
.
input
)
{
this
.
handleTextEditorEvent
(
editor
,
control
);
...
...
@@ -508,7 +519,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
}
public
add
(
input
:
IEditorInput
,
options
?:
ITextEditorOptions
,
fromEvent
?:
boolean
):
void
{
if
(
!
this
.
blockStackChanges
)
{
if
(
!
this
.
navigatingInStack
)
{
this
.
addToStack
(
input
,
options
,
fromEvent
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录