Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f6c0093e
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,发现更多精彩内容 >>
提交
f6c0093e
编写于
2月 04, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
history - preserve selections (fix #89699)
上级
c635cab0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
20 deletion
+10
-20
src/vs/workbench/services/history/browser/history.ts
src/vs/workbench/services/history/browser/history.ts
+10
-20
未找到文件。
src/vs/workbench/services/history/browser/history.ts
浏览文件 @
f6c0093e
...
...
@@ -5,7 +5,7 @@
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
IEditor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
ITextEditorOptions
,
IResourceInput
,
ITextEditorSelection
}
from
'
vs/platform/editor/common/editor
'
;
import
{
ITextEditorOptions
,
IResourceInput
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IEditorInput
,
IEditor
as
IBaseEditor
,
Extensions
as
EditorExtensions
,
EditorInput
,
IEditorCloseEvent
,
IEditorInputFactoryRegistry
,
toResource
,
IEditorIdentifier
,
GroupIdentifier
,
EditorsOrder
}
from
'
vs/workbench/common/editor
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IHistoryService
}
from
'
vs/workbench/services/history/common/history
'
;
...
...
@@ -43,21 +43,14 @@ export class TextEditorState {
private
static
readonly
EDITOR_SELECTION_THRESHOLD
=
10
;
// number of lines to move in editor to justify for new state
private
textEditorSelection
?:
ITextEditorSelection
;
constructor
(
private
_editorInput
:
IEditorInput
,
private
_selection
:
Selection
|
null
)
{
this
.
textEditorSelection
=
Selection
.
isISelection
(
_selection
)
?
{
startLineNumber
:
_selection
.
startLineNumber
,
startColumn
:
_selection
.
startColumn
}
:
undefined
;
}
constructor
(
private
_editorInput
:
IEditorInput
,
private
_selection
:
Selection
|
null
)
{
}
get
editorInput
():
IEditorInput
{
return
this
.
_editorInput
;
}
get
selection
():
ITextEditor
Selection
|
undefined
{
return
this
.
textEditorSelection
;
get
selection
():
Selection
|
undefined
{
return
withNullAsUndefined
(
this
.
_selection
)
;
}
justifiesNewPushState
(
other
:
TextEditorState
,
event
?:
ICursorPositionChangedEvent
):
boolean
{
...
...
@@ -91,7 +84,7 @@ interface ISerializedEditorHistoryEntry {
interface
IStackEntry
{
input
:
IEditorInput
|
IResourceInput
;
selection
?:
ITextEditor
Selection
;
selection
?:
Selection
;
}
interface
IRecentlyClosedFile
{
...
...
@@ -436,19 +429,19 @@ export class HistoryService extends Disposable implements IHistoryService {
this
.
addToNavigationStack
(
editor
.
input
);
}
private
addToNavigationStack
(
input
:
IEditorInput
,
selection
?:
ITextEditor
Selection
):
void
{
private
addToNavigationStack
(
input
:
IEditorInput
,
selection
?:
Selection
):
void
{
if
(
!
this
.
navigatingInStack
)
{
this
.
doAddOrReplaceInNavigationStack
(
input
,
selection
);
}
}
private
replaceInNavigationStack
(
input
:
IEditorInput
,
selection
?:
ITextEditor
Selection
):
void
{
private
replaceInNavigationStack
(
input
:
IEditorInput
,
selection
?:
Selection
):
void
{
if
(
!
this
.
navigatingInStack
)
{
this
.
doAddOrReplaceInNavigationStack
(
input
,
selection
,
true
/* force replace */
);
}
}
private
doAddOrReplaceInNavigationStack
(
input
:
IEditorInput
,
selection
?:
ITextEditor
Selection
,
forceReplace
?:
boolean
):
void
{
private
doAddOrReplaceInNavigationStack
(
input
:
IEditorInput
,
selection
?:
Selection
,
forceReplace
?:
boolean
):
void
{
// Overwrite an entry in the stack if we have a matching input that comes
// with editor options to indicate that this entry is more specific. Also
...
...
@@ -528,7 +521,7 @@ export class HistoryService extends Disposable implements IHistoryService {
return
input
;
}
private
sameSelection
(
selectionA
?:
ITextEditorSelection
,
selectionB
?:
ITextEditor
Selection
):
boolean
{
private
sameSelection
(
selectionA
?:
Selection
,
selectionB
?:
Selection
):
boolean
{
if
(
!
selectionA
&&
!
selectionB
)
{
return
true
;
}
...
...
@@ -693,10 +686,7 @@ export class HistoryService extends Disposable implements IHistoryService {
const
position
=
activeTextEditorWidget
.
getPosition
();
if
(
position
)
{
this
.
lastEditLocation
.
selection
=
{
startLineNumber
:
position
.
lineNumber
,
startColumn
:
position
.
column
};
this
.
lastEditLocation
.
selection
=
new
Selection
(
position
.
lineNumber
,
position
.
column
,
position
.
lineNumber
,
position
.
column
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录