Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the search order settings for the search editor #103627

Merged
merged 3 commits into from Aug 3, 2020
Merged

Use the search order settings for the search editor #103627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a9be68
Use the search order settings for the search editor
damienmg Jul 30, 2020
9864322
Make serializeSearchResultForEditor's searchOrder parameter mandatory
damienmg Jul 31, 2020
bd1d05b
Merge branch 'master' into fix-103625
damienmg Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
View file
Open in desktop
Expand Up @@ -501,10 +501,11 @@ export class SearchEditor extends BaseTextEditor {
return;
}

const sortOrder = this.configurationService.getValue<ISearchConfigurationProperties>('search').sortOrder;
const controller = ReferencesController.get(this.searchResultEditor);
controller.closeWidget(false);
const labelFormatter = (uri: URI): string => this.labelService.getUriLabel(uri, { relative: true });
const results = serializeSearchResultForEditor(this.searchModel.searchResult, config.includes, config.excludes, config.contextLines, labelFormatter);
const results = serializeSearchResultForEditor(this.searchModel.searchResult, config.includes, config.excludes, config.contextLines, labelFormatter, sortOrder);
const { body } = await input.getModels();
this.modelService.updateModel(body, results.text);
input.config = config;
Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
View file
Open in desktop
Expand Up @@ -175,13 +175,14 @@ export const createEditorFromSearchResult =
const instantiationService = accessor.get(IInstantiationService);
const labelService = accessor.get(ILabelService);
const configurationService = accessor.get(IConfigurationService);
const sortOrder = configurationService.getValue<ISearchConfigurationProperties>('search').sortOrder;


telemetryService.publicLog2('searchEditor/createEditorFromSearchResult');

const labelFormatter = (uri: URI): string => labelService.getUriLabel(uri, { relative: true });

const { text, matchRanges, config } = serializeSearchResultForEditor(searchResult, rawIncludePattern, rawExcludePattern, 0, labelFormatter);
const { text, matchRanges, config } = serializeSearchResultForEditor(searchResult, rawIncludePattern, rawExcludePattern, 0, labelFormatter, sortOrder);
const contextLines = configurationService.getValue<ISearchConfigurationProperties>('search').searchEditor.defaultNumberOfContextLines;

if (searchResult.isDirty || contextLines === 0 || contextLines === null) {
Expand Down
12 changes: 7 additions & 5 deletions src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
View file
Open in desktop
Expand Up @@ -11,9 +11,9 @@ import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
import { Range } from 'vs/editor/common/core/range';
import type { ITextModel } from 'vs/editor/common/model';
import { localize } from 'vs/nls';
import { FileMatch, Match, searchMatchComparer, SearchResult } from 'vs/workbench/contrib/search/common/searchModel';
import { FileMatch, Match, searchMatchComparer, SearchResult, FolderMatch } from 'vs/workbench/contrib/search/common/searchModel';
import type { SearchConfiguration } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
import { ITextQuery } from 'vs/workbench/services/search/common/search';
import { ITextQuery, SearchSortOrder } from 'vs/workbench/services/search/common/search';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';

// Using \r\n on Windows inserts an extra newline between results.
Expand Down Expand Up @@ -208,7 +208,7 @@ export const extractSearchQueryFromLines = (lines: string[]): SearchConfiguratio
};

export const serializeSearchResultForEditor =
(searchResult: SearchResult, rawIncludePattern: string, rawExcludePattern: string, contextLines: number, labelFormatter: (x: URI) => string): { matchRanges: Range[], text: string, config: Partial<SearchConfiguration> } => {
(searchResult: SearchResult, rawIncludePattern: string, rawExcludePattern: string, contextLines: number, labelFormatter: (x: URI) => string, sortOrder: SearchSortOrder): { matchRanges: Range[], text: string, config: Partial<SearchConfiguration> } => {
if (!searchResult.query) { throw Error('Internal Error: Expected query, got null'); }
const config = contentPatternToSearchConfiguration(searchResult.query, rawIncludePattern, rawExcludePattern, contextLines);

Expand All @@ -221,11 +221,13 @@ export const serializeSearchResultForEditor =
: localize('noResults', "No Results"),
''];

const matchComparer = (a: FileMatch | FolderMatch, b: FileMatch | FolderMatch) => searchMatchComparer(a, b, sortOrder);

const allResults =
flattenSearchResultSerializations(
flatten(
searchResult.folderMatches().sort(searchMatchComparer)
.map(folderMatch => folderMatch.matches().sort(searchMatchComparer)
searchResult.folderMatches().sort(matchComparer)
.map(folderMatch => folderMatch.matches().sort(matchComparer)
.map(fileMatch => fileMatchToSearchResultFormat(fileMatch, labelFormatter)))));

return {
Expand Down