Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6be53f86
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,发现更多精彩内容 >>
提交
6be53f86
编写于
7月 17, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#54483 Do not define new type of identifier for single folder
上级
e43be978
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
14 deletion
+5
-14
src/vs/platform/workspaces/common/workspaces.ts
src/vs/platform/workspaces/common/workspaces.ts
+0
-9
src/vs/workbench/services/configuration/node/configurationService.ts
...bench/services/configuration/node/configurationService.ts
+5
-5
未找到文件。
src/vs/platform/workspaces/common/workspaces.ts
浏览文件 @
6be53f86
...
...
@@ -29,11 +29,6 @@ export const UNTITLED_WORKSPACE_NAME = 'workspace.json';
*/
export
type
ISingleFolderWorkspaceIdentifier
=
string
;
/**
* A single folder workspace identifier is just the folder URI
*/
export
type
ISingleFolderWorkspaceIdentifier2
=
URI
;
export
interface
IWorkspaceIdentifier
{
id
:
string
;
configPath
:
string
;
...
...
@@ -142,10 +137,6 @@ export function isSingleFolderWorkspaceIdentifier(obj: any): obj is ISingleFolde
return
typeof
obj
===
'
string
'
;
}
export
function
isSingleFolderWorkspaceIdentifier2
(
obj
:
any
):
obj
is
ISingleFolderWorkspaceIdentifier2
{
return
obj
instanceof
URI
;
}
export
function
isWorkspaceIdentifier
(
obj
:
any
):
obj
is
IWorkspaceIdentifier
{
const
workspaceIdentifier
=
obj
as
IWorkspaceIdentifier
;
...
...
src/vs/workbench/services/configuration/node/configurationService.ts
浏览文件 @
6be53f86
...
...
@@ -26,7 +26,7 @@ import { IWorkspaceConfigurationService, FOLDER_CONFIG_FOLDER_NAME, defaultSetti
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
IConfigurationNode
,
IConfigurationRegistry
,
Extensions
,
IConfigurationPropertySchema
,
allSettings
,
windowSettings
,
resourceSettings
,
applicationSettings
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
createHash
}
from
'
crypto
'
;
import
{
getWorkspaceLabel
,
IWorkspaceIdentifier
,
ISingleFolderWorkspaceIdentifier
,
isSingleFolderWorkspaceIdentifier
,
isWorkspaceIdentifier
,
IStoredWorkspaceFolder
,
isStoredWorkspaceFolder
,
IWorkspaceFolderCreationData
,
ISingleFolderWorkspaceIdentifier2
,
isSingleFolderWorkspaceIdentifier2
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
getWorkspaceLabel
,
IWorkspaceIdentifier
,
ISingleFolderWorkspaceIdentifier
,
isSingleFolderWorkspaceIdentifier
,
isWorkspaceIdentifier
,
IStoredWorkspaceFolder
,
isStoredWorkspaceFolder
,
IWorkspaceFolderCreationData
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
IWindowConfiguration
}
from
'
vs/platform/windows/common/windows
'
;
import
{
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
...
...
@@ -301,7 +301,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
return
this
.
_configuration
.
keys
();
}
initialize
(
arg
:
IWorkspaceIdentifier
|
ISingleFolderWorkspaceIdentifier2
|
IWindowConfiguration
,
postInitialisationTask
:
()
=>
void
=
()
=>
null
):
TPromise
<
any
>
{
initialize
(
arg
:
IWorkspaceIdentifier
|
URI
|
IWindowConfiguration
,
postInitialisationTask
:
()
=>
void
=
()
=>
null
):
TPromise
<
any
>
{
return
this
.
createWorkspace
(
arg
)
.
then
(
workspace
=>
this
.
updateWorkspaceAndInitializeConfiguration
(
workspace
,
postInitialisationTask
));
}
...
...
@@ -328,12 +328,12 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
this
.
jsonEditingService
=
instantiationService
.
createInstance
(
JSONEditingService
);
}
private
createWorkspace
(
arg
:
IWorkspaceIdentifier
|
ISingleFolderWorkspaceIdentifier2
|
IWindowConfiguration
):
TPromise
<
Workspace
>
{
private
createWorkspace
(
arg
:
IWorkspaceIdentifier
|
URI
|
IWindowConfiguration
):
TPromise
<
Workspace
>
{
if
(
isWorkspaceIdentifier
(
arg
))
{
return
this
.
createMulitFolderWorkspace
(
arg
);
}
if
(
isSingleFolderWorkspaceIdentifier2
(
arg
)
)
{
if
(
arg
instanceof
URI
)
{
return
this
.
createSingleFolderWorkspace
(
arg
);
}
...
...
@@ -351,7 +351,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
});
}
private
createSingleFolderWorkspace
(
folder
:
ISingleFolderWorkspaceIdentifier2
):
TPromise
<
Workspace
>
{
private
createSingleFolderWorkspace
(
folder
:
URI
):
TPromise
<
Workspace
>
{
if
(
folder
.
scheme
===
Schemas
.
file
)
{
return
stat
(
folder
.
fsPath
)
.
then
(
workspaceStat
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录