Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bfe83a84
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,发现更多精彩内容 >>
提交
bfe83a84
编写于
12月 11, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
eng - less TPromise
上级
491f0d7b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
18 deletion
+9
-18
src/vs/base/browser/htmlContentRenderer.ts
src/vs/base/browser/htmlContentRenderer.ts
+6
-6
src/vs/workbench/api/node/extHostExtensionService.ts
src/vs/workbench/api/node/extHostExtensionService.ts
+3
-12
未找到文件。
src/vs/base/browser/htmlContentRenderer.ts
浏览文件 @
bfe83a84
...
...
@@ -8,16 +8,16 @@
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
{
defaultGenerator
}
from
'
vs/base/common/idGenerator
'
;
import
{
escape
}
from
'
vs/base/common/strings
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
removeMarkdownEscapes
,
IMarkdownString
}
from
'
vs/base/common/htmlContent
'
;
import
{
marked
}
from
'
vs/base/common/marked/marked
'
;
import
{
IMouseEvent
}
from
'
vs/base/browser/mouseEvent
'
;
import
{
isThenable
}
from
'
vs/base/common/async
'
;
export
interface
RenderOptions
{
className
?:
string
;
inline
?:
boolean
;
actionCallback
?:
(
content
:
string
,
event
?:
IMouseEvent
)
=>
void
;
codeBlockRenderer
?:
(
modeId
:
string
,
value
:
string
)
=>
string
|
T
Promis
e
<
string
>
;
codeBlockRenderer
?:
(
modeId
:
string
,
value
:
string
)
=>
string
|
T
henabl
e
<
string
>
;
}
function
createElement
(
options
:
RenderOptions
):
HTMLElement
{
...
...
@@ -53,7 +53,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions
// signal to code-block render that the
// element has been created
let
signalInnerHTML
:
Function
;
const
withInnerHTML
=
new
T
Promise
(
c
=>
signalInnerHTML
=
c
);
const
withInnerHTML
=
new
Promise
(
c
=>
signalInnerHTML
=
c
);
const
renderer
=
new
marked
.
Renderer
();
renderer
.
image
=
(
href
:
string
,
title
:
string
,
text
:
string
)
=>
{
...
...
@@ -122,17 +122,17 @@ export function renderMarkdown(markdown: IMarkdownString, options: RenderOptions
return
value
;
}
if
(
TPromise
.
is
(
value
))
{
if
(
isThenable
(
value
))
{
// when code-block rendering is async we return sync
// but update the node with the real result later.
const
id
=
defaultGenerator
.
nextId
();
TPromise
.
join
([
value
,
withInnerHTML
]).
done
(
values
=>
{
Promise
.
all
([
value
,
withInnerHTML
]).
then
(
values
=>
{
const
strValue
=
values
[
0
]
as
string
;
const
span
=
element
.
querySelector
(
`div[data-code="
${
id
}
"]`
);
if
(
span
)
{
span
.
innerHTML
=
strValue
;
}
}
,
err
=>
{
}
).
catch
(
err
=>
{
// ignore
});
return
`<div class="code" data-code="
${
id
}
">
${
escape
(
code
)}
</div>`
;
...
...
src/vs/workbench/api/node/extHostExtensionService.ts
浏览文件 @
bfe83a84
...
...
@@ -6,7 +6,7 @@
import
{
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
join
}
from
'
path
'
;
import
{
mkdirp
,
dirExists
}
from
'
vs/base/node/pfs
'
;
import
{
mkdirp
,
dirExists
,
realpath
}
from
'
vs/base/node/pfs
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ExtensionDescriptionRegistry
}
from
'
vs/workbench/services/extensions/node/extensionDescriptionRegistry
'
;
...
...
@@ -18,7 +18,6 @@ import { IExtensionMemento, ExtensionsActivator, ActivatedExtension, IExtensionA
import
{
ExtHostThreadService
}
from
'
vs/workbench/services/thread/node/extHostThreadService
'
;
import
{
ExtHostConfiguration
}
from
'
vs/workbench/api/node/extHostConfiguration
'
;
import
{
ExtHostWorkspace
}
from
'
vs/workbench/api/node/extHostWorkspace
'
;
import
{
realpath
}
from
'
fs
'
;
import
{
TernarySearchTree
}
from
'
vs/base/common/map
'
;
import
{
Barrier
}
from
'
vs/base/common/async
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
...
...
@@ -222,16 +221,8 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
if
(
!
ext
.
main
)
{
return
undefined
;
}
return
new
TPromise
((
resolve
,
reject
)
=>
{
realpath
(
ext
.
extensionFolderPath
,
(
err
,
path
)
=>
{
if
(
err
)
{
reject
(
err
);
}
else
{
tree
.
set
(
path
,
ext
);
resolve
(
void
0
);
}
});
});
return
realpath
(
ext
.
extensionFolderPath
).
then
(
value
=>
tree
.
set
(
value
,
ext
));
});
this
.
_extensionPathIndex
=
TPromise
.
join
(
extensions
).
then
(()
=>
tree
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录