Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
edd2c737
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,发现更多精彩内容 >>
提交
edd2c737
编写于
3月 20, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use withUndefinedAsNull and avoid null supression
上级
f1ab1ecb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
6 deletion
+7
-6
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
...editor/browser/viewParts/contentWidgets/contentWidgets.ts
+1
-1
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+3
-2
src/vs/editor/standalone/browser/colorizer.ts
src/vs/editor/standalone/browser/colorizer.ts
+3
-3
未找到文件。
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
浏览文件 @
edd2c737
...
...
@@ -272,7 +272,7 @@ class Widget {
public
setPosition
(
position
:
IPosition
|
null
|
undefined
,
range
:
IRange
|
null
|
undefined
,
preference
:
ContentWidgetPositionPreference
[]
|
null
|
undefined
):
void
{
this
.
_setPosition
(
position
,
range
);
this
.
_preference
=
preference
||
null
;
this
.
_preference
=
withUndefinedAsNull
(
preference
)
;
this
.
_cachedDomNodeClientWidth
=
-
1
;
this
.
_cachedDomNodeClientHeight
=
-
1
;
}
...
...
src/vs/editor/common/model/textModel.ts
浏览文件 @
edd2c737
...
...
@@ -32,6 +32,7 @@ import { ignoreBracketsInToken } from 'vs/editor/common/modes/supports';
import
{
BracketsUtils
,
RichEditBracket
,
RichEditBrackets
}
from
'
vs/editor/common/modes/supports/richEditBrackets
'
;
import
{
IStringStream
,
ITextSnapshot
}
from
'
vs/platform/files/common/files
'
;
import
{
ITheme
,
ThemeColor
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
withUndefinedAsNull
}
from
'
vs/base/common/types
'
;
const
CHEAP_TOKENIZATION_LENGTH_LIMIT
=
2048
;
...
...
@@ -2877,8 +2878,8 @@ export class ModelDecorationOptions implements model.IModelDecorationOptions {
this
.
stickiness
=
options
.
stickiness
||
model
.
TrackedRangeStickiness
.
AlwaysGrowsWhenTypingAtEdges
;
this
.
zIndex
=
options
.
zIndex
||
0
;
this
.
className
=
options
.
className
?
cleanClassName
(
options
.
className
)
:
null
;
this
.
hoverMessage
=
options
.
hoverMessage
||
null
;
this
.
glyphMarginHoverMessage
=
options
.
glyphMarginHoverMessage
||
null
;
this
.
hoverMessage
=
withUndefinedAsNull
(
options
.
hoverMessage
)
;
this
.
glyphMarginHoverMessage
=
withUndefinedAsNull
(
options
.
glyphMarginHoverMessage
)
;
this
.
isWholeLine
=
options
.
isWholeLine
||
false
;
this
.
showIfCollapsed
=
options
.
showIfCollapsed
||
false
;
this
.
collapseOnReplaceEdit
=
options
.
collapseOnReplaceEdit
||
false
;
...
...
src/vs/editor/standalone/browser/colorizer.ts
浏览文件 @
edd2c737
...
...
@@ -63,16 +63,16 @@ export class Colorizer {
// Send out the event to create the mode
modeService
.
triggerMode
(
language
);
le
t
tokenizationSupport
=
TokenizationRegistry
.
get
(
language
);
cons
t
tokenizationSupport
=
TokenizationRegistry
.
get
(
language
);
if
(
tokenizationSupport
)
{
return
_colorize
(
lines
,
tabSize
,
tokenizationSupport
);
}
le
t
tokenizationSupportPromise
=
TokenizationRegistry
.
getPromise
(
language
);
cons
t
tokenizationSupportPromise
=
TokenizationRegistry
.
getPromise
(
language
);
if
(
tokenizationSupportPromise
)
{
// A tokenizer will be registered soon
return
new
Promise
<
string
>
((
resolve
,
reject
)
=>
{
tokenizationSupportPromise
!
.
then
(
tokenizationSupport
=>
{
tokenizationSupportPromise
.
then
(
tokenizationSupport
=>
{
_colorize
(
lines
,
tabSize
,
tokenizationSupport
).
then
(
resolve
,
reject
);
},
reject
);
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录