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

Fix #80667

Browse Source
This commit is contained in:
Rob Lourens
2019-09-15 14:24:06 -07:00
parent d3780038d7
commit 57f485539c
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/services/search/common/search.ts
View File

@@ -252,7 +252,10 @@ export class TextSearchMatch implements ITextSearchMatch {
constructor(text: string, range: ISearchRange | ISearchRange[], previewOptions?: ITextSearchPreviewOptions) {
this.ranges = range;
if (previewOptions && previewOptions.matchLines === 1 && (!Array.isArray(range) || range.length === 1)) {
// Trim preview if this is one match and a single-line match with a preview requested.
// Otherwise send the full text, like for replace or for showing multiple previews.
// TODO this is fishy.
if (previewOptions && previewOptions.matchLines === 1 && (!Array.isArray(range) || range.length === 1) && isSingleLineRange(range)) {
const oneRange = Array.isArray(range) ? range[0] : range;
// 1 line preview requested
@@ -273,7 +276,6 @@ export class TextSearchMatch implements ITextSearchMatch {
} else {
const firstMatchLine = Array.isArray(range) ? range[0].startLineNumber : range.startLineNumber;
// n line, no preview requested, or multiple matches in the preview
this.preview = {
text,
matches: mapArrayOrNot(range, r => new SearchRange(r.startLineNumber - firstMatchLine, r.startColumn, r.endLineNumber - firstMatchLine, r.endColumn))
@@ -282,6 +284,12 @@ export class TextSearchMatch implements ITextSearchMatch {
}
}
function isSingleLineRange(range: ISearchRange | ISearchRange[]): boolean {
return Array.isArray(range) ?
range[0].startLineNumber === range[0].endLineNumber :
range.startLineNumber === range.endLineNumber;
}
export class SearchRange implements ISearchRange {
startLineNumber: number;
startColumn: number;

26
src/vs/workbench/services/search/test/common/search.test.ts
View File

@@ -12,7 +12,7 @@ suite('TextSearchResult', () => {
charsPerLine: 100
};
function assertPreviewRangeText(text: string, result: TextSearchMatch): void {
function assertOneLinePreviewRangeText(text: string, result: TextSearchMatch): void {
assert.equal(
result.preview.text.substring((<SearchRange>result.preview.matches).startColumn, (<SearchRange>result.preview.matches).endColumn),
text);
@@ -22,49 +22,49 @@ suite('TextSearchResult', () => {
const range = new OneLineRange(5, 0, 0);
const result = new TextSearchMatch('', range);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('', result);
assertOneLinePreviewRangeText('', result);
});
test('empty with preview options', () => {
const range = new OneLineRange(5, 0, 0);
const result = new TextSearchMatch('', range, previewOptions1);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('', result);
assertOneLinePreviewRangeText('', result);
});
test('short without preview options', () => {
const range = new OneLineRange(5, 4, 7);
const result = new TextSearchMatch('foo bar', range);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('bar', result);
assertOneLinePreviewRangeText('bar', result);
});
test('short with preview options', () => {
const range = new OneLineRange(5, 4, 7);
const result = new TextSearchMatch('foo bar', range, previewOptions1);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('bar', result);
assertOneLinePreviewRangeText('bar', result);
});
test('leading', () => {
const range = new OneLineRange(5, 25, 28);
const result = new TextSearchMatch('long text very long text foo', range, previewOptions1);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('foo', result);
assertOneLinePreviewRangeText('foo', result);
});
test('trailing', () => {
const range = new OneLineRange(5, 0, 3);
const result = new TextSearchMatch('foo long text very long text long text very long text long text very long text long text very long text long text very long text', range, previewOptions1);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('foo', result);
assertOneLinePreviewRangeText('foo', result);
});
test('middle', () => {
const range = new OneLineRange(5, 30, 33);
const result = new TextSearchMatch('long text very long text long foo text very long text long text very long text long text very long text long text very long text', range, previewOptions1);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('foo', result);
assertOneLinePreviewRangeText('foo', result);
});
test('truncating match', () => {
@@ -76,7 +76,7 @@ suite('TextSearchResult', () => {
const range = new OneLineRange(0, 4, 7);
const result = new TextSearchMatch('foo bar', range, previewOptions);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('b', result);
assertOneLinePreviewRangeText('b', result);
});
test('one line of multiline match', () => {
@@ -88,7 +88,11 @@ suite('TextSearchResult', () => {
const range = new SearchRange(5, 4, 6, 3);
const result = new TextSearchMatch('foo bar\nfoo bar', range, previewOptions);
assert.deepEqual(result.ranges, range);
assertPreviewRangeText('bar', result);
assert.equal(result.preview.text, 'foo bar\nfoo bar');
assert.equal((<SearchRange>result.preview.matches).startLineNumber, 0);
assert.equal((<SearchRange>result.preview.matches).startColumn, 4);
assert.equal((<SearchRange>result.preview.matches).endLineNumber, 1);
assert.equal((<SearchRange>result.preview.matches).endColumn, 3);
});
// test('all lines of multiline match', () => {
@@ -102,4 +106,4 @@ suite('TextSearchResult', () => {
// assert.deepEqual(result.range, range);
// assertPreviewRangeText('bar\nfoo', result);
// });
});
});