Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
105e8718
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,发现更多精彩内容 >>
提交
105e8718
编写于
4月 17, 2019
作者:
A
Andre Weinand
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
filter workspace paths contradicting ext development
上级
5a010d8e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
46 addition
and
30 deletion
+46
-30
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+46
-30
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
105e8718
...
...
@@ -1190,46 +1190,62 @@ export class WindowsManager implements IWindowsMainService {
}
}
// Make sure we are not asked to open a workspace or folder that is already opened
if
(
cliArgs
.
length
&&
cliArgs
.
some
(
path
=>
!!
findWindowOnWorkspaceOrFolderUri
(
WindowsManager
.
WINDOWS
,
URI
.
file
(
path
))))
{
cliArgs
=
[];
if
(
!
Array
.
isArray
(
extensionDevelopmentPath
))
{
extensionDevelopmentPath
=
[
extensionDevelopmentPath
];
}
if
(
folderUris
.
length
&&
folderUris
.
some
(
uri
=>
!!
findWindowOnWorkspaceOrFolderUri
(
WindowsManager
.
WINDOWS
,
this
.
argToUri
(
uri
))))
{
folderUris
=
[];
}
if
(
fileUris
.
length
&&
fileUris
.
some
(
uri
=>
!!
findWindowOnWorkspaceOrFolderUri
(
WindowsManager
.
WINDOWS
,
this
.
argToUri
(
uri
))))
{
fileUris
=
[];
}
openConfig
.
cli
.
_
=
cliArgs
;
openConfig
.
cli
[
'
folder-uri
'
]
=
folderUris
;
openConfig
.
cli
[
'
file-uri
'
]
=
fileUris
;
if
(
Array
.
isArray
(
extensionDevelopmentPath
))
{
let
authority
:
string
|
undefined
=
undefined
;
for
(
let
p
of
extensionDevelopmentPath
)
{
const
match
=
p
.
match
(
/^vscode-remote:
\/\/([^\/]
+
)
/
);
if
(
match
)
{
const
auth
=
URI
.
parse
(
p
).
authority
;
let
authority
=
''
;
for
(
let
p
of
extensionDevelopmentPath
)
{
if
(
p
.
match
(
/^
[
a-zA-Z
][
a-zA-Z0-9
\+\-\.]
+:/
))
{
const
url
=
URI
.
parse
(
p
);
if
(
url
.
scheme
===
Schemas
.
vscodeRemote
)
{
if
(
authority
)
{
if
(
auth
!==
authority
)
{
console
.
log
(
'
more than one
authority
'
);
if
(
url
.
authority
!==
authority
)
{
this
.
logService
.
error
(
'
more than one extension development path
authority
'
);
}
}
else
{
authority
=
auth
;
authority
=
url
.
authority
;
}
}
}
if
(
authority
)
{
openConfig
.
cli
[
'
remote
'
]
=
authority
;
}
// Make sure that we do not try to open:
// - a workspace or folder that is already opened
// - a workspace or file that has a different authority as the extension development.
cliArgs
=
cliArgs
.
filter
(
path
=>
{
const
uri
=
URI
.
file
(
path
);
if
(
!!
findWindowOnWorkspaceOrFolderUri
(
WindowsManager
.
WINDOWS
,
uri
))
{
return
false
;
}
return
uri
.
authority
===
authority
;
});
}
else
{
const
match
=
extensionDevelopmentPath
.
match
(
/^vscode-remote:
\/\/([^\/]
+
)
/
);
if
(
match
)
{
openConfig
.
cli
[
'
remote
'
]
=
URI
.
parse
(
extensionDevelopmentPath
).
authority
;
folderUris
=
folderUris
.
filter
(
uri
=>
{
const
u
=
this
.
argToUri
(
uri
);
if
(
!!
findWindowOnWorkspaceOrFolderUri
(
WindowsManager
.
WINDOWS
,
u
))
{
return
false
;
}
return
u
?
u
.
authority
===
authority
:
false
;
});
fileUris
=
fileUris
.
filter
(
uri
=>
{
const
u
=
this
.
argToUri
(
uri
);
if
(
!!
findWindowOnWorkspaceOrFolderUri
(
WindowsManager
.
WINDOWS
,
u
))
{
return
false
;
}
return
u
?
u
.
authority
===
authority
:
false
;
});
openConfig
.
cli
.
_
=
cliArgs
;
openConfig
.
cli
[
'
folder-uri
'
]
=
folderUris
;
openConfig
.
cli
[
'
file-uri
'
]
=
fileUris
;
// if there are no files or folders cli args left, use the "remote" cli argument
if
(
!
cliArgs
.
length
&&
!
folderUris
.
length
&&
!
fileUris
.
length
)
{
if
(
authority
)
{
openConfig
.
cli
.
remote
=
authority
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录