Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
31d16921
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,发现更多精彩内容 >>
提交
31d16921
编写于
8月 25, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use string concat and rename escape trick to signal that it creates a code block, #10939
上级
dd5d2f00
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
16 deletion
+23
-16
src/vs/base/common/htmlContent.ts
src/vs/base/common/htmlContent.ts
+1
-1
src/vs/editor/common/services/modelServiceImpl.ts
src/vs/editor/common/services/modelServiceImpl.ts
+18
-11
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
...editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+2
-2
src/vs/editor/contrib/hover/browser/modesContentHover.ts
src/vs/editor/contrib/hover/browser/modesContentHover.ts
+2
-2
未找到文件。
src/vs/base/common/htmlContent.ts
浏览文件 @
31d16921
...
...
@@ -67,7 +67,7 @@ function markedStringEqual(a:MarkedString, b:MarkedString): boolean {
);
}
export
function
text
ToMarkedString
(
text
:
string
)
:
MarkedString
{
export
function
text
AsCodeBlock
(
text
:
string
)
:
MarkedString
{
return
{
language
:
'
string
'
,
value
:
text
};
}
...
...
src/vs/editor/common/services/modelServiceImpl.ts
浏览文件 @
31d16921
...
...
@@ -8,7 +8,7 @@ import * as nls from 'vs/nls';
import
network
=
require
(
'
vs/base/common/network
'
);
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
EmitterEvent
}
from
'
vs/base/common/eventEmitter
'
;
import
{
MarkedString
,
text
ToMarkedString
}
from
'
vs/base/common/htmlContent
'
;
import
{
MarkedString
,
text
AsCodeBlock
}
from
'
vs/base/common/htmlContent
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
URI
from
'
vs/base/common/uri
'
;
...
...
@@ -121,7 +121,6 @@ class ModelMarkerHandler {
let
className
:
string
;
let
color
:
string
;
let
darkColor
:
string
;
let
hoverMessage
:
MarkedString
[]
=
null
;
switch
(
marker
.
severity
)
{
case
Severity
.
Ignore
:
...
...
@@ -141,16 +140,24 @@ class ModelMarkerHandler {
break
;
}
if
(
typeof
marker
.
message
===
'
string
'
)
{
hoverMessage
=
[
textToMarkedString
(
marker
.
message
)
];
}
else
if
(
Array
.
isArray
(
marker
.
message
))
{
hoverMessage
=
<
MarkedString
[]
><
any
>
marker
.
message
;
}
else
if
(
marker
.
message
)
{
hoverMessage
=
[
marker
.
message
];
}
let
hoverMessage
:
MarkedString
[]
=
null
;
let
{
message
,
source
}
=
marker
;
if
(
hoverMessage
&&
marker
.
source
)
{
hoverMessage
.
unshift
(
`[
${
marker
.
source
}
] `
);
if
(
typeof
message
===
'
string
'
)
{
if
(
source
)
{
message
=
nls
.
localize
(
'
sourceAndDiagMessage
'
,
"
[{0}] {1}
"
,
source
,
message
);
}
hoverMessage
=
[
textAsCodeBlock
(
message
)];
}
else
if
(
message
)
{
// this some old undocumented trick to get
// formatted error messages. no clue if we still
// have a need for that
hoverMessage
=
source
?
[
`[
${
marker
.
source
}
] `
]
:
[];
if
(
Array
.
isArray
(
message
))
{
hoverMessage
.
push
(...(
<
any
>
message
));
}
else
{
hoverMessage
.
push
(
message
);
}
}
return
{
...
...
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
浏览文件 @
31d16921
...
...
@@ -9,7 +9,7 @@ import 'vs/css!./goToDeclaration';
import
*
as
nls
from
'
vs/nls
'
;
import
{
Throttler
}
from
'
vs/base/common/async
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
MarkedString
,
text
ToMarkedString
}
from
'
vs/base/common/htmlContent
'
;
import
{
MarkedString
,
text
AsCodeBlock
}
from
'
vs/base/common/htmlContent
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
Severity
from
'
vs/base/common/severity
'
;
...
...
@@ -385,7 +385,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
value
:
text
};
}
else
{
hoverMessage
=
text
ToMarkedString
(
text
);
hoverMessage
=
text
AsCodeBlock
(
text
);
}
}
...
...
src/vs/editor/contrib/hover/browser/modesContentHover.ts
浏览文件 @
31d16921
...
...
@@ -20,7 +20,7 @@ import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
import
{
getHover
}
from
'
../common/hover
'
;
import
{
HoverOperation
,
IHoverComputer
}
from
'
./hoverOperation
'
;
import
{
ContentHoverWidget
}
from
'
./hoverWidgets
'
;
import
{
text
ToMarkedString
,
MarkedString
}
from
'
vs/base/common/htmlContent
'
;
import
{
text
AsCodeBlock
,
MarkedString
}
from
'
vs/base/common/htmlContent
'
;
class
ModesContentComputer
implements
IHoverComputer
<
Hover
[]
>
{
...
...
@@ -112,7 +112,7 @@ class ModesContentComputer implements IHoverComputer<Hover[]> {
private
_getLoadingMessage
():
Hover
{
return
{
range
:
this
.
_range
,
contents
:
[
text
ToMarkedString
(
nls
.
localize
(
'
modesContentHover.loading
'
,
"
Loading...
"
))]
contents
:
[
text
AsCodeBlock
(
nls
.
localize
(
'
modesContentHover.loading
'
,
"
Loading...
"
))]
};
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录