Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a7c698ce
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,发现更多精彩内容 >>
未验证
提交
a7c698ce
编写于
5月 19, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move view layout modification through view model
上级
4bb364cc
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
58 addition
and
50 deletion
+58
-50
src/vs/editor/browser/controller/pointerHandler.ts
src/vs/editor/browser/controller/pointerHandler.ts
+3
-3
src/vs/editor/browser/view/viewImpl.ts
src/vs/editor/browser/view/viewImpl.ts
+2
-3
src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
...itor/browser/viewParts/editorScrollbar/editorScrollbar.ts
+1
-1
src/vs/editor/browser/viewParts/lines/viewLines.ts
src/vs/editor/browser/viewParts/lines/viewLines.ts
+4
-4
src/vs/editor/browser/viewParts/minimap/minimap.ts
src/vs/editor/browser/viewParts/minimap/minimap.ts
+1
-1
src/vs/editor/browser/viewParts/viewZones/viewZones.ts
src/vs/editor/browser/viewParts/viewZones/viewZones.ts
+8
-12
src/vs/editor/browser/widget/codeEditorWidget.ts
src/vs/editor/browser/widget/codeEditorWidget.ts
+3
-3
src/vs/editor/common/viewLayout/linesLayout.ts
src/vs/editor/common/viewLayout/linesLayout.ts
+8
-5
src/vs/editor/common/viewLayout/viewLayout.ts
src/vs/editor/common/viewLayout/viewLayout.ts
+6
-3
src/vs/editor/common/viewModel/viewModel.ts
src/vs/editor/common/viewModel/viewModel.ts
+4
-12
src/vs/editor/common/viewModel/viewModelImpl.ts
src/vs/editor/common/viewModel/viewModelImpl.ts
+14
-1
src/vs/editor/test/common/viewLayout/linesLayout.test.ts
src/vs/editor/test/common/viewLayout/linesLayout.test.ts
+4
-2
未找到文件。
src/vs/editor/browser/controller/pointerHandler.ts
浏览文件 @
a7c698ce
...
@@ -100,7 +100,7 @@ class StandardPointerHandler extends MouseHandler implements IDisposable {
...
@@ -100,7 +100,7 @@ class StandardPointerHandler extends MouseHandler implements IDisposable {
}
}
private
_onGestureChange
(
e
:
IThrottledGestureEvent
):
void
{
private
_onGestureChange
(
e
:
IThrottledGestureEvent
):
void
{
this
.
_context
.
viewLayout
.
deltaScrollNow
(
-
e
.
translationX
,
-
e
.
translationY
);
this
.
_context
.
model
.
deltaScrollNow
(
-
e
.
translationX
,
-
e
.
translationY
);
}
}
public
dispose
():
void
{
public
dispose
():
void
{
...
@@ -177,7 +177,7 @@ export class PointerEventHandler extends MouseHandler {
...
@@ -177,7 +177,7 @@ export class PointerEventHandler extends MouseHandler {
private
onChange
(
e
:
GestureEvent
):
void
{
private
onChange
(
e
:
GestureEvent
):
void
{
if
(
this
.
_lastPointerType
===
'
touch
'
)
{
if
(
this
.
_lastPointerType
===
'
touch
'
)
{
this
.
_context
.
viewLayout
.
deltaScrollNow
(
-
e
.
translationX
,
-
e
.
translationY
);
this
.
_context
.
model
.
deltaScrollNow
(
-
e
.
translationX
,
-
e
.
translationY
);
}
}
}
}
...
@@ -215,7 +215,7 @@ class TouchHandler extends MouseHandler {
...
@@ -215,7 +215,7 @@ class TouchHandler extends MouseHandler {
}
}
private
onChange
(
e
:
GestureEvent
):
void
{
private
onChange
(
e
:
GestureEvent
):
void
{
this
.
_context
.
viewLayout
.
deltaScrollNow
(
-
e
.
translationX
,
-
e
.
translationY
);
this
.
_context
.
model
.
deltaScrollNow
(
-
e
.
translationX
,
-
e
.
translationY
);
}
}
}
}
...
...
src/vs/editor/browser/view/viewImpl.ts
浏览文件 @
a7c698ce
...
@@ -443,11 +443,11 @@ export class View extends ViewEventHandler {
...
@@ -443,11 +443,11 @@ export class View extends ViewEventHandler {
}
}
public
restoreState
(
scrollPosition
:
{
scrollLeft
:
number
;
scrollTop
:
number
;
}):
void
{
public
restoreState
(
scrollPosition
:
{
scrollLeft
:
number
;
scrollTop
:
number
;
}):
void
{
this
.
_context
.
viewLayout
.
setScrollPosition
({
scrollTop
:
scrollPosition
.
scrollTop
},
ScrollType
.
Immediate
);
this
.
_context
.
model
.
setScrollPosition
({
scrollTop
:
scrollPosition
.
scrollTop
},
ScrollType
.
Immediate
);
this
.
_context
.
model
.
tokenizeViewport
();
this
.
_context
.
model
.
tokenizeViewport
();
this
.
_renderNow
();
this
.
_renderNow
();
this
.
viewLines
.
updateLineWidths
();
this
.
viewLines
.
updateLineWidths
();
this
.
_context
.
viewLayout
.
setScrollPosition
({
scrollLeft
:
scrollPosition
.
scrollLeft
},
ScrollType
.
Immediate
);
this
.
_context
.
model
.
setScrollPosition
({
scrollLeft
:
scrollPosition
.
scrollLeft
},
ScrollType
.
Immediate
);
}
}
public
getOffsetForColumn
(
modelLineNumber
:
number
,
modelColumn
:
number
):
number
{
public
getOffsetForColumn
(
modelLineNumber
:
number
,
modelColumn
:
number
):
number
{
...
@@ -480,7 +480,6 @@ export class View extends ViewEventHandler {
...
@@ -480,7 +480,6 @@ export class View extends ViewEventHandler {
return
this
.
_renderOnce
(()
=>
{
return
this
.
_renderOnce
(()
=>
{
const
zonesHaveChanged
=
this
.
viewZones
.
changeViewZones
(
callback
);
const
zonesHaveChanged
=
this
.
viewZones
.
changeViewZones
(
callback
);
if
(
zonesHaveChanged
)
{
if
(
zonesHaveChanged
)
{
this
.
_context
.
viewLayout
.
onHeightMaybeChanged
();
this
.
_context
.
privateViewEventBus
.
emit
(
new
viewEvents
.
ViewZonesChangedEvent
());
this
.
_context
.
privateViewEventBus
.
emit
(
new
viewEvents
.
ViewZonesChangedEvent
());
}
}
return
zonesHaveChanged
;
return
zonesHaveChanged
;
...
...
src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
浏览文件 @
a7c698ce
...
@@ -88,7 +88,7 @@ export class EditorScrollbar extends ViewPart {
...
@@ -88,7 +88,7 @@ export class EditorScrollbar extends ViewPart {
}
}
}
}
this
.
_context
.
viewLayout
.
setScrollPosition
(
newScrollPosition
,
ScrollType
.
Immediate
);
this
.
_context
.
model
.
setScrollPosition
(
newScrollPosition
,
ScrollType
.
Immediate
);
};
};
// I've seen this happen both on the view dom node & on the lines content dom node.
// I've seen this happen both on the view dom node & on the lines content dom node.
...
...
src/vs/editor/browser/viewParts/lines/viewLines.ts
浏览文件 @
a7c698ce
...
@@ -282,7 +282,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
...
@@ -282,7 +282,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
const
scrollTopDelta
=
Math
.
abs
(
this
.
_context
.
viewLayout
.
getCurrentScrollTop
()
-
newScrollPosition
.
scrollTop
);
const
scrollTopDelta
=
Math
.
abs
(
this
.
_context
.
viewLayout
.
getCurrentScrollTop
()
-
newScrollPosition
.
scrollTop
);
const
scrollType
=
(
scrollTopDelta
<=
this
.
_lineHeight
?
ScrollType
.
Immediate
:
e
.
scrollType
);
const
scrollType
=
(
scrollTopDelta
<=
this
.
_lineHeight
?
ScrollType
.
Immediate
:
e
.
scrollType
);
this
.
_context
.
viewLayout
.
setScrollPosition
(
newScrollPosition
,
scrollType
);
this
.
_context
.
model
.
setScrollPosition
(
newScrollPosition
,
scrollType
);
return
true
;
return
true
;
}
}
...
@@ -307,7 +307,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
...
@@ -307,7 +307,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
return
this
.
_visibleLines
.
onTokensChanged
(
e
);
return
this
.
_visibleLines
.
onTokensChanged
(
e
);
}
}
public
onZonesChanged
(
e
:
viewEvents
.
ViewZonesChangedEvent
):
boolean
{
public
onZonesChanged
(
e
:
viewEvents
.
ViewZonesChangedEvent
):
boolean
{
this
.
_context
.
viewLayout
.
onMaxLineWidthChanged
(
this
.
_maxLineWidth
);
this
.
_context
.
model
.
setMaxLineWidth
(
this
.
_maxLineWidth
);
return
this
.
_visibleLines
.
onZonesChanged
(
e
);
return
this
.
_visibleLines
.
onZonesChanged
(
e
);
}
}
public
onThemeChanged
(
e
:
viewEvents
.
ViewThemeChangedEvent
):
boolean
{
public
onThemeChanged
(
e
:
viewEvents
.
ViewThemeChangedEvent
):
boolean
{
...
@@ -587,7 +587,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
...
@@ -587,7 +587,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
this
.
_ensureMaxLineWidth
(
newScrollLeft
.
maxHorizontalOffset
);
this
.
_ensureMaxLineWidth
(
newScrollLeft
.
maxHorizontalOffset
);
}
}
// set `scrollLeft`
// set `scrollLeft`
this
.
_context
.
viewLayout
.
setScrollPosition
({
this
.
_context
.
model
.
setScrollPosition
({
scrollLeft
:
newScrollLeft
.
scrollLeft
scrollLeft
:
newScrollLeft
.
scrollLeft
},
horizontalRevealRequest
.
scrollType
);
},
horizontalRevealRequest
.
scrollType
);
}
}
...
@@ -626,7 +626,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
...
@@ -626,7 +626,7 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
const
iLineWidth
=
Math
.
ceil
(
lineWidth
);
const
iLineWidth
=
Math
.
ceil
(
lineWidth
);
if
(
this
.
_maxLineWidth
<
iLineWidth
)
{
if
(
this
.
_maxLineWidth
<
iLineWidth
)
{
this
.
_maxLineWidth
=
iLineWidth
;
this
.
_maxLineWidth
=
iLineWidth
;
this
.
_context
.
viewLayout
.
onMaxLineWidthChanged
(
this
.
_maxLineWidth
);
this
.
_context
.
model
.
setMaxLineWidth
(
this
.
_maxLineWidth
);
}
}
}
}
...
...
src/vs/editor/browser/viewParts/minimap/minimap.ts
浏览文件 @
a7c698ce
...
@@ -1022,7 +1022,7 @@ export class Minimap extends ViewPart implements IMinimapModel {
...
@@ -1022,7 +1022,7 @@ export class Minimap extends ViewPart implements IMinimapModel {
}
}
public
setScrollTop
(
scrollTop
:
number
):
void
{
public
setScrollTop
(
scrollTop
:
number
):
void
{
this
.
_context
.
viewLayout
.
setScrollPosition
({
this
.
_context
.
model
.
setScrollPosition
({
scrollTop
:
scrollTop
scrollTop
:
scrollTop
},
ScrollType
.
Immediate
);
},
ScrollType
.
Immediate
);
}
}
...
...
src/vs/editor/browser/viewParts/viewZones/viewZones.ts
浏览文件 @
a7c698ce
...
@@ -79,9 +79,8 @@ export class ViewZones extends ViewPart {
...
@@ -79,9 +79,8 @@ export class ViewZones extends ViewPart {
for
(
const
whitespace
of
whitespaces
)
{
for
(
const
whitespace
of
whitespaces
)
{
oldWhitespaces
.
set
(
whitespace
.
id
,
whitespace
);
oldWhitespaces
.
set
(
whitespace
.
id
,
whitespace
);
}
}
return
this
.
_context
.
viewLayout
.
changeWhitespace
((
whitespaceAccessor
:
IWhitespaceChangeAccessor
)
=>
{
let
hadAChange
=
false
;
let
hadAChange
=
false
;
this
.
_context
.
model
.
changeWhitespace
((
whitespaceAccessor
:
IWhitespaceChangeAccessor
)
=>
{
const
keys
=
Object
.
keys
(
this
.
_zones
);
const
keys
=
Object
.
keys
(
this
.
_zones
);
for
(
let
i
=
0
,
len
=
keys
.
length
;
i
<
len
;
i
++
)
{
for
(
let
i
=
0
,
len
=
keys
.
length
;
i
<
len
;
i
++
)
{
const
id
=
keys
[
i
];
const
id
=
keys
[
i
];
...
@@ -94,9 +93,8 @@ export class ViewZones extends ViewPart {
...
@@ -94,9 +93,8 @@ export class ViewZones extends ViewPart {
hadAChange
=
true
;
hadAChange
=
true
;
}
}
}
}
return
hadAChange
;
});
});
return
hadAChange
;
}
}
public
onConfigurationChanged
(
e
:
viewEvents
.
ViewConfigurationChangedEvent
):
boolean
{
public
onConfigurationChanged
(
e
:
viewEvents
.
ViewConfigurationChangedEvent
):
boolean
{
...
@@ -115,11 +113,7 @@ export class ViewZones extends ViewPart {
...
@@ -115,11 +113,7 @@ export class ViewZones extends ViewPart {
}
}
public
onLineMappingChanged
(
e
:
viewEvents
.
ViewLineMappingChangedEvent
):
boolean
{
public
onLineMappingChanged
(
e
:
viewEvents
.
ViewLineMappingChangedEvent
):
boolean
{
const
hadAChange
=
this
.
_recomputeWhitespacesProps
();
return
this
.
_recomputeWhitespacesProps
();
if
(
hadAChange
)
{
this
.
_context
.
viewLayout
.
onHeightMaybeChanged
();
}
return
hadAChange
;
}
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
@@ -199,9 +193,9 @@ export class ViewZones extends ViewPart {
...
@@ -199,9 +193,9 @@ export class ViewZones extends ViewPart {
}
}
public
changeViewZones
(
callback
:
(
changeAccessor
:
IViewZoneChangeAccessor
)
=>
any
):
boolean
{
public
changeViewZones
(
callback
:
(
changeAccessor
:
IViewZoneChangeAccessor
)
=>
any
):
boolean
{
let
zonesHaveChanged
=
false
;
return
this
.
_context
.
viewLayout
.
changeWhitespace
((
whitespaceAccessor
:
IWhitespaceChangeAccessor
)
=>
{
this
.
_context
.
model
.
changeWhitespace
((
whitespaceAccessor
:
IWhitespaceChangeAccessor
)
=>
{
let
zonesHaveChanged
=
false
;
const
changeAccessor
:
IViewZoneChangeAccessor
=
{
const
changeAccessor
:
IViewZoneChangeAccessor
=
{
addZone
:
(
zone
:
IViewZone
):
string
=>
{
addZone
:
(
zone
:
IViewZone
):
string
=>
{
...
@@ -231,6 +225,8 @@ export class ViewZones extends ViewPart {
...
@@ -231,6 +225,8 @@ export class ViewZones extends ViewPart {
return
zonesHaveChanged
;
return
zonesHaveChanged
;
});
});
return
zonesHaveChanged
;
}
}
private
_addZone
(
whitespaceAccessor
:
IWhitespaceChangeAccessor
,
zone
:
IViewZone
):
string
{
private
_addZone
(
whitespaceAccessor
:
IWhitespaceChangeAccessor
,
zone
:
IViewZone
):
string
{
...
...
src/vs/editor/browser/widget/codeEditorWidget.ts
浏览文件 @
a7c698ce
...
@@ -862,7 +862,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
...
@@ -862,7 +862,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
if
(
typeof
newScrollLeft
!==
'
number
'
)
{
if
(
typeof
newScrollLeft
!==
'
number
'
)
{
throw
new
Error
(
'
Invalid arguments
'
);
throw
new
Error
(
'
Invalid arguments
'
);
}
}
this
.
_modelData
.
viewModel
.
viewLayout
.
setScrollPosition
({
this
.
_modelData
.
viewModel
.
setScrollPosition
({
scrollLeft
:
newScrollLeft
scrollLeft
:
newScrollLeft
},
scrollType
);
},
scrollType
);
}
}
...
@@ -873,7 +873,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
...
@@ -873,7 +873,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
if
(
typeof
newScrollTop
!==
'
number
'
)
{
if
(
typeof
newScrollTop
!==
'
number
'
)
{
throw
new
Error
(
'
Invalid arguments
'
);
throw
new
Error
(
'
Invalid arguments
'
);
}
}
this
.
_modelData
.
viewModel
.
viewLayout
.
setScrollPosition
({
this
.
_modelData
.
viewModel
.
setScrollPosition
({
scrollTop
:
newScrollTop
scrollTop
:
newScrollTop
},
scrollType
);
},
scrollType
);
}
}
...
@@ -881,7 +881,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
...
@@ -881,7 +881,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
if
(
!
this
.
_modelData
)
{
if
(
!
this
.
_modelData
)
{
return
;
return
;
}
}
this
.
_modelData
.
viewModel
.
viewLayout
.
setScrollPosition
(
position
,
scrollType
);
this
.
_modelData
.
viewModel
.
setScrollPosition
(
position
,
scrollType
);
}
}
public
saveViewState
():
editorCommon
.
ICodeEditorViewState
|
null
{
public
saveViewState
():
editorCommon
.
ICodeEditorViewState
|
null
{
...
...
src/vs/editor/common/viewLayout/linesLayout.ts
浏览文件 @
a7c698ce
...
@@ -180,33 +180,36 @@ export class LinesLayout {
...
@@ -180,33 +180,36 @@ export class LinesLayout {
this
.
_lineCount
=
lineCount
;
this
.
_lineCount
=
lineCount
;
}
}
public
changeWhitespace
<
T
>
(
callback
:
(
accessor
:
IWhitespaceChangeAccessor
)
=>
T
):
T
{
public
changeWhitespace
(
callback
:
(
accessor
:
IWhitespaceChangeAccessor
)
=>
void
):
boolean
{
let
hadAChange
=
false
;
try
{
try
{
const
accessor
=
{
const
accessor
:
IWhitespaceChangeAccessor
=
{
insertWhitespace
:
(
afterLineNumber
:
number
,
ordinal
:
number
,
heightInPx
:
number
,
minWidth
:
number
):
string
=>
{
insertWhitespace
:
(
afterLineNumber
:
number
,
ordinal
:
number
,
heightInPx
:
number
,
minWidth
:
number
):
string
=>
{
hadAChange
=
true
;
afterLineNumber
=
afterLineNumber
|
0
;
afterLineNumber
=
afterLineNumber
|
0
;
ordinal
=
ordinal
|
0
;
ordinal
=
ordinal
|
0
;
heightInPx
=
heightInPx
|
0
;
heightInPx
=
heightInPx
|
0
;
minWidth
=
minWidth
|
0
;
minWidth
=
minWidth
|
0
;
const
id
=
this
.
_instanceId
+
(
++
this
.
_lastWhitespaceId
);
const
id
=
this
.
_instanceId
+
(
++
this
.
_lastWhitespaceId
);
this
.
_pendingChanges
.
insert
(
new
EditorWhitespace
(
id
,
afterLineNumber
,
ordinal
,
heightInPx
,
minWidth
));
this
.
_pendingChanges
.
insert
(
new
EditorWhitespace
(
id
,
afterLineNumber
,
ordinal
,
heightInPx
,
minWidth
));
return
id
;
return
id
;
},
},
changeOneWhitespace
:
(
id
:
string
,
newAfterLineNumber
:
number
,
newHeight
:
number
):
void
=>
{
changeOneWhitespace
:
(
id
:
string
,
newAfterLineNumber
:
number
,
newHeight
:
number
):
void
=>
{
hadAChange
=
true
;
newAfterLineNumber
=
newAfterLineNumber
|
0
;
newAfterLineNumber
=
newAfterLineNumber
|
0
;
newHeight
=
newHeight
|
0
;
newHeight
=
newHeight
|
0
;
this
.
_pendingChanges
.
change
({
id
,
newAfterLineNumber
,
newHeight
});
this
.
_pendingChanges
.
change
({
id
,
newAfterLineNumber
,
newHeight
});
},
},
removeWhitespace
:
(
id
:
string
):
void
=>
{
removeWhitespace
:
(
id
:
string
):
void
=>
{
hadAChange
=
true
;
this
.
_pendingChanges
.
remove
({
id
});
this
.
_pendingChanges
.
remove
({
id
});
}
}
};
};
return
callback
(
accessor
);
callback
(
accessor
);
}
finally
{
}
finally
{
this
.
_pendingChanges
.
commit
(
this
);
this
.
_pendingChanges
.
commit
(
this
);
}
}
return
hadAChange
;
}
}
public
_commitPendingChanges
(
inserts
:
EditorWhitespace
[],
changes
:
IPendingChange
[],
removes
:
IPendingRemove
[]):
void
{
public
_commitPendingChanges
(
inserts
:
EditorWhitespace
[],
changes
:
IPendingChange
[],
removes
:
IPendingRemove
[]):
void
{
...
...
src/vs/editor/common/viewLayout/viewLayout.ts
浏览文件 @
a7c698ce
...
@@ -324,7 +324,7 @@ export class ViewLayout extends Disposable implements IViewLayout {
...
@@ -324,7 +324,7 @@ export class ViewLayout extends Disposable implements IViewLayout {
}
}
}
}
public
onMaxLineWidthChanged
(
maxLineWidth
:
number
):
void
{
public
setMaxLineWidth
(
maxLineWidth
:
number
):
void
{
const
scrollDimensions
=
this
.
_scrollable
.
getScrollDimensions
();
const
scrollDimensions
=
this
.
_scrollable
.
getScrollDimensions
();
// const newScrollWidth = ;
// const newScrollWidth = ;
this
.
_scrollable
.
setScrollDimensions
(
new
EditorScrollDimensions
(
this
.
_scrollable
.
setScrollDimensions
(
new
EditorScrollDimensions
(
...
@@ -353,8 +353,11 @@ export class ViewLayout extends Disposable implements IViewLayout {
...
@@ -353,8 +353,11 @@ export class ViewLayout extends Disposable implements IViewLayout {
}
}
// ---- IVerticalLayoutProvider
// ---- IVerticalLayoutProvider
public
changeWhitespace
<
T
>
(
callback
:
(
accessor
:
IWhitespaceChangeAccessor
)
=>
T
):
T
{
public
changeWhitespace
(
callback
:
(
accessor
:
IWhitespaceChangeAccessor
)
=>
void
):
void
{
return
this
.
_linesLayout
.
changeWhitespace
(
callback
);
const
hadAChange
=
this
.
_linesLayout
.
changeWhitespace
(
callback
);
if
(
hadAChange
)
{
this
.
onHeightMaybeChanged
();
}
}
}
public
getVerticalOffsetForLineNumber
(
lineNumber
:
number
):
number
{
public
getVerticalOffsetForLineNumber
(
lineNumber
:
number
):
number
{
return
this
.
_linesLayout
.
getVerticalOffsetForLineNumber
(
lineNumber
);
return
this
.
_linesLayout
.
getVerticalOffsetForLineNumber
(
lineNumber
);
...
...
src/vs/editor/common/viewModel/viewModel.ts
浏览文件 @
a7c698ce
...
@@ -44,8 +44,6 @@ export interface IViewLayout {
...
@@ -44,8 +44,6 @@ export interface IViewLayout {
getScrollable
():
Scrollable
;
getScrollable
():
Scrollable
;
onMaxLineWidthChanged
(
width
:
number
):
void
;
getScrollWidth
():
number
;
getScrollWidth
():
number
;
getScrollHeight
():
number
;
getScrollHeight
():
number
;
...
@@ -56,8 +54,6 @@ export interface IViewLayout {
...
@@ -56,8 +54,6 @@ export interface IViewLayout {
getFutureViewport
():
Viewport
;
getFutureViewport
():
Viewport
;
validateScrollPosition
(
scrollPosition
:
INewScrollPosition
):
IScrollPosition
;
validateScrollPosition
(
scrollPosition
:
INewScrollPosition
):
IScrollPosition
;
setScrollPosition
(
position
:
INewScrollPosition
,
type
:
ScrollType
):
void
;
deltaScrollNow
(
deltaScrollLeft
:
number
,
deltaScrollTop
:
number
):
void
;
getLinesViewportData
():
IPartialViewLinesViewportData
;
getLinesViewportData
():
IPartialViewLinesViewportData
;
getLinesViewportDataAtScrollTop
(
scrollTop
:
number
):
IPartialViewLinesViewportData
;
getLinesViewportDataAtScrollTop
(
scrollTop
:
number
):
IPartialViewLinesViewportData
;
...
@@ -68,18 +64,10 @@ export interface IViewLayout {
...
@@ -68,18 +64,10 @@ export interface IViewLayout {
getVerticalOffsetForLineNumber
(
lineNumber
:
number
):
number
;
getVerticalOffsetForLineNumber
(
lineNumber
:
number
):
number
;
getWhitespaceAtVerticalOffset
(
verticalOffset
:
number
):
IViewWhitespaceViewportData
|
null
;
getWhitespaceAtVerticalOffset
(
verticalOffset
:
number
):
IViewWhitespaceViewportData
|
null
;
// --------------- Begin vertical whitespace management
changeWhitespace
<
T
>
(
callback
:
(
accessor
:
IWhitespaceChangeAccessor
)
=>
T
):
T
;
/**
/**
* Get the layout information for whitespaces currently in the viewport
* Get the layout information for whitespaces currently in the viewport
*/
*/
getWhitespaceViewportData
():
IViewWhitespaceViewportData
[];
getWhitespaceViewportData
():
IViewWhitespaceViewportData
[];
// TODO@Alex whitespace management should work via a change accessor sort of thing
onHeightMaybeChanged
():
void
;
// --------------- End vertical whitespace management
}
}
export
interface
ICoordinatesConverter
{
export
interface
ICoordinatesConverter
{
...
@@ -169,6 +157,10 @@ export interface IViewModel extends IViewEventEmitter, ICursorSimpleModel {
...
@@ -169,6 +157,10 @@ export interface IViewModel extends IViewEventEmitter, ICursorSimpleModel {
getVerticalOffsetForLineNumber
(
viewLineNumber
:
number
):
number
;
getVerticalOffsetForLineNumber
(
viewLineNumber
:
number
):
number
;
getScrollTop
():
number
;
getScrollTop
():
number
;
setScrollTop
(
newScrollTop
:
number
,
scrollType
:
ScrollType
):
void
;
setScrollTop
(
newScrollTop
:
number
,
scrollType
:
ScrollType
):
void
;
setScrollPosition
(
position
:
INewScrollPosition
,
type
:
ScrollType
):
void
;
deltaScrollNow
(
deltaScrollLeft
:
number
,
deltaScrollTop
:
number
):
void
;
changeWhitespace
(
callback
:
(
accessor
:
IWhitespaceChangeAccessor
)
=>
void
):
void
;
setMaxLineWidth
(
maxLineWidth
:
number
):
void
;
//#endregion
//#endregion
}
}
...
...
src/vs/editor/common/viewModel/viewModelImpl.ts
浏览文件 @
a7c698ce
...
@@ -10,7 +10,7 @@ import { ConfigurationChangedEvent, EDITOR_FONT_DEFAULTS, EditorOption, filterVa
...
@@ -10,7 +10,7 @@ import { ConfigurationChangedEvent, EDITOR_FONT_DEFAULTS, EditorOption, filterVa
import
{
IPosition
,
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
IPosition
,
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
ISelection
,
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
ISelection
,
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
IRange
,
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
IRange
,
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
IConfiguration
,
IViewState
,
ScrollType
,
ICursorState
,
ICommand
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IConfiguration
,
IViewState
,
ScrollType
,
ICursorState
,
ICommand
,
INewScrollPosition
}
from
'
vs/editor/common/editorCommon
'
;
import
{
EndOfLinePreference
,
IActiveIndentGuideInfo
,
ITextModel
,
TrackedRangeStickiness
,
TextModelResolvedOptions
,
IIdentifiedSingleEditOperation
,
ICursorStateComputer
}
from
'
vs/editor/common/model
'
;
import
{
EndOfLinePreference
,
IActiveIndentGuideInfo
,
ITextModel
,
TrackedRangeStickiness
,
TextModelResolvedOptions
,
IIdentifiedSingleEditOperation
,
ICursorStateComputer
}
from
'
vs/editor/common/model
'
;
import
{
ModelDecorationOverviewRulerOptions
,
ModelDecorationMinimapOptions
}
from
'
vs/editor/common/model/textModel
'
;
import
{
ModelDecorationOverviewRulerOptions
,
ModelDecorationMinimapOptions
}
from
'
vs/editor/common/model/textModel
'
;
import
*
as
textModelEvents
from
'
vs/editor/common/model/textModelEvents
'
;
import
*
as
textModelEvents
from
'
vs/editor/common/model/textModelEvents
'
;
...
@@ -28,6 +28,7 @@ import { EditorTheme } from 'vs/editor/common/view/viewContext';
...
@@ -28,6 +28,7 @@ import { EditorTheme } from 'vs/editor/common/view/viewContext';
import
{
Cursor
}
from
'
vs/editor/common/controller/cursor
'
;
import
{
Cursor
}
from
'
vs/editor/common/controller/cursor
'
;
import
{
PartialCursorState
,
CursorState
,
IColumnSelectData
,
EditOperationType
,
CursorConfiguration
}
from
'
vs/editor/common/controller/cursorCommon
'
;
import
{
PartialCursorState
,
CursorState
,
IColumnSelectData
,
EditOperationType
,
CursorConfiguration
}
from
'
vs/editor/common/controller/cursorCommon
'
;
import
{
CursorChangeReason
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
CursorChangeReason
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
IWhitespaceChangeAccessor
}
from
'
vs/editor/common/viewLayout/linesLayout
'
;
const
USE_IDENTITY_LINES_COLLECTION
=
true
;
const
USE_IDENTITY_LINES_COLLECTION
=
true
;
...
@@ -943,6 +944,18 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
...
@@ -943,6 +944,18 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
public
setScrollTop
(
newScrollTop
:
number
,
scrollType
:
ScrollType
):
void
{
public
setScrollTop
(
newScrollTop
:
number
,
scrollType
:
ScrollType
):
void
{
this
.
viewLayout
.
setScrollPosition
({
scrollTop
:
newScrollTop
},
scrollType
);
this
.
viewLayout
.
setScrollPosition
({
scrollTop
:
newScrollTop
},
scrollType
);
}
}
public
setScrollPosition
(
position
:
INewScrollPosition
,
type
:
ScrollType
):
void
{
this
.
viewLayout
.
setScrollPosition
(
position
,
type
);
}
public
deltaScrollNow
(
deltaScrollLeft
:
number
,
deltaScrollTop
:
number
):
void
{
this
.
viewLayout
.
deltaScrollNow
(
deltaScrollLeft
,
deltaScrollTop
);
}
public
changeWhitespace
(
callback
:
(
accessor
:
IWhitespaceChangeAccessor
)
=>
void
):
void
{
return
this
.
viewLayout
.
changeWhitespace
(
callback
);
}
public
setMaxLineWidth
(
maxLineWidth
:
number
):
void
{
this
.
viewLayout
.
setMaxLineWidth
(
maxLineWidth
);
}
//#endregion
//#endregion
private
_withViewEventsCollector
(
callback
:
(
eventsCollector
:
viewEvents
.
ViewEventsCollector
)
=>
void
):
void
{
private
_withViewEventsCollector
(
callback
:
(
eventsCollector
:
viewEvents
.
ViewEventsCollector
)
=>
void
):
void
{
...
...
src/vs/editor/test/common/viewLayout/linesLayout.test.ts
浏览文件 @
a7c698ce
...
@@ -8,9 +8,11 @@ import { LinesLayout, EditorWhitespace } from 'vs/editor/common/viewLayout/lines
...
@@ -8,9 +8,11 @@ import { LinesLayout, EditorWhitespace } from 'vs/editor/common/viewLayout/lines
suite
(
'
Editor ViewLayout - LinesLayout
'
,
()
=>
{
suite
(
'
Editor ViewLayout - LinesLayout
'
,
()
=>
{
function
insertWhitespace
(
linesLayout
:
LinesLayout
,
afterLineNumber
:
number
,
ordinal
:
number
,
heightInPx
:
number
,
minWidth
:
number
):
string
{
function
insertWhitespace
(
linesLayout
:
LinesLayout
,
afterLineNumber
:
number
,
ordinal
:
number
,
heightInPx
:
number
,
minWidth
:
number
):
string
{
return
linesLayout
.
changeWhitespace
((
accessor
)
=>
{
let
id
:
string
;
return
accessor
.
insertWhitespace
(
afterLineNumber
,
ordinal
,
heightInPx
,
minWidth
);
linesLayout
.
changeWhitespace
((
accessor
)
=>
{
id
=
accessor
.
insertWhitespace
(
afterLineNumber
,
ordinal
,
heightInPx
,
minWidth
);
});
});
return
id
!
;
}
}
function
changeOneWhitespace
(
linesLayout
:
LinesLayout
,
id
:
string
,
newAfterLineNumber
:
number
,
newHeight
:
number
):
void
{
function
changeOneWhitespace
(
linesLayout
:
LinesLayout
,
id
:
string
,
newAfterLineNumber
:
number
,
newHeight
:
number
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录