Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7fa15b39
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,发现更多精彩内容 >>
提交
7fa15b39
编写于
5月 21, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
improved pinning from dirty event
上级
036a3db1
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
24 addition
and
36 deletion
+24
-36
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+7
-2
src/vs/workbench/common/editor/editorStacksModel.ts
src/vs/workbench/common/editor/editorStacksModel.ts
+5
-0
src/vs/workbench/parts/files/browser/fileTracker.ts
src/vs/workbench/parts/files/browser/fileTracker.ts
+12
-34
未找到文件。
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
7fa15b39
...
...
@@ -123,9 +123,14 @@ export class EditorPart extends Part implements IEditorPart {
}
private
onEditorInputDirtyStateChanged
(
event
:
EditorInputEvent
):
void
{
if
(
this
.
sideBySideControl
)
{
this
.
sideBySideControl
.
updateTitleArea
(
event
.
editorInput
);
// we pin every editor that becomes dirty across all groups
if
(
event
.
editorInput
.
isDirty
())
{
this
.
stacks
.
groups
.
forEach
(
group
=>
group
.
contains
(
event
.
editorInput
)
&&
this
.
pinEditor
(
this
.
stacks
.
positionOfGroup
(
group
),
event
.
editorInput
));
}
// Update UI
this
.
sideBySideControl
.
updateTitleArea
(
event
.
editorInput
);
}
private
onEditorDisposed
(
identifier
:
IEditorIdentifier
):
void
{
...
...
src/vs/workbench/common/editor/editorStacksModel.ts
浏览文件 @
7fa15b39
...
...
@@ -35,6 +35,7 @@ export interface IEditorGroup {
getEditor
(
index
:
number
):
EditorInput
;
indexOf
(
editor
:
EditorInput
):
number
;
contains
(
editor
:
EditorInput
):
boolean
;
getEditors
(
mru
?:
boolean
):
EditorInput
[];
isActive
(
editor
:
EditorInput
):
boolean
;
...
...
@@ -515,6 +516,10 @@ export class EditorGroup implements IEditorGroup {
return
-
1
;
}
public
contains
(
candidate
:
EditorInput
):
boolean
{
return
this
.
indexOf
(
candidate
)
>=
0
;
}
private
setMostRecentlyUsed
(
editor
:
EditorInput
):
void
{
const
index
=
this
.
indexOf
(
editor
);
if
(
index
===
-
1
)
{
...
...
src/vs/workbench/parts/files/browser/fileTracker.ts
浏览文件 @
7fa15b39
...
...
@@ -21,7 +21,6 @@ import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEdit
import
{
IFrameEditorInput
}
from
'
vs/workbench/common/editor/iframeEditorInput
'
;
import
{
State
,
TextFileEditorModel
,
CACHE
}
from
'
vs/workbench/parts/files/common/editors/textFileEditorModel
'
;
import
{
IFrameEditor
}
from
'
vs/workbench/browser/parts/editor/iframeEditor
'
;
import
{
UntitledEditorInput
}
from
'
vs/workbench/common/editor/untitledEditorInput
'
;
import
{
EventType
as
WorkbenchEventType
,
EditorInputEvent
,
UntitledEditorEvent
}
from
'
vs/workbench/common/events
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
...
...
@@ -80,8 +79,6 @@ export class FileTracker implements IWorkbenchContribution {
if
(
this
.
textFileService
.
getAutoSaveMode
()
!==
AutoSaveMode
.
AFTER_SHORT_DELAY
)
{
this
.
updateActivityBadge
();
// no indication needed when auto save is enabled for short delay
}
this
.
updateActiveEditor
(
e
.
resource
);
}
private
onTextFileSaveError
(
e
:
TextFileChangeEvent
):
void
{
...
...
@@ -112,7 +109,6 @@ export class FileTracker implements IWorkbenchContribution {
}
this
.
updateActivityBadge
();
this
.
updateActiveEditor
(
e
.
resource
);
}
private
onUntitledEditorDeleted
(
e
:
UntitledEditorEvent
):
void
{
...
...
@@ -126,22 +122,6 @@ export class FileTracker implements IWorkbenchContribution {
}
}
private
updateActiveEditor
(
resource
:
URI
):
void
{
const
activeEditor
=
this
.
editorService
.
getActiveEditor
();
if
(
activeEditor
)
{
const
input
=
activeEditor
.
input
;
let
inputResource
:
URI
;
if
(
input
instanceof
UntitledEditorInput
||
input
instanceof
FileEditorInput
)
{
inputResource
=
input
.
getResource
();
}
// Pin the active editor because the user has made changes to the file within
if
(
inputResource
&&
inputResource
.
toString
()
===
resource
.
toString
())
{
this
.
editorService
.
pinEditor
(
activeEditor
.
position
,
activeEditor
.
input
);
}
}
}
private
updateActivityBadge
():
void
{
let
dirtyCount
=
this
.
textFileService
.
getDirty
().
length
;
this
.
lastDirtyCount
=
dirtyCount
;
...
...
@@ -157,24 +137,22 @@ export class FileTracker implements IWorkbenchContribution {
// Find all file editor inputs that are open from the given file resource and emit a editor input state change event.
// We could do all of this within the file editor input but having all the file change listeners in
// one place is more elegant and keeps the logic together at once place.
le
t
editors
=
arrays
.
flatten
(
this
.
editorService
.
getStacksModel
().
groups
.
map
(
g
=>
g
.
getEditors
()));
cons
t
editors
=
arrays
.
flatten
(
this
.
editorService
.
getStacksModel
().
groups
.
map
(
g
=>
g
.
getEditors
()));
editors
.
forEach
(
input
=>
{
if
(
this
.
matchesResource
(
input
,
resource
))
{
this
.
eventService
.
emit
(
WorkbenchEventType
.
EDITOR_INPUT_DIRTY_STATE_CHANGED
,
new
EditorInputEvent
(
input
));
}
});
}
private
matchesResource
(
input
:
EditorInput
,
resource
:
URI
):
boolean
{
// Diff Editor Input
if
(
input
instanceof
DiffEditorInput
)
{
input
=
(
<
DiffEditorInput
>
input
).
getModifiedInput
();
}
// File Editor Input
if
(
input
instanceof
FileEditorInput
)
{
let
fileInput
=
<
FileEditorInput
>
input
;
if
(
fileInput
.
getResource
().
toString
()
===
resource
.
toString
())
{
let
inputEvent
=
input
instanceof
DiffEditorInput
?
input
:
fileInput
;
// make sure to still send around the input from the diff editor if given
this
.
eventService
.
emit
(
WorkbenchEventType
.
EDITOR_INPUT_DIRTY_STATE_CHANGED
,
new
EditorInputEvent
(
inputEvent
));
}
}
});
return
input
instanceof
FileEditorInput
&&
input
.
getResource
().
toString
()
===
resource
.
toString
();
}
// Note: there is some duplication with the other file event handler below. Since we cannot always rely on the disk events
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录