Skip to content

Commit e07cacd

Browse files
roblourensroblourens
committed
Refactor search - rename files
1 parent d616c78 commit e07cacd

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎src/vs/workbench/api/node/extHostSearch.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import { ILogService } from 'vs/platform/log/common/log';
1717
import { IFileMatch, IFileSearchProviderStats, IFolderQuery, IPatternInfo, IRawSearchQuery, ISearchCompleteStats, ISearchQuery } from 'vs/platform/search/common/search';
1818
import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
1919
import { FileIndexSearchManager, IDirectoryEntry, IDirectoryTree, IInternalFileMatch } from 'vs/workbench/api/node/extHostSearch.fileIndex';
20-
import { RipgrepSearchProvider } from 'vs/workbench/services/search/node/ripgrepSearchEH';
20+
import { RipgrepSearchProvider } from 'vs/workbench/services/search/node/ripgrepSearchProvider';
2121
import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
2222
import { QueryGlobTester, resolvePatternsForProvider } from 'vs/workbench/services/search/node/search';
23-
import { TextSearchEngine } from 'vs/workbench/services/search/node/textSearchEngine';
23+
import { TextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
2424
import * as vscode from 'vscode';
2525
import { ExtHostSearchShape, IMainContext, MainContext, MainThreadSearchShape } from './extHost.protocol';
2626

@@ -127,7 +127,7 @@ export class ExtHostSearch implements ExtHostSearchShape {
127127
}
128128

129129
const query = reviveQuery(rawQuery);
130-
const engine = new TextSearchEngine(pattern, query, provider, this._extfs);
130+
const engine = new TextSearchManager(pattern, query, provider, this._extfs);
131131
return engine.search(progress => this._proxy.$handleTextMatch(handle, session, progress), token);
132132
}
133133
}

‎src/vs/workbench/services/search/node/rawSearchService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { TextSearchEngineAdapter } from 'vs/workbench/services/search/node/textS
2323
import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
2424
import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
2525
import { IFileSearchProgressItem, IRawFileMatch, IRawSearch, IRawSearchService, ISearchEngine, ISearchEngineSuccess, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess } from './search';
26-
import { BatchedCollector } from 'vs/workbench/services/search/node/textSearchEngine';
26+
import { BatchedCollector } from 'vs/workbench/services/search/node/textSearchManager';
2727

2828
gracefulFs.gracefulify(fs);
2929

src/vs/workbench/services/search/node/ripgrepSearchEH.ts renamed to src/vs/workbench/services/search/node/ripgrepSearchProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { CancellationTokenSource } from 'vs/base/common/cancellation';
77
import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
8-
import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEH';
8+
import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
99
import * as vscode from 'vscode';
1010

1111
export class RipgrepSearchProvider implements vscode.TextSearchProvider {

src/vs/workbench/services/search/node/ripgrepTextSearchEH.ts renamed to src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class RipgrepTextSearchEngine {
4343
let rgProc: Maybe<cp.ChildProcess> = cp.spawn(rgDiskPath, rgArgs, { cwd });
4444
rgProc.on('error', e => {
4545
console.error(e);
46-
// this.outputChannel.append('Error: ' + (e && e.message));
46+
this.outputChannel.appendLine('Error: ' + (e && e.message));
4747
reject(e);
4848
});
4949

‎src/vs/workbench/services/search/node/textSearchAdapter.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { CancellationToken } from 'vs/base/common/cancellation';
77
import { URI } from 'vs/base/common/uri';
88
import * as extfs from 'vs/base/node/extfs';
99
import { IFolderQuery, IProgress, ISearchQuery, ITextSearchStats, QueryType, IFileMatch } from 'vs/platform/search/common/search';
10-
import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEH';
11-
import { TextSearchEngine } from 'vs/workbench/services/search/node/textSearchEngine';
10+
import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
11+
import { TextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
1212
import { IRawSearch, ISerializedFileMatch, ISerializedSearchSuccess } from './search';
1313

1414
export class TextSearchEngineAdapter {
@@ -61,7 +61,7 @@ export class TextSearchEngineAdapter {
6161
onMessage({ message: msg });
6262
}
6363
};
64-
const textSearchEngine = new TextSearchEngine(this.config.contentPattern, query, new RipgrepTextSearchEngine(pretendOutputChannel), extfs);
64+
const textSearchEngine = new TextSearchManager(this.config.contentPattern, query, new RipgrepTextSearchEngine(pretendOutputChannel), extfs);
6565
textSearchEngine
6666
.search(
6767
matches => {

src/vs/workbench/services/search/node/textSearchEngine.ts renamed to src/vs/workbench/services/search/node/textSearchManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IFileMatch, IFolderQuery, IPatternInfo, ISearchCompleteStats, ISearchQu
1515
import * as vscode from 'vscode';
1616
import { QueryGlobTester, resolvePatternsForProvider } from 'vs/workbench/services/search/node/search';
1717

18-
export class TextSearchEngine {
18+
export class TextSearchManager {
1919

2020
private collector: TextSearchResultsCollector;
2121

‎src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as assert from 'assert';
7-
import { fixRegexEndingPattern } from 'vs/workbench/services/search/node/ripgrepTextSearchEH';
7+
import { fixRegexEndingPattern } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
88

99
suite('RipgrepTextSearch - etc', () => {
1010
test('fixRegexEndingPattern', () => {

0 commit comments

Comments
 (0)