Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b867b319
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b867b319
编写于
3月 23, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove reference from disposed TextModel when keeping undo-redo elements
上级
f3361680
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
6 deletion
+19
-6
src/vs/editor/common/model/editStack.ts
src/vs/editor/common/model/editStack.ts
+17
-6
src/vs/editor/common/services/modelServiceImpl.ts
src/vs/editor/common/services/modelServiceImpl.ts
+2
-0
未找到文件。
src/vs/editor/common/model/editStack.ts
浏览文件 @
b867b319
...
...
@@ -137,7 +137,7 @@ class SingleModelEditStackData {
export
class
SingleModelEditStackElement
implements
IResourceUndoRedoElement
{
public
model
:
ITextModel
;
public
model
:
ITextModel
|
URI
;
private
_data
:
SingleModelEditStackData
|
ArrayBuffer
;
public
get
type
():
UndoRedoElementType
.
Resource
{
...
...
@@ -145,6 +145,9 @@ export class SingleModelEditStackElement implements IResourceUndoRedoElement {
}
public
get
resource
():
URI
{
if
(
URI
.
isUri
(
this
.
model
))
{
return
this
.
model
;
}
return
this
.
model
.
uri
;
}
...
...
@@ -157,7 +160,7 @@ export class SingleModelEditStackElement implements IResourceUndoRedoElement {
this
.
_data
=
SingleModelEditStackData
.
create
(
model
,
beforeCursorState
);
}
public
setModel
(
model
:
ITextModel
):
void
{
public
setModel
(
model
:
ITextModel
|
URI
):
void
{
this
.
model
=
model
;
}
...
...
@@ -178,6 +181,10 @@ export class SingleModelEditStackElement implements IResourceUndoRedoElement {
}
public
undo
():
void
{
if
(
URI
.
isUri
(
this
.
model
))
{
// don't have a model
throw
new
Error
(
`Invalid SingleModelEditStackElement`
);
}
if
(
this
.
_data
instanceof
SingleModelEditStackData
)
{
this
.
_data
=
this
.
_data
.
serialize
();
}
...
...
@@ -186,6 +193,10 @@ export class SingleModelEditStackElement implements IResourceUndoRedoElement {
}
public
redo
():
void
{
if
(
URI
.
isUri
(
this
.
model
))
{
// don't have a model
throw
new
Error
(
`Invalid SingleModelEditStackElement`
);
}
if
(
this
.
_data
instanceof
SingleModelEditStackData
)
{
this
.
_data
=
this
.
_data
.
serialize
();
}
...
...
@@ -211,7 +222,7 @@ export class MultiModelEditStackElement implements IWorkspaceUndoRedoElement {
private
readonly
_editStackElementsMap
:
Map
<
string
,
SingleModelEditStackElement
>
;
public
get
resources
():
readonly
URI
[]
{
return
this
.
_editStackElementsArr
.
map
(
editStackElement
=>
editStackElement
.
model
.
uri
);
return
this
.
_editStackElementsArr
.
map
(
editStackElement
=>
editStackElement
.
resource
);
}
constructor
(
...
...
@@ -223,13 +234,13 @@ export class MultiModelEditStackElement implements IWorkspaceUndoRedoElement {
this
.
_editStackElementsArr
=
editStackElements
.
slice
(
0
);
this
.
_editStackElementsMap
=
new
Map
<
string
,
SingleModelEditStackElement
>
();
for
(
const
editStackElement
of
this
.
_editStackElementsArr
)
{
const
key
=
uriGetComparisonKey
(
editStackElement
.
model
.
uri
);
const
key
=
uriGetComparisonKey
(
editStackElement
.
resource
);
this
.
_editStackElementsMap
.
set
(
key
,
editStackElement
);
}
}
public
setModel
(
model
:
ITextModel
):
void
{
const
key
=
uriGetComparisonKey
(
model
.
uri
);
public
setModel
(
model
:
ITextModel
|
URI
):
void
{
const
key
=
uriGetComparisonKey
(
URI
.
isUri
(
model
)
?
model
:
model
.
uri
);
if
(
this
.
_editStackElementsMap
.
has
(
key
))
{
this
.
_editStackElementsMap
.
get
(
key
)
!
.
setModel
(
model
);
}
...
...
src/vs/editor/common/services/modelServiceImpl.ts
浏览文件 @
b867b319
...
...
@@ -477,9 +477,11 @@ export class ModelServiceImpl extends Disposable implements IModelService {
maintainUndoRedoStack
=
true
;
for
(
const
element
of
elements
.
past
)
{
heapSize
+=
element
.
heapSize
(
resource
);
element
.
setModel
(
resource
);
// remove reference from text buffer instance
}
for
(
const
element
of
elements
.
future
)
{
heapSize
+=
element
.
heapSize
(
resource
);
element
.
setModel
(
resource
);
// remove reference from text buffer instance
}
}
else
{
maintainUndoRedoStack
=
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录