Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6af56c72
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,发现更多精彩内容 >>
提交
6af56c72
编写于
10月 09, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extract type alias
上级
3ed36f09
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
35 deletion
+28
-35
src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
.../contrib/customEditor/browser/customEditorInputFactory.ts
+1
-1
src/vs/workbench/contrib/webview/browser/webviewEditorInputFactory.ts
...ench/contrib/webview/browser/webviewEditorInputFactory.ts
+1
-1
src/vs/workbench/contrib/webview/browser/webviewEditorService.ts
...workbench/contrib/webview/browser/webviewEditorService.ts
+26
-33
未找到文件。
src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
浏览文件 @
6af56c72
...
...
@@ -41,7 +41,7 @@ export class CustomEditoInputFactory extends WebviewEditorInputFactory {
):
CustomFileEditorInput
{
const
data
=
this
.
fromJson
(
serializedEditorInput
);
const
id
=
data
.
id
||
generateUuid
();
const
webviewInput
=
this
.
webviewService
.
reviveWebview
(
id
,
data
.
viewType
,
data
.
title
,
data
.
iconPath
,
data
.
state
,
data
.
options
,
data
.
extensionLocation
?
{
const
webviewInput
=
this
.
webviewService
.
reviveWebview
(
id
,
data
.
viewType
,
data
.
title
,
data
.
iconPath
,
data
.
state
,
data
.
options
,
data
.
extensionLocation
&&
data
.
extensionId
?
{
location
:
data
.
extensionLocation
,
id
:
data
.
extensionId
}
:
undefined
,
data
.
group
);
...
...
src/vs/workbench/contrib/webview/browser/webviewEditorInputFactory.ts
浏览文件 @
6af56c72
...
...
@@ -54,7 +54,7 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {
serializedEditorInput
:
string
):
WebviewInput
{
const
data
=
this
.
fromJson
(
serializedEditorInput
);
return
this
.
_webviewService
.
reviveWebview
(
data
.
id
||
generateUuid
(),
data
.
viewType
,
data
.
title
,
data
.
iconPath
,
data
.
state
,
data
.
options
,
data
.
extensionLocation
?
{
return
this
.
_webviewService
.
reviveWebview
(
data
.
id
||
generateUuid
(),
data
.
viewType
,
data
.
title
,
data
.
iconPath
,
data
.
state
,
data
.
options
,
data
.
extensionLocation
&&
data
.
extensionId
?
{
location
:
data
.
extensionLocation
,
id
:
data
.
extensionId
}
:
undefined
,
data
.
group
);
...
...
src/vs/workbench/contrib/webview/browser/webviewEditorService.ts
浏览文件 @
6af56c72
...
...
@@ -26,6 +26,27 @@ export interface ICreateWebViewShowOptions {
preserveFocus
:
boolean
;
}
export
interface
WebviewInputOptions
extends
WebviewOptions
,
WebviewContentOptions
{
readonly
tryRestoreScrollPosition
?:
boolean
;
readonly
retainContextWhenHidden
?:
boolean
;
readonly
enableCommandUris
?:
boolean
;
}
export
function
areWebviewInputOptionsEqual
(
a
:
WebviewInputOptions
,
b
:
WebviewInputOptions
):
boolean
{
return
a
.
enableCommandUris
===
b
.
enableCommandUris
&&
a
.
enableFindWidget
===
b
.
enableFindWidget
&&
a
.
allowScripts
===
b
.
allowScripts
&&
a
.
retainContextWhenHidden
===
b
.
retainContextWhenHidden
&&
a
.
tryRestoreScrollPosition
===
b
.
tryRestoreScrollPosition
&&
equals
(
a
.
localResourceRoots
,
b
.
localResourceRoots
,
isEqual
)
&&
equals
(
a
.
portMapping
,
b
.
portMapping
,
(
a
,
b
)
=>
a
.
extensionHostPort
===
b
.
extensionHostPort
&&
a
.
webviewPort
===
b
.
webviewPort
);
}
export
interface
WebviewExtensionDescription
{
readonly
location
:
URI
;
readonly
id
:
ExtensionIdentifier
;
}
export
interface
IWebviewEditorService
{
_serviceBrand
:
undefined
;
...
...
@@ -35,10 +56,7 @@ export interface IWebviewEditorService {
title
:
string
,
showOptions
:
ICreateWebViewShowOptions
,
options
:
WebviewInputOptions
,
extension
:
undefined
|
{
location
:
URI
,
id
:
ExtensionIdentifier
},
extension
:
WebviewExtensionDescription
|
undefined
,
):
WebviewInput
;
reviveWebview
(
...
...
@@ -48,10 +66,7 @@ export interface IWebviewEditorService {
iconPath
:
{
light
:
URI
,
dark
:
URI
}
|
undefined
,
state
:
any
,
options
:
WebviewInputOptions
,
extension
:
undefined
|
{
readonly
location
:
URI
,
readonly
id
?:
ExtensionIdentifier
},
extension
:
WebviewExtensionDescription
|
undefined
,
group
:
number
|
undefined
):
WebviewInput
;
...
...
@@ -84,22 +99,6 @@ export interface WebviewResolve {
):
Promise
<
void
>
;
}
export
interface
WebviewInputOptions
extends
WebviewOptions
,
WebviewContentOptions
{
readonly
tryRestoreScrollPosition
?:
boolean
;
readonly
retainContextWhenHidden
?:
boolean
;
readonly
enableCommandUris
?:
boolean
;
}
export
function
areWebviewInputOptionsEqual
(
a
:
WebviewInputOptions
,
b
:
WebviewInputOptions
):
boolean
{
return
a
.
enableCommandUris
===
b
.
enableCommandUris
&&
a
.
enableFindWidget
===
b
.
enableFindWidget
&&
a
.
allowScripts
===
b
.
allowScripts
&&
a
.
retainContextWhenHidden
===
b
.
retainContextWhenHidden
&&
a
.
tryRestoreScrollPosition
===
b
.
tryRestoreScrollPosition
&&
equals
(
a
.
localResourceRoots
,
b
.
localResourceRoots
,
isEqual
)
&&
equals
(
a
.
portMapping
,
b
.
portMapping
,
(
a
,
b
)
=>
a
.
extensionHostPort
===
b
.
extensionHostPort
&&
a
.
webviewPort
===
b
.
webviewPort
);
}
function
canRevive
(
reviver
:
WebviewResolve
,
webview
:
WebviewInput
):
boolean
{
if
(
webview
.
isDisposed
())
{
return
false
;
...
...
@@ -143,10 +142,7 @@ export class WebviewEditorService implements IWebviewEditorService {
title
:
string
,
showOptions
:
ICreateWebViewShowOptions
,
options
:
WebviewInputOptions
,
extension
:
undefined
|
{
location
:
URI
,
id
:
ExtensionIdentifier
},
extension
:
WebviewExtensionDescription
|
undefined
,
):
WebviewInput
{
const
webview
=
this
.
createWebiew
(
id
,
extension
,
options
);
...
...
@@ -188,10 +184,7 @@ export class WebviewEditorService implements IWebviewEditorService {
iconPath
:
{
light
:
URI
,
dark
:
URI
}
|
undefined
,
state
:
any
,
options
:
WebviewInputOptions
,
extension
:
undefined
|
{
readonly
location
:
URI
,
readonly
id
:
ExtensionIdentifier
},
extension
:
WebviewExtensionDescription
|
undefined
,
group
:
number
|
undefined
,
):
WebviewInput
{
const
webview
=
this
.
createWebiew
(
id
,
extension
,
options
);
...
...
@@ -254,7 +247,7 @@ export class WebviewEditorService implements IWebviewEditorService {
}
}
private
createWebiew
(
id
:
string
,
extension
:
{
location
:
URI
;
id
:
ExtensionIdentifier
;
}
|
undefined
,
options
:
WebviewInputOptions
)
{
private
createWebiew
(
id
:
string
,
extension
:
WebviewExtensionDescription
|
undefined
,
options
:
WebviewInputOptions
)
{
const
webview
=
this
.
_webviewService
.
createWebviewEditorOverlay
(
id
,
{
enableFindWidget
:
options
.
enableFindWidget
,
retainContextWhenHidden
:
options
.
retainContextWhenHidden
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录