Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
25e65e6e
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,发现更多精彩内容 >>
未验证
提交
25e65e6e
编写于
1月 09, 2020
作者:
A
Alexandru Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify wrapping computation
上级
4cb0c653
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
50 deletion
+42
-50
src/vs/editor/common/viewModel/characterHardWrappingLineMapper.ts
...ditor/common/viewModel/characterHardWrappingLineMapper.ts
+40
-49
src/vs/editor/common/viewModel/splitLinesCollection.ts
src/vs/editor/common/viewModel/splitLinesCollection.ts
+1
-0
src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
...editor/test/common/viewModel/splitLinesCollection.test.ts
+1
-1
未找到文件。
src/vs/editor/common/viewModel/characterHardWrappingLineMapper.ts
浏览文件 @
25e65e6e
...
...
@@ -94,64 +94,53 @@ function createLineMapping(classifier: WrappingCharacterClassifier, previousBrea
return
null
;
}
const
len
=
lineText
.
length
;
if
(
len
<=
1
)
{
return
null
;
}
const
wrappedTextIndentLength
=
computeWrappedTextIndentLength
(
lineText
,
tabSize
,
firstLineBreakingColumn
,
columnsForFullWidthChar
,
hardWrappingIndent
);
const
wrappedLineBreakingColumn
=
firstLineBreakingColumn
-
wrappedTextIndentLength
;
let
breakingOffsets
:
number
[]
=
[];
let
breakingOffsetsVisibleColumn
:
number
[]
=
[];
let
breakingOffsetsCount
:
number
=
0
;
let
visibleColumn
=
0
;
let
breakOffset
=
0
;
let
breakOffsetVisibleColumn
=
0
;
const
len
=
lineText
.
length
;
const
len1
=
len
-
1
;
let
breakingColumn
=
firstLineBreakingColumn
;
let
prevCharCode
=
CharCode
.
Null
;
let
prevCharCodeClass
=
CharacterClass
.
NONE
;
let
charCode
=
CharCode
.
Null
;
let
charCodeClass
=
CharacterClass
.
NONE
;
let
nextCharCode
=
(
len
>
0
?
lineText
.
charCodeAt
(
0
)
:
CharCode
.
Null
);
let
nextCharCodeClass
=
classifier
.
get
(
nextCharCode
);
let
prevCharCode
=
lineText
.
charCodeAt
(
0
);
let
prevCharCodeClass
=
classifier
.
get
(
prevCharCode
);
let
visibleColumn
=
computeCharWidth
(
prevCharCode
,
0
,
tabSize
,
columnsForFullWidthChar
);
for
(
let
i
=
0
;
i
<
len
;
i
++
)
{
// At this point, there is a certainty that the character before `i` fits on the current line,
// but the character at `i` might not fit
for
(
let
i
=
1
;
i
<
len
;
i
++
)
{
const
charCode
=
lineText
.
charCodeAt
(
i
);
const
charCodeClass
=
classifier
.
get
(
charCode
);
prevCharCode
=
charCode
;
prevCharCodeClass
=
charCodeClass
;
charCode
=
nextCharCode
;
charCodeClass
=
nextCharCodeClass
;
nextCharCode
=
(
i
<
len1
?
lineText
.
charCodeAt
(
i
+
1
)
:
CharCode
.
Null
);
nextCharCodeClass
=
classifier
.
get
(
nextCharCode
);
if
(
strings
.
isLowSurrogate
(
charCode
))
{
if
(
strings
.
isHighSurrogate
(
prevCharCode
))
{
// A surrogate pair must always be considered as a single unit, so it is never to be broken
visibleColumn
+=
1
;
prevCharCode
=
charCode
;
prevCharCodeClass
=
charCodeClass
;
continue
;
}
if
(
prevCharCode
!==
CharCode
.
Null
&&
canBreakBefore
(
charCodeClass
,
prevC
harCodeClass
))
{
if
(
canBreak
(
prevCharCodeClass
,
c
harCodeClass
))
{
breakOffset
=
i
;
breakOffsetVisibleColumn
=
visibleColumn
;
}
const
charColumnSize
=
(
charCode
===
CharCode
.
Tab
?
tabCharacterWidth
(
visibleColumn
,
tabSize
)
:
(
strings
.
isFullWidthCharacter
(
charCode
)
?
columnsForFullWidthChar
:
1
)
);
visibleColumn
+=
charColumnSize
;
const
charWidth
=
computeCharWidth
(
charCode
,
visibleColumn
,
tabSize
,
columnsForFullWidthChar
);
visibleColumn
+=
charWidth
;
// check if adding character at `i` will go over the breaking column
if
(
visibleColumn
>
breakingColumn
&&
i
!==
0
)
{
if
(
visibleColumn
>
breakingColumn
)
{
// We need to break at least before character at `i`:
if
(
breakOffset
===
0
||
visibleColumn
-
breakOffsetVisibleColumn
>
wrappedLineBreakingColumn
)
{
// Cannot break at `breakOffset`, must break at `i`
breakOffset
=
i
;
breakOffsetVisibleColumn
=
visibleColumn
-
char
ColumnSize
;
breakOffsetVisibleColumn
=
visibleColumn
-
char
Width
;
}
breakingOffsets
[
breakingOffsetsCount
]
=
breakOffset
;
...
...
@@ -161,11 +150,8 @@ function createLineMapping(classifier: WrappingCharacterClassifier, previousBrea
breakOffset
=
0
;
}
// At this point, there is a certainty that the character at `i` fits on the current line
if
(
nextCharCode
!==
CharCode
.
Null
&&
canBreakAfter
(
charCodeClass
,
nextCharCodeClass
))
{
breakOffset
=
i
+
1
;
breakOffsetVisibleColumn
=
visibleColumn
;
}
prevCharCode
=
charCode
;
prevCharCodeClass
=
charCodeClass
;
}
if
(
breakingOffsetsCount
===
0
)
{
...
...
@@ -176,31 +162,36 @@ function createLineMapping(classifier: WrappingCharacterClassifier, previousBrea
breakingOffsets
[
breakingOffsetsCount
]
=
len
;
breakingOffsetsVisibleColumn
[
breakingOffsetsCount
]
=
visibleColumn
;
return
new
LineBreakingData
(
breakingOffsets
,
breakingOffsetsVisibleColumn
,
wrappedTextIndentLength
);
return
new
LineBreakingData
(
firstLineBreakingColumn
,
breakingOffsets
,
breakingOffsetsVisibleColumn
,
wrappedTextIndentLength
);
}
function
computeCharWidth
(
charCode
:
number
,
visibleColumn
:
number
,
tabSize
:
number
,
columnsForFullWidthChar
:
number
):
number
{
if
(
charCode
===
CharCode
.
Tab
)
{
return
(
tabSize
-
(
visibleColumn
%
tabSize
));
}
if
(
strings
.
isFullWidthCharacter
(
charCode
))
{
return
columnsForFullWidthChar
;
}
return
1
;
}
function
tabCharacterWidth
(
visibleColumn
:
number
,
tabSize
:
number
):
number
{
return
(
tabSize
-
(
visibleColumn
%
tabSize
));
}
function
canBreakBefore
(
charCodeClass
:
CharacterClass
,
prevCharCodeClass
:
CharacterClass
):
boolean
{
// This is a character that indicates that a break should happen before it
// (or) CJK breaking : before break : Kinsoku Shori : Don't break after a leading character, like an open bracket
/**
* Kinsoku Shori : Don't break after a leading character, like an open bracket
* Kinsoku Shori : Don't break before a trailing character, like a period
*/
function
canBreak
(
prevCharCodeClass
:
CharacterClass
,
charCodeClass
:
CharacterClass
):
boolean
{
return
(
(
charCodeClass
===
CharacterClass
.
BREAK_BEFORE
)
(
prevCharCodeClass
===
CharacterClass
.
BREAK_AFTER
)
||
(
prevCharCodeClass
===
CharacterClass
.
BREAK_IDEOGRAPHIC
&&
charCodeClass
!==
CharacterClass
.
BREAK_AFTER
)
||
(
charCodeClass
===
CharacterClass
.
BREAK_BEFORE
)
||
(
charCodeClass
===
CharacterClass
.
BREAK_IDEOGRAPHIC
&&
prevCharCodeClass
!==
CharacterClass
.
BREAK_BEFORE
)
);
}
function
canBreakAfter
(
charCodeClass
:
CharacterClass
,
nextCharCodeClass
:
CharacterClass
):
boolean
{
// This is a character that indicates that a break should happen after it
// (or) CJK breaking : after break : Kinsoku Shori : Don't break before a trailing character, like a period
return
(
(
charCodeClass
===
CharacterClass
.
BREAK_AFTER
)
||
(
charCodeClass
===
CharacterClass
.
BREAK_IDEOGRAPHIC
&&
nextCharCodeClass
!==
CharacterClass
.
BREAK_AFTER
)
);
}
function
computeWrappedTextIndentLength
(
lineText
:
string
,
tabSize
:
number
,
firstLineBreakingColumn
:
number
,
columnsForFullWidthChar
:
number
,
hardWrappingIndent
:
WrappingIndent
):
number
{
let
wrappedTextIndentLength
=
0
;
if
(
hardWrappingIndent
!==
WrappingIndent
.
None
)
{
...
...
src/vs/editor/common/viewModel/splitLinesCollection.ts
浏览文件 @
25e65e6e
...
...
@@ -28,6 +28,7 @@ export class OutputPosition {
export
class
LineBreakingData
{
constructor
(
public
readonly
breakingColumn
:
number
,
public
readonly
breakOffsets
:
number
[],
public
readonly
breakingOffsetsVisibleColumn
:
number
[],
public
readonly
wrappedTextIndentLength
:
number
...
...
src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
浏览文件 @
25e65e6e
...
...
@@ -781,7 +781,7 @@ function createLineMapping(breakingLengths: number[], breakingOffsetsVisibleColu
for
(
let
i
=
0
;
i
<
breakingLengths
.
length
;
i
++
)
{
sums
[
i
]
=
(
i
>
0
?
sums
[
i
-
1
]
:
0
)
+
breakingLengths
[
i
];
}
return
new
LineBreakingData
(
sums
,
breakingOffsetsVisibleColumn
,
wrappedTextIndentWidth
);
return
new
LineBreakingData
(
0
,
sums
,
breakingOffsetsVisibleColumn
,
wrappedTextIndentWidth
);
}
function
createModel
(
text
:
string
):
ISimpleModel
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录