Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
ea22a06e
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
ea22a06e
编写于
9月 25, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #34834
上级
f37884c2
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
.../workbench/parts/preferences/browser/preferencesEditor.ts
+7
-7
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
浏览文件 @
ea22a06e
...
@@ -238,12 +238,12 @@ export class PreferencesEditor extends BaseEditor {
...
@@ -238,12 +238,12 @@ export class PreferencesEditor extends BaseEditor {
}
}
private
getSettingsConfigurationTarget
(
resource
:
URI
):
ConfigurationTarget
{
private
getSettingsConfigurationTarget
(
resource
:
URI
):
ConfigurationTarget
{
if
(
this
.
preferencesService
.
userSettingsResource
.
fsPath
===
resource
.
fsPath
)
{
if
(
this
.
preferencesService
.
userSettingsResource
.
toString
()
===
resource
.
toString
()
)
{
return
ConfigurationTarget
.
USER
;
return
ConfigurationTarget
.
USER
;
}
}
const
workspaceSettingsResource
=
this
.
preferencesService
.
workspaceSettingsResource
;
const
workspaceSettingsResource
=
this
.
preferencesService
.
workspaceSettingsResource
;
if
(
workspaceSettingsResource
&&
workspaceSettingsResource
.
fsPath
===
resource
.
fsPath
)
{
if
(
workspaceSettingsResource
&&
workspaceSettingsResource
.
toString
()
===
resource
.
toString
()
)
{
return
ConfigurationTarget
.
WORKSPACE
;
return
ConfigurationTarget
.
WORKSPACE
;
}
}
...
@@ -255,10 +255,10 @@ export class PreferencesEditor extends BaseEditor {
...
@@ -255,10 +255,10 @@ export class PreferencesEditor extends BaseEditor {
}
}
private
getSettingsConfigurationTargetUri
(
resource
:
URI
):
URI
{
private
getSettingsConfigurationTargetUri
(
resource
:
URI
):
URI
{
if
(
this
.
preferencesService
.
userSettingsResource
.
fsPath
===
resource
.
fsPath
)
{
if
(
this
.
preferencesService
.
userSettingsResource
.
toString
()
===
resource
.
toString
()
)
{
return
resource
;
return
resource
;
}
}
if
(
this
.
preferencesService
.
workspaceSettingsResource
.
fsPath
===
resource
.
fsPath
)
{
if
(
this
.
preferencesService
.
workspaceSettingsResource
.
toString
()
===
resource
.
toString
()
)
{
return
resource
;
return
resource
;
}
}
...
@@ -911,17 +911,17 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
...
@@ -911,17 +911,17 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
return
false
;
return
false
;
}
}
if
(
this
.
preferencesService
.
userSettingsResource
&&
this
.
preferencesService
.
userSettingsResource
.
fsPath
===
model
.
uri
.
fsPath
)
{
if
(
this
.
preferencesService
.
userSettingsResource
&&
this
.
preferencesService
.
userSettingsResource
.
toString
()
===
model
.
uri
.
toString
()
)
{
return
true
;
return
true
;
}
}
if
(
this
.
preferencesService
.
workspaceSettingsResource
&&
this
.
preferencesService
.
workspaceSettingsResource
.
fsPath
===
model
.
uri
.
fsPath
)
{
if
(
this
.
preferencesService
.
workspaceSettingsResource
&&
this
.
preferencesService
.
workspaceSettingsResource
.
toString
()
===
model
.
uri
.
toString
()
)
{
return
true
;
return
true
;
}
}
for
(
const
folder
of
this
.
workspaceContextService
.
getWorkspace
().
folders
)
{
for
(
const
folder
of
this
.
workspaceContextService
.
getWorkspace
().
folders
)
{
const
folderSettingsResource
=
this
.
preferencesService
.
getFolderSettingsResource
(
folder
.
uri
);
const
folderSettingsResource
=
this
.
preferencesService
.
getFolderSettingsResource
(
folder
.
uri
);
if
(
folderSettingsResource
&&
folderSettingsResource
.
fsPath
===
model
.
uri
.
fsPath
)
{
if
(
folderSettingsResource
&&
folderSettingsResource
.
toString
()
===
model
.
uri
.
toString
()
)
{
return
true
;
return
true
;
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录