Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
84cf12f4
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,发现更多精彩内容 >>
未验证
提交
84cf12f4
编写于
11月 25, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add trusted types policies where `.innerHTML` needs to be used (#108400)
上级
89c255a5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
3 deletion
+13
-3
src/vs/editor/browser/view/domLineBreaksComputer.ts
src/vs/editor/browser/view/domLineBreaksComputer.ts
+5
-1
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+4
-1
src/vs/editor/standalone/browser/colorizer.ts
src/vs/editor/standalone/browser/colorizer.ts
+4
-1
未找到文件。
src/vs/editor/browser/view/domLineBreaksComputer.ts
浏览文件 @
84cf12f4
...
...
@@ -12,6 +12,8 @@ import * as strings from 'vs/base/common/strings';
import
{
Configuration
}
from
'
vs/editor/browser/config/configuration
'
;
import
{
ILineBreaksComputer
,
LineBreakData
}
from
'
vs/editor/common/viewModel/viewModel
'
;
const
ttPolicy
=
window
.
trustedTypes
?.
createPolicy
(
'
domLineBreaksComputer
'
,
{
createHTML
:
value
=>
value
});
export
class
DOMLineBreaksComputerFactory
implements
ILineBreaksComputerFactory
{
public
static
create
():
DOMLineBreaksComputerFactory
{
...
...
@@ -108,7 +110,9 @@ function createLineBreaks(requests: string[], fontInfo: FontInfo, tabSize: numbe
allCharOffsets
[
i
]
=
tmp
[
0
];
allVisibleColumns
[
i
]
=
tmp
[
1
];
}
containerDomNode
.
innerHTML
=
sb
.
build
();
const
html
=
sb
.
build
();
const
trustedhtml
=
ttPolicy
?
ttPolicy
.
createHTML
(
html
)
:
html
;
containerDomNode
.
innerHTML
=
trustedhtml
as
unknown
as
string
;
containerDomNode
.
style
.
position
=
'
absolute
'
;
containerDomNode
.
style
.
top
=
'
10000
'
;
...
...
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
84cf12f4
...
...
@@ -156,6 +156,7 @@ let DIFF_EDITOR_ID = 0;
const
diffInsertIcon
=
registerIcon
(
'
diff-insert
'
,
Codicon
.
add
);
const
diffRemoveIcon
=
registerIcon
(
'
diff-remove
'
,
Codicon
.
remove
);
const
ttPolicy
=
window
.
trustedTypes
?.
createPolicy
(
'
diffEditorWidget
'
,
{
createHTML
:
value
=>
value
});
export
class
DiffEditorWidget
extends
Disposable
implements
editorBrowser
.
IDiffEditor
{
...
...
@@ -2383,7 +2384,9 @@ class InlineViewZonesComputer extends ViewZonesComputer {
}
maxCharsPerLine
+=
scrollBeyondLastColumn
;
domNode
.
innerHTML
=
sb
.
build
();
const
html
=
sb
.
build
();
const
trustedhtml
=
ttPolicy
?
ttPolicy
.
createHTML
(
html
)
:
html
;
domNode
.
innerHTML
=
trustedhtml
as
unknown
as
string
;
viewZone
.
minWidthInPx
=
(
maxCharsPerLine
*
typicalHalfwidthCharacterWidth
);
if
(
viewLineCounts
)
{
...
...
src/vs/editor/standalone/browser/colorizer.ts
浏览文件 @
84cf12f4
...
...
@@ -15,6 +15,8 @@ import { ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
import
{
IStandaloneThemeService
}
from
'
vs/editor/standalone/common/standaloneThemeService
'
;
import
{
MonarchTokenizer
}
from
'
vs/editor/standalone/common/monarch/monarchLexer
'
;
const
ttPolicy
=
window
.
trustedTypes
?.
createPolicy
(
'
standaloneColorizer
'
,
{
createHTML
:
value
=>
value
});
export
interface
IColorizerOptions
{
tabSize
?:
number
;
}
...
...
@@ -40,7 +42,8 @@ export class Colorizer {
let
text
=
domNode
.
firstChild
?
domNode
.
firstChild
.
nodeValue
:
''
;
domNode
.
className
+=
'
'
+
theme
;
let
render
=
(
str
:
string
)
=>
{
domNode
.
innerHTML
=
str
;
const
trustedhtml
=
ttPolicy
?
ttPolicy
.
createHTML
(
str
)
:
str
;
domNode
.
innerHTML
=
trustedhtml
as
unknown
as
string
;
};
return
this
.
colorize
(
modeService
,
text
||
''
,
mimeType
,
options
).
then
(
render
,
(
err
)
=>
console
.
error
(
err
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录