Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bca7206f
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,发现更多精彩内容 >>
提交
bca7206f
编写于
11月 07, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Forward onEdit from webviewEditor to mainthread
上级
c3bf2929
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
13 deletion
+36
-13
src/vs/workbench/api/browser/mainThreadWebview.ts
src/vs/workbench/api/browser/mainThreadWebview.ts
+7
-0
src/vs/workbench/api/common/extHost.protocol.ts
src/vs/workbench/api/common/extHost.protocol.ts
+2
-0
src/vs/workbench/api/common/extHostWebview.ts
src/vs/workbench/api/common/extHostWebview.ts
+27
-13
未找到文件。
src/vs/workbench/api/browser/mainThreadWebview.ts
浏览文件 @
bca7206f
...
...
@@ -296,6 +296,13 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
this
.
_editorProviders
.
delete
(
viewType
);
}
public
$onEdit
(
handle
:
extHostProtocol
.
WebviewPanelHandle
,
editJson
:
string
):
void
{
const
webview
=
this
.
getWebviewInput
(
handle
);
if
(
!
(
webview
instanceof
CustomFileEditorInput
))
{
throw
new
Error
(
`Webview is not a webview editor`
);
}
}
private
hookupWebviewEventDelegate
(
handle
:
extHostProtocol
.
WebviewPanelHandle
,
input
:
WebviewInput
)
{
input
.
webview
.
onDidClickLink
((
uri
:
URI
)
=>
this
.
onDidClickLink
(
handle
,
uri
));
input
.
webview
.
onMessage
((
message
:
any
)
=>
this
.
_proxy
.
$onMessage
(
handle
,
message
));
...
...
src/vs/workbench/api/common/extHost.protocol.ts
浏览文件 @
bca7206f
...
...
@@ -570,6 +570,8 @@ export interface MainThreadWebviewsShape extends IDisposable {
$registerEditorProvider
(
extension
:
WebviewExtensionDescription
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
):
void
;
$unregisterEditorProvider
(
viewType
:
string
):
void
;
$onEdit
(
handle
:
WebviewPanelHandle
,
editJson
:
string
):
void
;
}
export
interface
WebviewPanelViewStateData
{
...
...
src/vs/workbench/api/common/extHostWebview.ts
浏览文件 @
bca7206f
...
...
@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
Disposable
,
DisposableStore
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
generateUuid
}
from
'
vs/base/common/uuid
'
;
import
*
as
modes
from
'
vs/editor/common/modes
'
;
...
...
@@ -14,7 +15,7 @@ import { EditorViewColumn } from 'vs/workbench/api/common/shared/editor';
import
{
asWebviewUri
,
WebviewInitData
}
from
'
vs/workbench/api/common/shared/webview
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
ExtHostWebviewsShape
,
IMainContext
,
MainContext
,
MainThreadWebviewsShape
,
WebviewPanelHandle
,
WebviewPanelViewStateData
}
from
'
./extHost.protocol
'
;
import
{
Disposable
}
from
'
./extHostTypes
'
;
import
{
Disposable
as
VSCodeDisposable
}
from
'
./extHostTypes
'
;
type
IconPath
=
URI
|
{
light
:
URI
,
dark
:
URI
};
...
...
@@ -91,8 +92,7 @@ export class ExtHostWebview implements vscode.Webview {
}
}
export
class
ExtHostWebviewEditor
implements
vscode
.
WebviewPanel
{
export
class
ExtHostWebviewEditor
extends
Disposable
implements
vscode
.
WebviewPanel
{
private
readonly
_handle
:
WebviewPanelHandle
;
private
readonly
_proxy
:
MainThreadWebviewsShape
;
private
readonly
_viewType
:
string
;
...
...
@@ -107,10 +107,10 @@ export class ExtHostWebviewEditor implements vscode.WebviewPanel {
_isDisposed
:
boolean
=
false
;
readonly
_onDisposeEmitter
=
new
Emitter
<
void
>
(
);
readonly
_onDisposeEmitter
=
this
.
_register
(
new
Emitter
<
void
>
()
);
public
readonly
onDidDispose
:
Event
<
void
>
=
this
.
_onDisposeEmitter
.
event
;
readonly
_onDidChangeViewStateEmitter
=
new
Emitter
<
vscode
.
WebviewPanelOnDidChangeViewStateEvent
>
(
);
readonly
_onDidChangeViewStateEmitter
=
this
.
_register
(
new
Emitter
<
vscode
.
WebviewPanelOnDidChangeViewStateEvent
>
()
);
public
readonly
onDidChangeViewState
:
Event
<
vscode
.
WebviewPanelOnDidChangeViewStateEvent
>
=
this
.
_onDidChangeViewStateEmitter
.
event
;
constructor
(
...
...
@@ -122,6 +122,7 @@ export class ExtHostWebviewEditor implements vscode.WebviewPanel {
editorOptions
:
vscode
.
WebviewPanelOptions
,
webview
:
ExtHostWebview
)
{
super
();
this
.
_handle
=
handle
;
this
.
_proxy
=
proxy
;
this
.
_viewType
=
viewType
;
...
...
@@ -135,16 +136,12 @@ export class ExtHostWebviewEditor implements vscode.WebviewPanel {
if
(
this
.
_isDisposed
)
{
return
;
}
this
.
_isDisposed
=
true
;
this
.
_onDisposeEmitter
.
fire
();
this
.
_proxy
.
$disposeWebview
(
this
.
_handle
);
this
.
_webview
.
dispose
();
this
.
_onDisposeEmitter
.
dispose
();
this
.
_onDidChangeViewStateEmitter
.
dispose
();
super
.
dispose
();
}
get
webview
()
{
...
...
@@ -236,6 +233,10 @@ export class ExtHostWebviewEditor implements vscode.WebviewPanel {
});
}
_addDisposable
(
disposable
:
IDisposable
)
{
this
.
_register
(
disposable
);
}
private
assertNotDisposed
()
{
if
(
this
.
_isDisposed
)
{
throw
new
Error
(
'
Webview is disposed
'
);
...
...
@@ -296,7 +297,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
this
.
_serializers
.
set
(
viewType
,
{
serializer
,
extension
});
this
.
_proxy
.
$registerSerializer
(
viewType
);
return
new
Disposable
(()
=>
{
return
new
VSCode
Disposable
(()
=>
{
this
.
_serializers
.
delete
(
viewType
);
this
.
_proxy
.
$unregisterSerializer
(
viewType
);
});
...
...
@@ -315,7 +316,7 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
this
.
_editorProviders
.
set
(
viewType
,
{
extension
,
provider
,
});
this
.
_proxy
.
$registerEditorProvider
({
id
:
extension
.
identifier
,
location
:
extension
.
extensionLocation
},
viewType
,
options
||
{});
return
new
Disposable
(()
=>
{
return
new
VSCode
Disposable
(()
=>
{
this
.
_editorProviders
.
delete
(
viewType
);
this
.
_proxy
.
$unregisterEditorProvider
(
viewType
);
});
...
...
@@ -418,11 +419,24 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
if
(
!
entry
)
{
return
Promise
.
reject
(
new
Error
(
`No provider found for '
${
viewType
}
'`
));
}
const
{
provider
,
extension
}
=
entry
;
const
webview
=
new
ExtHostWebview
(
handle
,
this
.
_proxy
,
options
,
this
.
initData
,
this
.
workspace
,
extension
);
const
revivedPanel
=
new
ExtHostWebviewEditor
(
handle
,
this
.
_proxy
,
viewType
,
title
,
typeof
position
===
'
number
'
&&
position
>=
0
?
typeConverters
.
ViewColumn
.
to
(
position
)
:
undefined
,
options
,
webview
);
this
.
_webviewPanels
.
set
(
handle
,
revivedPanel
);
await
Promise
.
resolve
(
provider
.
resolveWebviewEditor
({
resource
:
URI
.
revive
(
resource
)
},
revivedPanel
));
const
capabilities
=
await
provider
.
resolveWebviewEditor
({
resource
:
URI
.
revive
(
resource
)
},
revivedPanel
);
revivedPanel
.
_addDisposable
(
this
.
hookupCapabilities
(
handle
,
capabilities
));
}
private
hookupCapabilities
(
handle
:
WebviewPanelHandle
,
capabilities
:
vscode
.
WebviewEditorCapabilities
):
IDisposable
{
const
disposables
=
new
DisposableStore
();
if
(
capabilities
.
editingCapability
)
{
disposables
.
add
(
capabilities
.
editingCapability
.
onEdit
(
edit
=>
{
this
.
_proxy
.
$onEdit
(
handle
,
JSON
.
stringify
(
edit
));
}));
}
return
disposables
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录