Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
adb07509
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,发现更多精彩内容 >>
提交
adb07509
编写于
4月 20, 2020
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Persist focused notebook cell, dom focus on load
上级
12e7d78c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
7 deletion
+29
-7
src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+6
-1
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+16
-0
src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
...rkbench/contrib/notebook/browser/view/notebookCellList.ts
+2
-2
src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
...h/contrib/notebook/browser/viewModel/notebookViewModel.ts
+5
-4
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
浏览文件 @
adb07509
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
import
{
IMouseWheelEvent
}
from
'
vs/base/browser/mouseEvent
'
;
import
{
IMouseWheelEvent
}
from
'
vs/base/browser/mouseEvent
'
;
import
{
IListEvent
,
IListMouseEvent
}
from
'
vs/base/browser/ui/list/list
'
;
import
{
IListEvent
,
IListMouseEvent
}
from
'
vs/base/browser/ui/list/list
'
;
import
{
IListOptions
,
IListStyles
}
from
'
vs/base/browser/ui/list/listWidget
'
;
import
{
IListOptions
,
IListStyles
,
List
}
from
'
vs/base/browser/ui/list/listWidget
'
;
import
{
ProgressBar
}
from
'
vs/base/browser/ui/progressbar/progressbar
'
;
import
{
ProgressBar
}
from
'
vs/base/browser/ui/progressbar/progressbar
'
;
import
{
ToolBar
}
from
'
vs/base/browser/ui/toolbar/toolbar
'
;
import
{
ToolBar
}
from
'
vs/base/browser/ui/toolbar/toolbar
'
;
import
{
CancellationTokenSource
}
from
'
vs/base/common/cancellation
'
;
import
{
CancellationTokenSource
}
from
'
vs/base/common/cancellation
'
;
...
@@ -341,6 +341,11 @@ export interface INotebookCellList {
...
@@ -341,6 +341,11 @@ export interface INotebookCellList {
updateOptions
(
options
:
IListOptions
<
ICellViewModel
>
):
void
;
updateOptions
(
options
:
IListOptions
<
ICellViewModel
>
):
void
;
layout
(
height
?:
number
,
width
?:
number
):
void
;
layout
(
height
?:
number
,
width
?:
number
):
void
;
dispose
():
void
;
dispose
():
void
;
// TODO resolve differences between List<CellViewModel> and INotebookCellList<ICellViewModel>
getFocus
():
number
[];
setFocus
(
indexes
:
number
[]):
void
;
setSelection
(
indexes
:
number
[]):
void
;
}
}
export
interface
BaseCellRenderTemplate
{
export
interface
BaseCellRenderTemplate
{
...
...
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
浏览文件 @
adb07509
...
@@ -312,6 +312,7 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
...
@@ -312,6 +312,7 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
focus
()
{
focus
()
{
super
.
focus
();
super
.
focus
();
this
.
editorFocus
?.
set
(
true
);
this
.
editorFocus
?.
set
(
true
);
this
.
list
?.
domFocus
();
}
}
async
setInput
(
input
:
NotebookEditorInput
,
options
:
EditorOptions
|
undefined
,
token
:
CancellationToken
):
Promise
<
void
>
{
async
setInput
(
input
:
NotebookEditorInput
,
options
:
EditorOptions
|
undefined
,
token
:
CancellationToken
):
Promise
<
void
>
{
...
@@ -431,6 +432,10 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
...
@@ -431,6 +432,10 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
this
.
list
!
.
layout
();
this
.
list
!
.
layout
();
this
.
restoreTextEditorViewState
(
viewState
);
}
private
restoreTextEditorViewState
(
viewState
:
INotebookEditorViewState
|
undefined
):
void
{
if
(
viewState
?.
scrollPosition
!==
undefined
)
{
if
(
viewState
?.
scrollPosition
!==
undefined
)
{
this
.
list
!
.
scrollTop
=
viewState
!
.
scrollPosition
.
top
;
this
.
list
!
.
scrollTop
=
viewState
!
.
scrollPosition
.
top
;
this
.
list
!
.
scrollLeft
=
viewState
!
.
scrollPosition
.
left
;
this
.
list
!
.
scrollLeft
=
viewState
!
.
scrollPosition
.
left
;
...
@@ -438,6 +443,12 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
...
@@ -438,6 +443,12 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
this
.
list
!
.
scrollTop
=
0
;
this
.
list
!
.
scrollTop
=
0
;
this
.
list
!
.
scrollLeft
=
0
;
this
.
list
!
.
scrollLeft
=
0
;
}
}
if
(
typeof
viewState
?.
focus
===
'
number
'
)
{
this
.
list
!
.
setFocus
([
viewState
.
focus
]);
}
else
{
this
.
list
!
.
setFocus
([
0
]);
}
}
}
private
saveTextEditorViewState
(
input
:
NotebookEditorInput
):
void
{
private
saveTextEditorViewState
(
input
:
NotebookEditorInput
):
void
{
...
@@ -456,6 +467,11 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
...
@@ -456,6 +467,11 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
}
}
state
.
cellTotalHeights
=
cellHeights
;
state
.
cellTotalHeights
=
cellHeights
;
const
focus
=
this
.
list
.
getFocus
()[
0
];
if
(
focus
)
{
state
.
focus
=
focus
;
}
}
}
this
.
editorMemento
.
saveEditorState
(
this
.
group
,
input
.
resource
,
state
);
this
.
editorMemento
.
saveEditorState
(
this
.
group
,
input
.
resource
,
state
);
...
...
src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
浏览文件 @
adb07509
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
{
IMouseWheelEvent
}
from
'
vs/base/browser/mouseEvent
'
;
import
{
IMouseWheelEvent
}
from
'
vs/base/browser/mouseEvent
'
;
import
{
IListRenderer
,
IListVirtualDelegate
,
ListError
}
from
'
vs/base/browser/ui/list/list
'
;
import
{
IListRenderer
,
IListVirtualDelegate
,
ListError
}
from
'
vs/base/browser/ui/list/list
'
;
import
{
IListStyles
,
IStyleController
,
MouseController
}
from
'
vs/base/browser/ui/list/listWidget
'
;
import
{
IListStyles
,
IStyleController
,
MouseController
,
IListOptions
}
from
'
vs/base/browser/ui/list/listWidget
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
DisposableStore
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
DisposableStore
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
isMacintosh
}
from
'
vs/base/common/platform
'
;
import
{
isMacintosh
}
from
'
vs/base/common/platform
'
;
...
@@ -120,7 +120,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
...
@@ -120,7 +120,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
}
}
protected
createMouseController
():
MouseController
<
CellViewModel
>
{
protected
createMouseController
(
_options
:
IListOptions
<
CellViewModel
>
):
MouseController
<
CellViewModel
>
{
return
new
NotebookMouseController
(
this
);
return
new
NotebookMouseController
(
this
);
}
}
...
...
src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
浏览文件 @
adb07509
...
@@ -33,6 +33,7 @@ export interface INotebookEditorViewState {
...
@@ -33,6 +33,7 @@ export interface INotebookEditorViewState {
editorViewStates
:
{
[
key
:
number
]:
editorCommon
.
ICodeEditorViewState
|
null
};
editorViewStates
:
{
[
key
:
number
]:
editorCommon
.
ICodeEditorViewState
|
null
};
cellTotalHeights
?:
{
[
key
:
number
]:
number
};
cellTotalHeights
?:
{
[
key
:
number
]:
number
};
scrollPosition
?:
{
left
:
number
;
top
:
number
;
};
scrollPosition
?:
{
left
:
number
;
top
:
number
;
};
focus
?:
number
;
}
}
export
interface
ICellModelDecorations
{
export
interface
ICellModelDecorations
{
...
@@ -578,8 +579,8 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
...
@@ -578,8 +579,8 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
}
}
saveEditorViewState
():
INotebookEditorViewState
{
saveEditorViewState
():
INotebookEditorViewState
{
const
state
:
{
[
key
:
number
]:
boolean
}
=
{};
const
editingCells
:
{
[
key
:
number
]:
boolean
}
=
{};
this
.
_viewCells
.
filter
(
cell
=>
cell
.
editState
===
CellEditState
.
Editing
).
forEach
(
cell
=>
state
[
cell
.
model
.
handle
]
=
true
);
this
.
_viewCells
.
filter
(
cell
=>
cell
.
editState
===
CellEditState
.
Editing
).
forEach
(
cell
=>
editingCells
[
cell
.
model
.
handle
]
=
true
);
const
editorViewStates
:
{
[
key
:
number
]:
editorCommon
.
ICodeEditorViewState
}
=
{};
const
editorViewStates
:
{
[
key
:
number
]:
editorCommon
.
ICodeEditorViewState
}
=
{};
this
.
_viewCells
.
map
(
cell
=>
({
handle
:
cell
.
model
.
handle
,
state
:
cell
.
saveEditorViewState
()
})).
forEach
(
viewState
=>
{
this
.
_viewCells
.
map
(
cell
=>
({
handle
:
cell
.
model
.
handle
,
state
:
cell
.
saveEditorViewState
()
})).
forEach
(
viewState
=>
{
if
(
viewState
.
state
)
{
if
(
viewState
.
state
)
{
...
@@ -588,8 +589,8 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
...
@@ -588,8 +589,8 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
});
});
return
{
return
{
editingCells
:
state
,
editingCells
,
editorViewStates
:
editorViewStates
editorViewStates
};
};
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录