microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 04:43:37 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Filter out zero-width selections

Browse Source
This commit is contained in:
Andrew Branch
2019-04-19 09:44:42 -07:00
parent 6177596c27
commit f0a3d2bf92
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/smartSelection.ts
View File

@@ -70,10 +70,13 @@ namespace ts.SmartSelectionRange {
return selectionRange;
function pushSelectionRange(start: number, end: number): void {
// Skip ranges that are identical to the parent
const textSpan = createTextSpanFromBounds(start, end);
if (!selectionRange || !textSpansEqual(textSpan, selectionRange.textSpan)) {
selectionRange = { textSpan, ...selectionRange && { parent: selectionRange } };
// Skip empty ranges
if (start !== end) {
// Skip ranges that are identical to the parent
const textSpan = createTextSpanFromBounds(start, end);
if (!selectionRange || !textSpansEqual(textSpan, selectionRange.textSpan)) {
selectionRange = { textSpan, ...selectionRange && { parent: selectionRange } };
}
}
}
}

33
src/testRunner/unittests/tsserver/smartSelection.ts
View File

@@ -12,7 +12,7 @@ namespace ts.projectSystem {
};
}
describe("unittests:: tsserver:: selectionRange", () => {
describe("unittests:: tsserver:: smartSelection", () => {
it("works for simple JavaScript", () => {
const getSmartSelectionRange = setup("/file.js", `
class Foo {
@@ -652,5 +652,36 @@ function square(x) {
start: { line: 1, offset: 1 },
end: { line: 1, offset: 13 } } } }]);
});
it("never returns empty ranges", () => {
const getSmartSelectionRange = setup("/file.ts", `
class HomePage {
componentDidMount() {
if (this.props.username) {
return '';
}
}
}`);
const locations = getSmartSelectionRange([
{ line: 3, offset: 23 }, // componentDidMount(/**/)
{ line: 4, offset: 32 }, // username/**/)
{ line: 5, offset: 21 }, // return '/**/'
]);
assert.deepEqual(locations![0].textSpan, { // this.props.username
start: { line: 3, offset: 23 },
end: { line: 3, offset: 24 },
});
assert.deepEqual(locations![1].textSpan, { // this.props.username
start: { line: 4, offset: 32 },
end: { line: 4, offset: 33 },
});
assert.deepEqual(locations![2].textSpan, { // ''
start: { line: 5, offset: 20 },
end: { line: 5, offset: 22 },
});
});
});
}