Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4d8bb929
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,发现更多精彩内容 >>
提交
4d8bb929
编写于
2月 08, 2019
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use fileservice to decide which editor inputs are openable
上级
af76bbac
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
9 deletion
+18
-9
src/vs/workbench/browser/parts/editor/editorWidgets.ts
src/vs/workbench/browser/parts/editor/editorWidgets.ts
+9
-4
src/vs/workbench/contrib/files/electron-browser/fileActions.ts
...s/workbench/contrib/files/electron-browser/fileActions.ts
+9
-5
未找到文件。
src/vs/workbench/browser/parts/editor/editorWidgets.ts
浏览文件 @
4d8bb929
...
...
@@ -14,12 +14,12 @@ import { buttonBackground, buttonForeground, editorBackground, editorForeground,
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
hasWorkspaceFileExtension
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
Disposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
IEditorContribution
}
from
'
vs/editor/common/editorCommon
'
;
import
{
isEqual
}
from
'
vs/base/common/resources
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
export
class
FloatingClickWidget
extends
Widget
implements
IOverlayWidget
{
...
...
@@ -107,7 +107,8 @@ export class OpenWorkspaceButtonContribution extends Disposable implements IEdit
private
editor
:
ICodeEditor
,
@
IInstantiationService
private
readonly
instantiationService
:
IInstantiationService
,
@
IWindowService
private
readonly
windowService
:
IWindowService
,
@
IWorkspaceContextService
private
readonly
contextService
:
IWorkspaceContextService
@
IWorkspaceContextService
private
readonly
contextService
:
IWorkspaceContextService
,
@
IFileService
private
readonly
fileService
:
IFileService
)
{
super
();
...
...
@@ -138,8 +139,12 @@ export class OpenWorkspaceButtonContribution extends Disposable implements IEdit
return
false
;
// we need a model
}
if
(
model
.
uri
.
scheme
!==
Schemas
.
file
||
!
hasWorkspaceFileExtension
(
model
.
uri
.
fsPath
))
{
return
false
;
// we need a local workspace file
if
(
!
hasWorkspaceFileExtension
(
model
.
uri
.
fsPath
))
{
return
false
;
// we need a workspace file
}
if
(
!
this
.
fileService
.
canHandleResource
(
model
.
uri
))
{
return
false
;
// needs to be backed by a file service
}
if
(
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
WORKSPACE
)
{
...
...
src/vs/workbench/contrib/files/electron-browser/fileActions.ts
浏览文件 @
4d8bb929
...
...
@@ -46,7 +46,6 @@ import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree';
import
{
ExplorerItem
}
from
'
vs/workbench/contrib/files/common/explorerModel
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
sequence
}
from
'
vs/base/common/async
'
;
import
{
REMOTE_HOST_SCHEME
}
from
'
vs/platform/remote/common/remoteHosts
'
;
export
const
NEW_FILE_COMMAND_ID
=
'
explorer.newFile
'
;
export
const
NEW_FILE_LABEL
=
nls
.
localize
(
'
newFile
'
,
"
New File
"
);
...
...
@@ -869,17 +868,22 @@ export class ShowOpenedFileInNewWindow extends Action {
label
:
string
,
@
IEditorService
private
readonly
editorService
:
IEditorService
,
@
IWindowService
private
readonly
windowService
:
IWindowService
,
@
INotificationService
private
readonly
notificationService
:
INotificationService
@
INotificationService
private
readonly
notificationService
:
INotificationService
,
@
IFileService
private
readonly
fileService
:
IFileService
)
{
super
(
id
,
label
);
}
public
run
():
Promise
<
any
>
{
const
fileResource
=
toResource
(
this
.
editorService
.
activeEditor
,
{
supportSideBySide
:
true
});
if
(
fileResource
&&
(
fileResource
.
scheme
===
Schemas
.
file
||
fileResource
.
scheme
===
REMOTE_HOST_SCHEME
))
{
this
.
windowService
.
openWindow
([{
uri
:
fileResource
,
typeHint
:
'
file
'
}],
{
forceNewWindow
:
true
,
forceOpenWorkspaceAsFile
:
true
});
if
(
fileResource
)
{
if
(
this
.
fileService
.
canHandleResource
(
fileResource
))
{
this
.
windowService
.
openWindow
([{
uri
:
fileResource
,
typeHint
:
'
file
'
}],
{
forceNewWindow
:
true
,
forceOpenWorkspaceAsFile
:
true
});
}
else
{
this
.
notificationService
.
info
(
nls
.
localize
(
'
openFileToShowInNewWindow.unsupportedschema
'
,
"
The active editor must contain an openable resource.
"
));
}
}
else
{
this
.
notificationService
.
info
(
nls
.
localize
(
'
openFileToShowInNewWindow
'
,
"
Open a file first to open in new window
"
));
this
.
notificationService
.
info
(
nls
.
localize
(
'
openFileToShowInNewWindow
.nofile
'
,
"
Open a file first to open in new window
"
));
}
return
Promise
.
resolve
(
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录