Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
47e2a847
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,发现更多精彩内容 >>
提交
47e2a847
编写于
10月 23, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #12839: use width when reading position of last column in whitespace only line
上级
18cac377
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
5 deletion
+20
-5
src/vs/editor/browser/viewParts/lines/viewLine.ts
src/vs/editor/browser/viewParts/lines/viewLine.ts
+8
-0
src/vs/editor/common/viewLayout/viewLineRenderer.ts
src/vs/editor/common/viewLayout/viewLineRenderer.ts
+12
-5
未找到文件。
src/vs/editor/browser/viewParts/lines/viewLine.ts
浏览文件 @
47e2a847
...
...
@@ -34,6 +34,7 @@ export class ViewLine implements IVisibleLineData {
protected
_charOffsetInPart
:
number
[];
private
_lastRenderedPartIndex
:
number
;
private
_isWhitespaceOnly
:
boolean
;
private
_cachedWidth
:
number
;
constructor
(
context
:
ViewContext
)
{
...
...
@@ -50,6 +51,7 @@ export class ViewLine implements IVisibleLineData {
this
.
_lineParts
=
null
;
this
.
_charOffsetInPart
=
[];
this
.
_lastRenderedPartIndex
=
0
;
this
.
_isWhitespaceOnly
=
false
;
}
// --- begin IVisibleLineData
...
...
@@ -177,6 +179,7 @@ export class ViewLine implements IVisibleLineData {
this
.
_charOffsetInPart
=
r
.
charOffsetInPart
;
this
.
_lastRenderedPartIndex
=
r
.
lastRenderedPartIndex
;
this
.
_isWhitespaceOnly
=
r
.
isWhitespaceOnly
;
return
r
.
output
;
}
...
...
@@ -237,6 +240,11 @@ export class ViewLine implements IVisibleLineData {
return
[
new
HorizontalRange
(
0
,
0
)];
}
if
(
column
===
this
.
_charOffsetInPart
.
length
&&
this
.
_isWhitespaceOnly
)
{
// This branch helps in the case of whitespace only lines which have a width set
return
[
new
HorizontalRange
(
this
.
getWidth
(),
0
)];
}
let
partIndex
=
findIndexInArrayWithMax
(
this
.
_lineParts
,
column
-
1
,
this
.
_lastRenderedPartIndex
);
let
charOffsetInPart
=
this
.
_charOffsetInPart
[
column
-
1
];
...
...
src/vs/editor/common/viewLayout/viewLineRenderer.ts
浏览文件 @
47e2a847
...
...
@@ -42,11 +42,13 @@ export class RenderLineOutput {
charOffsetInPart
:
number
[];
lastRenderedPartIndex
:
number
;
output
:
string
;
isWhitespaceOnly
:
boolean
;
constructor
(
charOffsetInPart
:
number
[],
lastRenderedPartIndex
:
number
,
output
:
string
)
{
constructor
(
charOffsetInPart
:
number
[],
lastRenderedPartIndex
:
number
,
output
:
string
,
isWhitespaceOnly
:
boolean
)
{
this
.
charOffsetInPart
=
charOffsetInPart
;
this
.
lastRenderedPartIndex
=
lastRenderedPartIndex
;
this
.
output
=
output
;
this
.
isWhitespaceOnly
=
isWhitespaceOnly
;
}
}
...
...
@@ -65,7 +67,8 @@ export function renderLine(input: RenderLineInput): RenderLineOutput {
[],
0
,
// This is basically for IE's hit test to work
'
<span><span> </span></span>
'
'
<span><span> </span></span>
'
,
true
);
}
...
...
@@ -99,6 +102,7 @@ function renderLineActual(lineText: string, lineTextLength: number, tabSize: num
let
charOffsetInPartArr
:
number
[]
=
[];
let
charOffsetInPart
=
0
;
let
tabsCharDelta
=
0
;
let
isWhitespaceOnly
=
/^
\s
*$/
.
test
(
lineText
);
out
+=
'
<span>
'
;
for
(
let
partIndex
=
0
,
partIndexLen
=
actualLineParts
.
length
;
partIndex
<
partIndexLen
;
partIndex
++
)
{
...
...
@@ -151,7 +155,8 @@ function renderLineActual(lineText: string, lineTextLength: number, tabSize: num
return
new
RenderLineOutput
(
charOffsetInPartArr
,
partIndex
,
out
out
,
isWhitespaceOnly
);
}
}
...
...
@@ -224,7 +229,8 @@ function renderLineActual(lineText: string, lineTextLength: number, tabSize: num
return
new
RenderLineOutput
(
charOffsetInPartArr
,
partIndex
,
out
out
,
isWhitespaceOnly
);
}
}
...
...
@@ -242,6 +248,7 @@ function renderLineActual(lineText: string, lineTextLength: number, tabSize: num
return
new
RenderLineOutput
(
charOffsetInPartArr
,
actualLineParts
.
length
-
1
,
out
out
,
isWhitespaceOnly
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录