Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 bf4a68a2 编写于 作者: R Rob Lourens
浏览文件
操作

Settings exclude control - Implement editing

上级 740d37d7
隐藏空白更改
内联 并排
Showing with 96 addition and 129 deletion
src/vs/workbench/parts/preferences/browser/media/settingsWidgets.css
浏览文件 @ bf4a68a2
......@@ -74,35 +74,24 @@
padding: 4px 10px;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .monaco-text-button.setting-exclude-addPattern {
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .monaco-text-button.setting-exclude-addButton {
margin-right: 10px;
}
.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-edit-row.setting-exclude-newExcludeItem {
display: flex;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-patternInput {
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-patternInput,
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-siblingInput,
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-newPatternInput {
max-width: 300px;
display: inline-block;
margin-right: 10px;
}
.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-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-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;
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-okButton {
margin-right: 10px;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-widget {
......
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @ bf4a68a2
......@@ -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, settingsTextInputBorder, settingsTextInputForeground, settingItemInactiveSelectionBorder, settingsHeaderForeground, settingsTextInputBackground } from 'vs/workbench/parts/preferences/browser/settingsWidgets';
import { ExcludeSettingWidget, settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsTextInputBorder, settingsTextInputForeground, settingItemInactiveSelectionBorder, settingsHeaderForeground, settingsTextInputBackground, IExcludeDataItem } from 'vs/workbench/parts/preferences/browser/settingsWidgets';
import { ISearchResult, ISetting, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
const $ = DOM.$;
......@@ -213,21 +213,23 @@ function createSettingsTreeSettingElement(setting: ISetting, parent: any, settin
return element;
}
function getExcludeDisplayValue(element: SettingsTreeSettingElement): any {
function getExcludeDisplayValue(element: SettingsTreeSettingElement): IExcludeDataItem[] {
const data = element.isConfigured ?
{
...element.defaultValue,
...element.value
} :
objects.mixin({ ...element.scopeValue }, element.defaultValue, false) :
element.defaultValue;
for (let key in data) {
if (!data[key]) {
delete data[key];
}
}
return data;
return Object.keys(data)
.filter(key => !!data[key])
.map(key => {
const value = data[key];
const sibling = typeof value === 'boolean' ? undefined : value.when;
return {
id: key,
pattern: key,
sibling
};
});
}
interface IInspectResult {
......@@ -551,7 +553,7 @@ export class SettingsRenderer implements ITreeRenderer {
_getExcludeSettingHeight(element: SettingsTreeSettingElement): number {
const displayValue = getExcludeDisplayValue(element);
return (Object.keys(displayValue).length + 1) * 22 + 72;
return (displayValue.length + 1) * 22 + 80;
}
_getUnexpandedSettingHeight(element: SettingsTreeSettingElement): number {
......
src/vs/workbench/parts/preferences/browser/settingsWidgets.ts
浏览文件 @ bf4a68a2
......@@ -83,55 +83,32 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
}
});
enum AddItemMode {
None,
Pattern,
PatternWithSibling
}
export class ExcludeSettingListModel {
private _dataItems: IExcludeItem[] = [];
// private _newItem = AddItemMode.None;
get items(): IExcludeItem[] {
const items = [
...this._dataItems
];
// items.push(<INewExcludeItem>{
// id: 'newItem',
// mode: this._newItem
// });
return items;
}
setAddItemMode(mode: AddItemMode): void {
// this._newItem = mode;
private _dataItems: IExcludeDataItem[] = [];
private _editKey: string;
get items(): IExcludeViewItem[] {
return this._dataItems.map(item => {
return <IExcludeViewItem>{
...item,
editing: item.pattern === this._editKey
};
});
}
setValue(excludeValue: any, defaultValue: any): void {
this._dataItems = this.excludeValueToItems(excludeValue);
setEditKey(key: string): void {
this._editKey = key;
}
private excludeValueToItems(excludeValue: any): IExcludeItem[] {
return Object.keys(excludeValue)
.map(key => {
const value = excludeValue[key];
const sibling = typeof value === 'boolean' ? undefined : value.when;
return {
id: key,
pattern: key,
sibling
};
});
setValue(excludeData: IExcludeDataItem[]): void {
this._dataItems = excludeData;
}
}
interface IExcludeChangeEvent {
originalPattern: string;
pattern: string;
sibling?: string;
}
export class ExcludeSettingWidget extends Disposable {
......@@ -156,8 +133,8 @@ export class ExcludeSettingWidget extends Disposable {
this.update();
}
setValue(excludeValue: any): void {
this.model.setValue(excludeValue, void 0);
setValue(excludeData: IExcludeDataItem[]): void {
this.model.setValue(excludeData);
this.patternInput.value = '';
this.update();
}
......@@ -190,14 +167,17 @@ export class ExcludeSettingWidget extends Disposable {
enabled: true,
id: 'workbench.action.editExcludeItem',
tooltip: localize('editExcludeItem', "Edit Exclude Item"),
run: () => { }
run: () => {
this.model.setEditKey(key);
this.update();
}
};
}
private renderItem(item: IExcludeItem): HTMLElement {
return isExcludeDataItem(item) ?
this.renderDataItem(item) :
this.renderEditItem(item);
private renderItem(item: IExcludeViewItem): HTMLElement {
return item.editing ?
this.renderEditItem(item) :
this.renderDataItem(item);
}
private renderDataItem(item: IExcludeDataItem): HTMLElement {
......@@ -227,7 +207,7 @@ export class ExcludeSettingWidget extends Disposable {
this.patternInput = new InputBox(rowElement, this.contextViewService, {
placeholder: localize('excludePatternInputPlaceholder', "Exclude Pattern...")
});
this.patternInput.element.classList.add('setting-exclude-patternInput');
this.patternInput.element.classList.add('setting-exclude-newPatternInput');
this._register(attachInputBoxStyler(this.patternInput, this.themeService, {
inputBackground: settingsTextInputBackground,
inputForeground: settingsTextInputForeground,
......@@ -237,7 +217,7 @@ export class ExcludeSettingWidget extends Disposable {
const addPatternButton = this._register(new Button(rowElement));
addPatternButton.label = localize('addPattern', "Add Pattern");
addPatternButton.element.classList.add('setting-exclude-addPattern', 'setting-exclude-addButton');
addPatternButton.element.classList.add('setting-exclude-addButton');
this._register(attachButtonStyler(addPatternButton, this.themeService));
const addItem = () => this._onDidChangeExclude.fire({
......@@ -257,15 +237,25 @@ export class ExcludeSettingWidget extends Disposable {
return rowElement;
}
private renderEditItem(item: INewExcludeItem): HTMLElement {
private renderEditItem(item: IExcludeViewItem): HTMLElement {
const rowElement = $('.setting-exclude-edit-row');
const onKeydown = (e: StandardKeyboardEvent) => {
if (e.equals(KeyCode.Enter)) {
const onSubmit = edited => {
this.model.setEditKey(null);
if (edited) {
this._onDidChangeExclude.fire({
originalPattern: undefined,
pattern: patternInput.value
originalPattern: item.pattern,
pattern: patternInput.value,
sibling: siblingInput && siblingInput.value
});
} else {
this.update();
}
};
const onKeydown = (e: StandardKeyboardEvent) => {
if (e.equals(KeyCode.Enter)) {
onSubmit(true);
}
};
......@@ -279,31 +269,41 @@ export class ExcludeSettingWidget extends Disposable {
inputBorder: settingsTextInputBorder
}));
this.listDisposables.push(patternInput);
patternInput.value = item.pattern;
this.listDisposables.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.listDisposables.push(siblingInput);
this.listDisposables.push(attachInputBoxStyler(siblingInput, this.themeService, {
inputBackground: settingsTextInputBackground,
inputForeground: settingsTextInputForeground,
inputBorder: settingsTextInputBorder
}));
this.listDisposables.push(DOM.addStandardDisposableListener(siblingInput.inputElement, DOM.EventType.KEY_DOWN, onKeydown));
let siblingInput: InputBox;
if (item.sibling) {
siblingInput = new InputBox(rowElement, this.contextViewService, {
placeholder: localize('excludeSiblingInputPlaceholder', "When Pattern Is Present...")
});
siblingInput.element.classList.add('setting-exclude-siblingInput');
this.listDisposables.push(siblingInput);
this.listDisposables.push(attachInputBoxStyler(siblingInput, this.themeService, {
inputBackground: settingsTextInputBackground,
inputForeground: settingsTextInputForeground,
inputBorder: settingsTextInputBorder
}));
siblingInput.value = item.sibling;
this.listDisposables.push(DOM.addStandardDisposableListener(siblingInput.inputElement, DOM.EventType.KEY_DOWN, onKeydown));
}
rowElement.classList.add('setting-exclude-newExcludeItem');
const okButton = this._register(new Button(rowElement));
okButton.label = localize('okButton', "OK");
okButton.element.classList.add('setting-exclude-okButton');
this.listDisposables.push(attachButtonStyler(okButton, this.themeService));
this.listDisposables.push(okButton.onDidClick(() => onSubmit(true)));
rowElement.classList.remove('setting-exclude-newPattern');
rowElement.classList.remove('setting-exclude-newPatternWithSibling');
if (item.mode === AddItemMode.Pattern) {
rowElement.classList.add('setting-exclude-newPattern');
const cancelButton = this._register(new Button(rowElement));
cancelButton.label = localize('cancelButton', "Cancel");
cancelButton.element.classList.add('setting-exclude-cancelButton');
this.listDisposables.push(attachButtonStyler(cancelButton, this.themeService));
this.listDisposables.push(cancelButton.onDidClick(() => onSubmit(false)));
setTimeout(() => {
patternInput.focus();
patternInput.select();
} else if (item.mode === AddItemMode.PatternWithSibling) {
rowElement.classList.add('setting-exclude-newPatternWithSibling');
}
}, 0);
return rowElement;
}
......@@ -314,35 +314,11 @@ export class ExcludeSettingWidget extends Disposable {
}
}
interface IExcludeDataItem {
id: string;
export interface IExcludeDataItem {
pattern: string;
sibling?: string;
}
interface INewExcludeItem {
id: string;
mode: AddItemMode;
interface IExcludeViewItem extends IExcludeDataItem {
editing?: boolean;
}
type IExcludeItem = IExcludeDataItem | INewExcludeItem;
function isExcludeDataItem(excludeItem: IExcludeItem): excludeItem is IExcludeDataItem {
return !!(<IExcludeDataItem>excludeItem).pattern;
}
// class EditExcludeItemAction extends Action {
// static readonly ID = 'workbench.action.editExcludeItem';
// static readonly LABEL = localize('editExcludeItem', "Edit Exclude Item");
// constructor() {
// super(EditExcludeItemAction.ID, EditExcludeItemAction.LABEL);
// this.class = 'setting-excludeAction-edit';
// }
// run(item: IExcludeItem): TPromise<boolean> {
// return TPromise.wrap(true);
// }
// }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或