Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7115b312
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7115b312
编写于
4月 25, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #47225
上级
e572ffc4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
18 deletion
+44
-18
src/vs/editor/browser/core/editorState.ts
src/vs/editor/browser/core/editorState.ts
+30
-0
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+11
-3
src/vs/editor/contrib/codelens/codelensController.ts
src/vs/editor/contrib/codelens/codelensController.ts
+3
-15
未找到文件。
src/vs/editor/browser/core/editorState.ts
浏览文件 @
7115b312
...
...
@@ -71,3 +71,33 @@ export class EditorState {
return
this
.
_equals
(
new
EditorState
(
editor
,
this
.
flags
));
}
}
export
class
StableEditorScrollState
{
public
static
capture
(
editor
:
ICodeEditor
):
StableEditorScrollState
{
let
visiblePosition
:
Position
=
null
;
let
visiblePositionScrollDelta
=
0
;
if
(
editor
.
getScrollTop
()
!==
0
)
{
const
visibleRanges
=
editor
.
getVisibleRanges
();
if
(
visibleRanges
.
length
>
0
)
{
visiblePosition
=
visibleRanges
[
0
].
getStartPosition
();
const
visiblePositionScrollTop
=
editor
.
getTopForPosition
(
visiblePosition
.
lineNumber
,
visiblePosition
.
column
);
visiblePositionScrollDelta
=
editor
.
getScrollTop
()
-
visiblePositionScrollTop
;
}
}
return
new
StableEditorScrollState
(
visiblePosition
,
visiblePositionScrollDelta
);
}
constructor
(
private
readonly
_visiblePosition
:
Position
,
private
readonly
_visiblePositionScrollDelta
:
number
)
{
}
public
restore
(
editor
:
ICodeEditor
):
void
{
if
(
this
.
_visiblePosition
)
{
const
visiblePositionScrollTop
=
editor
.
getTopForPosition
(
this
.
_visiblePosition
.
lineNumber
,
this
.
_visiblePosition
.
column
);
editor
.
setScrollTop
(
visiblePositionScrollTop
+
this
.
_visiblePositionScrollDelta
);
}
}
}
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
7115b312
...
...
@@ -43,6 +43,7 @@ import URI from 'vs/base/common/uri';
import
{
IStringBuilder
,
createStringBuilder
}
from
'
vs/editor/common/core/stringBuilder
'
;
import
{
IModelDeltaDecoration
,
IModelDecorationsChangeAccessor
,
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
StableEditorScrollState
}
from
'
vs/editor/browser/core/editorState
'
;
interface
IEditorDiffDecorations
{
decorations
:
IModelDeltaDecoration
[];
...
...
@@ -102,7 +103,10 @@ class VisualEditorState {
this
.
_decorations
=
editor
.
deltaDecorations
(
this
.
_decorations
,
[]);
}
public
apply
(
editor
:
CodeEditor
,
overviewRuler
:
editorBrowser
.
IOverviewRuler
,
newDecorations
:
IEditorDiffDecorationsWithZones
):
void
{
public
apply
(
editor
:
CodeEditor
,
overviewRuler
:
editorBrowser
.
IOverviewRuler
,
newDecorations
:
IEditorDiffDecorationsWithZones
,
restoreScrollState
:
boolean
):
void
{
const
scrollState
=
restoreScrollState
?
StableEditorScrollState
.
capture
(
editor
)
:
null
;
// view zones
editor
.
changeViewZones
((
viewChangeAccessor
:
editorBrowser
.
IViewZoneChangeAccessor
)
=>
{
for
(
let
i
=
0
,
length
=
this
.
_zones
.
length
;
i
<
length
;
i
++
)
{
...
...
@@ -118,6 +122,10 @@ class VisualEditorState {
}
});
if
(
scrollState
)
{
scrollState
.
restore
(
editor
);
}
// decorations
this
.
_decorations
=
editor
.
deltaDecorations
(
this
.
_decorations
,
newDecorations
.
decorations
);
...
...
@@ -916,8 +924,8 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
try
{
this
.
_currentlyChangingViewZones
=
true
;
this
.
_originalEditorState
.
apply
(
this
.
originalEditor
,
this
.
_originalOverviewRuler
,
diffDecorations
.
original
);
this
.
_modifiedEditorState
.
apply
(
this
.
modifiedEditor
,
this
.
_modifiedOverviewRuler
,
diffDecorations
.
modified
);
this
.
_originalEditorState
.
apply
(
this
.
originalEditor
,
this
.
_originalOverviewRuler
,
diffDecorations
.
original
,
false
);
this
.
_modifiedEditorState
.
apply
(
this
.
modifiedEditor
,
this
.
_modifiedOverviewRuler
,
diffDecorations
.
modified
,
true
);
}
finally
{
this
.
_currentlyChangingViewZones
=
false
;
}
...
...
src/vs/editor/contrib/codelens/codelensController.ts
浏览文件 @
7115b312
...
...
@@ -10,7 +10,6 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
CodeLensProviderRegistry
,
ICodeLensSymbol
}
from
'
vs/editor/common/modes
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
...
...
@@ -20,6 +19,7 @@ import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOption
import
{
CodeLens
,
CodeLensHelper
}
from
'
vs/editor/contrib/codelens/codelensWidget
'
;
import
{
IModelDecorationsChangeAccessor
}
from
'
vs/editor/common/model
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
StableEditorScrollState
}
from
'
vs/editor/browser/core/editorState
'
;
export
class
CodeLensContribution
implements
editorCommon
.
IEditorContribution
{
...
...
@@ -219,16 +219,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
}
}
let
visiblePosition
:
Position
=
null
;
let
visiblePositionScrollDelta
=
0
;
if
(
this
.
_editor
.
getScrollTop
()
!==
0
)
{
const
visibleRanges
=
this
.
_editor
.
getVisibleRanges
();
if
(
visibleRanges
.
length
>
0
)
{
visiblePosition
=
visibleRanges
[
0
].
getStartPosition
();
const
visiblePositionScrollTop
=
this
.
_editor
.
getTopForPosition
(
visiblePosition
.
lineNumber
,
visiblePosition
.
column
);
visiblePositionScrollDelta
=
this
.
_editor
.
getScrollTop
()
-
visiblePositionScrollTop
;
}
}
const
scrollState
=
StableEditorScrollState
.
capture
(
this
.
_editor
);
this
.
_editor
.
changeDecorations
((
changeAccessor
)
=>
{
this
.
_editor
.
changeViewZones
((
accessor
)
=>
{
...
...
@@ -270,10 +261,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
});
});
if
(
visiblePosition
)
{
const
visiblePositionScrollTop
=
this
.
_editor
.
getTopForPosition
(
visiblePosition
.
lineNumber
,
visiblePosition
.
column
);
this
.
_editor
.
setScrollTop
(
visiblePositionScrollTop
+
visiblePositionScrollDelta
);
}
scrollState
.
restore
(
this
.
_editor
);
}
private
_onViewportChanged
():
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录