Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f8934261
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,发现更多精彩内容 >>
提交
f8934261
编写于
11月 28, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #63822: Keep tokens for empty lines if the language id is not the buffer language id
上级
14ba9f92
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
20 deletion
+38
-20
src/vs/editor/common/model/textModelTokens.ts
src/vs/editor/common/model/textModelTokens.ts
+10
-3
src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
...vs/editor/contrib/comment/test/lineCommentCommand.test.ts
+0
-17
src/vs/editor/test/common/model/textModelWithTokens.test.ts
src/vs/editor/test/common/model/textModelWithTokens.test.ts
+28
-0
未找到文件。
src/vs/editor/common/model/textModelTokens.ts
浏览文件 @
f8934261
...
@@ -11,7 +11,7 @@ import { Range } from 'vs/editor/common/core/range';
...
@@ -11,7 +11,7 @@ import { Range } from 'vs/editor/common/core/range';
import
{
TokenizationResult2
}
from
'
vs/editor/common/core/token
'
;
import
{
TokenizationResult2
}
from
'
vs/editor/common/core/token
'
;
import
{
ITextBuffer
}
from
'
vs/editor/common/model
'
;
import
{
ITextBuffer
}
from
'
vs/editor/common/model
'
;
import
{
IModelTokensChangedEvent
}
from
'
vs/editor/common/model/textModelEvents
'
;
import
{
IModelTokensChangedEvent
}
from
'
vs/editor/common/model/textModelEvents
'
;
import
{
ColorId
,
FontStyle
,
IState
,
ITokenizationSupport
,
LanguageId
,
LanguageIdentifier
,
MetadataConsts
,
StandardTokenType
}
from
'
vs/editor/common/modes
'
;
import
{
ColorId
,
FontStyle
,
IState
,
ITokenizationSupport
,
LanguageId
,
LanguageIdentifier
,
MetadataConsts
,
StandardTokenType
,
TokenMetadata
}
from
'
vs/editor/common/modes
'
;
import
{
nullTokenize2
}
from
'
vs/editor/common/modes/nullMode
'
;
import
{
nullTokenize2
}
from
'
vs/editor/common/modes/nullMode
'
;
function
getDefaultMetadata
(
topLevelLanguageId
:
LanguageId
):
number
{
function
getDefaultMetadata
(
topLevelLanguageId
:
LanguageId
):
number
{
...
@@ -262,8 +262,15 @@ export class ModelLinesTokens {
...
@@ -262,8 +262,15 @@ export class ModelLinesTokens {
}
}
if
(
lineTextLength
===
0
)
{
if
(
lineTextLength
===
0
)
{
target
.
_lineTokens
=
EMPTY_LINE_TOKENS
;
let
hasDifferentLanguageId
=
false
;
return
;
if
(
tokens
&&
tokens
.
length
>
1
)
{
hasDifferentLanguageId
=
(
TokenMetadata
.
getLanguageId
(
tokens
[
1
])
!==
topLevelLanguageId
);
}
if
(
!
hasDifferentLanguageId
)
{
target
.
_lineTokens
=
EMPTY_LINE_TOKENS
;
return
;
}
}
}
if
(
!
tokens
||
tokens
.
length
===
0
)
{
if
(
!
tokens
||
tokens
.
length
===
0
)
{
...
...
src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
浏览文件 @
f8934261
...
@@ -1056,21 +1056,4 @@ suite('Editor Contrib - Line Comment in mixed modes', () => {
...
@@ -1056,21 +1056,4 @@ suite('Editor Contrib - Line Comment in mixed modes', () => {
new
Selection
(
2
,
8
,
2
,
8
),
new
Selection
(
2
,
8
,
2
,
8
),
);
);
});
});
test
.
skip
(
'
issue #63822: Commenting code in JSX tag body from line 0
'
,
()
=>
{
testLineCommentCommand
(
[
'
<div>
'
,
''
,
'
</div>
'
,
],
new
Selection
(
2
,
1
,
2
,
1
),
[
'
<div>
'
,
'
{/* */}
'
,
'
</div>
'
,
],
new
Selection
(
2
,
1
,
2
,
1
),
);
});
});
});
src/vs/editor/test/common/model/textModelWithTokens.test.ts
浏览文件 @
f8934261
...
@@ -390,6 +390,34 @@ suite('TextModelWithTokens regression tests', () => {
...
@@ -390,6 +390,34 @@ suite('TextModelWithTokens regression tests', () => {
model
.
dispose
();
model
.
dispose
();
registration
.
dispose
();
registration
.
dispose
();
});
});
test
(
'
issue #63822: Wrong embedded language detected for empty lines
'
,
()
=>
{
const
outerMode
=
new
LanguageIdentifier
(
'
outerMode
'
,
3
);
const
innerMode
=
new
LanguageIdentifier
(
'
innerMode
'
,
4
);
const
tokenizationSupport
:
ITokenizationSupport
=
{
getInitialState
:
()
=>
NULL_STATE
,
tokenize
:
undefined
,
tokenize2
:
(
line
,
state
)
=>
{
let
tokens
=
new
Uint32Array
(
2
);
tokens
[
0
]
=
0
;
tokens
[
1
]
=
(
innerMode
.
id
<<
MetadataConsts
.
LANGUAGEID_OFFSET
)
>>>
0
;
return
new
TokenizationResult2
(
tokens
,
state
);
}
};
let
registration
=
TokenizationRegistry
.
register
(
outerMode
.
language
,
tokenizationSupport
);
let
model
=
TextModel
.
createFromString
(
'
A model with one line
'
,
undefined
,
outerMode
);
model
.
forceTokenization
(
1
);
assert
.
equal
(
model
.
getLanguageIdAtPosition
(
1
,
1
),
innerMode
.
id
);
model
.
dispose
();
registration
.
dispose
();
});
});
});
suite
(
'
TextModel.getLineIndentGuide
'
,
()
=>
{
suite
(
'
TextModel.getLineIndentGuide
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录