Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1b3fdcf7
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,发现更多精彩内容 >>
提交
1b3fdcf7
编写于
7月 25, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings exclude control - implement adding patterns
上级
4f053d82
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
71 addition
and
55 deletion
+71
-55
src/vs/workbench/parts/preferences/browser/media/settingsWidgets.css
...bench/parts/preferences/browser/media/settingsWidgets.css
+9
-14
src/vs/workbench/parts/preferences/browser/settingsTree.ts
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+7
-13
src/vs/workbench/parts/preferences/browser/settingsWidgets.ts
...vs/workbench/parts/preferences/browser/settingsWidgets.ts
+55
-28
未找到文件。
src/vs/workbench/parts/preferences/browser/media/settingsWidgets.css
浏览文件 @
1b3fdcf7
...
...
@@ -78,35 +78,30 @@
margin-right
:
10px
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.monaco-text-button.setting-exclude-addButton
{
display
:
none
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude.is-expanded
.monaco-text-button.setting-exclude-addButton
{
display
:
inline-block
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
new
-row.setting-exclude-newExcludeItem
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
edit
-row.setting-exclude-newExcludeItem
{
display
:
flex
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-new-row.setting-exclude-newExcludeItem
.setting-exclude-patternInput
,
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-new-row.setting-exclude-newExcludeItem
.setting-exclude-siblingInput
{
display
:
none
;
flex
:
1
;
max-width
:
200px
;
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-patternInput
{
max-width
:
300px
;
display
:
inline-block
;
margin-right
:
10px
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
new
-row.setting-exclude-newPattern
.setting-exclude-patternInput
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
edit
-row.setting-exclude-newPattern
.setting-exclude-patternInput
{
display
:
inline-block
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
new
-row.setting-exclude-newPatternWithSibling
.setting-exclude-patternInput
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
edit
-row.setting-exclude-newPatternWithSibling
.setting-exclude-patternInput
{
margin-right
:
5px
;
}
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
new
-row.setting-exclude-newPatternWithSibling
.setting-exclude-patternInput
,
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
new
-row.setting-exclude-newPatternWithSibling
.setting-exclude-siblingInput
{
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
edit
-row.setting-exclude-newPatternWithSibling
.setting-exclude-patternInput
,
.settings-editor
>
.settings-body
>
.settings-tree-container
.setting-item.setting-item-exclude
.setting-exclude-
edit
-row.setting-exclude-newPatternWithSibling
.setting-exclude-siblingInput
{
display
:
inline-block
;
}
...
...
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @
1b3fdcf7
...
...
@@ -35,7 +35,7 @@ import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler, attach
import
{
ICssStyleCollector
,
ITheme
,
IThemeService
,
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
SettingsTarget
}
from
'
vs/workbench/parts/preferences/browser/preferencesWidgets
'
;
import
{
ITOCEntry
}
from
'
vs/workbench/parts/preferences/browser/settingsLayout
'
;
import
{
ExcludeSettingWidget
,
settingsNumberInputBackground
,
settingsNumberInputBorder
,
settingsNumberInputForeground
,
settingsSelectBackground
,
settingsSelectBorder
,
settingsSelectForeground
,
settingsTextInputB
ackground
,
settingsTextInputBorder
,
settingsTextInputForeground
,
settingItemInactiveSelectionBorder
,
settingsHeaderFore
ground
}
from
'
vs/workbench/parts/preferences/browser/settingsWidgets
'
;
import
{
ExcludeSettingWidget
,
settingsNumberInputBackground
,
settingsNumberInputBorder
,
settingsNumberInputForeground
,
settingsSelectBackground
,
settingsSelectBorder
,
settingsSelectForeground
,
settingsTextInputB
order
,
settingsTextInputForeground
,
settingItemInactiveSelectionBorder
,
settingsHeaderForeground
,
settingsTextInputBack
ground
}
from
'
vs/workbench/parts/preferences/browser/settingsWidgets
'
;
import
{
ISearchResult
,
ISetting
,
ISettingsGroup
}
from
'
vs/workbench/services/preferences/common/preferences
'
;
const
$
=
DOM
.
$
;
...
...
@@ -551,7 +551,7 @@ export class SettingsRenderer implements ITreeRenderer {
_getExcludeSettingHeight
(
element
:
SettingsTreeSettingElement
):
number
{
const
displayValue
=
getExcludeDisplayValue
(
element
);
return
(
Object
.
keys
(
displayValue
).
length
+
1
)
*
22
+
7
0
;
return
(
Object
.
keys
(
displayValue
).
length
+
1
)
*
22
+
7
2
;
}
_getUnexpandedSettingHeight
(
element
:
SettingsTreeSettingElement
):
number
{
...
...
@@ -825,15 +825,6 @@ export class SettingsRenderer implements ITreeRenderer {
const
excludeWidget
=
this
.
instantiationService
.
createInstance
(
ExcludeSettingWidget
,
common
.
controlElement
);
common
.
toDispose
.
push
(
excludeWidget
);
// common.toDispose.push(excludeWidget.onDidClick(() => this._onDidOpenSettings.fire()));
// excludeWidget.label = localize('editInSettingsJson', "Edit in settings.json");
// excludeWidget.element.classList.add('edit-in-settings-button');
// common.toDispose.push(attachButtonStyler(excludeWidget, this.themeService, {
// buttonBackground: Color.transparent.toString(),
// buttonHoverBackground: Color.transparent.toString(),
// buttonForeground: 'foreground'
// }));
const
template
:
ISettingExcludeItemTemplate
=
{
...
common
,
...
...
@@ -851,16 +842,19 @@ export class SettingsRenderer implements ITreeRenderer {
// editing something present in the value
newValue
[
e
.
pattern
]
=
newValue
[
e
.
originalPattern
];
delete
newValue
[
e
.
originalPattern
];
}
else
{
}
else
if
(
e
.
originalPattern
)
{
// editing a default
newValue
[
e
.
originalPattern
]
=
false
;
newValue
[
e
.
pattern
]
=
template
.
context
.
defaultValue
[
e
.
originalPattern
];
}
else
{
// adding a new pattern
newValue
[
e
.
pattern
]
=
true
;
}
}
else
{
if
(
e
.
originalPattern
in
newValue
)
{
// deleting a configured pattern
delete
newValue
[
e
.
originalPattern
];
}
else
{
}
else
if
(
e
.
originalPattern
)
{
// "deleting" a default by overriding it
newValue
[
e
.
originalPattern
]
=
false
;
}
...
...
src/vs/workbench/parts/preferences/browser/settingsWidgets.ts
浏览文件 @
1b3fdcf7
...
...
@@ -98,10 +98,10 @@ export class ExcludeSettingListModel {
...
this
.
_dataItems
];
items
.
push
(
<
INewExcludeItem
>
{
id
:
'
newItem
'
,
mode
:
this
.
_newItem
});
//
items.push(<INewExcludeItem>{
//
id: 'newItem',
//
mode: this._newItem
//
});
return
items
;
}
...
...
@@ -136,7 +136,8 @@ interface IExcludeChangeEvent {
export
class
ExcludeSettingWidget
extends
Disposable
{
private
listElement
:
HTMLElement
;
private
renderedDisposables
:
IDisposable
[]
=
[];
private
listDisposables
:
IDisposable
[]
=
[];
private
patternInput
:
InputBox
;
private
model
=
new
ExcludeSettingListModel
();
...
...
@@ -151,27 +152,19 @@ export class ExcludeSettingWidget extends Disposable {
super
();
this
.
listElement
=
DOM
.
append
(
container
,
$
(
'
.setting-exclude-widget
'
));
const
addPatternButton
=
this
.
_register
(
new
Button
(
container
));
addPatternButton
.
label
=
localize
(
'
addPattern
'
,
"
Add Pattern
"
);
addPatternButton
.
element
.
classList
.
add
(
'
setting-exclude-addPattern
'
,
'
setting-exclude-addButton
'
);
this
.
_register
(
attachButtonStyler
(
addPatternButton
,
this
.
themeService
));
this
.
_register
(
addPatternButton
.
onDidClick
(()
=>
{
this
.
model
.
setAddItemMode
(
AddItemMode
.
Pattern
);
this
.
update
();
}));
DOM
.
append
(
container
,
this
.
renderAddItem
());
this
.
update
();
}
setValue
(
excludeValue
:
any
):
void
{
this
.
model
.
setValue
(
excludeValue
,
void
0
);
this
.
patternInput
.
value
=
''
;
this
.
update
();
}
private
update
():
void
{
DOM
.
clearNode
(
this
.
listElement
);
this
.
renderedDisposables
=
dispose
(
this
.
rendered
Disposables
);
this
.
listDisposables
=
dispose
(
this
.
list
Disposables
);
this
.
model
.
items
.
map
(
item
=>
this
.
renderItem
(
item
))
...
...
@@ -204,13 +197,13 @@ export class ExcludeSettingWidget extends Disposable {
private
renderItem
(
item
:
IExcludeItem
):
HTMLElement
{
return
isExcludeDataItem
(
item
)
?
this
.
renderDataItem
(
item
)
:
this
.
render
New
Item
(
item
);
this
.
render
Edit
Item
(
item
);
}
private
renderDataItem
(
item
:
IExcludeDataItem
):
HTMLElement
{
const
rowElement
=
$
(
'
.setting-exclude-row
'
);
const
actionBar
=
new
ActionBar
(
rowElement
);
this
.
rendered
Disposables
.
push
(
actionBar
);
this
.
list
Disposables
.
push
(
actionBar
);
const
patternElement
=
DOM
.
append
(
rowElement
,
$
(
'
.setting-exclude-pattern
'
));
const
siblingElement
=
DOM
.
append
(
rowElement
,
$
(
'
.setting-exclude-sibling
'
));
...
...
@@ -229,15 +222,49 @@ export class ExcludeSettingWidget extends Disposable {
return
rowElement
;
}
private
render
NewItem
(
item
:
INewExcludeItem
):
HTMLElement
{
private
render
AddItem
(
):
HTMLElement
{
const
rowElement
=
$
(
'
.setting-exclude-new-row
'
);
this
.
patternInput
=
new
InputBox
(
rowElement
,
this
.
contextViewService
,
{
placeholder
:
localize
(
'
excludePatternInputPlaceholder
'
,
"
Exclude Pattern...
"
)
});
this
.
patternInput
.
element
.
classList
.
add
(
'
setting-exclude-patternInput
'
);
this
.
_register
(
attachInputBoxStyler
(
this
.
patternInput
,
this
.
themeService
,
{
inputBackground
:
settingsTextInputBackground
,
inputForeground
:
settingsTextInputForeground
,
inputBorder
:
settingsTextInputBorder
}));
this
.
_register
(
this
.
patternInput
);
const
addPatternButton
=
this
.
_register
(
new
Button
(
rowElement
));
addPatternButton
.
label
=
localize
(
'
addPattern
'
,
"
Add Pattern
"
);
addPatternButton
.
element
.
classList
.
add
(
'
setting-exclude-addPattern
'
,
'
setting-exclude-addButton
'
);
this
.
_register
(
attachButtonStyler
(
addPatternButton
,
this
.
themeService
));
const
addItem
=
()
=>
this
.
_onDidChangeExclude
.
fire
({
originalPattern
:
undefined
,
pattern
:
this
.
patternInput
.
value
});
this
.
_register
(
addPatternButton
.
onDidClick
(
addItem
));
const
onKeydown
=
(
e
:
StandardKeyboardEvent
)
=>
{
if
(
e
.
equals
(
KeyCode
.
Enter
))
{
addItem
();
}
};
this
.
_register
(
DOM
.
addStandardDisposableListener
(
this
.
patternInput
.
inputElement
,
DOM
.
EventType
.
KEY_DOWN
,
onKeydown
));
return
rowElement
;
}
private
renderEditItem
(
item
:
INewExcludeItem
):
HTMLElement
{
const
rowElement
=
$
(
'
.setting-exclude-edit-row
'
);
const
onKeydown
=
(
e
:
StandardKeyboardEvent
)
=>
{
if
(
e
.
equals
(
KeyCode
.
Enter
))
{
this
.
_onDidChangeExclude
.
fire
({
originalPattern
:
undefined
,
pattern
:
patternInput
.
value
,
// sibling: siblingInput.value
pattern
:
patternInput
.
value
});
}
};
...
...
@@ -246,25 +273,25 @@ export class ExcludeSettingWidget extends Disposable {
placeholder
:
localize
(
'
excludePatternInputPlaceholder
'
,
"
Exclude Pattern...
"
)
});
patternInput
.
element
.
classList
.
add
(
'
setting-exclude-patternInput
'
);
this
.
rendered
Disposables
.
push
(
attachInputBoxStyler
(
patternInput
,
this
.
themeService
,
{
this
.
list
Disposables
.
push
(
attachInputBoxStyler
(
patternInput
,
this
.
themeService
,
{
inputBackground
:
settingsTextInputBackground
,
inputForeground
:
settingsTextInputForeground
,
inputBorder
:
settingsTextInputBorder
}));
this
.
rendered
Disposables
.
push
(
patternInput
);
this
.
rendered
Disposables
.
push
(
DOM
.
addStandardDisposableListener
(
patternInput
.
inputElement
,
DOM
.
EventType
.
KEY_DOWN
,
onKeydown
));
this
.
list
Disposables
.
push
(
patternInput
);
this
.
list
Disposables
.
push
(
DOM
.
addStandardDisposableListener
(
patternInput
.
inputElement
,
DOM
.
EventType
.
KEY_DOWN
,
onKeydown
));
const
siblingInput
=
new
InputBox
(
rowElement
,
this
.
contextViewService
,
{
placeholder
:
localize
(
'
excludeSiblingInputPlaceholder
'
,
"
When Pattern Is Present...
"
)
});
siblingInput
.
element
.
classList
.
add
(
'
setting-exclude-siblingInput
'
);
this
.
rendered
Disposables
.
push
(
siblingInput
);
this
.
rendered
Disposables
.
push
(
attachInputBoxStyler
(
siblingInput
,
this
.
themeService
,
{
this
.
list
Disposables
.
push
(
siblingInput
);
this
.
list
Disposables
.
push
(
attachInputBoxStyler
(
siblingInput
,
this
.
themeService
,
{
inputBackground
:
settingsTextInputBackground
,
inputForeground
:
settingsTextInputForeground
,
inputBorder
:
settingsTextInputBorder
}));
this
.
rendered
Disposables
.
push
(
DOM
.
addStandardDisposableListener
(
siblingInput
.
inputElement
,
DOM
.
EventType
.
KEY_DOWN
,
onKeydown
));
this
.
list
Disposables
.
push
(
DOM
.
addStandardDisposableListener
(
siblingInput
.
inputElement
,
DOM
.
EventType
.
KEY_DOWN
,
onKeydown
));
rowElement
.
classList
.
add
(
'
setting-exclude-newExcludeItem
'
);
...
...
@@ -283,7 +310,7 @@ export class ExcludeSettingWidget extends Disposable {
dispose
()
{
super
.
dispose
();
this
.
renderedDisposables
=
dispose
(
this
.
rendered
Disposables
);
this
.
listDisposables
=
dispose
(
this
.
list
Disposables
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录