Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
01f9355f
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,发现更多精彩内容 >>
提交
01f9355f
编写于
9月 10, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - simplify metadata edit because we now have CellEditType.DocumentMetadata
上级
533ca9bf
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
17 addition
and
42 deletion
+17
-42
src/vs/workbench/api/browser/mainThreadBulkEdits.ts
src/vs/workbench/api/browser/mainThreadBulkEdits.ts
+1
-1
src/vs/workbench/api/browser/mainThreadEditors.ts
src/vs/workbench/api/browser/mainThreadEditors.ts
+1
-1
src/vs/workbench/api/browser/mainThreadNotebook.ts
src/vs/workbench/api/browser/mainThreadNotebook.ts
+2
-10
src/vs/workbench/api/common/extHost.protocol.ts
src/vs/workbench/api/common/extHost.protocol.ts
+2
-3
src/vs/workbench/api/common/extHostNotebookDocument.ts
src/vs/workbench/api/common/extHostNotebookDocument.ts
+1
-1
src/vs/workbench/api/common/extHostNotebookEditor.ts
src/vs/workbench/api/common/extHostNotebookEditor.ts
+7
-6
src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
+3
-19
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+0
-1
未找到文件。
src/vs/workbench/api/browser/mainThreadBulkEdits.ts
浏览文件 @
01f9355f
...
@@ -21,7 +21,7 @@ function reviveWorkspaceEditDto2(data: IWorkspaceEditDto | undefined): ResourceE
...
@@ -21,7 +21,7 @@ function reviveWorkspaceEditDto2(data: IWorkspaceEditDto | undefined): ResourceE
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Text
)
{
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Text
)
{
result
.
push
(
new
ResourceTextEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
modelVersionId
,
edit
.
metadata
));
result
.
push
(
new
ResourceTextEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
modelVersionId
,
edit
.
metadata
));
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Cell
)
{
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Cell
)
{
result
.
push
(
new
ResourceNotebookCellEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
notebook
Metadata
,
edit
.
notebook
VersionId
,
edit
.
metadata
));
result
.
push
(
new
ResourceNotebookCellEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
notebookVersionId
,
edit
.
metadata
));
}
}
}
}
return
result
;
return
result
;
...
...
src/vs/workbench/api/browser/mainThreadEditors.ts
浏览文件 @
01f9355f
...
@@ -44,7 +44,7 @@ function reviveWorkspaceEditDto2(data: IWorkspaceEditDto | undefined): ResourceE
...
@@ -44,7 +44,7 @@ function reviveWorkspaceEditDto2(data: IWorkspaceEditDto | undefined): ResourceE
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Text
)
{
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Text
)
{
result
.
push
(
new
ResourceTextEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
modelVersionId
,
edit
.
metadata
));
result
.
push
(
new
ResourceTextEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
modelVersionId
,
edit
.
metadata
));
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Cell
)
{
}
else
if
(
edit
.
_type
===
WorkspaceEditType
.
Cell
)
{
result
.
push
(
new
ResourceNotebookCellEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
notebook
Metadata
,
edit
.
notebook
VersionId
,
edit
.
metadata
));
result
.
push
(
new
ResourceNotebookCellEdit
(
edit
.
resource
,
edit
.
edit
,
edit
.
notebookVersionId
,
edit
.
metadata
));
}
}
}
}
return
result
;
return
result
;
...
...
src/vs/workbench/api/browser/mainThreadNotebook.ts
浏览文件 @
01f9355f
...
@@ -18,7 +18,7 @@ import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookB
...
@@ -18,7 +18,7 @@ import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookB
import
{
NotebookCellTextModel
}
from
'
vs/workbench/contrib/notebook/common/model/notebookCellTextModel
'
;
import
{
NotebookCellTextModel
}
from
'
vs/workbench/contrib/notebook/common/model/notebookCellTextModel
'
;
import
{
NotebookTextModel
}
from
'
vs/workbench/contrib/notebook/common/model/notebookTextModel
'
;
import
{
NotebookTextModel
}
from
'
vs/workbench/contrib/notebook/common/model/notebookTextModel
'
;
import
{
INotebookCellStatusBarService
}
from
'
vs/workbench/contrib/notebook/common/notebookCellStatusBarService
'
;
import
{
INotebookCellStatusBarService
}
from
'
vs/workbench/contrib/notebook/common/notebookCellStatusBarService
'
;
import
{
ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER
,
CellEditType
,
DisplayOrderKey
,
ICellEditOperation
,
ICellRange
,
IEditor
,
IMainCellDto
,
INotebookDocumentFilter
,
NotebookCellOutputsSplice
,
NotebookCellsChangeType
,
N
otebookDocumentMetadata
,
N
OTEBOOK_DISPLAY_ORDER
,
TransientMetadata
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER
,
CellEditType
,
DisplayOrderKey
,
ICellEditOperation
,
ICellRange
,
IEditor
,
IMainCellDto
,
INotebookDocumentFilter
,
NotebookCellOutputsSplice
,
NotebookCellsChangeType
,
NOTEBOOK_DISPLAY_ORDER
,
TransientMetadata
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
IMainNotebookController
,
INotebookService
}
from
'
vs/workbench/contrib/notebook/common/notebookService
'
;
import
{
IMainNotebookController
,
INotebookService
}
from
'
vs/workbench/contrib/notebook/common/notebookService
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkingCopyService
}
from
'
vs/workbench/services/workingCopy/common/workingCopyService
'
;
import
{
IWorkingCopyService
}
from
'
vs/workbench/services/workingCopy/common/workingCopyService
'
;
...
@@ -156,20 +156,12 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
...
@@ -156,20 +156,12 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
this
.
registerListeners
();
this
.
registerListeners
();
}
}
async
$tryApplyEdits
(
_viewType
:
string
,
resource
:
UriComponents
,
modelVersionId
:
number
,
cellEdits
:
ICellEditOperation
[]
,
newMetadata
:
NotebookDocumentMetadata
|
undefined
):
Promise
<
boolean
>
{
async
$tryApplyEdits
(
_viewType
:
string
,
resource
:
UriComponents
,
modelVersionId
:
number
,
cellEdits
:
ICellEditOperation
[]):
Promise
<
boolean
>
{
const
textModel
=
this
.
_notebookService
.
getNotebookTextModel
(
URI
.
from
(
resource
));
const
textModel
=
this
.
_notebookService
.
getNotebookTextModel
(
URI
.
from
(
resource
));
if
(
!
textModel
)
{
if
(
!
textModel
)
{
return
false
;
return
false
;
}
}
this
.
_notebookService
.
transformEditsOutputs
(
textModel
,
cellEdits
);
this
.
_notebookService
.
transformEditsOutputs
(
textModel
,
cellEdits
);
if
(
newMetadata
)
{
textModel
.
applyEdit
(
textModel
.
versionId
,
[
{
editType
:
CellEditType
.
DocumentMetadata
,
metadata
:
newMetadata
}
],
true
);
}
return
textModel
.
applyEdit
(
modelVersionId
,
cellEdits
,
true
);
return
textModel
.
applyEdit
(
modelVersionId
,
cellEdits
,
true
);
}
}
...
...
src/vs/workbench/api/common/extHost.protocol.ts
浏览文件 @
01f9355f
...
@@ -741,7 +741,7 @@ export interface MainThreadNotebookShape extends IDisposable {
...
@@ -741,7 +741,7 @@ export interface MainThreadNotebookShape extends IDisposable {
$registerNotebookKernelProvider
(
extension
:
NotebookExtensionDescription
,
handle
:
number
,
documentFilter
:
INotebookDocumentFilter
):
Promise
<
void
>
;
$registerNotebookKernelProvider
(
extension
:
NotebookExtensionDescription
,
handle
:
number
,
documentFilter
:
INotebookDocumentFilter
):
Promise
<
void
>
;
$unregisterNotebookKernelProvider
(
handle
:
number
):
Promise
<
void
>
;
$unregisterNotebookKernelProvider
(
handle
:
number
):
Promise
<
void
>
;
$onNotebookKernelChange
(
handle
:
number
,
uri
:
UriComponents
|
undefined
):
void
;
$onNotebookKernelChange
(
handle
:
number
,
uri
:
UriComponents
|
undefined
):
void
;
$tryApplyEdits
(
viewType
:
string
,
resource
:
UriComponents
,
modelVersionId
:
number
,
edits
:
ICellEditOperation
[]
,
metadata
:
NotebookDocumentMetadata
|
undefined
):
Promise
<
boolean
>
;
$tryApplyEdits
(
viewType
:
string
,
resource
:
UriComponents
,
modelVersionId
:
number
,
edits
:
ICellEditOperation
[]):
Promise
<
boolean
>
;
$updateNotebookLanguages
(
viewType
:
string
,
resource
:
UriComponents
,
languages
:
string
[]):
Promise
<
void
>
;
$updateNotebookLanguages
(
viewType
:
string
,
resource
:
UriComponents
,
languages
:
string
[]):
Promise
<
void
>
;
$spliceNotebookCellOutputs
(
viewType
:
string
,
resource
:
UriComponents
,
cellHandle
:
number
,
splices
:
NotebookCellOutputsSplice
[]):
Promise
<
void
>
;
$spliceNotebookCellOutputs
(
viewType
:
string
,
resource
:
UriComponents
,
cellHandle
:
number
,
splices
:
NotebookCellOutputsSplice
[]):
Promise
<
void
>
;
$postMessage
(
editorId
:
string
,
forRendererId
:
string
|
undefined
,
value
:
any
):
Promise
<
boolean
>
;
$postMessage
(
editorId
:
string
,
forRendererId
:
string
|
undefined
,
value
:
any
):
Promise
<
boolean
>
;
...
@@ -1275,8 +1275,7 @@ export interface IWorkspaceTextEditDto {
...
@@ -1275,8 +1275,7 @@ export interface IWorkspaceTextEditDto {
export
interface
IWorkspaceCellEditDto
{
export
interface
IWorkspaceCellEditDto
{
_type
:
WorkspaceEditType
.
Cell
;
_type
:
WorkspaceEditType
.
Cell
;
resource
:
UriComponents
;
resource
:
UriComponents
;
edit
?:
ICellEditOperation
;
edit
:
ICellEditOperation
;
notebookMetadata
?:
NotebookDocumentMetadata
;
notebookVersionId
?:
number
;
notebookVersionId
?:
number
;
metadata
?:
IWorkspaceEditEntryMetadataDto
;
metadata
?:
IWorkspaceEditEntryMetadataDto
;
}
}
...
...
src/vs/workbench/api/common/extHostNotebookDocument.ts
浏览文件 @
01f9355f
...
@@ -277,7 +277,7 @@ export class ExtHostNotebookDocument extends Disposable {
...
@@ -277,7 +277,7 @@ export class ExtHostNotebookDocument extends Disposable {
const
edit
:
IWorkspaceCellEditDto
=
{
const
edit
:
IWorkspaceCellEditDto
=
{
_type
:
WorkspaceEditType
.
Cell
,
_type
:
WorkspaceEditType
.
Cell
,
metadata
:
undefined
,
metadata
:
undefined
,
notebookMetadata
:
this
.
_metadata
,
edit
:
{
editType
:
CellEditType
.
DocumentMetadata
,
metadata
:
this
.
_metadata
}
,
resource
:
this
.
uri
,
resource
:
this
.
uri
,
notebookVersionId
:
this
.
notebookDocument
.
version
,
notebookVersionId
:
this
.
notebookDocument
.
version
,
};
};
...
...
src/vs/workbench/api/common/extHostNotebookEditor.ts
浏览文件 @
01f9355f
...
@@ -8,7 +8,7 @@ import { Emitter, Event } from 'vs/base/common/event';
...
@@ -8,7 +8,7 @@ import { Emitter, Event } from 'vs/base/common/event';
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
CellKind
,
MainThreadNotebookShape
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
import
{
CellKind
,
MainThreadNotebookShape
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
import
*
as
extHostTypes
from
'
vs/workbench/api/common/extHostTypes
'
;
import
*
as
extHostTypes
from
'
vs/workbench/api/common/extHostTypes
'
;
import
{
addIdToOutput
,
CellEditType
,
ICellEditOperation
,
ICellReplaceEdit
,
INotebookEditData
,
NotebookDocumentMetadata
,
notebookDocumentMetadataDefaults
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
addIdToOutput
,
CellEditType
,
ICellEditOperation
,
ICellReplaceEdit
,
INotebookEditData
,
notebookDocumentMetadataDefaults
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
*
as
vscode
from
'
vscode
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
ExtHostNotebookDocument
}
from
'
./extHostNotebookDocument
'
;
import
{
ExtHostNotebookDocument
}
from
'
./extHostNotebookDocument
'
;
...
@@ -18,7 +18,6 @@ class NotebookEditorCellEditBuilder implements vscode.NotebookEditorEdit {
...
@@ -18,7 +18,6 @@ class NotebookEditorCellEditBuilder implements vscode.NotebookEditorEdit {
private
_finalized
:
boolean
=
false
;
private
_finalized
:
boolean
=
false
;
private
_collectedEdits
:
ICellEditOperation
[]
=
[];
private
_collectedEdits
:
ICellEditOperation
[]
=
[];
private
_newNotebookDocumentMetadata
?:
NotebookDocumentMetadata
;
constructor
(
documentVersionId
:
number
)
{
constructor
(
documentVersionId
:
number
)
{
this
.
_documentVersionId
=
documentVersionId
;
this
.
_documentVersionId
=
documentVersionId
;
...
@@ -28,8 +27,7 @@ class NotebookEditorCellEditBuilder implements vscode.NotebookEditorEdit {
...
@@ -28,8 +27,7 @@ class NotebookEditorCellEditBuilder implements vscode.NotebookEditorEdit {
this
.
_finalized
=
true
;
this
.
_finalized
=
true
;
return
{
return
{
documentVersionId
:
this
.
_documentVersionId
,
documentVersionId
:
this
.
_documentVersionId
,
cellEdits
:
this
.
_collectedEdits
,
cellEdits
:
this
.
_collectedEdits
newMetadata
:
this
.
_newNotebookDocumentMetadata
};
};
}
}
...
@@ -41,7 +39,10 @@ class NotebookEditorCellEditBuilder implements vscode.NotebookEditorEdit {
...
@@ -41,7 +39,10 @@ class NotebookEditorCellEditBuilder implements vscode.NotebookEditorEdit {
replaceNotebookMetadata
(
value
:
vscode
.
NotebookDocumentMetadata
):
void
{
replaceNotebookMetadata
(
value
:
vscode
.
NotebookDocumentMetadata
):
void
{
this
.
_throwIfFinalized
();
this
.
_throwIfFinalized
();
this
.
_newNotebookDocumentMetadata
=
{
...
notebookDocumentMetadataDefaults
,
...
value
};
this
.
_collectedEdits
.
push
({
editType
:
CellEditType
.
DocumentMetadata
,
metadata
:
{
...
notebookDocumentMetadataDefaults
,
...
value
}
});
}
}
replaceCellMetadata
(
index
:
number
,
metadata
:
vscode
.
NotebookCellMetadata
):
void
{
replaceCellMetadata
(
index
:
number
,
metadata
:
vscode
.
NotebookCellMetadata
):
void
{
...
@@ -235,7 +236,7 @@ export class ExtHostNotebookEditor extends Disposable implements vscode.Notebook
...
@@ -235,7 +236,7 @@ export class ExtHostNotebookEditor extends Disposable implements vscode.Notebook
compressedEditsIndex
++
;
compressedEditsIndex
++
;
}
}
return
this
.
_proxy
.
$tryApplyEdits
(
this
.
_viewType
,
this
.
document
.
uri
,
editData
.
documentVersionId
,
compressedEdits
,
editData
.
newMetadata
);
return
this
.
_proxy
.
$tryApplyEdits
(
this
.
_viewType
,
this
.
document
.
uri
,
editData
.
documentVersionId
,
compressedEdits
);
}
}
revealRange
(
range
:
vscode
.
NotebookCellRange
,
revealType
?:
extHostTypes
.
NotebookEditorRevealType
)
{
revealRange
(
range
:
vscode
.
NotebookCellRange
,
revealType
?:
extHostTypes
.
NotebookEditorRevealType
)
{
...
...
src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
浏览文件 @
01f9355f
...
@@ -9,7 +9,7 @@ import { URI } from 'vs/base/common/uri';
...
@@ -9,7 +9,7 @@ import { URI } from 'vs/base/common/uri';
import
{
ResourceEdit
}
from
'
vs/editor/browser/services/bulkEditService
'
;
import
{
ResourceEdit
}
from
'
vs/editor/browser/services/bulkEditService
'
;
import
{
WorkspaceEditMetadata
}
from
'
vs/editor/common/modes
'
;
import
{
WorkspaceEditMetadata
}
from
'
vs/editor/common/modes
'
;
import
{
IProgress
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IProgress
}
from
'
vs/platform/progress/common/progress
'
;
import
{
CellEditType
,
ICellEditOperation
,
NotebookDocumentMetadata
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
ICellEditOperation
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
INotebookEditorModelResolverService
}
from
'
vs/workbench/contrib/notebook/common/notebookEditorModelResolverService
'
;
import
{
INotebookEditorModelResolverService
}
from
'
vs/workbench/contrib/notebook/common/notebookEditorModelResolverService
'
;
import
{
INotebookService
}
from
'
vs/workbench/contrib/notebook/common/notebookService
'
;
import
{
INotebookService
}
from
'
vs/workbench/contrib/notebook/common/notebookService
'
;
...
@@ -17,8 +17,7 @@ export class ResourceNotebookCellEdit extends ResourceEdit {
...
@@ -17,8 +17,7 @@ export class ResourceNotebookCellEdit extends ResourceEdit {
constructor
(
constructor
(
readonly
resource
:
URI
,
readonly
resource
:
URI
,
readonly
cellEdit
?:
ICellEditOperation
,
readonly
cellEdit
:
ICellEditOperation
,
readonly
notebookMetadata
?:
NotebookDocumentMetadata
,
readonly
versionId
?:
number
,
readonly
versionId
?:
number
,
readonly
metadata
?:
WorkspaceEditMetadata
readonly
metadata
?:
WorkspaceEditMetadata
)
{
)
{
...
@@ -49,23 +48,8 @@ export class BulkCellEdits {
...
@@ -49,23 +48,8 @@ export class BulkCellEdits {
// throw new Error(`Notebook '${first.resource}' has changed in the meantime`);
// throw new Error(`Notebook '${first.resource}' has changed in the meantime`);
// }
// }
const
edits
:
ICellEditOperation
[]
=
[];
let
newMetadata
:
NotebookDocumentMetadata
|
undefined
;
for
(
let
edit
of
group
)
{
if
(
edit
.
cellEdit
)
{
edits
.
push
(
edit
.
cellEdit
);
}
newMetadata
=
edit
.
notebookMetadata
??
newMetadata
;
}
// set metadata
if
(
newMetadata
)
{
edits
.
push
({
editType
:
CellEditType
.
DocumentMetadata
,
metadata
:
newMetadata
});
}
// apply edits
// apply edits
const
edits
=
group
.
map
(
entry
=>
entry
.
cellEdit
);
this
.
_notebookService
.
transformEditsOutputs
(
ref
.
object
.
notebook
,
edits
);
this
.
_notebookService
.
transformEditsOutputs
(
ref
.
object
.
notebook
,
edits
);
ref
.
object
.
notebook
.
applyEdit
(
ref
.
object
.
notebook
.
versionId
,
edits
,
true
);
ref
.
object
.
notebook
.
applyEdit
(
ref
.
object
.
notebook
.
versionId
,
edits
,
true
);
ref
.
dispose
();
ref
.
dispose
();
...
...
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
浏览文件 @
01f9355f
...
@@ -466,7 +466,6 @@ export type ICellEditOperation = ICellReplaceEdit | ICellOutputEdit | ICellMetad
...
@@ -466,7 +466,6 @@ export type ICellEditOperation = ICellReplaceEdit | ICellOutputEdit | ICellMetad
export
interface
INotebookEditData
{
export
interface
INotebookEditData
{
documentVersionId
:
number
;
documentVersionId
:
number
;
cellEdits
:
ICellEditOperation
[];
cellEdits
:
ICellEditOperation
[];
newMetadata
?:
NotebookDocumentMetadata
;
}
}
export
interface
NotebookDataDto
{
export
interface
NotebookDataDto
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录