Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e16a0519
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,发现更多精彩内容 >>
提交
e16a0519
编写于
5月 16, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
grid - cleanup
上级
4d5dc607
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
22 deletion
+14
-22
src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
+3
-4
src/vs/workbench/parts/files/electron-browser/fileCommands.ts
...vs/workbench/parts/files/electron-browser/fileCommands.ts
+3
-10
src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
...orkbench/parts/files/electron-browser/saveErrorHandler.ts
+8
-8
未找到文件。
src/vs/workbench/parts/files/common/dirtyFilesTracker.ts
浏览文件 @
e16a0519
...
...
@@ -11,7 +11,6 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import
{
VIEWLET_ID
}
from
'
vs/workbench/parts/files/common/files
'
;
import
{
TextFileModelChangeEvent
,
ITextFileService
,
AutoSaveMode
,
ModelState
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
platform
,
Platform
}
from
'
vs/base/common/platform
'
;
import
{
Position
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
ILifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
...
...
@@ -31,7 +30,7 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
constructor
(
@
ITextFileService
private
textFileService
:
ITextFileService
,
@
ILifecycleService
private
lifecycleService
:
ILifecycleService
,
@
INextEditorGroupsService
privateeditorGroupService
:
INextEditorGroupsService
,
@
INextEditorGroupsService
private
editorGroupService
:
INextEditorGroupsService
,
@
INextEditorService
private
editorService
:
INextEditorService
,
@
IActivityService
private
activityService
:
IActivityService
,
@
IWindowService
private
windowService
:
IWindowService
,
...
...
@@ -91,7 +90,7 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
private
doOpenDirtyResources
(
resources
:
URI
[]):
void
{
const
activeEditor
=
this
.
editorService
.
activeControl
;
const
active
Position
=
activeEditor
?
activeEditor
.
group
:
Position
.
ONE
;
const
active
Group
=
activeEditor
?
activeEditor
.
group
:
this
.
editorGroupService
.
activeGroup
.
id
;
// Open
this
.
editorService
.
openEditors
(
resources
.
map
(
resource
=>
{
...
...
@@ -99,7 +98,7 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
resource
,
options
:
{
inactive
:
true
,
pinned
:
true
,
preserveFocus
:
true
}
};
}),
active
Position
).
then
(
undefined
,
errors
.
onUnexpectedError
);
}),
active
Group
).
then
(
undefined
,
errors
.
onUnexpectedError
);
}
private
onTextFilesSaved
(
e
:
TextFileModelChangeEvent
[]):
void
{
...
...
src/vs/workbench/parts/files/electron-browser/fileCommands.ts
浏览文件 @
e16a0519
...
...
@@ -41,7 +41,7 @@ import { Schemas } from 'vs/base/common/network';
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
EditorContextKeys
}
from
'
vs/editor/common/editorContextKeys
'
;
import
{
INextEditorService
,
SIDE_GROUP
}
from
'
vs/workbench/services/editor/common/nextEditorService
'
;
import
{
INextEditorGroupsService
,
GroupDirection
}
from
'
vs/workbench/services/group/common/nextEditorGroupsService
'
;
import
{
INextEditorGroupsService
}
from
'
vs/workbench/services/group/common/nextEditorGroupsService
'
;
// Commands
...
...
@@ -266,12 +266,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
},
id
:
OPEN_TO_SIDE_COMMAND_ID
,
handler
:
(
accessor
,
resource
:
URI
|
object
)
=>
{
const
editorService
=
accessor
.
get
(
INextEditorService
);
const
editorGroupService
=
accessor
.
get
(
INextEditorGroupsService
);
const
listService
=
accessor
.
get
(
IListService
);
const
fileService
=
accessor
.
get
(
IFileService
);
const
tree
=
listService
.
lastFocusedList
;
const
resources
=
getMultiSelectedResources
(
resource
,
listService
,
editorService
);
const
activeGroup
=
editorGroupService
.
activeGroup
;
// Remove highlight
if
(
tree
instanceof
Tree
)
{
...
...
@@ -282,15 +280,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
if
(
resources
.
length
)
{
return
fileService
.
resolveFiles
(
resources
.
map
(
resource
=>
({
resource
}))).
then
(
resolved
=>
{
const
editors
=
resolved
.
filter
(
r
=>
r
.
success
&&
!
r
.
stat
.
isDirectory
).
map
(
r
=>
({
resource
:
r
.
stat
.
resource
,
options
:
{
preserveFocus
:
false
}
resource
:
r
.
stat
.
resource
}));
return
editorService
.
openEditors
(
editors
,
SIDE_GROUP
).
then
(()
=>
{
if
(
activeGroup
)
{
editorGroupService
.
focusGroup
(
editorGroupService
.
findNeighbourGroup
(
activeGroup
,
GroupDirection
.
RIGHT
));
}
});
return
editorService
.
openEditors
(
editors
,
SIDE_GROUP
);
});
}
...
...
src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
浏览文件 @
e16a0519
...
...
@@ -77,10 +77,10 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
private
registerListeners
():
void
{
this
.
toUnbind
.
push
(
this
.
textFileService
.
models
.
onModelSaved
(
e
=>
this
.
onFileSavedOrReverted
(
e
.
resource
)));
this
.
toUnbind
.
push
(
this
.
textFileService
.
models
.
onModelReverted
(
e
=>
this
.
onFileSavedOrReverted
(
e
.
resource
)));
this
.
toUnbind
.
push
(
this
.
editorService
.
onDidActiveEditorChange
(()
=>
this
.
on
Editors
Changed
()));
this
.
toUnbind
.
push
(
this
.
editorService
.
onDidActiveEditorChange
(()
=>
this
.
on
ActiveEditor
Changed
()));
}
private
on
Editors
Changed
():
void
{
private
on
ActiveEditor
Changed
():
void
{
let
isActiveEditorSaveConflictResolution
=
false
;
let
activeConflictResolutionResource
:
URI
;
...
...
@@ -317,7 +317,7 @@ export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource:
const
editor
=
editorService
.
activeControl
;
const
input
=
editor
.
input
;
const
position
=
editor
.
group
;
const
group
=
editor
.
group
;
resolverService
.
createModelReference
(
resource
).
then
(
reference
=>
{
const
model
=
reference
.
object
as
ITextFileEditorModel
;
...
...
@@ -335,12 +335,12 @@ export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource:
return
model
.
save
().
then
(()
=>
{
// Reopen file input
return
editorService
.
openEditor
({
resource
:
model
.
getResource
()
},
position
).
then
(()
=>
{
return
editorService
.
openEditor
({
resource
:
model
.
getResource
()
},
group
).
then
(()
=>
{
// Clean up
input
.
dispose
();
reference
.
dispose
();
editorService
.
closeEditor
(
input
,
position
);
editorService
.
closeEditor
(
input
,
group
);
});
});
});
...
...
@@ -353,7 +353,7 @@ export const revertLocalChangesCommand = (accessor: ServicesAccessor, resource:
const
editor
=
editorService
.
activeControl
;
const
input
=
editor
.
input
;
const
position
=
editor
.
group
;
const
group
=
editor
.
group
;
resolverService
.
createModelReference
(
resource
).
then
(
reference
=>
{
const
model
=
reference
.
object
as
ITextFileEditorModel
;
...
...
@@ -364,12 +364,12 @@ export const revertLocalChangesCommand = (accessor: ServicesAccessor, resource:
return
model
.
revert
().
then
(()
=>
{
// Reopen file input
return
editorService
.
openEditor
({
resource
:
model
.
getResource
()
},
position
).
then
(()
=>
{
return
editorService
.
openEditor
({
resource
:
model
.
getResource
()
},
group
).
then
(()
=>
{
// Clean up
input
.
dispose
();
reference
.
dispose
();
editorService
.
closeEditor
(
input
,
position
);
editorService
.
closeEditor
(
input
,
group
);
});
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录