Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
ebb58dc7
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,发现更多精彩内容 >>
提交
ebb58dc7
编写于
11月 23, 2016
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor: Rename settings to Preferences
上级
740457e8
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
43 addition
and
45 deletion
+43
-45
src/vs/workbench/electron-browser/workbench.main.ts
src/vs/workbench/electron-browser/workbench.main.ts
+1
-1
src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
...ch/parts/extensions/electron-browser/extensionsViewlet.ts
+1
-1
src/vs/workbench/parts/preferences/browser/media/preferences.css
...workbench/parts/preferences/browser/media/preferences.css
+0
-0
src/vs/workbench/parts/preferences/browser/preferences.contribution.ts
...nch/parts/preferences/browser/preferences.contribution.ts
+6
-6
src/vs/workbench/parts/preferences/browser/preferencesActions.ts
...workbench/parts/preferences/browser/preferencesActions.ts
+7
-7
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
.../workbench/parts/preferences/browser/preferencesEditor.ts
+10
-10
src/vs/workbench/parts/preferences/browser/preferencesService.ts
...workbench/parts/preferences/browser/preferencesService.ts
+8
-8
src/vs/workbench/parts/preferences/common/preferences.ts
src/vs/workbench/parts/preferences/common/preferences.ts
+2
-4
src/vs/workbench/parts/preferences/common/preferencesModels.ts
...s/workbench/parts/preferences/common/preferencesModels.ts
+1
-1
src/vs/workbench/parts/search/browser/searchActions.ts
src/vs/workbench/parts/search/browser/searchActions.ts
+3
-3
src/vs/workbench/parts/search/browser/searchViewlet.ts
src/vs/workbench/parts/search/browser/searchViewlet.ts
+3
-3
src/vs/workbench/parts/watermark/electron-browser/watermark.ts
...s/workbench/parts/watermark/electron-browser/watermark.ts
+1
-1
未找到文件。
src/vs/workbench/electron-browser/workbench.main.ts
浏览文件 @
ebb58dc7
...
...
@@ -26,7 +26,7 @@ import 'vs/workbench/browser/actions/toggleSidebarVisibility';
import
'
vs/workbench/browser/actions/toggleSidebarPosition
'
;
import
'
vs/workbench/browser/actions/toggleEditorLayout
'
;
import
'
vs/workbench/browser/actions/toggleZenMode
'
;
import
'
vs/workbench/parts/
settings/browser/openSetting
s.contribution
'
;
import
'
vs/workbench/parts/
preferences/browser/preference
s.contribution
'
;
import
'
vs/workbench/browser/actions/configureLocale
'
;
import
'
vs/workbench/parts/quickopen/browser/quickopen.contribution
'
;
...
...
src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
浏览文件 @
ebb58dc7
...
...
@@ -38,7 +38,7 @@ import { InstallVSIXAction } from 'vs/workbench/parts/extensions/electron-browse
import
{
IExtensionManagementService
,
IExtensionGalleryService
,
IExtensionTipsService
,
SortBy
,
SortOrder
,
IQueryOptions
,
LocalExtensionType
}
from
'
vs/platform/extensionManagement/common/extensionManagement
'
;
import
{
ExtensionsInput
}
from
'
vs/workbench/parts/extensions/common/extensionsInput
'
;
import
{
Query
}
from
'
../common/extensionQuery
'
;
import
{
OpenGlobalSettingsAction
}
from
'
vs/workbench/parts/
settings/browser/openSetting
sActions
'
;
import
{
OpenGlobalSettingsAction
}
from
'
vs/workbench/parts/
preferences/browser/preference
sActions
'
;
import
{
IProgressService
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
...
...
src/vs/workbench/parts/
settings/browser/media/openSetting
s.css
→
src/vs/workbench/parts/
preferences/browser/media/preference
s.css
浏览文件 @
ebb58dc7
文件已移动
src/vs/workbench/parts/
settings/browser/openSetting
s.contribution.ts
→
src/vs/workbench/parts/
preferences/browser/preference
s.contribution.ts
浏览文件 @
ebb58dc7
...
...
@@ -13,18 +13,18 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
KeyMod
,
KeyChord
,
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
SyncDescriptor
}
from
'
vs/platform/instantiation/common/descriptors
'
;
import
{
DefaultSettingsEditor
,
DefaultSettingsInput
,
DefaultKeybindingsInput
}
from
'
vs/workbench/parts/
settings/browser/defaultSettingsEditors
'
;
import
{
OpenGlobalSettingsAction
,
OpenGlobalKeybindingsAction
,
OpenWorkspaceSettingsAction
}
from
'
vs/workbench/parts/
settings/browser/openSetting
sActions
'
;
import
{
I
OpenSettingsService
}
from
'
vs/workbench/parts/settings/common/openSetting
s
'
;
import
{
OpenSettingsService
}
from
'
vs/workbench/parts/settings/browser/openSetting
sService
'
;
import
{
DefaultSettingsEditor
,
DefaultSettingsInput
,
DefaultKeybindingsInput
}
from
'
vs/workbench/parts/
preferences/browser/preferencesEditor
'
;
import
{
OpenGlobalSettingsAction
,
OpenGlobalKeybindingsAction
,
OpenWorkspaceSettingsAction
}
from
'
vs/workbench/parts/
preferences/browser/preference
sActions
'
;
import
{
I
PreferencesService
}
from
'
vs/workbench/parts/preferences/common/preference
s
'
;
import
{
PreferencesService
}
from
'
vs/workbench/parts/preferences/browser/preference
sService
'
;
registerSingleton
(
I
OpenSettingsService
,
OpenSetting
sService
);
registerSingleton
(
I
PreferencesService
,
Preference
sService
);
(
<
IEditorRegistry
>
Registry
.
as
(
EditorExtensions
.
Editors
)).
registerEditor
(
new
EditorDescriptor
(
DefaultSettingsEditor
.
ID
,
nls
.
localize
(
'
defaultSettingsEditor
'
,
"
Default Settings Editor
"
),
'
vs/workbench/parts/
settings/browser/defaultSettingsEditors
'
,
'
vs/workbench/parts/
preferences/browser/preferencesEditor
'
,
'
DefaultSettingsEditor
'
),
[
...
...
src/vs/workbench/parts/
settings/browser/openSetting
sActions.ts
→
src/vs/workbench/parts/
preferences/browser/preference
sActions.ts
浏览文件 @
ebb58dc7
...
...
@@ -7,7 +7,7 @@
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
{
I
OpenSettingsService
}
from
'
vs/workbench/parts/settings/common/openSetting
s
'
;
import
{
I
PreferencesService
}
from
'
vs/workbench/parts/preferences/common/preference
s
'
;
export
class
OpenGlobalSettingsAction
extends
Action
{
...
...
@@ -17,13 +17,13 @@ export class OpenGlobalSettingsAction extends Action {
constructor
(
id
:
string
,
label
:
string
,
@
I
OpenSettingsService
private
openSettingsService
:
IOpenSetting
sService
@
I
PreferencesService
private
preferencesService
:
IPreference
sService
)
{
super
(
id
,
label
);
}
public
run
(
event
?:
any
):
TPromise
<
void
>
{
return
this
.
openSetting
sService
.
openGlobalSettings
();
return
this
.
preference
sService
.
openGlobalSettings
();
}
}
...
...
@@ -35,13 +35,13 @@ export class OpenGlobalKeybindingsAction extends Action {
constructor
(
id
:
string
,
label
:
string
,
@
I
OpenSettingsService
private
openSettingsService
:
IOpenSetting
sService
@
I
PreferencesService
private
preferencesService
:
IPreference
sService
)
{
super
(
id
,
label
);
}
public
run
(
event
?:
any
):
TPromise
<
any
>
{
return
this
.
openSetting
sService
.
openGlobalKeybindingSettings
();
return
this
.
preference
sService
.
openGlobalKeybindingSettings
();
}
}
...
...
@@ -53,12 +53,12 @@ export class OpenWorkspaceSettingsAction extends Action {
constructor
(
id
:
string
,
label
:
string
,
@
I
OpenSettingsService
private
openSettingsService
:
IOpenSetting
sService
@
I
PreferencesService
private
preferencesService
:
IPreference
sService
)
{
super
(
id
,
label
);
}
public
run
(
event
?:
any
):
TPromise
<
void
>
{
return
this
.
openSetting
sService
.
openWorkspaceSettings
();
return
this
.
preference
sService
.
openWorkspaceSettings
();
}
}
\ No newline at end of file
src/vs/workbench/parts/
settings/browser/defaultSettingsEditors
.ts
→
src/vs/workbench/parts/
preferences/browser/preferencesEditor
.ts
浏览文件 @
ebb58dc7
...
...
@@ -21,7 +21,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
import
{
StringEditor
}
from
'
vs/workbench/browser/parts/editor/stringEditor
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IFoldingController
,
ID
as
FoldingContributionId
}
from
'
vs/editor/contrib/folding/common/folding
'
;
import
{
I
OpenSettingsService
,
ISettingsGroup
,
ISetting
}
from
'
vs/workbench/parts/settings/common/openSetting
s
'
;
import
{
I
PreferencesService
,
ISettingsGroup
,
ISetting
}
from
'
vs/workbench/parts/preferences/common/preference
s
'
;
import
{
editorContribution
}
from
'
vs/editor/browser/editorBrowserExtensions
'
;
import
{
ICodeEditor
,
IEditorMouseEvent
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
...
...
@@ -57,9 +57,9 @@ export class AbstractSettingsInput extends StringEditorInput {
export
class
DefaultSettingsInput
extends
AbstractSettingsInput
{
private
static
INSTANCE
:
DefaultSettingsInput
;
public
static
getInstance
(
instantiationService
:
IInstantiationService
,
openSettingsService
:
IOpenSetting
sService
):
DefaultSettingsInput
{
public
static
getInstance
(
instantiationService
:
IInstantiationService
,
preferencesService
:
IPreference
sService
):
DefaultSettingsInput
{
if
(
!
DefaultSettingsInput
.
INSTANCE
)
{
const
defaultSettings
=
openSetting
sService
.
defaultSettings
;
const
defaultSettings
=
preference
sService
.
defaultSettings
;
DefaultSettingsInput
.
INSTANCE
=
instantiationService
.
createInstance
(
DefaultSettingsInput
,
nls
.
localize
(
'
defaultName
'
,
"
Default Settings
"
),
null
,
defaultSettings
.
content
,
defaultSettings
.
uri
,
'
application/json
'
,
false
);
}
return
DefaultSettingsInput
.
INSTANCE
;
...
...
@@ -69,9 +69,9 @@ export class DefaultSettingsInput extends AbstractSettingsInput {
export
class
DefaultKeybindingsInput
extends
AbstractSettingsInput
{
private
static
INSTANCE
:
DefaultKeybindingsInput
;
public
static
getInstance
(
instantiationService
:
IInstantiationService
,
openSettingsService
:
IOpenSetting
sService
):
DefaultKeybindingsInput
{
public
static
getInstance
(
instantiationService
:
IInstantiationService
,
preferencesService
:
IPreference
sService
):
DefaultKeybindingsInput
{
if
(
!
DefaultKeybindingsInput
.
INSTANCE
)
{
const
defaultKeybindings
=
openSetting
sService
.
defaultKeybindings
;
const
defaultKeybindings
=
preference
sService
.
defaultKeybindings
;
DefaultKeybindingsInput
.
INSTANCE
=
instantiationService
.
createInstance
(
DefaultKeybindingsInput
,
nls
.
localize
(
'
defaultKeybindings
'
,
"
Default Keyboard Shortcuts
"
),
null
,
defaultKeybindings
.
content
,
defaultKeybindings
.
uri
,
'
application/json
'
,
false
);
}
...
...
@@ -146,7 +146,7 @@ export class DefaultSettingsContribution extends Disposable implements editorCom
constructor
(
private
editor
:
ICodeEditor
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
I
OpenSettingsService
private
openSettingsService
:
IOpenSetting
sService
@
I
PreferencesService
private
preferencesService
:
IPreference
sService
)
{
super
();
this
.
_register
(
editor
.
onDidChangeModel
(()
=>
this
.
onModelChanged
()));
...
...
@@ -167,14 +167,14 @@ export class DefaultSettingsContribution extends Disposable implements editorCom
return
;
}
if
(
model
.
uri
.
fsPath
===
this
.
openSetting
sService
.
defaultSettings
.
uri
.
fsPath
)
{
if
(
model
.
uri
.
fsPath
===
this
.
preference
sService
.
defaultSettings
.
uri
.
fsPath
)
{
this
.
styleDefaultSettings
(
model
);
}
}
private
canHandle
(
model
:
editorCommon
.
IModel
)
{
if
(
model
)
{
if
(
model
.
uri
.
fsPath
===
this
.
openSetting
sService
.
defaultSettings
.
uri
.
fsPath
)
{
if
(
model
.
uri
.
fsPath
===
this
.
preference
sService
.
defaultSettings
.
uri
.
fsPath
)
{
return
true
;
}
}
...
...
@@ -187,7 +187,7 @@ export class DefaultSettingsContribution extends Disposable implements editorCom
private
renderDecorations
(
model
:
editorCommon
.
IModel
)
{
this
.
settingsActions
=
this
.
instantiationService
.
createInstance
(
SettingsActionsDecorators
,
this
.
editor
);
this
.
settingsActions
.
render
(
this
.
openSetting
sService
.
defaultSettings
.
settingsGroups
);
this
.
settingsActions
.
render
(
this
.
preference
sService
.
defaultSettings
.
settingsGroups
);
}
}
...
...
@@ -196,7 +196,7 @@ export class SettingsActionsDecorators extends Disposable {
private
decorationIds
:
string
[]
=
[];
constructor
(
private
editor
:
ICodeEditor
,
@
I
OpenSettingsService
private
settingsService
:
IOpenSetting
sService
,
@
I
PreferencesService
private
settingsService
:
IPreference
sService
,
@
IContextMenuService
private
contextMenuService
:
IContextMenuService
)
{
super
();
...
...
src/vs/workbench/parts/
settings/browser/openSetting
sService.ts
→
src/vs/workbench/parts/
preferences/browser/preference
sService.ts
浏览文件 @
ebb58dc7
...
...
@@ -2,7 +2,7 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
'
vs/css!./media/
openSetting
s
'
;
import
'
vs/css!./media/
preference
s
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
URI
from
'
vs/base/common/uri
'
;
...
...
@@ -25,13 +25,13 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
IConfigurationEditingService
,
ConfigurationTarget
,
IConfigurationValue
}
from
'
vs/workbench/services/configuration/common/configurationEditing
'
;
import
{
I
OpenSettingsService
,
IDefaultSettings
,
IDefaultKeybindings
}
from
'
vs/workbench/parts/settings/common/openSetting
s
'
;
import
{
DefaultSettings
,
DefaultKeybindings
}
from
'
vs/workbench/parts/
settings/common/defaultSetting
s
'
;
import
{
I
PreferencesService
,
IDefaultSettings
,
IDefaultKeybindings
}
from
'
vs/workbench/parts/preferences/common/preference
s
'
;
import
{
DefaultSettings
,
DefaultKeybindings
}
from
'
vs/workbench/parts/
preferences/common/preferencesModel
s
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ITextModelContentProvider
}
from
'
vs/editor/common/services/resolverService
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
import
{
DefaultSettingsInput
,
DefaultKeybindingsInput
}
from
'
vs/workbench/parts/
settings/browser/defaultSettingsEditors
'
;
import
{
DefaultSettingsInput
,
DefaultKeybindingsInput
}
from
'
vs/workbench/parts/
preferences/browser/preferencesEditor
'
;
const
SETTINGS_INFO_IGNORE_KEY
=
'
settings.workspace.info.ignore
'
;
...
...
@@ -44,7 +44,7 @@ interface IWorkbenchSettingsConfiguration {
};
}
export
class
OpenSettingsService
extends
Disposable
implements
IOpenSetting
sService
{
export
class
PreferencesService
extends
Disposable
implements
IPreference
sService
{
_serviceBrand
:
any
;
...
...
@@ -257,7 +257,7 @@ export class OpenSettingsService extends Disposable implements IOpenSettingsServ
export
class
SettingsContentProvider
implements
ITextModelContentProvider
{
constructor
(
@
I
OpenSettingsService
private
openSettingsService
:
IOpenSetting
sService
,
@
I
PreferencesService
private
preferencesService
:
IPreference
sService
,
@
IModelService
private
modelService
:
IModelService
,
@
IModeService
private
modeService
:
IModeService
)
{
...
...
@@ -267,12 +267,12 @@ export class SettingsContentProvider implements ITextModelContentProvider {
if
(
uri
.
scheme
!==
'
vscode
'
)
{
return
null
;
}
const
defaultSettings
=
this
.
openSetting
sService
.
defaultSettings
;
const
defaultSettings
=
this
.
preference
sService
.
defaultSettings
;
if
(
defaultSettings
.
uri
.
fsPath
===
uri
.
fsPath
)
{
let
mode
=
this
.
modeService
.
getOrCreateMode
(
'
application/json
'
);
return
TPromise
.
as
(
this
.
modelService
.
createModel
(
defaultSettings
.
content
,
mode
,
uri
));
}
const
defaultKeybindings
=
this
.
openSetting
sService
.
defaultKeybindings
;
const
defaultKeybindings
=
this
.
preference
sService
.
defaultKeybindings
;
if
(
defaultKeybindings
.
uri
.
fsPath
===
uri
.
fsPath
)
{
let
mode
=
this
.
modeService
.
getOrCreateMode
(
'
application/json
'
);
return
TPromise
.
as
(
this
.
modelService
.
createModel
(
defaultKeybindings
.
content
,
mode
,
uri
));
...
...
src/vs/workbench/parts/
settings/common/openSetting
s.ts
→
src/vs/workbench/parts/
preferences/common/preference
s.ts
浏览文件 @
ebb58dc7
...
...
@@ -33,8 +33,6 @@ export interface IDefaultSettings {
uri
:
URI
;
content
:
string
;
settingsGroups
:
ISettingsGroup
[];
// filterSettings(filter: string): ISettingsGroup[];
}
export
interface
IDefaultKeybindings
{
...
...
@@ -42,9 +40,9 @@ export interface IDefaultKeybindings {
content
:
string
;
}
export
const
I
OpenSettingsService
=
createDecorator
<
IOpenSettingsService
>
(
'
openSetting
sService
'
);
export
const
I
PreferencesService
=
createDecorator
<
IPreferencesService
>
(
'
preference
sService
'
);
export
interface
I
OpenSetting
sService
{
export
interface
I
Preference
sService
{
_serviceBrand
:
any
;
defaultSettings
:
IDefaultSettings
;
...
...
src/vs/workbench/parts/
settings/common/defaultSetting
s.ts
→
src/vs/workbench/parts/
preferences/common/preferencesModel
s.ts
浏览文件 @
ebb58dc7
...
...
@@ -9,7 +9,7 @@ import * as strings from 'vs/base/common/strings';
import
URI
from
'
vs/base/common/uri
'
;
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
IConfigurationNode
,
IConfigurationRegistry
,
Extensions
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IDefaultSettings
,
IDefaultKeybindings
,
ISettingsGroup
,
ISetting
}
from
'
vs/workbench/parts/
settings/common/openSetting
s
'
;
import
{
IDefaultSettings
,
IDefaultKeybindings
,
ISettingsGroup
,
ISetting
}
from
'
vs/workbench/parts/
preferences/common/preference
s
'
;
import
{
IWorkspaceConfigurationService
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
...
...
src/vs/workbench/parts/search/browser/searchActions.ts
浏览文件 @
ebb58dc7
...
...
@@ -18,7 +18,7 @@ import { SearchResult, Match, FileMatch, FileMatchOrMatch } from 'vs/workbench/p
import
{
IReplaceService
}
from
'
vs/workbench/parts/search/common/replace
'
;
import
*
as
Constants
from
'
vs/workbench/parts/search/common/constants
'
;
import
{
CollapseAllAction
as
TreeCollapseAction
}
from
'
vs/base/parts/tree/browser/treeDefaults
'
;
import
{
I
OpenSettingsService
}
from
'
vs/workbench/parts/settings/common/openSetting
s
'
;
import
{
I
PreferencesService
}
from
'
vs/workbench/parts/preferences/common/preference
s
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
...
...
@@ -450,7 +450,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
export
class
ConfigureGlobalExclusionsAction
extends
Action
{
constructor
(
@
I
OpenSettingsService
private
openSettingsService
:
IOpenSetting
sService
)
{
constructor
(
@
I
PreferencesService
private
preferencesService
:
IPreference
sService
)
{
super
(
'
configureGlobalExclusionsAction
'
);
this
.
label
=
nls
.
localize
(
'
ConfigureGlobalExclusionsAction.label
'
,
"
Open Settings
"
);
...
...
@@ -459,6 +459,6 @@ export class ConfigureGlobalExclusionsAction extends Action {
}
public
run
():
TPromise
<
void
>
{
return
this
.
openSetting
sService
.
openGlobalSettings
().
then
(
null
,
errors
.
onUnexpectedError
);
return
this
.
preference
sService
.
openGlobalSettings
().
then
(
null
,
errors
.
onUnexpectedError
);
}
}
src/vs/workbench/parts/search/browser/searchViewlet.ts
浏览文件 @
ebb58dc7
...
...
@@ -24,7 +24,7 @@ import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
import
{
ITree
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
{
Tree
}
from
'
vs/base/parts/tree/browser/treeImpl
'
;
import
{
Scope
}
from
'
vs/workbench/common/memento
'
;
import
{
I
OpenSettingsService
}
from
'
vs/workbench/parts/settings/common/openSetting
s
'
;
import
{
I
PreferencesService
}
from
'
vs/workbench/parts/preferences/common/preference
s
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
getOutOfWorkspaceEditorResources
}
from
'
vs/workbench/common/editor
'
;
import
{
FileChangeType
,
FileChangesEvent
,
EventType
as
FileEventType
}
from
'
vs/platform/files/common/files
'
;
...
...
@@ -104,7 +104,7 @@ export class SearchViewlet extends Viewlet {
@
IKeybindingService
private
keybindingService
:
IKeybindingService
,
@
IReplaceService
private
replaceService
:
IReplaceService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
I
OpenSettingsService
private
openSettingsService
:
IOpenSetting
sService
@
I
PreferencesService
private
preferencesService
:
IPreference
sService
)
{
super
(
Constants
.
VIEWLET_ID
,
telemetryService
);
...
...
@@ -878,7 +878,7 @@ export class SearchViewlet extends Viewlet {
}).
on
(
dom
.
EventType
.
CLICK
,
(
e
:
MouseEvent
)
=>
{
dom
.
EventHelper
.
stop
(
e
,
false
);
this
.
openSetting
sService
.
openWorkspaceSettings
().
done
(()
=>
null
,
errors
.
onUnexpectedError
);
this
.
preference
sService
.
openWorkspaceSettings
().
done
(()
=>
null
,
errors
.
onUnexpectedError
);
});
}
}
else
{
...
...
src/vs/workbench/parts/watermark/electron-browser/watermark.ts
浏览文件 @
ebb58dc7
...
...
@@ -26,7 +26,7 @@ import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/comm
import
{
Parts
,
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
StartAction
}
from
'
vs/workbench/parts/debug/browser/debugActions
'
;
import
{
FindInFilesActionId
}
from
'
vs/workbench/parts/search/common/constants
'
;
import
{
OpenGlobalKeybindingsAction
}
from
'
vs/workbench/parts/
settings/browser/openSetting
sActions
'
;
import
{
OpenGlobalKeybindingsAction
}
from
'
vs/workbench/parts/
preferences/browser/preference
sActions
'
;
import
{
ToggleTerminalAction
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalActions
'
;
import
{
SelectColorThemeAction
}
from
'
vs/workbench/parts/themes/electron-browser/themes.contribution
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录