Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b171e8f5
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,发现更多精彩内容 >>
提交
b171e8f5
编写于
6月 06, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #49673 - "Clear search history" doesn't work when search viewlet is not active
上级
a03c4b62
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
152 addition
and
87 deletion
+152
-87
src/vs/platform/search/common/search.ts
src/vs/platform/search/common/search.ts
+22
-6
src/vs/workbench/electron-browser/shell.ts
src/vs/workbench/electron-browser/shell.ts
+4
-1
src/vs/workbench/parts/search/browser/searchActions.ts
src/vs/workbench/parts/search/browser/searchActions.ts
+20
-23
src/vs/workbench/parts/search/browser/searchView.ts
src/vs/workbench/parts/search/browser/searchView.ts
+60
-57
src/vs/workbench/services/search/node/searchHistoryService.ts
...vs/workbench/services/search/node/searchHistoryService.ts
+46
-0
未找到文件。
src/vs/platform/search/common/search.ts
浏览文件 @
b171e8f5
...
@@ -4,19 +4,20 @@
...
@@ -4,19 +4,20 @@
*--------------------------------------------------------------------------------------------*/
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
'
use strict
'
;
import
{
PPromise
,
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
uri
,
{
UriComponents
}
from
'
vs/base/common/uri
'
;
import
*
as
glob
from
'
vs/base/common/glob
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
glob
from
'
vs/base/common/glob
'
;
import
uri
,
{
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
PPromise
,
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IFilesConfiguration
}
from
'
vs/platform/files/common/files
'
;
import
{
IFilesConfiguration
}
from
'
vs/platform/files/common/files
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
export
const
ID
=
'
searchService
'
;
export
const
VIEW_ID
=
'
workbench.view.search
'
;
export
const
VIEW_ID
=
'
workbench.view.search
'
;
export
const
ISearchService
=
createDecorator
<
ISearchService
>
(
ID
);
export
const
ISearchHistoryService
=
createDecorator
<
ISearchHistoryService
>
(
'
searchHistoryService
'
);
export
const
ISearchService
=
createDecorator
<
ISearchService
>
(
'
searchService
'
);
/**
/**
* A service that enables to search for files or with in files.
* A service that enables to search for files or with in files.
...
@@ -29,6 +30,21 @@ export interface ISearchService {
...
@@ -29,6 +30,21 @@ export interface ISearchService {
registerSearchResultProvider
(
provider
:
ISearchResultProvider
):
IDisposable
;
registerSearchResultProvider
(
provider
:
ISearchResultProvider
):
IDisposable
;
}
}
export
interface
ISearchHistoryValues
{
search
?:
string
[];
replace
?:
string
[];
include
?:
string
[];
exclude
?:
string
[];
}
export
interface
ISearchHistoryService
{
_serviceBrand
:
any
;
onDidClearHistory
:
Event
<
void
>
;
clearHistory
():
void
;
load
():
ISearchHistoryValues
;
save
(
history
:
ISearchHistoryValues
):
void
;
}
export
interface
ISearchResultProvider
{
export
interface
ISearchResultProvider
{
search
(
query
:
ISearchQuery
):
PPromise
<
ISearchComplete
,
ISearchProgressItem
>
;
search
(
query
:
ISearchQuery
):
PPromise
<
ISearchComplete
,
ISearchProgressItem
>
;
}
}
...
...
src/vs/workbench/electron-browser/shell.ts
浏览文件 @
b171e8f5
...
@@ -51,7 +51,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
...
@@ -51,7 +51,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
import
{
ILifecycleService
,
LifecyclePhase
,
ShutdownReason
,
StartupKind
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
ILifecycleService
,
LifecyclePhase
,
ShutdownReason
,
StartupKind
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
ISearchService
}
from
'
vs/platform/search/common/search
'
;
import
{
ISearchService
,
ISearchHistoryService
}
from
'
vs/platform/search/common/search
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
CommandService
}
from
'
vs/workbench/services/commands/common/commandService
'
;
import
{
CommandService
}
from
'
vs/workbench/services/commands/common/commandService
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
...
@@ -96,6 +96,7 @@ import { DialogChannel } from 'vs/platform/dialogs/common/dialogIpc';
...
@@ -96,6 +96,7 @@ import { DialogChannel } from 'vs/platform/dialogs/common/dialogIpc';
import
{
EventType
,
addDisposableListener
,
addClass
,
getClientArea
}
from
'
vs/base/browser/dom
'
;
import
{
EventType
,
addDisposableListener
,
addClass
,
getClientArea
}
from
'
vs/base/browser/dom
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
OpenerService
}
from
'
vs/editor/browser/services/openerService
'
;
import
{
OpenerService
}
from
'
vs/editor/browser/services/openerService
'
;
import
{
SearchHistoryService
}
from
'
vs/workbench/services/search/node/searchHistoryService
'
;
/**
/**
* Services that we require for the Shell
* Services that we require for the Shell
...
@@ -446,6 +447,8 @@ export class WorkbenchShell {
...
@@ -446,6 +447,8 @@ export class WorkbenchShell {
serviceCollection
.
set
(
ISearchService
,
new
SyncDescriptor
(
SearchService
));
serviceCollection
.
set
(
ISearchService
,
new
SyncDescriptor
(
SearchService
));
serviceCollection
.
set
(
ISearchHistoryService
,
new
SyncDescriptor
(
SearchHistoryService
));
serviceCollection
.
set
(
IWorkbenchIssueService
,
new
SyncDescriptor
(
WorkbenchIssueService
));
serviceCollection
.
set
(
IWorkbenchIssueService
,
new
SyncDescriptor
(
WorkbenchIssueService
));
serviceCollection
.
set
(
ICodeEditorService
,
new
SyncDescriptor
(
CodeEditorService
));
serviceCollection
.
set
(
ICodeEditorService
,
new
SyncDescriptor
(
CodeEditorService
));
...
...
src/vs/workbench/parts/search/browser/searchActions.ts
浏览文件 @
b171e8f5
...
@@ -3,30 +3,30 @@
...
@@ -3,30 +3,30 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
*--------------------------------------------------------------------------------------------*/
import
*
as
nls
from
'
vs/nls
'
;
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
ITree
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
{
INavigator
}
from
'
vs/base/common/iterator
'
;
import
{
INavigator
}
from
'
vs/base/common/iterator
'
;
import
{
createKeybinding
,
ResolvedKeybinding
}
from
'
vs/base/common/keyCodes
'
;
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
isWindows
,
OS
}
from
'
vs/base/common/platform
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ITree
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
import
{
ICommandHandler
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
ISearchHistoryService
,
VIEW_ID
}
from
'
vs/platform/search/common/search
'
;
import
{
SearchView
}
from
'
vs/workbench/parts/search/browser/searchView
'
;
import
{
SearchView
}
from
'
vs/workbench/parts/search/browser/searchView
'
;
import
{
Match
,
FileMatch
,
FileMatchOrMatch
,
FolderMatch
,
RenderableMatch
,
SearchResult
,
searchMatchComparer
}
from
'
vs/workbench/parts/search/common/searchModel
'
;
import
{
IReplaceService
}
from
'
vs/workbench/parts/search/common/replace
'
;
import
*
as
Constants
from
'
vs/workbench/parts/search/common/constants
'
;
import
*
as
Constants
from
'
vs/workbench/parts/search/common/constants
'
;
import
{
IReplaceService
}
from
'
vs/workbench/parts/search/common/replace
'
;
import
{
FileMatch
,
FileMatchOrMatch
,
FolderMatch
,
Match
,
RenderableMatch
,
searchMatchComparer
,
SearchResult
}
from
'
vs/workbench/parts/search/common/searchModel
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ResolvedKeybinding
,
createKeybinding
}
from
'
vs/base/common/keyCodes
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
OS
,
isWindows
}
from
'
vs/base/common/platform
'
;
import
{
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IPanelService
}
from
'
vs/workbench/services/panel/common/panelService
'
;
import
{
IPanelService
}
from
'
vs/workbench/services/panel/common/panelService
'
;
import
{
VIEW_ID
}
from
'
vs/platform/search/common/search
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
import
{
ICommandHandler
}
from
'
vs/platform/commands/common/commands
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
URI
from
'
vs/base/common/uri
'
;
export
function
isSearchViewFocused
(
viewletService
:
IViewletService
,
panelService
:
IPanelService
):
boolean
{
export
function
isSearchViewFocused
(
viewletService
:
IViewletService
,
panelService
:
IPanelService
):
boolean
{
let
searchView
=
getSearchView
(
viewletService
,
panelService
);
let
searchView
=
getSearchView
(
viewletService
,
panelService
);
...
@@ -830,9 +830,6 @@ export const copyAllCommand: ICommandHandler = accessor => {
...
@@ -830,9 +830,6 @@ export const copyAllCommand: ICommandHandler = accessor => {
};
};
export
const
clearHistoryCommand
:
ICommandHandler
=
accessor
=>
{
export
const
clearHistoryCommand
:
ICommandHandler
=
accessor
=>
{
const
viewletService
=
accessor
.
get
(
IViewletService
);
const
searchHistoryService
=
accessor
.
get
(
ISearchHistoryService
);
const
panelService
=
accessor
.
get
(
IPanelService
);
searchHistoryService
.
clearHistory
();
const
searchView
=
getSearchView
(
viewletService
,
panelService
);
};
searchView
.
clearHistory
();
};
\ No newline at end of file
src/vs/workbench/parts/search/browser/searchView.ts
浏览文件 @
b171e8f5
...
@@ -5,62 +5,62 @@
...
@@ -5,62 +5,62 @@
'
use strict
'
;
'
use strict
'
;
import
'
vs/css!./media/searchview
'
;
import
{
$
,
Builder
}
from
'
vs/base/browser/builder
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Emitter
,
debounceEvent
}
from
'
vs/base/common/event
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
*
as
aria
from
'
vs/base/browser/ui/aria/aria
'
;
import
*
as
env
from
'
vs/base/common/platform
'
;
import
{
Delayer
}
from
'
vs/base/common/async
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
Builder
,
$
}
from
'
vs/base/browser/builder
'
;
import
*
as
aria
from
'
vs/base/browser/ui/aria/aria
'
;
import
{
FindInput
}
from
'
vs/base/browser/ui/findinput/findInput
'
;
import
{
FindInput
}
from
'
vs/base/browser/ui/findinput/findInput
'
;
import
{
ITree
,
IFocusEvent
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
{
Scope
}
from
'
vs/workbench/common/memento
'
;
import
{
IPreferencesService
}
from
'
vs/workbench/services/preferences/common/preferences
'
;
import
{
FileChangeType
,
FileChangesEvent
,
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
Match
,
FileMatch
,
SearchModel
,
FileMatchOrMatch
,
IChangeEvent
,
ISearchWorkbenchService
,
FolderMatch
}
from
'
vs/workbench/parts/search/common/searchModel
'
;
import
{
QueryBuilder
}
from
'
vs/workbench/parts/search/common/queryBuilder
'
;
import
{
MessageType
}
from
'
vs/base/browser/ui/inputbox/inputBox
'
;
import
{
MessageType
}
from
'
vs/base/browser/ui/inputbox/inputBox
'
;
import
{
ISearchProgressItem
,
ISearchComplete
,
ISearchQuery
,
IQueryOptions
,
ISearchConfiguration
,
IPatternInfo
,
VIEW_ID
}
from
'
vs/platform/search/common/search
'
;
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
IEditorService
,
SIDE_GROUP
,
ACTIVE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
Delayer
}
from
'
vs/base/common/async
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
{
debounceEvent
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
env
from
'
vs/base/common/platform
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IFocusEvent
,
ITree
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
'
vs/css!./media/searchview
'
;
import
{
ICodeEditor
,
isCodeEditor
,
isDiffEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IContextKey
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IConfirmation
,
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
FileChangesEvent
,
FileChangeType
,
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
TreeResourceNavigator
,
WorkbenchTree
}
from
'
vs/platform/list/browser/listService
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IProgressService
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IProgressService
}
from
'
vs/platform/progress/common/progress
'
;
import
{
I
WorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
I
PatternInfo
,
IQueryOptions
,
ISearchComplete
,
ISearchConfiguration
,
ISearchHistoryService
,
ISearchProgressItem
,
ISearchQuery
,
VIEW_ID
}
from
'
vs/platform/search/common/search
'
;
import
{
I
ContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
I
StorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
diffInserted
,
diffInsertedOutline
,
diffRemoved
,
diffRemovedOutline
,
editorFindMatchHighlight
,
editorFindMatchHighlightBorder
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
PatternInputWidget
,
ExcludePatternInputWidget
}
from
'
vs/workbench/parts/search/browser/patternInputWidget
'
;
import
{
ICssStyleCollector
,
ITheme
,
IThemeService
,
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
SearchRenderer
,
SearchDataSource
,
SearchAccessibilityProvider
,
SearchFilter
,
SearchTreeController
,
SearchSorter
}
from
'
vs/workbench/parts/search/browser/searchResultsView
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
SearchWidget
,
ISearchWidgetOptions
}
from
'
vs/workbench/parts/search/browser/searchWidget
'
;
import
{
OpenFileFolderAction
,
OpenFolderAction
}
from
'
vs/workbench/browser/actions/workspaceActions
'
;
import
{
RefreshAction
,
CollapseDeepestExpandedLevelAction
,
ClearSearchResultsAction
,
CancelSearchAction
}
from
'
vs/workbench/parts/search/browser/searchActions
'
;
import
{
IReplaceService
}
from
'
vs/workbench/parts/search/common/replace
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
OpenFolderAction
,
OpenFileFolderAction
}
from
'
vs/workbench/browser/actions/workspaceActions
'
;
import
*
as
Constants
from
'
vs/workbench/parts/search/common/constants
'
;
import
{
IThemeService
,
ITheme
,
ICssStyleCollector
,
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
editorFindMatchHighlight
,
diffInserted
,
diffRemoved
,
diffInsertedOutline
,
diffRemovedOutline
,
editorFindMatchHighlightBorder
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
getOutOfWorkspaceEditorResources
}
from
'
vs/workbench/parts/search/common/search
'
;
import
{
PreferencesEditor
}
from
'
vs/workbench/parts/preferences/browser/preferencesEditor
'
;
import
{
isDiffEditor
,
isCodeEditor
,
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
TreeResourceNavigator
,
WorkbenchTree
}
from
'
vs/platform/list/browser/listService
'
;
import
{
IEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
SimpleFileResourceDragAndDrop
}
from
'
vs/workbench/browser/dnd
'
;
import
{
SimpleFileResourceDragAndDrop
}
from
'
vs/workbench/browser/dnd
'
;
import
{
IConfirmation
,
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
Viewlet
}
from
'
vs/workbench/browser/viewlet
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
Scope
}
from
'
vs/workbench/common/memento
'
;
import
{
IPanel
}
from
'
vs/workbench/common/panel
'
;
import
{
IPanel
}
from
'
vs/workbench/common/panel
'
;
import
{
IViewlet
}
from
'
vs/workbench/common/viewlet
'
;
import
{
IViewlet
}
from
'
vs/workbench/common/viewlet
'
;
import
{
Viewlet
}
from
'
vs/workbench/browser/viewlet
'
;
import
{
PreferencesEditor
}
from
'
vs/workbench/parts/preferences/browser/preferencesEditor
'
;
import
{
ExcludePatternInputWidget
,
PatternInputWidget
}
from
'
vs/workbench/parts/search/browser/patternInputWidget
'
;
import
{
CancelSearchAction
,
ClearSearchResultsAction
,
CollapseDeepestExpandedLevelAction
,
RefreshAction
}
from
'
vs/workbench/parts/search/browser/searchActions
'
;
import
{
SearchAccessibilityProvider
,
SearchDataSource
,
SearchFilter
,
SearchRenderer
,
SearchSorter
,
SearchTreeController
}
from
'
vs/workbench/parts/search/browser/searchResultsView
'
;
import
{
ISearchWidgetOptions
,
SearchWidget
}
from
'
vs/workbench/parts/search/browser/searchWidget
'
;
import
*
as
Constants
from
'
vs/workbench/parts/search/common/constants
'
;
import
{
QueryBuilder
}
from
'
vs/workbench/parts/search/common/queryBuilder
'
;
import
{
IReplaceService
}
from
'
vs/workbench/parts/search/common/replace
'
;
import
{
getOutOfWorkspaceEditorResources
}
from
'
vs/workbench/parts/search/common/search
'
;
import
{
FileMatch
,
FileMatchOrMatch
,
FolderMatch
,
IChangeEvent
,
ISearchWorkbenchService
,
Match
,
SearchModel
}
from
'
vs/workbench/parts/search/common/searchModel
'
;
import
{
ACTIVE_GROUP
,
IEditorService
,
SIDE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
IPreferencesService
}
from
'
vs/workbench/services/preferences/common/preferences
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
export
class
SearchView
extends
Viewlet
implements
IViewlet
,
IPanel
{
export
class
SearchView
extends
Viewlet
implements
IViewlet
,
IPanel
{
...
@@ -130,7 +130,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
...
@@ -130,7 +130,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
@
IReplaceService
private
replaceService
:
IReplaceService
,
@
IReplaceService
private
replaceService
:
IReplaceService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
IPreferencesService
private
preferencesService
:
IPreferencesService
,
@
IPreferencesService
private
preferencesService
:
IPreferencesService
,
@
IThemeService
protected
themeService
:
IThemeService
@
IThemeService
protected
themeService
:
IThemeService
,
@
ISearchHistoryService
private
searchHistoryService
:
ISearchHistoryService
)
{
)
{
super
(
VIEW_ID
,
partService
,
telemetryService
,
themeService
);
super
(
VIEW_ID
,
partService
,
telemetryService
,
themeService
);
...
@@ -152,6 +153,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
...
@@ -152,6 +153,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
this
.
toUnbind
.
push
(
this
.
fileService
.
onFileChanges
(
e
=>
this
.
onFilesChanged
(
e
)));
this
.
toUnbind
.
push
(
this
.
fileService
.
onFileChanges
(
e
=>
this
.
onFilesChanged
(
e
)));
this
.
toUnbind
.
push
(
this
.
untitledEditorService
.
onDidChangeDirty
(
e
=>
this
.
onUntitledDidChangeDirty
(
e
)));
this
.
toUnbind
.
push
(
this
.
untitledEditorService
.
onDidChangeDirty
(
e
=>
this
.
onUntitledDidChangeDirty
(
e
)));
this
.
toUnbind
.
push
(
this
.
contextService
.
onDidChangeWorkbenchState
(()
=>
this
.
onDidChangeWorkbenchState
()));
this
.
toUnbind
.
push
(
this
.
contextService
.
onDidChangeWorkbenchState
(()
=>
this
.
onDidChangeWorkbenchState
()));
this
.
_register
(
this
.
searchHistoryService
.
onDidClearHistory
(()
=>
this
.
clearHistory
()));
this
.
selectCurrentMatchEmitter
=
new
Emitter
<
string
>
();
this
.
selectCurrentMatchEmitter
=
new
Emitter
<
string
>
();
debounceEvent
(
this
.
selectCurrentMatchEmitter
.
event
,
(
l
,
e
)
=>
e
,
100
,
/*leading=*/
true
)
debounceEvent
(
this
.
selectCurrentMatchEmitter
.
event
,
(
l
,
e
)
=>
e
,
100
,
/*leading=*/
true
)
...
@@ -182,11 +184,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
...
@@ -182,11 +184,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
});
});
this
.
createSearchWidget
(
this
.
searchWidgetsContainer
);
this
.
createSearchWidget
(
this
.
searchWidgetsContainer
);
const
history
=
this
.
searchHistoryService
.
load
();
const
filePatterns
=
this
.
viewletSettings
[
'
query.filePatterns
'
]
||
''
;
const
filePatterns
=
this
.
viewletSettings
[
'
query.filePatterns
'
]
||
''
;
let
patternExclusions
=
this
.
viewletSettings
[
'
query.folderExclusions
'
]
||
''
;
let
patternExclusions
=
this
.
viewletSettings
[
'
query.folderExclusions
'
]
||
''
;
const
patternExclusionsHistory
:
string
[]
=
this
.
viewletSettings
[
'
query.folderExclusionsHistory
'
]
||
[];
const
patternExclusionsHistory
:
string
[]
=
history
.
exclude
||
[];
let
patternIncludes
=
this
.
viewletSettings
[
'
query.folderIncludes
'
]
||
''
;
let
patternIncludes
=
this
.
viewletSettings
[
'
query.folderIncludes
'
]
||
''
;
let
patternIncludesHistory
:
string
[]
=
this
.
viewletSettings
[
'
query.folderIncludesHistory
'
]
||
[];
let
patternIncludesHistory
:
string
[]
=
history
.
include
||
[];
const
queryDetailsExpanded
=
this
.
viewletSettings
[
'
query.queryDetailsExpanded
'
]
||
''
;
const
queryDetailsExpanded
=
this
.
viewletSettings
[
'
query.queryDetailsExpanded
'
]
||
''
;
const
useExcludesAndIgnoreFiles
=
typeof
this
.
viewletSettings
[
'
query.useExcludesAndIgnoreFiles
'
]
===
'
boolean
'
?
const
useExcludesAndIgnoreFiles
=
typeof
this
.
viewletSettings
[
'
query.useExcludesAndIgnoreFiles
'
]
===
'
boolean
'
?
this
.
viewletSettings
[
'
query.useExcludesAndIgnoreFiles
'
]
:
true
;
this
.
viewletSettings
[
'
query.useExcludesAndIgnoreFiles
'
]
:
true
;
...
@@ -328,8 +331,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
...
@@ -328,8 +331,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
let
isRegex
=
this
.
viewletSettings
[
'
query.regex
'
]
===
true
;
let
isRegex
=
this
.
viewletSettings
[
'
query.regex
'
]
===
true
;
let
isWholeWords
=
this
.
viewletSettings
[
'
query.wholeWords
'
]
===
true
;
let
isWholeWords
=
this
.
viewletSettings
[
'
query.wholeWords
'
]
===
true
;
let
isCaseSensitive
=
this
.
viewletSettings
[
'
query.caseSensitive
'
]
===
true
;
let
isCaseSensitive
=
this
.
viewletSettings
[
'
query.caseSensitive
'
]
===
true
;
let
searchHistory
=
this
.
viewletSettings
[
'
query.searchHistory
'
]
||
[];
const
history
=
this
.
searchHistoryService
.
load
();
let
replaceHistory
=
this
.
viewletSettings
[
'
query.replaceHistory
'
]
||
[];
let
searchHistory
=
history
.
search
||
[];
let
replaceHistory
=
history
.
replace
||
[];
this
.
searchWidget
=
this
.
instantiationService
.
createInstance
(
SearchWidget
,
builder
,
<
ISearchWidgetOptions
>
{
this
.
searchWidget
=
this
.
instantiationService
.
createInstance
(
SearchWidget
,
builder
,
<
ISearchWidgetOptions
>
{
value
:
contentPattern
,
value
:
contentPattern
,
...
@@ -1509,7 +1513,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
...
@@ -1509,7 +1513,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
this
.
updateTitleArea
();
this
.
updateTitleArea
();
}
}
p
ublic
clearHistory
():
void
{
p
rivate
clearHistory
():
void
{
this
.
searchWidget
.
clearHistory
();
this
.
searchWidget
.
clearHistory
();
this
.
inputPatternExcludes
.
clearHistory
();
this
.
inputPatternExcludes
.
clearHistory
();
this
.
inputPatternIncludes
.
clearHistory
();
this
.
inputPatternIncludes
.
clearHistory
();
...
@@ -1523,24 +1527,23 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
...
@@ -1523,24 +1527,23 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
const
patternExcludes
=
this
.
inputPatternExcludes
.
getValue
().
trim
();
const
patternExcludes
=
this
.
inputPatternExcludes
.
getValue
().
trim
();
const
patternIncludes
=
this
.
inputPatternIncludes
.
getValue
().
trim
();
const
patternIncludes
=
this
.
inputPatternIncludes
.
getValue
().
trim
();
const
useExcludesAndIgnoreFiles
=
this
.
inputPatternExcludes
.
useExcludesAndIgnoreFiles
();
const
useExcludesAndIgnoreFiles
=
this
.
inputPatternExcludes
.
useExcludesAndIgnoreFiles
();
const
searchHistory
=
this
.
searchWidget
.
getSearchHistory
();
const
replaceHistory
=
this
.
searchWidget
.
getReplaceHistory
();
const
patternExcludesHistory
=
this
.
inputPatternExcludes
.
getHistory
();
const
patternIncludesHistory
=
this
.
inputPatternIncludes
.
getHistory
();
// store memento
// store memento
this
.
viewletSettings
[
'
query.contentPattern
'
]
=
contentPattern
;
this
.
viewletSettings
[
'
query.contentPattern
'
]
=
contentPattern
;
this
.
viewletSettings
[
'
query.searchHistory
'
]
=
searchHistory
;
this
.
viewletSettings
[
'
query.replaceHistory
'
]
=
replaceHistory
;
this
.
viewletSettings
[
'
query.regex
'
]
=
isRegex
;
this
.
viewletSettings
[
'
query.regex
'
]
=
isRegex
;
this
.
viewletSettings
[
'
query.wholeWords
'
]
=
isWholeWords
;
this
.
viewletSettings
[
'
query.wholeWords
'
]
=
isWholeWords
;
this
.
viewletSettings
[
'
query.caseSensitive
'
]
=
isCaseSensitive
;
this
.
viewletSettings
[
'
query.caseSensitive
'
]
=
isCaseSensitive
;
this
.
viewletSettings
[
'
query.folderExclusions
'
]
=
patternExcludes
;
this
.
viewletSettings
[
'
query.folderExclusions
'
]
=
patternExcludes
;
this
.
viewletSettings
[
'
query.folderIncludes
'
]
=
patternIncludes
;
this
.
viewletSettings
[
'
query.folderIncludes
'
]
=
patternIncludes
;
this
.
viewletSettings
[
'
query.folderExclusionsHistory
'
]
=
patternExcludesHistory
;
this
.
viewletSettings
[
'
query.folderIncludesHistory
'
]
=
patternIncludesHistory
;
this
.
viewletSettings
[
'
query.useExcludesAndIgnoreFiles
'
]
=
useExcludesAndIgnoreFiles
;
this
.
viewletSettings
[
'
query.useExcludesAndIgnoreFiles
'
]
=
useExcludesAndIgnoreFiles
;
this
.
searchHistoryService
.
save
({
search
:
this
.
searchWidget
.
getSearchHistory
(),
replace
:
this
.
searchWidget
.
getReplaceHistory
(),
exclude
:
this
.
inputPatternExcludes
.
getHistory
(),
include
:
this
.
inputPatternIncludes
.
getHistory
()
});
super
.
shutdown
();
super
.
shutdown
();
}
}
...
...
src/vs/workbench/services/search/node/searchHistoryService.ts
0 → 100644
浏览文件 @
b171e8f5
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
ISearchHistoryValues
,
ISearchHistoryService
}
from
'
vs/platform/search/common/search
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
export
class
SearchHistoryService
implements
ISearchHistoryService
{
public
_serviceBrand
:
any
;
private
static
readonly
SEARCH_HISTORY_KEY
=
'
workbench.search.history
'
;
private
readonly
_onDidClearHistory
:
Emitter
<
void
>
=
new
Emitter
<
void
>
();
public
readonly
onDidClearHistory
:
Event
<
void
>
=
this
.
_onDidClearHistory
.
event
;
constructor
(
@
IStorageService
private
storageService
:
IStorageService
)
{
}
public
clearHistory
():
void
{
this
.
storageService
.
remove
(
SearchHistoryService
.
SEARCH_HISTORY_KEY
,
StorageScope
.
WORKSPACE
);
this
.
_onDidClearHistory
.
fire
();
}
public
load
():
ISearchHistoryValues
{
let
result
:
ISearchHistoryValues
;
const
raw
=
this
.
storageService
.
get
(
SearchHistoryService
.
SEARCH_HISTORY_KEY
,
StorageScope
.
WORKSPACE
);
if
(
raw
)
{
try
{
result
=
JSON
.
parse
(
raw
);
}
catch
(
e
)
{
// Invalid data
}
}
return
result
||
{};
}
public
save
(
history
:
ISearchHistoryValues
):
void
{
this
.
storageService
.
store
(
SearchHistoryService
.
SEARCH_HISTORY_KEY
,
JSON
.
stringify
(
history
),
StorageScope
.
WORKSPACE
);
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录