Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
94ccb584
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,发现更多精彩内容 >>
提交
94ccb584
编写于
4月 01, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use concrete types
上级
ba6f665c
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
239 addition
and
229 deletion
+239
-229
src/vs/editor/common/model/modelLine.ts
src/vs/editor/common/model/modelLine.ts
+10
-27
src/vs/editor/common/model/textModelWithTokens.ts
src/vs/editor/common/model/textModelWithTokens.ts
+31
-3
src/vs/editor/common/model/tokensBinaryEncoding.ts
src/vs/editor/common/model/tokensBinaryEncoding.ts
+3
-4
src/vs/editor/test/common/model/model.line.test.ts
src/vs/editor/test/common/model/model.line.test.ts
+195
-195
未找到文件。
src/vs/editor/common/model/modelLine.ts
浏览文件 @
94ccb584
...
...
@@ -5,8 +5,8 @@
'
use strict
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
ILineTokens
,
IReadOnlyLineMarker
,
ITokensInflatorMap
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IMode
,
I
ModeTransition
,
IState
,
IToken
}
from
'
vs/editor/common/modes
'
;
import
{
ILineTokens
,
IReadOnlyLineMarker
,
ITokensInflatorMap
,
LineToken
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IMode
,
I
State
}
from
'
vs/editor/common/modes
'
;
import
*
as
TokensBinaryEncoding
from
'
vs/editor/common/model/tokensBinaryEncoding
'
;
import
{
ModeTransition
}
from
'
vs/editor/common/core/modeTransition
'
;
...
...
@@ -104,13 +104,6 @@ export class ModelLine {
// --- BEGIN MODE TRANSITIONS
private
_setModeTransitions
(
topLevelMode
:
IMode
,
modeTransitions
:
IModeTransition
[]):
void
{
let
desired
=
toModeTransitions
(
topLevelMode
,
modeTransitions
);
this
.
_modeTransitions
=
desired
;
}
public
getModeTransitions
(
topLevelMode
:
IMode
):
ModeTransition
[]
{
if
(
this
.
_modeTransitions
)
{
return
this
.
_modeTransitions
;
...
...
@@ -123,23 +116,13 @@ export class ModelLine {
// --- BEGIN TOKENS
public
setTokens
(
map
:
ITokensInflatorMap
,
tokens
:
IToken
[],
topLevelMode
:
IMode
,
modeTransitions
:
IModeTransition
[]):
void
{
this
.
_setLineTokensFromInflated
(
map
,
tokens
);
this
.
_setModeTransitions
(
topLevelMode
,
modeTransitions
);
}
private
_setLineTokensFromInflated
(
map
:
ITokensInflatorMap
,
tokens
:
IToken
[]):
void
{
let
desired
=
toLineTokensFromInflated
(
map
,
tokens
,
this
.
_text
.
length
);
this
.
_lineTokens
=
desired
;
public
setTokens
(
map
:
ITokensInflatorMap
,
tokens
:
LineToken
[],
topLevelMode
:
IMode
,
modeTransitions
:
ModeTransition
[]):
void
{
this
.
_lineTokens
=
toLineTokensFromInflated
(
map
,
tokens
,
this
.
_text
.
length
);
this
.
_modeTransitions
=
toModeTransitions
(
topLevelMode
,
modeTransitions
);
}
private
_setLineTokensFromDeflated
(
map
:
ITokensInflatorMap
,
tokens
:
number
[]):
void
{
let
desired
=
toLineTokensFromDeflated
(
map
,
tokens
,
this
.
_text
.
length
);
this
.
_lineTokens
=
desired
;
this
.
_lineTokens
=
toLineTokensFromDeflated
(
map
,
tokens
,
this
.
_text
.
length
);
}
public
getTokens
():
ILineTokens
{
...
...
@@ -642,7 +625,7 @@ export class ModelLine {
}
}
function
toLineTokensFromInflated
(
map
:
ITokensInflatorMap
,
tokens
:
I
Token
[],
textLength
:
number
):
ILineTokens
{
function
toLineTokensFromInflated
(
map
:
ITokensInflatorMap
,
tokens
:
Line
Token
[],
textLength
:
number
):
ILineTokens
{
if
(
textLength
===
0
)
{
return
null
;
}
...
...
@@ -683,7 +666,7 @@ export class LineTokens implements ILineTokens {
private
map
:
ITokensInflatorMap
;
private
_tokens
:
number
[];
constructor
(
map
:
ITokensInflatorMap
,
tokens
:
/*IToken[]|*/
number
[])
{
constructor
(
map
:
ITokensInflatorMap
,
tokens
:
number
[])
{
this
.
map
=
map
;
this
.
_tokens
=
tokens
;
}
...
...
@@ -805,7 +788,7 @@ export class DefaultLineTokens implements ILineTokens {
}
function
toModeTransitions
(
topLevelMode
:
IMode
,
modeTransitions
:
I
ModeTransition
[]):
ModeTransition
[]
{
function
toModeTransitions
(
topLevelMode
:
IMode
,
modeTransitions
:
ModeTransition
[]):
ModeTransition
[]
{
if
(
!
modeTransitions
||
modeTransitions
.
length
===
0
)
{
return
null
;
...
...
@@ -813,5 +796,5 @@ function toModeTransitions(topLevelMode:IMode, modeTransitions:IModeTransition[]
return
null
;
}
return
ModeTransition
.
create
(
modeTransitions
)
;
return
modeTransitions
;
}
src/vs/editor/common/model/textModelWithTokens.ts
浏览文件 @
94ccb584
...
...
@@ -18,7 +18,7 @@ import {ModelLine} from 'vs/editor/common/model/modelLine';
import
{
TextModel
}
from
'
vs/editor/common/model/textModel
'
;
import
{
WordHelper
}
from
'
vs/editor/common/model/textModelWithTokensHelpers
'
;
import
{
TokenIterator
}
from
'
vs/editor/common/model/tokenIterator
'
;
import
{
ILineContext
,
ILineTokens
,
IMode
,
IState
}
from
'
vs/editor/common/modes
'
;
import
{
ILineContext
,
ILineTokens
,
I
Token
,
IModeTransition
,
I
Mode
,
IState
}
from
'
vs/editor/common/modes
'
;
import
{
NullMode
,
NullState
,
nullTokenize
}
from
'
vs/editor/common/modes/nullMode
'
;
import
{
ignoreBracketsInToken
}
from
'
vs/editor/common/modes/supports
'
;
import
{
BracketsUtils
}
from
'
vs/editor/common/modes/supports/richEditBrackets
'
;
...
...
@@ -535,8 +535,36 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
}
}
_updateLineTokens
(
lineIndex
:
number
,
map
:
editorCommon
.
ITokensInflatorMap
,
topLevelMode
:
IMode
,
r
:
ILineTokens
):
void
{
this
.
_lines
[
lineIndex
].
setTokens
(
map
,
r
.
tokens
,
topLevelMode
,
r
.
modeTransitions
);
private
static
_toLineTokens
(
tokens
:
IToken
[]):
editorCommon
.
LineToken
[]
{
if
(
!
tokens
||
tokens
.
length
===
0
)
{
return
[];
}
if
(
tokens
[
0
]
instanceof
editorCommon
.
LineToken
)
{
return
<
editorCommon
.
LineToken
[]
>
tokens
;
}
let
result
:
editorCommon
.
LineToken
[]
=
[];
for
(
let
i
=
0
,
len
=
tokens
.
length
;
i
<
len
;
i
++
)
{
result
[
i
]
=
new
editorCommon
.
LineToken
(
tokens
[
i
].
startIndex
,
tokens
[
i
].
type
);
}
return
result
;
}
private
static
_toModeTransitions
(
modeTransitions
:
IModeTransition
[]):
ModeTransition
[]
{
if
(
!
modeTransitions
||
modeTransitions
.
length
===
0
)
{
return
[];
}
if
(
modeTransitions
[
0
]
instanceof
ModeTransition
)
{
return
<
ModeTransition
[]
>
modeTransitions
;
}
let
result
:
ModeTransition
[]
=
[];
for
(
let
i
=
0
,
len
=
modeTransitions
.
length
;
i
<
len
;
i
++
)
{
result
[
i
]
=
new
ModeTransition
(
modeTransitions
[
i
].
startIndex
,
modeTransitions
[
i
].
mode
);
}
return
result
;
}
private
_updateLineTokens
(
lineIndex
:
number
,
map
:
editorCommon
.
ITokensInflatorMap
,
topLevelMode
:
IMode
,
r
:
ILineTokens
):
void
{
this
.
_lines
[
lineIndex
].
setTokens
(
map
,
TextModelWithTokens
.
_toLineTokens
(
r
.
tokens
),
topLevelMode
,
TextModelWithTokens
.
_toModeTransitions
(
r
.
modeTransitions
));
}
private
_beginBackgroundTokenization
():
void
{
...
...
src/vs/editor/common/model/tokensBinaryEncoding.ts
浏览文件 @
94ccb584
...
...
@@ -7,7 +7,6 @@
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
ITokensInflatorMap
,
LineToken
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IToken
}
from
'
vs/editor/common/modes
'
;
export
var
START_INDEX_MASK
=
0xffffffff
;
export
var
TYPE_MASK
=
0xffff
;
...
...
@@ -20,7 +19,7 @@ var DEFLATED_TOKENS_EMPTY_TEXT:number[] = [];
var
INFLATED_TOKENS_NON_EMPTY_TEXT
:
LineToken
[]
=
[
DEFAULT_TOKEN
];
var
DEFLATED_TOKENS_NON_EMPTY_TEXT
:
number
[]
=
[
0
];
export
function
deflateArr
(
map
:
ITokensInflatorMap
,
tokens
:
I
Token
[]):
number
[]
{
export
function
deflateArr
(
map
:
ITokensInflatorMap
,
tokens
:
Line
Token
[]):
number
[]
{
if
(
tokens
.
length
===
0
)
{
return
DEFLATED_TOKENS_EMPTY_TEXT
;
}
...
...
@@ -32,7 +31,7 @@ export function deflateArr(map:ITokensInflatorMap, tokens:IToken[]): number[] {
len
:
number
,
deflatedToken
:
number
,
deflated
:
number
,
token
:
I
Token
,
token
:
Line
Token
,
inflateMap
=
map
.
_inflate
,
deflateMap
=
map
.
_deflate
,
prevStartIndex
:
number
=
-
1
,
...
...
@@ -80,7 +79,7 @@ export function deflateArr(map:ITokensInflatorMap, tokens:IToken[]): number[] {
return
result
;
}
export
function
inflate
(
map
:
ITokensInflatorMap
,
binaryEncodedToken
:
number
):
I
Token
{
export
function
inflate
(
map
:
ITokensInflatorMap
,
binaryEncodedToken
:
number
):
Line
Token
{
if
(
binaryEncodedToken
===
0
)
{
return
DEFAULT_TOKEN
;
}
...
...
src/vs/editor/test/common/model/model.line.test.ts
浏览文件 @
94ccb584
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录