Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7465e3a3
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,发现更多精彩内容 >>
提交
7465e3a3
编写于
9月 13, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #58254: better logic for restoring top of viewport
上级
80a9557b
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
7 addition
and
5 deletion
+7
-5
src/vs/editor/common/viewModel/viewModelImpl.ts
src/vs/editor/common/viewModel/viewModelImpl.ts
+7
-5
未找到文件。
src/vs/editor/common/viewModel/viewModelImpl.ts
浏览文件 @
7465e3a3
...
@@ -35,7 +35,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
...
@@ -35,7 +35,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
private
hasFocus
:
boolean
;
private
hasFocus
:
boolean
;
private
viewportStartLine
:
number
;
private
viewportStartLine
:
number
;
private
viewportStartLineTrackedRange
:
string
;
private
viewportStartLineTrackedRange
:
string
;
private
viewportStartLine
Top
:
number
;
private
viewportStartLine
Delta
:
number
;
private
readonly
lines
:
IViewModelLinesCollection
;
private
readonly
lines
:
IViewModelLinesCollection
;
public
readonly
coordinatesConverter
:
ICoordinatesConverter
;
public
readonly
coordinatesConverter
:
ICoordinatesConverter
;
public
readonly
viewLayout
:
ViewLayout
;
public
readonly
viewLayout
:
ViewLayout
;
...
@@ -51,7 +51,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
...
@@ -51,7 +51,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
this
.
hasFocus
=
false
;
this
.
hasFocus
=
false
;
this
.
viewportStartLine
=
-
1
;
this
.
viewportStartLine
=
-
1
;
this
.
viewportStartLineTrackedRange
=
null
;
this
.
viewportStartLineTrackedRange
=
null
;
this
.
viewportStartLine
Top
=
0
;
this
.
viewportStartLine
Delta
=
0
;
if
(
USE_IDENTITY_LINES_COLLECTION
&&
this
.
model
.
isTooLargeForTokenization
())
{
if
(
USE_IDENTITY_LINES_COLLECTION
&&
this
.
model
.
isTooLargeForTokenization
())
{
...
@@ -162,7 +162,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
...
@@ -162,7 +162,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
if
(
restorePreviousViewportStart
&&
previousViewportStartModelPosition
)
{
if
(
restorePreviousViewportStart
&&
previousViewportStartModelPosition
)
{
const
viewPosition
=
this
.
coordinatesConverter
.
convertModelPositionToViewPosition
(
previousViewportStartModelPosition
);
const
viewPosition
=
this
.
coordinatesConverter
.
convertModelPositionToViewPosition
(
previousViewportStartModelPosition
);
const
viewPositionTop
=
this
.
viewLayout
.
getVerticalOffsetForLineNumber
(
viewPosition
.
lineNumber
);
const
viewPositionTop
=
this
.
viewLayout
.
getVerticalOffsetForLineNumber
(
viewPosition
.
lineNumber
);
this
.
viewLayout
.
deltaScrollNow
(
0
,
viewPositionTop
-
this
.
viewportStartLineTop
);
this
.
viewLayout
.
setScrollPositionNow
({
scrollTop
:
viewPositionTop
+
this
.
viewportStartLineDelta
}
);
}
}
}
}
...
@@ -252,7 +252,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
...
@@ -252,7 +252,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
if
(
modelRange
)
{
if
(
modelRange
)
{
const
viewPosition
=
this
.
coordinatesConverter
.
convertModelPositionToViewPosition
(
modelRange
.
getStartPosition
());
const
viewPosition
=
this
.
coordinatesConverter
.
convertModelPositionToViewPosition
(
modelRange
.
getStartPosition
());
const
viewPositionTop
=
this
.
viewLayout
.
getVerticalOffsetForLineNumber
(
viewPosition
.
lineNumber
);
const
viewPositionTop
=
this
.
viewLayout
.
getVerticalOffsetForLineNumber
(
viewPosition
.
lineNumber
);
this
.
viewLayout
.
deltaScrollNow
(
0
,
viewPositionTop
-
this
.
viewportStartLineTop
);
this
.
viewLayout
.
setScrollPositionNow
({
scrollTop
:
viewPositionTop
+
this
.
viewportStartLineDelta
}
);
}
}
}
}
}));
}));
...
@@ -450,7 +450,9 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
...
@@ -450,7 +450,9 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
this
.
viewportStartLine
=
startLineNumber
;
this
.
viewportStartLine
=
startLineNumber
;
let
position
=
this
.
coordinatesConverter
.
convertViewPositionToModelPosition
(
new
Position
(
startLineNumber
,
this
.
getLineMinColumn
(
startLineNumber
)));
let
position
=
this
.
coordinatesConverter
.
convertViewPositionToModelPosition
(
new
Position
(
startLineNumber
,
this
.
getLineMinColumn
(
startLineNumber
)));
this
.
viewportStartLineTrackedRange
=
this
.
model
.
_setTrackedRange
(
this
.
viewportStartLineTrackedRange
,
new
Range
(
position
.
lineNumber
,
position
.
column
,
position
.
lineNumber
,
position
.
column
),
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
);
this
.
viewportStartLineTrackedRange
=
this
.
model
.
_setTrackedRange
(
this
.
viewportStartLineTrackedRange
,
new
Range
(
position
.
lineNumber
,
position
.
column
,
position
.
lineNumber
,
position
.
column
),
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
);
this
.
viewportStartLineTop
=
this
.
viewLayout
.
getVerticalOffsetForLineNumber
(
startLineNumber
);
const
viewportStartLineTop
=
this
.
viewLayout
.
getVerticalOffsetForLineNumber
(
startLineNumber
);
const
scrollTop
=
this
.
viewLayout
.
getCurrentScrollTop
();
this
.
viewportStartLineDelta
=
scrollTop
-
viewportStartLineTop
;
}
}
public
getActiveIndentGuide
(
lineNumber
:
number
,
minLineNumber
:
number
,
maxLineNumber
:
number
):
IActiveIndentGuideInfo
{
public
getActiveIndentGuide
(
lineNumber
:
number
,
minLineNumber
:
number
,
maxLineNumber
:
number
):
IActiveIndentGuideInfo
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录