Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
482dc607
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,发现更多精彩内容 >>
提交
482dc607
编写于
7月 17, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix tests
上级
79cc26ac
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
5 addition
and
5 deletion
+5
-5
src/vs/workbench/electron-browser/main.ts
src/vs/workbench/electron-browser/main.ts
+1
-1
src/vs/workbench/services/configuration/node/configurationService.ts
...bench/services/configuration/node/configurationService.ts
+4
-4
未找到文件。
src/vs/workbench/electron-browser/main.ts
浏览文件 @
482dc607
...
@@ -116,7 +116,7 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
...
@@ -116,7 +116,7 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
}
}
function
createAndInitializeWorkspaceService
(
configuration
:
IWindowConfiguration
,
environmentService
:
EnvironmentService
):
TPromise
<
WorkspaceService
>
{
function
createAndInitializeWorkspaceService
(
configuration
:
IWindowConfiguration
,
environmentService
:
EnvironmentService
):
TPromise
<
WorkspaceService
>
{
const
folderUri
=
configuration
.
folderPath
?
uri
.
file
(
configuration
.
folderPath
)
/* TODO:
Change to URI.path parsing
once main sends URIs*/
:
null
;
const
folderUri
=
configuration
.
folderPath
?
uri
.
file
(
configuration
.
folderPath
)
/* TODO:
Sandy Change to URI.parse
once main sends URIs*/
:
null
;
return
validateFolderUri
(
folderUri
,
configuration
.
verbose
).
then
(
validatedFolderUri
=>
{
return
validateFolderUri
(
folderUri
,
configuration
.
verbose
).
then
(
validatedFolderUri
=>
{
const
workspaceService
=
new
WorkspaceService
(
environmentService
);
const
workspaceService
=
new
WorkspaceService
(
environmentService
);
...
...
src/vs/workbench/services/configuration/node/configurationService.ts
浏览文件 @
482dc607
...
@@ -132,16 +132,16 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
...
@@ -132,16 +132,16 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
public
isCurrentWorkspace
(
workspaceIdentifier
:
ISingleFolderWorkspaceIdentifier
|
IWorkspaceIdentifier
):
boolean
{
public
isCurrentWorkspace
(
workspaceIdentifier
:
ISingleFolderWorkspaceIdentifier
|
IWorkspaceIdentifier
):
boolean
{
switch
(
this
.
getWorkbenchState
())
{
switch
(
this
.
getWorkbenchState
())
{
case
WorkbenchState
.
FOLDER
:
case
WorkbenchState
.
FOLDER
:
return
isSingleFolderWorkspaceIdentifier
(
workspaceIdentifier
)
&&
isEqual
(
this
.
workspace
.
folders
[
0
].
uri
,
this
.
to
SingleFolderWorkspaceIdentifier2
(
workspaceIdentifier
),
this
.
workspace
.
folders
[
0
].
uri
.
scheme
!==
Schemas
.
file
||
!
isLinux
);
return
isSingleFolderWorkspaceIdentifier
(
workspaceIdentifier
)
&&
isEqual
(
this
.
workspace
.
folders
[
0
].
uri
,
this
.
to
Uri
(
workspaceIdentifier
),
this
.
workspace
.
folders
[
0
].
uri
.
scheme
!==
Schemas
.
file
||
!
isLinux
);
case
WorkbenchState
.
WORKSPACE
:
case
WorkbenchState
.
WORKSPACE
:
return
isWorkspaceIdentifier
(
workspaceIdentifier
)
&&
this
.
workspace
.
id
===
workspaceIdentifier
.
id
;
return
isWorkspaceIdentifier
(
workspaceIdentifier
)
&&
this
.
workspace
.
id
===
workspaceIdentifier
.
id
;
}
}
return
false
;
return
false
;
}
}
private
to
SingleFolderWorkspaceIdentifier2
(
folderIdentifier
:
ISingleFolderWorkspaceIdentifier
):
URI
{
private
to
Uri
(
folderIdentifier
:
ISingleFolderWorkspaceIdentifier
):
URI
{
const
uri
=
URI
.
parse
(
folderIdentifier
);
// TODO:Sandy Change to URI.parse parsing once main sends URIs
return
uri
.
scheme
?
uri
:
URI
.
file
(
folderIdentifier
);
return
URI
.
file
(
folderIdentifier
);
}
}
private
doUpdateFolders
(
foldersToAdd
:
IWorkspaceFolderCreationData
[],
foldersToRemove
:
URI
[],
index
?:
number
):
TPromise
<
void
>
{
private
doUpdateFolders
(
foldersToAdd
:
IWorkspaceFolderCreationData
[],
foldersToRemove
:
URI
[],
index
?:
number
):
TPromise
<
void
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录