Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f35758ab
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,发现更多精彩内容 >>
提交
f35758ab
编写于
4月 23, 2020
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename supportsMultipleEditorsPerResource -> supportsMultipleEditorsPerDocument
For #77131
上级
e5194075
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
12 addition
and
12 deletion
+12
-12
extensions/image-preview/src/extension.ts
extensions/image-preview/src/extension.ts
+1
-1
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+1
-1
src/vs/workbench/api/browser/mainThreadWebview.ts
src/vs/workbench/api/browser/mainThreadWebview.ts
+4
-4
src/vs/workbench/api/common/extHost.api.impl.ts
src/vs/workbench/api/common/extHost.api.impl.ts
+1
-1
src/vs/workbench/api/common/extHost.protocol.ts
src/vs/workbench/api/common/extHost.protocol.ts
+1
-1
src/vs/workbench/api/common/extHostWebview.ts
src/vs/workbench/api/common/extHostWebview.ts
+2
-2
src/vs/workbench/contrib/customEditor/browser/customEditors.ts
...s/workbench/contrib/customEditor/browser/customEditors.ts
+1
-1
src/vs/workbench/contrib/customEditor/common/customEditor.ts
src/vs/workbench/contrib/customEditor/common/customEditor.ts
+1
-1
未找到文件。
extensions/image-preview/src/extension.ts
浏览文件 @
f35758ab
...
@@ -24,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
...
@@ -24,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
const
previewManager
=
new
PreviewManager
(
extensionRoot
,
sizeStatusBarEntry
,
binarySizeStatusBarEntry
,
zoomStatusBarEntry
);
const
previewManager
=
new
PreviewManager
(
extensionRoot
,
sizeStatusBarEntry
,
binarySizeStatusBarEntry
,
zoomStatusBarEntry
);
context
.
subscriptions
.
push
(
vscode
.
window
.
registerCustomEditorProvider2
(
PreviewManager
.
viewType
,
previewManager
,
{
context
.
subscriptions
.
push
(
vscode
.
window
.
registerCustomEditorProvider2
(
PreviewManager
.
viewType
,
previewManager
,
{
supportsMultipleEditorsPer
Resource
:
true
,
supportsMultipleEditorsPer
Document
:
true
,
}));
}));
context
.
subscriptions
.
push
(
vscode
.
commands
.
registerCommand
(
'
imagePreview.zoomIn
'
,
()
=>
{
context
.
subscriptions
.
push
(
vscode
.
commands
.
registerCommand
(
'
imagePreview.zoomIn
'
,
()
=>
{
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
f35758ab
...
@@ -1491,7 +1491,7 @@ declare module 'vscode' {
...
@@ -1491,7 +1491,7 @@ declare module 'vscode' {
* When set, users can split and create copies of the custom editor. The custom editor must make sure it
* When set, users can split and create copies of the custom editor. The custom editor must make sure it
* can properly synchronize the states of all editor instances for a resource so that they are consistent.
* can properly synchronize the states of all editor instances for a resource so that they are consistent.
*/
*/
readonly
supportsMultipleEditorsPer
Resource
?:
boolean
;
readonly
supportsMultipleEditorsPer
Document
?:
boolean
;
}
}
):
Disposable
;
):
Disposable
;
}
}
...
...
src/vs/workbench/api/browser/mainThreadWebview.ts
浏览文件 @
f35758ab
...
@@ -309,8 +309,8 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
...
@@ -309,8 +309,8 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
this
.
registerEditorProvider
(
ModelType
.
Text
,
extensionData
,
viewType
,
options
,
capabilities
,
true
);
this
.
registerEditorProvider
(
ModelType
.
Text
,
extensionData
,
viewType
,
options
,
capabilities
,
true
);
}
}
public
$registerCustomEditorProvider
(
extensionData
:
extHostProtocol
.
WebviewExtensionDescription
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
,
supportsMultipleEditorsPer
Resource
:
boolean
):
void
{
public
$registerCustomEditorProvider
(
extensionData
:
extHostProtocol
.
WebviewExtensionDescription
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
,
supportsMultipleEditorsPer
Document
:
boolean
):
void
{
this
.
registerEditorProvider
(
ModelType
.
Custom
,
extensionData
,
viewType
,
options
,
{},
supportsMultipleEditorsPer
Resource
);
this
.
registerEditorProvider
(
ModelType
.
Custom
,
extensionData
,
viewType
,
options
,
{},
supportsMultipleEditorsPer
Document
);
}
}
private
registerEditorProvider
(
private
registerEditorProvider
(
...
@@ -319,14 +319,14 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
...
@@ -319,14 +319,14 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
viewType
:
string
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
,
options
:
modes
.
IWebviewPanelOptions
,
capabilities
:
extHostProtocol
.
CustomTextEditorCapabilities
,
capabilities
:
extHostProtocol
.
CustomTextEditorCapabilities
,
supportsMultipleEditorsPer
Resource
:
boolean
,
supportsMultipleEditorsPer
Document
:
boolean
,
):
DisposableStore
{
):
DisposableStore
{
if
(
this
.
_editorProviders
.
has
(
viewType
))
{
if
(
this
.
_editorProviders
.
has
(
viewType
))
{
throw
new
Error
(
`Provider for
${
viewType
}
already registered`
);
throw
new
Error
(
`Provider for
${
viewType
}
already registered`
);
}
}
this
.
_customEditorService
.
registerCustomEditorCapabilities
(
viewType
,
{
this
.
_customEditorService
.
registerCustomEditorCapabilities
(
viewType
,
{
supportsMultipleEditorsPer
Resource
supportsMultipleEditorsPer
Document
});
});
const
extension
=
reviveWebviewExtension
(
extensionData
);
const
extension
=
reviveWebviewExtension
(
extensionData
);
...
...
src/vs/workbench/api/common/extHost.api.impl.ts
浏览文件 @
f35758ab
...
@@ -588,7 +588,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
...
@@ -588,7 +588,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
registerCustomEditorProvider
:
(
viewType
:
string
,
provider
:
vscode
.
CustomTextEditorProvider
,
options
:
{
webviewOptions
?:
vscode
.
WebviewPanelOptions
}
=
{})
=>
{
registerCustomEditorProvider
:
(
viewType
:
string
,
provider
:
vscode
.
CustomTextEditorProvider
,
options
:
{
webviewOptions
?:
vscode
.
WebviewPanelOptions
}
=
{})
=>
{
return
extHostWebviews
.
registerCustomEditorProvider
(
extension
,
viewType
,
provider
,
options
);
return
extHostWebviews
.
registerCustomEditorProvider
(
extension
,
viewType
,
provider
,
options
);
},
},
registerCustomEditorProvider2
:
(
viewType
:
string
,
provider
:
vscode
.
CustomEditorProvider
,
options
:
{
webviewOptions
?:
vscode
.
WebviewPanelOptions
,
supportsMultipleEditorsPer
Resource
?:
boolean
}
=
{})
=>
{
registerCustomEditorProvider2
:
(
viewType
:
string
,
provider
:
vscode
.
CustomEditorProvider
,
options
:
{
webviewOptions
?:
vscode
.
WebviewPanelOptions
,
supportsMultipleEditorsPer
Document
?:
boolean
}
=
{})
=>
{
checkProposedApiEnabled
(
extension
);
checkProposedApiEnabled
(
extension
);
return
extHostWebviews
.
registerCustomEditorProvider
(
extension
,
viewType
,
provider
,
options
);
return
extHostWebviews
.
registerCustomEditorProvider
(
extension
,
viewType
,
provider
,
options
);
},
},
...
...
src/vs/workbench/api/common/extHost.protocol.ts
浏览文件 @
f35758ab
...
@@ -612,7 +612,7 @@ export interface MainThreadWebviewsShape extends IDisposable {
...
@@ -612,7 +612,7 @@ export interface MainThreadWebviewsShape extends IDisposable {
$unregisterSerializer
(
viewType
:
string
):
void
;
$unregisterSerializer
(
viewType
:
string
):
void
;
$registerTextEditorProvider
(
extension
:
WebviewExtensionDescription
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
,
capabilities
:
CustomTextEditorCapabilities
):
void
;
$registerTextEditorProvider
(
extension
:
WebviewExtensionDescription
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
,
capabilities
:
CustomTextEditorCapabilities
):
void
;
$registerCustomEditorProvider
(
extension
:
WebviewExtensionDescription
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
,
supportsMultipleEditorsPer
Resource
:
boolean
):
void
;
$registerCustomEditorProvider
(
extension
:
WebviewExtensionDescription
,
viewType
:
string
,
options
:
modes
.
IWebviewPanelOptions
,
supportsMultipleEditorsPer
Document
:
boolean
):
void
;
$unregisterEditorProvider
(
viewType
:
string
):
void
;
$unregisterEditorProvider
(
viewType
:
string
):
void
;
$onDidEdit
(
resource
:
UriComponents
,
viewType
:
string
,
editId
:
number
,
label
:
string
|
undefined
):
void
;
$onDidEdit
(
resource
:
UriComponents
,
viewType
:
string
,
editId
:
number
,
label
:
string
|
undefined
):
void
;
...
...
src/vs/workbench/api/common/extHostWebview.ts
浏览文件 @
f35758ab
...
@@ -460,7 +460,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape {
...
@@ -460,7 +460,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape {
extension
:
IExtensionDescription
,
extension
:
IExtensionDescription
,
viewType
:
string
,
viewType
:
string
,
provider
:
vscode
.
CustomEditorProvider
|
vscode
.
CustomTextEditorProvider
,
provider
:
vscode
.
CustomEditorProvider
|
vscode
.
CustomTextEditorProvider
,
options
:
{
webviewOptions
?:
vscode
.
WebviewPanelOptions
,
supportsMultipleEditorsPer
Resource
?:
boolean
},
options
:
{
webviewOptions
?:
vscode
.
WebviewPanelOptions
,
supportsMultipleEditorsPer
Document
?:
boolean
},
):
vscode
.
Disposable
{
):
vscode
.
Disposable
{
const
disposables
=
new
DisposableStore
();
const
disposables
=
new
DisposableStore
();
if
(
'
resolveCustomTextEditor
'
in
provider
)
{
if
(
'
resolveCustomTextEditor
'
in
provider
)
{
...
@@ -470,7 +470,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape {
...
@@ -470,7 +470,7 @@ export class ExtHostWebviews implements extHostProtocol.ExtHostWebviewsShape {
});
});
}
else
{
}
else
{
disposables
.
add
(
this
.
_editorProviders
.
addCustomProvider
(
viewType
,
extension
,
provider
));
disposables
.
add
(
this
.
_editorProviders
.
addCustomProvider
(
viewType
,
extension
,
provider
));
this
.
_proxy
.
$registerCustomEditorProvider
(
toExtensionData
(
extension
),
viewType
,
options
.
webviewOptions
||
{},
!!
options
.
supportsMultipleEditorsPer
Resource
);
this
.
_proxy
.
$registerCustomEditorProvider
(
toExtensionData
(
extension
),
viewType
,
options
.
webviewOptions
||
{},
!!
options
.
supportsMultipleEditorsPer
Document
);
}
}
return
extHostTypes
.
Disposable
.
from
(
return
extHostTypes
.
Disposable
.
from
(
...
...
src/vs/workbench/contrib/customEditor/browser/customEditors.ts
浏览文件 @
f35758ab
...
@@ -207,7 +207,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
...
@@ -207,7 +207,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
}
}
const
capabilities
=
this
.
getCustomEditorCapabilities
(
viewType
)
||
{};
const
capabilities
=
this
.
getCustomEditorCapabilities
(
viewType
)
||
{};
if
(
!
capabilities
.
supportsMultipleEditorsPer
Resource
)
{
if
(
!
capabilities
.
supportsMultipleEditorsPer
Document
)
{
const
movedEditor
=
await
this
.
tryRevealExistingEditorForResourceInGroup
(
resource
,
viewType
,
options
,
group
);
const
movedEditor
=
await
this
.
tryRevealExistingEditorForResourceInGroup
(
resource
,
viewType
,
options
,
group
);
if
(
movedEditor
)
{
if
(
movedEditor
)
{
return
movedEditor
;
return
movedEditor
;
...
...
src/vs/workbench/contrib/customEditor/common/customEditor.ts
浏览文件 @
f35758ab
...
@@ -22,7 +22,7 @@ export const CONTEXT_CUSTOM_EDITORS = new RawContextKey<string>('customEditors',
...
@@ -22,7 +22,7 @@ export const CONTEXT_CUSTOM_EDITORS = new RawContextKey<string>('customEditors',
export
const
CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE
=
new
RawContextKey
<
boolean
>
(
'
focusedCustomEditorIsEditable
'
,
false
);
export
const
CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE
=
new
RawContextKey
<
boolean
>
(
'
focusedCustomEditorIsEditable
'
,
false
);
export
interface
CustomEditorCapabilities
{
export
interface
CustomEditorCapabilities
{
readonly
supportsMultipleEditorsPer
Resource
?:
boolean
;
readonly
supportsMultipleEditorsPer
Document
?:
boolean
;
}
}
export
interface
ICustomEditorService
{
export
interface
ICustomEditorService
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录