Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
434da15e
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,发现更多精彩内容 >>
提交
434da15e
编写于
3月 03, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ViewLineChanged -> ViewLinesChanged
上级
493c5a1c
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
57 addition
and
51 deletion
+57
-51
src/vs/editor/browser/view/viewLayer.ts
src/vs/editor/browser/view/viewLayer.ts
+12
-9
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
...editor/browser/viewParts/contentWidgets/contentWidgets.ts
+1
-1
src/vs/editor/browser/viewParts/decorations/decorations.ts
src/vs/editor/browser/viewParts/decorations/decorations.ts
+1
-1
src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
...itor/browser/viewParts/editorScrollbar/editorScrollbar.ts
+2
-2
src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+1
-1
src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+1
-1
src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
+1
-1
src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
...or/browser/viewParts/linesDecorations/linesDecorations.ts
+1
-1
src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
.../browser/viewParts/marginDecorations/marginDecorations.ts
+1
-1
src/vs/editor/browser/viewParts/minimap/minimap.ts
src/vs/editor/browser/viewParts/minimap/minimap.ts
+5
-5
src/vs/editor/browser/viewParts/selections/selections.ts
src/vs/editor/browser/viewParts/selections/selections.ts
+1
-1
src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
+1
-1
src/vs/editor/common/view/viewEvents.ts
src/vs/editor/common/view/viewEvents.ts
+21
-16
src/vs/editor/common/viewModel/splitLinesCollection.ts
src/vs/editor/common/viewModel/splitLinesCollection.ts
+1
-3
src/vs/editor/common/viewModel/viewEventHandler.ts
src/vs/editor/common/viewModel/viewEventHandler.ts
+6
-6
src/vs/editor/test/browser/view/viewLayer.test.ts
src/vs/editor/test/browser/view/viewLayer.test.ts
+1
-1
未找到文件。
src/vs/editor/browser/view/viewLayer.ts
浏览文件 @
434da15e
...
...
@@ -155,7 +155,7 @@ export class RenderedLinesCollection<T extends ILine> {
return
deleted
;
}
public
onLine
Changed
(
changed
LineNumber
:
number
):
boolean
{
public
onLine
sChanged
(
changeFromLineNumber
:
number
,
changeTo
LineNumber
:
number
):
boolean
{
if
(
this
.
getCount
()
===
0
)
{
// no lines
return
false
;
...
...
@@ -164,14 +164,17 @@ export class RenderedLinesCollection<T extends ILine> {
let
startLineNumber
=
this
.
getStartLineNumber
();
let
endLineNumber
=
this
.
getEndLineNumber
();
if
(
changedLineNumber
<
startLineNumber
||
changedLineNumber
>
endLineNumber
)
{
// a line has been changed above or below the viewport
return
false
;
let
someoneNotified
=
false
;
for
(
let
changedLineNumber
=
changeFromLineNumber
;
changedLineNumber
<=
changeToLineNumber
;
changedLineNumber
++
)
{
if
(
changedLineNumber
>=
startLineNumber
&&
changedLineNumber
<=
endLineNumber
)
{
// Notify the line
this
.
_lines
[
changedLineNumber
-
this
.
_rendLineNumberStart
].
onContentChanged
();
someoneNotified
=
true
;
}
}
// Notify the line
this
.
_lines
[
changedLineNumber
-
this
.
_rendLineNumberStart
].
onContentChanged
();
return
true
;
return
someoneNotified
;
}
public
onLinesInserted
(
insertFromLineNumber
:
number
,
insertToLineNumber
:
number
):
T
[]
{
...
...
@@ -283,8 +286,8 @@ export abstract class ViewLayer<T extends IVisibleLine> extends ViewPart {
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
return
this
.
_linesCollection
.
onLine
Changed
(
e
.
l
ineNumber
);
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
this
.
_linesCollection
.
onLine
sChanged
(
e
.
fromLineNumber
,
e
.
toL
ineNumber
);
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
浏览文件 @
434da15e
...
...
@@ -124,7 +124,7 @@ export class ViewContentWidgets extends ViewPart {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/decorations/decorations.ts
浏览文件 @
434da15e
...
...
@@ -54,7 +54,7 @@ export class DecorationsOverlay extends DynamicViewOverlay {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
浏览文件 @
434da15e
...
...
@@ -163,10 +163,10 @@ export class EditorScrollbar extends ViewPart {
public
onFocusChanged
(
e
:
viewEvents
.
ViewFocusChangedEvent
):
boolean
{
return
false
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
MappingChanged
(
e
:
viewEvents
.
ViewLineMapping
ChangedEvent
):
boolean
{
return
false
;
}
public
onLine
MappingChanged
(
e
:
viewEvents
.
ViewLineMapping
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
false
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
浏览文件 @
434da15e
...
...
@@ -127,7 +127,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
浏览文件 @
434da15e
...
...
@@ -53,7 +53,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
浏览文件 @
434da15e
...
...
@@ -74,7 +74,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
浏览文件 @
434da15e
...
...
@@ -55,7 +55,7 @@ export class LinesDecorationsOverlay extends DedupOverlay {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
浏览文件 @
434da15e
...
...
@@ -45,7 +45,7 @@ export class MarginViewLineDecorationsOverlay extends DedupOverlay {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/minimap/minimap.ts
浏览文件 @
434da15e
...
...
@@ -343,12 +343,12 @@ class RenderData {
};
}
public
onLinesChanged
(
e
:
viewEvents
.
ViewLinesChangedEvent
):
boolean
{
return
this
.
_renderedLines
.
onLinesChanged
(
e
.
fromLineNumber
,
e
.
toLineNumber
);
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
void
{
this
.
_renderedLines
.
onLinesDeleted
(
e
.
fromLineNumber
,
e
.
toLineNumber
);
}
public
onLineChanged
(
e
:
viewEvents
.
ViewLineChangedEvent
):
boolean
{
return
this
.
_renderedLines
.
onLineChanged
(
e
.
lineNumber
);
}
public
onLinesInserted
(
e
:
viewEvents
.
ViewLinesInsertedEvent
):
void
{
this
.
_renderedLines
.
onLinesInserted
(
e
.
fromLineNumber
,
e
.
toLineNumber
);
}
...
...
@@ -596,9 +596,9 @@ export class Minimap extends ViewPart {
this
.
_lastRenderData
=
null
;
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
if
(
this
.
_lastRenderData
)
{
return
this
.
_lastRenderData
.
onLineChanged
(
e
);
return
this
.
_lastRenderData
.
onLine
s
Changed
(
e
);
}
return
false
;
}
...
...
src/vs/editor/browser/viewParts/selections/selections.ts
浏览文件 @
434da15e
...
...
@@ -122,7 +122,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
public
onFlushed
(
e
:
viewEvents
.
ViewFlushedEvent
):
boolean
{
return
true
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
浏览文件 @
434da15e
...
...
@@ -149,7 +149,7 @@ export class ViewCursors extends ViewPart {
this
.
_updateBlinking
();
return
false
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
true
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
src/vs/editor/common/view/viewEvents.ts
浏览文件 @
434da15e
...
...
@@ -17,8 +17,8 @@ export const enum ViewEventType {
ViewDecorationsChanged
=
4
,
ViewFlushed
=
5
,
ViewFocusChanged
=
6
,
ViewLineChanged
=
7
,
ViewLine
Mapping
Changed
=
8
,
ViewLine
Mapping
Changed
=
7
,
ViewLine
s
Changed
=
8
,
ViewLinesDeleted
=
9
,
ViewLinesInserted
=
10
,
ViewRevealRangeRequest
=
11
,
...
...
@@ -122,26 +122,31 @@ export class ViewFocusChangedEvent {
}
}
export
class
ViewLineChangedEvent
{
public
readonly
type
=
ViewEventType
.
ViewLineChanged
;
export
class
ViewLineMappingChangedEvent
{
/**
* The line that has changed.
*/
public
readonly
lineNumber
:
number
;
public
readonly
type
=
ViewEventType
.
ViewLineMappingChanged
;
constructor
(
lineNumber
:
number
)
{
this
.
lineNumber
=
lineNumber
;
constructor
()
{
// Nothing to do
}
}
export
class
ViewLine
Mapping
ChangedEvent
{
export
class
ViewLine
s
ChangedEvent
{
public
readonly
type
=
ViewEventType
.
ViewLine
Mapping
Changed
;
public
readonly
type
=
ViewEventType
.
ViewLine
s
Changed
;
constructor
()
{
// Nothing to do
/**
* The first line that has changed.
*/
public
readonly
fromLineNumber
:
number
;
/**
* The last line that has changed.
*/
public
readonly
toLineNumber
:
number
;
constructor
(
fromLineNumber
:
number
,
toLineNumber
:
number
)
{
this
.
fromLineNumber
=
fromLineNumber
;
this
.
toLineNumber
=
toLineNumber
;
}
}
...
...
@@ -296,7 +301,7 @@ export type ViewEvent = (
|
ViewDecorationsChangedEvent
|
ViewFlushedEvent
|
ViewFocusChangedEvent
|
ViewLineChangedEvent
|
ViewLine
s
ChangedEvent
|
ViewLineMappingChangedEvent
|
ViewLinesDeletedEvent
|
ViewLinesInsertedEvent
...
...
src/vs/editor/common/viewModel/splitLinesCollection.ts
浏览文件 @
434da15e
...
...
@@ -655,9 +655,7 @@ export class SplitLinesCollection {
this
.
prefixSumComputer
.
changeValue
(
lineIndex
,
newOutputLineCount
);
if
(
changeFrom
<=
changeTo
)
{
for
(
let
i
=
changeFrom
;
i
<=
changeTo
;
i
++
)
{
eventsCollector
.
emit
(
new
viewEvents
.
ViewLineChangedEvent
(
i
));
}
eventsCollector
.
emit
(
new
viewEvents
.
ViewLinesChangedEvent
(
changeFrom
,
changeTo
));
}
if
(
insertFrom
<=
insertTo
)
{
eventsCollector
.
emit
(
new
viewEvents
.
ViewLinesInsertedEvent
(
insertFrom
,
insertTo
));
...
...
src/vs/editor/common/viewModel/viewEventHandler.ts
浏览文件 @
434da15e
...
...
@@ -50,10 +50,10 @@ export class ViewEventHandler {
public
onFocusChanged
(
e
:
viewEvents
.
ViewFocusChangedEvent
):
boolean
{
return
false
;
}
public
onLine
Changed
(
e
:
viewEvents
.
ViewLine
ChangedEvent
):
boolean
{
public
onLine
MappingChanged
(
e
:
viewEvents
.
ViewLineMapping
ChangedEvent
):
boolean
{
return
false
;
}
public
onLine
MappingChanged
(
e
:
viewEvents
.
ViewLineMapping
ChangedEvent
):
boolean
{
public
onLine
sChanged
(
e
:
viewEvents
.
ViewLines
ChangedEvent
):
boolean
{
return
false
;
}
public
onLinesDeleted
(
e
:
viewEvents
.
ViewLinesDeletedEvent
):
boolean
{
...
...
@@ -128,14 +128,14 @@ export class ViewEventHandler {
}
break
;
case
viewEvents
.
ViewEventType
.
ViewLineChanged
:
if
(
this
.
onLineChanged
(
e
))
{
case
viewEvents
.
ViewEventType
.
ViewLine
Mapping
Changed
:
if
(
this
.
onLine
Mapping
Changed
(
e
))
{
shouldRender
=
true
;
}
break
;
case
viewEvents
.
ViewEventType
.
ViewLine
Mapping
Changed
:
if
(
this
.
onLine
Mapping
Changed
(
e
))
{
case
viewEvents
.
ViewEventType
.
ViewLine
s
Changed
:
if
(
this
.
onLine
s
Changed
(
e
))
{
shouldRender
=
true
;
}
break
;
...
...
src/vs/editor/test/browser/view/viewLayer.test.ts
浏览文件 @
434da15e
...
...
@@ -325,7 +325,7 @@ suite('RenderedLinesCollection onLineChanged', () => {
new
TestLine
(
'
old8
'
),
new
TestLine
(
'
old9
'
)
]);
let
actualPinged
=
col
.
onLine
Changed
(
changedLineNumber
);
let
actualPinged
=
col
.
onLine
sChanged
(
changedLineNumber
,
changedLineNumber
);
assert
.
deepEqual
(
actualPinged
,
expectedPinged
);
assertState
(
col
,
expectedState
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录