Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
435ca5fe
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,发现更多精彩内容 >>
提交
435ca5fe
编写于
6月 19, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#28538 Remove passing roots from roots change event
上级
2ea7f1c6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
11 deletion
+15
-11
src/vs/editor/browser/standalone/simpleServices.ts
src/vs/editor/browser/standalone/simpleServices.ts
+2
-2
src/vs/platform/workspace/common/workspace.ts
src/vs/platform/workspace/common/workspace.ts
+1
-1
src/vs/workbench/services/configuration/node/configuration.ts
...vs/workbench/services/configuration/node/configuration.ts
+7
-4
src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
...kbench/services/files/node/watcher/nsfw/watcherService.ts
+2
-1
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+3
-3
未找到文件。
src/vs/editor/browser/standalone/simpleServices.ts
浏览文件 @
435ca5fe
...
...
@@ -523,8 +523,8 @@ export class SimpleWorkspaceContextService implements IWorkspaceContextService {
private
static
SCHEME
:
'
inmemory
'
;
private
readonly
_onDidChangeWorkspaceRoots
:
Emitter
<
URI
[]
>
=
new
Emitter
<
URI
[]
>
();
public
readonly
onDidChangeWorkspaceRoots
:
Event
<
URI
[]
>
=
this
.
_onDidChangeWorkspaceRoots
.
event
;
private
readonly
_onDidChangeWorkspaceRoots
:
Emitter
<
void
>
=
new
Emitter
<
void
>
();
public
readonly
onDidChangeWorkspaceRoots
:
Event
<
void
>
=
this
.
_onDidChangeWorkspaceRoots
.
event
;
private
readonly
legacyWorkspace
:
ILegacyWorkspace
;
private
readonly
workspace
:
IWorkspace
;
...
...
src/vs/platform/workspace/common/workspace.ts
浏览文件 @
435ca5fe
...
...
@@ -36,7 +36,7 @@ export interface IWorkspaceContextService {
/**
* An event which fires on workspace roots change.
*/
onDidChangeWorkspaceRoots
:
Event
<
URI
[]
>
;
onDidChangeWorkspaceRoots
:
Event
<
void
>
;
/**
* Returns the root for the given resource from the workspace.
...
...
src/vs/workbench/services/configuration/node/configuration.ts
浏览文件 @
435ca5fe
...
...
@@ -163,8 +163,8 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
public
_serviceBrand
:
any
;
private
readonly
_onDidChangeWorkspaceRoots
:
Emitter
<
URI
[]
>
=
this
.
_register
(
new
Emitter
<
URI
[]
>
());
public
readonly
onDidChangeWorkspaceRoots
:
Event
<
URI
[]
>
=
this
.
_onDidChangeWorkspaceRoots
.
event
;
private
readonly
_onDidChangeWorkspaceRoots
:
Emitter
<
void
>
=
this
.
_register
(
new
Emitter
<
void
>
());
public
readonly
onDidChangeWorkspaceRoots
:
Event
<
void
>
=
this
.
_onDidChangeWorkspaceRoots
.
event
;
private
readonly
_onDidUpdateConfiguration
:
Emitter
<
IConfigurationServiceEvent
>
=
this
.
_register
(
new
Emitter
<
IConfigurationServiceEvent
>
());
public
readonly
onDidUpdateConfiguration
:
Event
<
IConfigurationServiceEvent
>
=
this
.
_onDidUpdateConfiguration
.
event
;
...
...
@@ -222,7 +222,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
this
.
workspace
.
roots
=
configuredFolders
;
this
.
workspace
.
name
=
configuredFolders
.
map
(
root
=>
basename
(
root
.
fsPath
)
||
root
.
fsPath
).
join
(
'
,
'
);
this
.
_onDidChangeWorkspaceRoots
.
fire
(
configuredFolders
);
this
.
_onDidChangeWorkspaceRoots
.
fire
();
}
}
...
...
@@ -372,7 +372,10 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
}
}
private
trigger
(
source
:
ConfigurationSource
,
sourceConfig
:
any
=
this
.
_configuration
.
getFolderConfigurationModel
(
this
.
workspace
.
roots
[
0
]).
contents
):
void
{
private
trigger
(
source
:
ConfigurationSource
,
sourceConfig
?:
any
):
void
{
if
(
!
sourceConfig
)
{
sourceConfig
=
this
.
workspace
?
this
.
_configuration
.
getFolderConfigurationModel
(
this
.
workspace
.
roots
[
0
]).
contents
:
this
.
_configuration
.
user
.
contents
;
}
this
.
_onDidUpdateConfiguration
.
fire
({
source
,
sourceConfig
});
}
}
...
...
src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
浏览文件 @
435ca5fe
...
...
@@ -73,7 +73,8 @@ export class FileWatcher {
}
},
this
.
errorLogger
);
this
.
contextService
.
onDidChangeWorkspaceRoots
(
roots
=>
{
this
.
contextService
.
onDidChangeWorkspaceRoots
(()
=>
{
const
roots
=
this
.
contextService
.
getWorkspace2
().
roots
;
service
.
setRoots
(
roots
.
map
(
r
=>
r
.
fsPath
));
console
.
log
(
'
roots changed
'
,
roots
);
});
...
...
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
435ca5fe
...
...
@@ -68,16 +68,16 @@ export class TestContextService implements IWorkspaceContextService {
private
id
:
string
;
private
options
:
any
;
private
_onDidChangeWorkspaceRoots
:
Emitter
<
URI
[]
>
;
private
_onDidChangeWorkspaceRoots
:
Emitter
<
void
>
;
constructor
(
workspace
:
any
=
TestWorkspace
,
options
:
any
=
null
)
{
this
.
workspace
=
workspace
;
this
.
id
=
generateUuid
();
this
.
options
=
options
||
Object
.
create
(
null
);
this
.
_onDidChangeWorkspaceRoots
=
new
Emitter
<
URI
[]
>
();
this
.
_onDidChangeWorkspaceRoots
=
new
Emitter
<
void
>
();
}
public
get
onDidChangeWorkspaceRoots
():
Event
<
URI
[]
>
{
public
get
onDidChangeWorkspaceRoots
():
Event
<
void
>
{
return
this
.
_onDidChangeWorkspaceRoots
.
event
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录