Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b6197bd5
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,发现更多精彩内容 >>
提交
b6197bd5
编写于
6月 29, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Files: logic to open dirty editor does not work well for many edits (fixes #8354)
上级
ee52cfac
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
8 deletion
+37
-8
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+5
-3
src/vs/workbench/parts/files/browser/fileTracker.ts
src/vs/workbench/parts/files/browser/fileTracker.ts
+32
-5
未找到文件。
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
b6197bd5
...
...
@@ -955,13 +955,15 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
const
input
=
editor
.
input
;
// Resolve editor options
const
preserveFocus
=
activePosition
!==
position
;
const
preserveFocus
=
(
activePosition
!==
position
)
;
let
options
:
EditorOptions
;
if
(
editor
.
options
)
{
options
=
editor
.
options
;
options
.
preserveFocus
=
preserveFocus
;
if
(
typeof
options
.
preserveFocus
!==
'
boolean
'
)
{
options
.
preserveFocus
=
preserveFocus
;
}
}
else
{
options
=
EditorOptions
.
create
({
preserveFocus
:
preserveFocus
});
options
=
EditorOptions
.
create
({
preserveFocus
});
}
promises
.
push
(
this
.
openEditor
(
input
,
options
,
position
,
widthRatios
));
...
...
src/vs/workbench/parts/files/browser/fileTracker.ts
浏览文件 @
b6197bd5
...
...
@@ -10,8 +10,10 @@ import nls = require('vs/nls');
import
{
MIME_UNKNOWN
}
from
'
vs/base/common/mime
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
paths
=
require
(
'
vs/base/common/paths
'
);
import
arrays
=
require
(
'
vs/base/common/arrays
'
);
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
EditorInput
,
EditorOptions
,
IEditorStacksModel
}
from
'
vs/workbench/common/editor
'
;
import
{
Position
}
from
'
vs/platform/editor/common/editor
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
BaseTextEditor
}
from
'
vs/workbench/browser/parts/editor/textEditor
'
;
import
{
LocalFileChangeEvent
,
TextFileChangeEvent
,
VIEWLET_ID
,
BINARY_FILE_EDITOR_ID
,
EventType
as
FileEventType
,
ITextFileService
,
AutoSaveMode
,
ModelState
}
from
'
vs/workbench/parts/files/common/files
'
;
...
...
@@ -39,6 +41,9 @@ export class FileTracker implements IWorkbenchContribution {
private
stacks
:
IEditorStacksModel
;
private
toUnbind
:
IDisposable
[];
private
pendingDirtyResources
:
URI
[];
private
pendingDirtyHandle
:
number
;
constructor
(
@
IEventService
private
eventService
:
IEventService
,
@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
,
...
...
@@ -51,6 +56,7 @@ export class FileTracker implements IWorkbenchContribution {
)
{
this
.
toUnbind
=
[];
this
.
stacks
=
editorGroupService
.
getStacksModel
();
this
.
pendingDirtyResources
=
[];
this
.
registerListeners
();
}
...
...
@@ -88,11 +94,32 @@ export class FileTracker implements IWorkbenchContribution {
// Since it might be the intent of whoever created the model to show it shortly
// after, we delay this a little bit and check again if the editor has not been
// opened meanwhile
setTimeout
(()
=>
{
if
(
!
this
.
stacks
.
isOpen
(
e
.
resource
)
&&
this
.
textFileService
.
isDirty
(
e
.
resource
))
{
this
.
editorService
.
openEditor
({
resource
:
e
.
resource
,
options
:
{
inactive
:
true
}
}).
done
(
null
,
errors
.
onUnexpectedError
);
}
},
500
);
this
.
pendingDirtyResources
.
push
(
e
.
resource
);
if
(
!
this
.
pendingDirtyHandle
)
{
this
.
pendingDirtyHandle
=
setTimeout
(()
=>
this
.
doOpenDirtyResources
(),
250
);
}
}
private
doOpenDirtyResources
():
void
{
const
dirtyNotOpenedResources
=
arrays
.
distinct
(
this
.
pendingDirtyResources
.
filter
(
r
=>
!
this
.
stacks
.
isOpen
(
r
)
&&
this
.
textFileService
.
isDirty
(
r
)),
r
=>
r
.
toString
());
// Reset
this
.
pendingDirtyHandle
=
void
0
;
this
.
pendingDirtyResources
=
[];
const
activeEditor
=
this
.
editorService
.
getActiveEditor
();
const
activePosition
=
activeEditor
?
activeEditor
.
position
:
Position
.
LEFT
;
// Open
this
.
editorService
.
openEditors
(
dirtyNotOpenedResources
.
map
(
resource
=>
{
return
{
input
:
{
resource
,
options
:
{
inactive
:
true
,
pinned
:
true
,
preserveFocus
:
true
}
},
position
:
activePosition
};
})).
done
(
null
,
errors
.
onUnexpectedError
);
}
private
onTextFileSaveError
(
e
:
TextFileChangeEvent
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录