Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
2a82df94
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,发现更多精彩内容 >>
未验证
提交
2a82df94
编写于
7月 09, 2021
作者:
L
Logan Ramos
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Part of #125422
上级
966eaaee
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
19 addition
and
19 deletion
+19
-19
src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint.ts
...ench/contrib/codeEditor/browser/untitledTextEditorHint.ts
+1
-1
src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
...ntrib/notebook/browser/contrib/outline/notebookOutline.ts
+2
-2
src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
...ench/contrib/notebook/browser/diff/notebookDiffActions.ts
+2
-2
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
...vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+1
-1
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
.../services/extensions/electron-browser/extensionService.ts
+1
-1
src/vs/workbench/services/host/browser/browserHostService.ts
src/vs/workbench/services/host/browser/browserHostService.ts
+1
-1
src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts
...esourceProperties/common/textResourcePropertiesService.ts
+2
-2
src/vs/workbench/services/themes/browser/workbenchThemeService.ts
...orkbench/services/themes/browser/workbenchThemeService.ts
+4
-4
src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
...bench/services/untitled/common/untitledTextEditorModel.ts
+1
-1
src/vs/workbench/services/workspaces/common/workspaceTrust.ts
...vs/workbench/services/workspaces/common/workspaceTrust.ts
+2
-2
src/vs/workbench/test/common/workbenchTestServices.ts
src/vs/workbench/test/common/workbenchTestServices.ts
+2
-2
未找到文件。
src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint.ts
浏览文件 @
2a82df94
...
...
@@ -47,7 +47,7 @@ export class UntitledTextEditorHintContribution implements IEditorContribution {
private
update
():
void
{
this
.
untitledTextHintContentWidget
?.
dispose
();
const
configValue
=
this
.
configurationService
.
getValue
<
'
text
'
|
'
hidden
'
>
(
untitledTextEditorHintSetting
);
const
configValue
=
this
.
configurationService
.
getValue
(
untitledTextEditorHintSetting
);
const
model
=
this
.
editor
.
getModel
();
if
(
model
&&
model
.
uri
.
scheme
===
Schemas
.
untitled
&&
model
.
getModeId
()
===
PLAINTEXT_MODE_ID
&&
configValue
===
'
text
'
)
{
...
...
src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
浏览文件 @
2a82df94
...
...
@@ -177,7 +177,7 @@ class NotebookOutlineRenderer implements ITreeRenderer<OutlineEntry, FuzzyScore,
template
.
container
.
style
.
removeProperty
(
'
--outline-element-color
'
);
template
.
decoration
.
innerText
=
''
;
if
(
markerInfo
)
{
const
useBadges
=
this
.
_configurationService
.
getValue
<
boolean
>
(
OutlineConfigKeys
.
problemsBadges
);
const
useBadges
=
this
.
_configurationService
.
getValue
(
OutlineConfigKeys
.
problemsBadges
);
if
(
!
useBadges
)
{
template
.
decoration
.
classList
.
remove
(
'
bubble
'
);
template
.
decoration
.
innerText
=
''
;
...
...
@@ -189,7 +189,7 @@ class NotebookOutlineRenderer implements ITreeRenderer<OutlineEntry, FuzzyScore,
template
.
decoration
.
innerText
=
markerInfo
.
count
>
9
?
'
9+
'
:
String
(
markerInfo
.
count
);
}
const
color
=
this
.
_themeService
.
getColorTheme
().
getColor
(
markerInfo
.
topSev
===
MarkerSeverity
.
Error
?
listErrorForeground
:
listWarningForeground
);
const
useColors
=
this
.
_configurationService
.
getValue
<
boolean
>
(
OutlineConfigKeys
.
problemsColors
);
const
useColors
=
this
.
_configurationService
.
getValue
(
OutlineConfigKeys
.
problemsColors
);
if
(
!
useColors
)
{
template
.
container
.
style
.
removeProperty
(
'
--outline-element-color
'
);
template
.
decoration
.
style
.
setProperty
(
'
--outline-element-color
'
,
color
?.
toString
()
??
'
inherit
'
);
...
...
src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
浏览文件 @
2a82df94
...
...
@@ -230,12 +230,12 @@ class ToggleRenderAction extends Action2 {
const
configurationService
=
accessor
.
get
(
IConfigurationService
);
if
(
this
.
toggleOutputs
!==
undefined
)
{
const
oldValue
=
configurationService
.
getValue
<
boolean
>
(
'
notebook.diff.ignoreOutputs
'
);
const
oldValue
=
configurationService
.
getValue
(
'
notebook.diff.ignoreOutputs
'
);
configurationService
.
updateValue
(
'
notebook.diff.ignoreOutputs
'
,
!
oldValue
);
}
if
(
this
.
toggleMetadata
!==
undefined
)
{
const
oldValue
=
configurationService
.
getValue
<
boolean
>
(
'
notebook.diff.ignoreMetadata
'
);
const
oldValue
=
configurationService
.
getValue
(
'
notebook.diff.ignoreMetadata
'
);
configurationService
.
updateValue
(
'
notebook.diff.ignoreMetadata
'
,
!
oldValue
);
}
}
...
...
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
浏览文件 @
2a82df94
...
...
@@ -1274,7 +1274,7 @@ class AcceptChangesContribution extends Disposable implements IEditorContributio
}
if
(
syncResourceConflicts
[
1
].
some
(({
remoteResource
})
=>
isEqual
(
remoteResource
,
model
.
uri
)))
{
return
this
.
configurationService
.
getValue
<
boolean
>
(
'
diffEditor.renderSideBySide
'
);
return
this
.
configurationService
.
getValue
(
'
diffEditor.renderSideBySide
'
);
}
return
false
;
...
...
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
浏览文件 @
2a82df94
...
...
@@ -111,7 +111,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
}
private
_isLocalWebWorkerEnabled
()
{
if
(
this
.
_configurationService
.
getValue
<
boolean
>
(
webWorkerExtHostConfig
))
{
if
(
this
.
_configurationService
.
getValue
(
webWorkerExtHostConfig
))
{
return
true
;
}
if
(
this
.
_environmentService
.
isExtensionDevelopment
&&
this
.
_environmentService
.
extensionDevelopmentKind
?.
some
(
k
=>
k
===
'
web
'
))
{
...
...
src/vs/workbench/services/host/browser/browserHostService.ts
浏览文件 @
2a82df94
...
...
@@ -138,7 +138,7 @@ export class BrowserHostService extends Disposable implements IHostService {
// Unknown / Keyboard shows veto depending on setting
case
HostShutdownReason
.
Unknown
:
case
HostShutdownReason
.
Keyboard
:
const
confirmBeforeClose
=
this
.
configurationService
.
getValue
<
'
always
'
|
'
keyboardOnly
'
|
'
never
'
>
(
'
window.confirmBeforeClose
'
);
const
confirmBeforeClose
=
this
.
configurationService
.
getValue
(
'
window.confirmBeforeClose
'
);
if
(
confirmBeforeClose
===
'
always
'
||
(
confirmBeforeClose
===
'
keyboardOnly
'
&&
this
.
shutdownReason
===
HostShutdownReason
.
Keyboard
))
{
e
.
veto
(
true
,
'
veto.confirmBeforeClose
'
);
}
...
...
src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts
浏览文件 @
2a82df94
...
...
@@ -30,8 +30,8 @@ export class TextResourcePropertiesService implements ITextResourcePropertiesSer
}
getEOL
(
resource
?:
URI
,
language
?:
string
):
string
{
const
eol
=
this
.
configurationService
.
getValue
<
string
>
(
'
files.eol
'
,
{
overrideIdentifier
:
language
,
resource
});
if
(
eol
&&
eol
!==
'
auto
'
)
{
const
eol
=
this
.
configurationService
.
getValue
(
'
files.eol
'
,
{
overrideIdentifier
:
language
,
resource
});
if
(
eol
&&
typeof
eol
===
'
string
'
&&
eol
!==
'
auto
'
)
{
return
eol
;
}
const
os
=
this
.
getOS
(
resource
);
...
...
src/vs/workbench/services/themes/browser/workbenchThemeService.ts
浏览文件 @
2a82df94
...
...
@@ -380,10 +380,10 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
}
private
getPreferredColorScheme
():
ColorScheme
|
undefined
{
if
(
this
.
configurationService
.
getValue
<
boolean
>
(
ThemeSettings
.
DETECT_HC
)
&&
this
.
hostColorService
.
highContrast
)
{
if
(
this
.
configurationService
.
getValue
(
ThemeSettings
.
DETECT_HC
)
&&
this
.
hostColorService
.
highContrast
)
{
return
ColorScheme
.
HIGH_CONTRAST
;
}
if
(
this
.
configurationService
.
getValue
<
boolean
>
(
ThemeSettings
.
DETECT_COLOR_SCHEME
))
{
if
(
this
.
configurationService
.
getValue
(
ThemeSettings
.
DETECT_COLOR_SCHEME
))
{
return
this
.
hostColorService
.
dark
?
ColorScheme
.
DARK
:
ColorScheme
.
LIGHT
;
}
return
undefined
;
...
...
@@ -391,8 +391,8 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
private
async
applyPreferredColorTheme
(
type
:
ColorScheme
):
Promise
<
IWorkbenchColorTheme
|
null
>
{
const
settingId
=
type
===
ColorScheme
.
DARK
?
ThemeSettings
.
PREFERRED_DARK_THEME
:
type
===
ColorScheme
.
LIGHT
?
ThemeSettings
.
PREFERRED_LIGHT_THEME
:
ThemeSettings
.
PREFERRED_HC_THEME
;
const
themeSettingId
=
this
.
configurationService
.
getValue
<
string
>
(
settingId
);
if
(
themeSettingId
)
{
const
themeSettingId
=
this
.
configurationService
.
getValue
(
settingId
);
if
(
themeSettingId
&&
typeof
themeSettingId
===
'
string
'
)
{
const
theme
=
this
.
colorThemeRegistry
.
findThemeBySettingsId
(
themeSettingId
,
undefined
);
if
(
theme
)
{
const
configurationTarget
=
this
.
settings
.
findAutoConfigurationTarget
(
settingId
);
...
...
src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
浏览文件 @
2a82df94
...
...
@@ -162,7 +162,7 @@ export class UntitledTextEditorModel extends BaseTextEditorModel implements IUnt
}
// Label Format
const
configuredLabelFormat
=
this
.
textResourceConfigurationService
.
getValue
<
string
>
(
this
.
resource
,
'
workbench.editor.untitled.labelFormat
'
);
const
configuredLabelFormat
=
this
.
textResourceConfigurationService
.
getValue
(
this
.
resource
,
'
workbench.editor.untitled.labelFormat
'
);
if
(
this
.
configuredLabelFormat
!==
configuredLabelFormat
&&
(
configuredLabelFormat
===
'
content
'
||
configuredLabelFormat
===
'
name
'
))
{
this
.
configuredLabelFormat
=
configuredLabelFormat
;
...
...
src/vs/workbench/services/workspaces/common/workspaceTrust.ts
浏览文件 @
2a82df94
...
...
@@ -80,7 +80,7 @@ export class WorkspaceTrustEnablementService extends Disposable implements IWork
return
false
;
}
return
this
.
configurationService
.
getValue
<
boolean
>
(
WORKSPACE_TRUST_ENABLED
)
??
false
;
return
!!
this
.
configurationService
.
getValue
(
WORKSPACE_TRUST_ENABLED
)
;
}
}
...
...
@@ -308,7 +308,7 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
}
// User setting
return
this
.
configurationService
.
getValue
<
boolean
>
(
WORKSPACE_TRUST_EMPTY_WINDOW
)
??
false
;
return
!!
this
.
configurationService
.
getValue
(
WORKSPACE_TRUST_EMPTY_WINDOW
)
;
}
return
this
.
getUrisTrust
(
this
.
getWorkspaceUris
());
...
...
src/vs/workbench/test/common/workbenchTestServices.ts
浏览文件 @
2a82df94
...
...
@@ -34,8 +34,8 @@ export class TestTextResourcePropertiesService implements ITextResourcePropertie
}
getEOL
(
resource
:
URI
,
language
?:
string
):
string
{
const
eol
=
this
.
configurationService
.
getValue
<
string
>
(
'
files.eol
'
,
{
overrideIdentifier
:
language
,
resource
});
if
(
eol
&&
eol
!==
'
auto
'
)
{
const
eol
=
this
.
configurationService
.
getValue
(
'
files.eol
'
,
{
overrideIdentifier
:
language
,
resource
});
if
(
eol
&&
typeof
eol
===
'
string
'
&&
eol
!==
'
auto
'
)
{
return
eol
;
}
return
(
isLinux
||
isMacintosh
)
?
'
\n
'
:
'
\r\n
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录