Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
aab56e95
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aab56e95
编写于
11月 15, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #62370
上级
f8ea816c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
22 deletion
+36
-22
src/vs/base/browser/htmlContentRenderer.ts
src/vs/base/browser/htmlContentRenderer.ts
+2
-2
src/vs/base/common/htmlContent.ts
src/vs/base/common/htmlContent.ts
+1
-0
src/vs/editor/common/services/modelServiceImpl.ts
src/vs/editor/common/services/modelServiceImpl.ts
+31
-20
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+2
-0
未找到文件。
src/vs/base/browser/htmlContentRenderer.ts
浏览文件 @
aab56e95
...
...
@@ -6,7 +6,7 @@
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
{
defaultGenerator
}
from
'
vs/base/common/idGenerator
'
;
import
{
escape
}
from
'
vs/base/common/strings
'
;
import
{
removeMarkdownEscapes
,
IMarkdownString
}
from
'
vs/base/common/htmlContent
'
;
import
{
removeMarkdownEscapes
,
IMarkdownString
,
MarkdownString
}
from
'
vs/base/common/htmlContent
'
;
import
*
as
marked
from
'
vs/base/common/marked/marked
'
;
import
{
IMouseEvent
}
from
'
vs/base/browser/mouseEvent
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
...
...
@@ -182,7 +182,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions
}
const
markedOptions
:
marked
.
MarkedOptions
=
{
sanitize
:
true
,
sanitize
:
markdown
instanceof
MarkdownString
?
markdown
.
sanitize
:
true
,
renderer
};
...
...
src/vs/base/common/htmlContent.ts
浏览文件 @
aab56e95
...
...
@@ -16,6 +16,7 @@ export class MarkdownString implements IMarkdownString {
value
:
string
;
isTrusted
?:
boolean
;
sanitize
:
boolean
=
true
;
constructor
(
value
:
string
=
''
)
{
this
.
value
=
value
;
...
...
src/vs/editor/common/services/modelServiceImpl.ts
浏览文件 @
aab56e95
...
...
@@ -3,10 +3,10 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
nls
from
'
vs/nls
'
;
import
{
isNonEmptyArray
}
from
'
vs/base/common/arrays
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
MarkdownString
}
from
'
vs/base/common/htmlContent
'
;
import
{
escape
}
from
'
vs/base/common/strings
'
;
import
{
Disposable
,
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
*
as
network
from
'
vs/base/common/network
'
;
import
{
basename
}
from
'
vs/base/common/paths
'
;
...
...
@@ -192,36 +192,47 @@ class ModelMarkerHandler {
let
{
message
,
source
,
relatedInformation
,
code
}
=
marker
;
if
(
typeof
message
===
'
string
'
)
{
message
=
message
.
trim
();
hoverMessage
=
new
MarkdownString
();
// Disable markdown renderer sanitize to allow html
// Hence, escape all input strings
hoverMessage
.
sanitize
=
false
;
if
(
source
)
{
if
(
/
\n
/g
.
test
(
message
))
{
if
(
code
)
{
message
=
nls
.
localize
(
'
diagAndSourceAndCodeMultiline
'
,
"
[{0}]
\n
{1} [{2}]
"
,
source
,
message
,
code
);
}
else
{
message
=
nls
.
localize
(
'
diagAndSourceMultiline
'
,
"
[{0}]
\n
{1}
"
,
source
,
message
);
}
}
else
{
if
(
code
)
{
message
=
nls
.
localize
(
'
diagAndSourceAndCode
'
,
"
[{0}] {1} [{2}]
"
,
source
,
message
,
code
);
}
else
{
message
=
nls
.
localize
(
'
diagAndSource
'
,
"
[{0}] {1}
"
,
source
,
message
);
}
hoverMessage
.
appendMarkdown
(
`<span style='opacity: 0.6'>[
${
escape
(
source
)}
]</span>`
);
hoverMessage
.
appendText
(
'
'
);
}
message
=
message
.
trim
();
const
lines
=
message
.
split
(
/
\r\n
|
\r
|
\n
/g
);
if
(
lines
.
length
>
1
)
{
if
(
source
)
{
hoverMessage
.
appendMarkdown
(
`</br>`
);
}
for
(
const
line
of
lines
)
{
hoverMessage
.
appendText
(
line
);
hoverMessage
.
appendMarkdown
(
`</br>`
);
}
}
else
{
hoverMessage
.
appendText
(
message
);
}
hoverMessage
=
new
MarkdownString
().
appendCodeblock
(
'
_
'
,
message
);
if
(
code
)
{
if
(
lines
.
length
===
1
)
{
hoverMessage
.
appendText
(
'
'
);
}
hoverMessage
.
appendMarkdown
(
`<span style='opacity: 0.6'>[
${
escape
(
code
)}
]</span>`
);
}
if
(
isNonEmptyArray
(
relatedInformation
))
{
hoverMessage
.
appendMarkdown
(
'
\n
'
);
hoverMessage
.
appendMarkdown
(
`\n`
);
for
(
const
{
message
,
resource
,
startLineNumber
,
startColumn
}
of
relatedInformation
)
{
hoverMessage
.
appendMarkdown
(
`* [
${
basename
(
resource
.
path
)}
(
${
startLineNumber
}
,
${
startColumn
}
)](
${
resource
.
toString
(
false
)}
#
${
startLineNumber
}
,
${
startColumn
}
): `
escape
(
`* [
${
basename
(
resource
.
path
)}
(
${
startLineNumber
}
,
${
startColumn
}
)](
${
resource
.
toString
(
false
)}
#
${
startLineNumber
}
,
${
startColumn
}
): `
)
);
hoverMessage
.
appendText
(
`
${
message
}
`
);
hoverMessage
.
appendMarkdown
(
'
\n
'
);
hoverMessage
.
appendText
(
`
${
escape
(
message
)
}
`
);
hoverMessage
.
appendMarkdown
(
`\n`
);
}
hoverMessage
.
appendMarkdown
(
'
\n
'
);
hoverMessage
.
appendMarkdown
(
`\n`
);
}
}
...
...
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
浏览文件 @
aab56e95
...
...
@@ -125,6 +125,7 @@ class MessageWidget {
const
sourceElement
=
document
.
createElement
(
'
div
'
);
sourceElement
.
innerText
=
`[
${
source
}
] `
;
dom
.
addClass
(
sourceElement
,
'
source
'
);
this
.
_editor
.
applyFontInfo
(
sourceElement
);
this
.
_messageBlock
.
appendChild
(
sourceElement
);
}
const
messageElement
=
document
.
createElement
(
'
div
'
);
...
...
@@ -135,6 +136,7 @@ class MessageWidget {
const
codeElement
=
document
.
createElement
(
'
div
'
);
codeElement
.
innerText
=
` [
${
code
}
]`
;
dom
.
addClass
(
codeElement
,
'
code
'
);
this
.
_editor
.
applyFontInfo
(
codeElement
);
this
.
_messageBlock
.
appendChild
(
codeElement
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录