Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3ac890f6
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,发现更多精彩内容 >>
提交
3ac890f6
编写于
11月 13, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
clone configuration when needed
上级
a91380c3
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
10 addition
and
7 deletion
+10
-7
src/vs/platform/telemetry/common/experiments.ts
src/vs/platform/telemetry/common/experiments.ts
+2
-1
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
...rkbench/parts/tasks/electron-browser/task.contribution.ts
+1
-1
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
...h/parts/terminal/electron-browser/terminalConfigHelper.ts
+2
-1
src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
...s/welcome/walkThrough/electron-browser/walkThroughPart.ts
+2
-1
src/vs/workbench/services/search/node/searchService.ts
src/vs/workbench/services/search/node/searchService.ts
+1
-1
src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
...services/themes/electron-browser/workbenchThemeService.ts
+2
-2
未找到文件。
src/vs/platform/telemetry/common/experiments.ts
浏览文件 @
3ac890f6
...
...
@@ -7,6 +7,7 @@
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
clone
}
from
'
vs/base/common/objects
'
;
/* __GDPR__FRAGMENT__
"IExperiments" : {
...
...
@@ -88,5 +89,5 @@ function splitRandom(random: number): [number, boolean] {
}
function
getExperimentsOverrides
(
configurationService
:
IConfigurationService
):
IExperiments
{
return
c
onfigurationService
.
getValue
<
any
>
(
'
experiments
'
)
||
{};
return
c
lone
(
configurationService
.
getValue
<
any
>
(
'
experiments
'
)
)
||
{};
}
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
浏览文件 @
3ac890f6
...
...
@@ -1601,7 +1601,7 @@ class TaskService extends EventEmitter implements ITaskService {
private
getConfiguration
(
workspaceFolder
:
IWorkspaceFolder
):
{
config
:
TaskConfig
.
ExternalTaskRunnerConfiguration
;
hasParseErrors
:
boolean
}
{
let
result
=
this
.
contextService
.
getWorkbenchState
()
!==
WorkbenchState
.
EMPTY
?
this
.
configurationService
.
getValue
<
TaskConfig
.
ExternalTaskRunnerConfiguration
>
(
'
tasks
'
,
{
resource
:
workspaceFolder
.
uri
}
)
?
Objects
.
clone
(
this
.
configurationService
.
getValue
<
TaskConfig
.
ExternalTaskRunnerConfiguration
>
(
'
tasks
'
,
{
resource
:
workspaceFolder
.
uri
})
)
:
undefined
;
if
(
!
result
)
{
return
{
config
:
undefined
,
hasParseErrors
:
false
};
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
浏览文件 @
3ac890f6
...
...
@@ -15,6 +15,7 @@ import { ITerminalConfiguration, ITerminalConfigHelper, ITerminalFont, IShellLau
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
isFedora
}
from
'
vs/workbench/parts/terminal/electron-browser/terminal
'
;
import
{
clone
}
from
'
vs/base/common/objects
'
;
interface
IEditorConfiguration
{
editor
:
IEditorOptions
;
...
...
@@ -49,7 +50,7 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
}
public
get
config
():
ITerminalConfiguration
{
return
this
.
_configurationService
.
getValue
<
IFullTerminalConfiguration
>
().
terminal
.
integrated
;
return
clone
(
this
.
_configurationService
.
getValue
<
IFullTerminalConfiguration
>
().
terminal
.
integrated
)
;
}
private
_measureFont
(
fontFamily
:
string
,
fontSize
:
number
,
lineHeight
:
number
):
ITerminalFont
{
...
...
src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
浏览文件 @
3ac890f6
...
...
@@ -39,6 +39,7 @@ import { registerColor, focusBorder, textLinkForeground, textLinkActiveForegroun
import
{
getExtraColor
}
from
'
vs/workbench/parts/welcome/walkThrough/node/walkThroughUtils
'
;
import
{
UILabelProvider
}
from
'
vs/base/common/keybindingLabels
'
;
import
{
OS
,
OperatingSystem
}
from
'
vs/base/common/platform
'
;
import
{
clone
}
from
'
vs/base/common/objects
'
;
export
const
WALK_THROUGH_FOCUS
=
new
RawContextKey
<
boolean
>
(
'
interactivePlaygroundFocus
'
,
false
);
...
...
@@ -461,7 +462,7 @@ export class WalkThroughPart extends BaseEditor {
}
private
getEditorOptions
(
language
:
string
):
IEditorOptions
{
const
config
=
this
.
configurationService
.
getValue
<
IEditorOptions
>
(
'
editor
'
,
{
overrideIdentifier
:
language
}
);
const
config
=
clone
(
this
.
configurationService
.
getValue
<
IEditorOptions
>
(
'
editor
'
,
{
overrideIdentifier
:
language
})
);
return
{
...
isObject
(
config
)
?
config
:
Object
.
create
(
null
),
scrollBeyondLastLine
:
false
,
...
...
src/vs/workbench/services/search/node/searchService.ts
浏览文件 @
3ac890f6
...
...
@@ -64,7 +64,7 @@ export class SearchService implements ISearchService {
// Configuration: File Excludes
if
(
!
query
.
disregardExcludeSettings
)
{
const
fileExcludes
=
configuration
&&
configuration
.
files
&&
configuration
.
files
.
exclude
;
const
fileExcludes
=
objects
.
clone
(
configuration
&&
configuration
.
files
&&
configuration
.
files
.
exclude
)
;
if
(
fileExcludes
)
{
if
(
!
query
.
excludePattern
)
{
query
.
excludePattern
=
fileExcludes
;
...
...
src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
浏览文件 @
3ac890f6
...
...
@@ -375,10 +375,10 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
}
private
updateColorCustomizations
(
notify
=
true
):
void
{
let
newColorCustomizations
=
this
.
configurationService
.
getValue
<
IColorCustomizations
>
(
CUSTOM_WORKBENCH_COLORS_SETTING
)
||
{};
let
newColorCustomizations
=
objects
.
clone
(
this
.
configurationService
.
getValue
<
IColorCustomizations
>
(
CUSTOM_WORKBENCH_COLORS_SETTING
)
)
||
{};
let
newColorIds
=
Object
.
keys
(
newColorCustomizations
);
let
newTokenColorCustomizations
=
this
.
configurationService
.
getValue
<
ITokenColorCustomizations
>
(
CUSTOM_EDITOR_COLORS_SETTING
)
||
{};
let
newTokenColorCustomizations
=
objects
.
clone
(
this
.
configurationService
.
getValue
<
ITokenColorCustomizations
>
(
CUSTOM_EDITOR_COLORS_SETTING
)
)
||
{};
if
(
this
.
hasCustomizationChanged
(
newColorCustomizations
,
newColorIds
,
newTokenColorCustomizations
))
{
this
.
colorCustomizations
=
newColorCustomizations
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录