提交 3607d732 编写于 作者: R Rob Lourens

Fix build - remove duplication in search config interfaces

上级 dac2e8ee
...@@ -171,8 +171,7 @@ export class LineMatch implements ILineMatch { ...@@ -171,8 +171,7 @@ export class LineMatch implements ILineMatch {
} }
} }
export interface ISearchConfiguration extends IFilesConfiguration { export interface ISearchConfigurationProperties {
search: {
exclude: glob.IExpression; exclude: glob.IExpression;
useRipgrep: boolean; useRipgrep: boolean;
/** /**
...@@ -181,7 +180,10 @@ export interface ISearchConfiguration extends IFilesConfiguration { ...@@ -181,7 +180,10 @@ export interface ISearchConfiguration extends IFilesConfiguration {
useIgnoreFiles: boolean; useIgnoreFiles: boolean;
followSymlinks: boolean; followSymlinks: boolean;
smartCase: boolean; smartCase: boolean;
}; }
export interface ISearchConfiguration extends IFilesConfiguration {
search: ISearchConfigurationProperties;
editor: { editor: {
wordSeparators: string; wordSeparators: string;
}; };
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
import { TPromise } from 'vs/base/common/winjs.base'; import { TPromise } from 'vs/base/common/winjs.base';
import { onUnexpectedError } from 'vs/base/common/errors'; import { onUnexpectedError } from 'vs/base/common/errors';
import { IDisposable } from 'vs/base/common/lifecycle'; import { IDisposable } from 'vs/base/common/lifecycle';
import { ISearchConfiguration } from 'vs/platform/search/common/search'; import { ISearchConfiguration, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
import glob = require('vs/base/common/glob');
import { SymbolInformation } from 'vs/editor/common/modes'; import { SymbolInformation } from 'vs/editor/common/modes';
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
...@@ -64,21 +63,16 @@ export function getWorkspaceSymbols(query: string): TPromise<[IWorkspaceSymbolPr ...@@ -64,21 +63,16 @@ export function getWorkspaceSymbols(query: string): TPromise<[IWorkspaceSymbolPr
return TPromise.join(promises).then(_ => result); return TPromise.join(promises).then(_ => result);
} }
export interface IWorkbenchSearchConfiguration extends ISearchConfiguration { export interface IWorkbenchSearchConfigurationProperties extends ISearchConfigurationProperties {
search: {
quickOpen: { quickOpen: {
includeSymbols: boolean; includeSymbols: boolean;
},
exclude: glob.IExpression,
useRipgrep: boolean,
/**
* Use ignore file for file search.
*/
useIgnoreFiles: boolean,
followSymlinks: boolean;
}; };
} }
export interface IWorkbenchSearchConfiguration extends ISearchConfiguration {
search: IWorkbenchSearchConfigurationProperties;
}
/** /**
* Helper to return all opened editors with resources not belonging to the currently opened workspace. * Helper to return all opened editors with resources not belonging to the currently opened workspace.
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册