microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 05:28:19 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Fix tests -

Browse Source 
Remove OutputService reference from SearchService, this should be handled elsewhere
This commit is contained in:
Rob Lourens
2017-04-13 23:30:45 -07:00
parent 9c861b653e
commit 0c64bf0e2d
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/workbench/services/search/node/searchService.ts
View File

@@ -22,8 +22,6 @@ import { ISearchChannel, SearchChannelClient } from './searchIpc';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { ResourceMap } from 'vs/base/common/map';
import { IOutputService } from 'vs/workbench/parts/output/common/output';
export class SearchService implements ISearchService {
public _serviceBrand: any;
@@ -34,8 +32,7 @@ export class SearchService implements ISearchService {
@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
@IEnvironmentService environmentService: IEnvironmentService,
@IWorkspaceContextService private contextService: IWorkspaceContextService,
@IConfigurationService private configurationService: IConfigurationService,
@IOutputService private outputService: IOutputService
@IConfigurationService private configurationService: IConfigurationService
) {
this.diskSearch = new DiskSearch(!environmentService.isBuilt || environmentService.verbose);
}
@@ -76,7 +73,6 @@ export class SearchService implements ISearchService {
// Allow caller to register progress callback
process.nextTick(() => localResults.values().filter((res) => !!res).forEach(onProgress));
const outputChannel = this.outputService.getChannel('search');
rawSearchQuery = searchP.then(
// on Complete
@@ -103,11 +99,6 @@ export class SearchService implements ISearchService {
}
}
// Log
else if (progress.message) {
outputChannel.append(progress.message);
}
// Progress
else {
onProgress(<IProgress>progress);

4
src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts
View File

@@ -30,9 +30,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
import { IModelService } from 'vs/editor/common/services/modelService';
import { IOutputService } from 'vs/workbench/parts/output/common/output';
import { OutputService } from "vs/workbench/parts/output/browser/outputServices";
import { SearchModel } from 'vs/workbench/parts/search/common/searchModel';
import { QueryBuilder } from 'vs/workbench/parts/search/common/searchQuery';
@@ -70,7 +67,6 @@ suite('TextSearch performance (integration)', () => {
[IEditorGroupService, new TestEditorGroupService()],
[IEnvironmentService, TestEnvironmentService],
[IUntitledEditorService, createSyncDescriptor(UntitledEditorService)],
[IOutputService, createSyncDescriptor(OutputService)],
[ISearchService, createSyncDescriptor(SearchService)]
));