Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4f3262dd
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,发现更多精彩内容 >>
提交
4f3262dd
编写于
7月 08, 2019
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correctly render multiline decorations in the minimap, fixes #76133
上级
1016c99d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
40 addition
and
40 deletion
+40
-40
src/vs/editor/browser/viewParts/minimap/minimap.ts
src/vs/editor/browser/viewParts/minimap/minimap.ts
+40
-40
未找到文件。
src/vs/editor/browser/viewParts/minimap/minimap.ts
浏览文件 @
4f3262dd
...
...
@@ -738,61 +738,61 @@ export class Minimap extends ViewPart {
const
lineHeightRatio
=
renderMinimap
===
RenderMinimap
.
LargeBlocks
||
renderMinimap
===
RenderMinimap
.
SmallBlocks
?
0.5
:
1
;
const
height
=
lineHeight
*
lineHeightRatio
;
// Loop over decorations, ignoring those that don't have the minimap property set and rendering those on the same line together
let
i
=
0
;
for
(;
i
<
decorations
.
length
;
i
++
)
{
if
(
!
decorations
[
i
].
options
.
minimap
)
{
// Loop over decorations, ignoring those that don't have the minimap property set and rendering rectangles for each line the decoration spans
const
lineOffsetMap
=
new
Map
<
number
,
number
[]
>
();
for
(
let
i
=
0
;
i
<
decorations
.
length
;
i
++
)
{
const
decoration
=
decorations
[
i
];
if
(
!
decoration
.
options
.
minimap
)
{
continue
;
}
let
decorationsForLine
=
[
decorations
[
i
]];
let
currentLine
=
decorations
[
i
].
range
.
startLineNumber
;
let
j
=
i
+
1
;
while
(
j
<
decorations
.
length
&&
decorations
[
j
].
range
.
startLineNumber
===
currentLine
)
{
if
(
decorations
[
j
].
options
.
minimap
)
{
decorationsForLine
.
push
(
decorations
[
j
]);
}
j
+=
1
;
for
(
let
line
=
decoration
.
range
.
startLineNumber
;
line
<=
decoration
.
range
.
endLineNumber
;
line
++
)
{
this
.
renderDecorationOnLine
(
canvasContext
,
lineOffsetMap
,
decoration
,
layout
,
line
,
height
,
lineHeight
,
tabSize
,
characterWidth
);
}
i
=
j
-
1
;
this
.
renderDecorationsForLine
(
canvasContext
,
decorationsForLine
,
layout
,
currentLine
,
height
,
lineHeight
,
tabSize
,
characterWidth
);
}
}
}
private
renderDecorationsForLine
(
canvasContext
:
CanvasRenderingContext2D
,
decorations
:
ViewModelDecoration
[],
private
renderDecorationOnLine
(
canvasContext
:
CanvasRenderingContext2D
,
lineOffsetMap
:
Map
<
number
,
number
[]
>
,
decoration
:
ViewModelDecoration
,
layout
:
MinimapLayout
,
startL
ineNumber
:
number
,
l
ineNumber
:
number
,
height
:
number
,
lineHeight
:
number
,
tabSize
:
number
,
charWidth
:
number
)
{
const
y
=
(
startLineNumber
-
layout
.
startLineNumber
)
*
lineHeight
;
const
lineData
=
this
.
_context
.
model
.
getLineContent
(
startLineNumber
);
const
lineIndexToXOffset
=
[
0
];
for
(
let
i
=
1
;
i
<
lineData
.
length
+
1
;
i
++
)
{
const
charCode
=
lineData
.
charCodeAt
(
i
-
1
);
const
dx
=
charCode
===
CharCode
.
Tab
?
tabSize
*
charWidth
:
strings
.
isFullWidthCharacter
(
charCode
)
?
2
*
charWidth
:
charWidth
;
lineIndexToXOffset
[
i
]
=
lineIndexToXOffset
[
i
-
1
]
+
dx
;
charWidth
:
number
):
void
{
const
y
=
(
lineNumber
-
layout
.
startLineNumber
)
*
lineHeight
;
// Cache line offset data so that it is only read once per line
let
lineIndexToXOffset
=
lineOffsetMap
.
get
(
lineNumber
);
if
(
!
lineIndexToXOffset
)
{
const
lineData
=
this
.
_context
.
model
.
getLineContent
(
lineNumber
);
lineIndexToXOffset
=
[
0
];
for
(
let
i
=
1
;
i
<
lineData
.
length
+
1
;
i
++
)
{
const
charCode
=
lineData
.
charCodeAt
(
i
-
1
);
const
dx
=
charCode
===
CharCode
.
Tab
?
tabSize
*
charWidth
:
strings
.
isFullWidthCharacter
(
charCode
)
?
2
*
charWidth
:
charWidth
;
lineIndexToXOffset
[
i
]
=
lineIndexToXOffset
[
i
-
1
]
+
dx
;
}
lineOffsetMap
.
set
(
lineNumber
,
lineIndexToXOffset
);
}
for
(
let
i
=
0
;
i
<
decorations
.
length
;
i
++
)
{
const
currentDecoration
=
decorations
[
i
];
const
{
startColumn
,
endColumn
}
=
currentDecoration
.
range
;
const
x
=
lineIndexToXOffset
[
startColumn
-
1
];
const
width
=
lineIndexToXOffset
[
endColumn
-
1
]
-
x
;
const
{
startColumn
,
endColumn
,
startLineNumber
,
endLineNumber
}
=
decoration
.
range
;
const
x
=
startLineNumber
===
lineNumber
?
lineIndexToXOffset
[
startColumn
-
1
]
:
0
;
this
.
renderDecoration
(
canvasContext
,
<
ModelDecorationMinimapOptions
>
currentDecoration
.
options
.
minimap
,
x
,
y
,
width
,
height
);
}
const
endColumnForLine
=
endLineNumber
>
lineNumber
?
lineIndexToXOffset
.
length
-
1
:
endColumn
-
1
;
// If the decoration starts at the last character of the column and spans over it, ensure it has a width
const
width
=
lineIndexToXOffset
[
endColumnForLine
]
-
x
||
2
;
this
.
renderDecoration
(
canvasContext
,
<
ModelDecorationMinimapOptions
>
decoration
.
options
.
minimap
,
x
,
y
,
width
,
height
);
}
private
renderDecoration
(
canvasContext
:
CanvasRenderingContext2D
,
minimapOptions
:
ModelDecorationMinimapOptions
,
x
:
number
,
y
:
number
,
width
:
number
,
height
:
number
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录