Skip to content

Commit 5df0356

Browse files
Switch all target imports to use the targets barrel (#1573)
Fixes #772 ## Checklist - [ ] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [ ] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [ ] I have not broken the cheatsheet Co-authored-by: Pokey Rule <[email protected]>
1 parent 69ea22e commit 5df0356

13 files changed

+30
-28
lines changed

packages/cursorless-engine/src/processTargets/targets/DocumentTarget.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Range } from "@cursorless/common";
22
import { shrinkRangeToFitContent } from "../../util/selectionUtils";
3-
import BaseTarget, { CommonTargetParameters } from "./BaseTarget";
4-
import PlainTarget from "./PlainTarget";
3+
import { BaseTarget, CommonTargetParameters, PlainTarget } from "./";
54

65
export default class DocumentTarget extends BaseTarget<CommonTargetParameters> {
76
insertionDelimiter = "\n";

packages/cursorless-engine/src/processTargets/targets/ImplicitTarget.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type { CommonTargetParameters } from "./BaseTarget";
2-
import BaseTarget from "./BaseTarget";
1+
import { BaseTarget, CommonTargetParameters } from ".";
32

43
/**
54
* A target that was not explicitly spoken by the user. For example:

packages/cursorless-engine/src/processTargets/targets/InteriorTarget.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { Range } from "@cursorless/common";
2+
import { BaseTarget, MinimumTargetParameters } from ".";
23
import { Target } from "../../typings/target.types";
34
import { shrinkRangeToFitContent } from "../../util/selectionUtils";
45
import { isSameType } from "../../util/typeUtils";
56
import {
67
createContinuousRangeFromRanges,
78
createContinuousRangeUntypedTarget,
89
} from "../targetUtil/createContinuousRange";
9-
import type { MinimumTargetParameters } from "./BaseTarget";
10-
import BaseTarget from "./BaseTarget";
1110

1211
export interface InteriorTargetParameters extends MinimumTargetParameters {
1312
readonly fullInteriorRange: Range;

packages/cursorless-engine/src/processTargets/targets/LineTarget.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { Position, Range, TextEditor } from "@cursorless/common";
2+
import { BaseTarget, CommonTargetParameters } from ".";
23
import { Target } from "../../typings/target.types";
34
import { expandToFullLine } from "../../util/rangeUtils";
45
import { tryConstructPlainTarget } from "../../util/tryConstructTarget";
56
import { createContinuousLineRange } from "../targetUtil/createContinuousRange";
6-
import type { CommonTargetParameters } from "./BaseTarget";
7-
import BaseTarget from "./BaseTarget";
87

98
export default class LineTarget extends BaseTarget<CommonTargetParameters> {
109
insertionDelimiter = "\n";

packages/cursorless-engine/src/processTargets/targets/NotebookCellTarget.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
import { Target } from "../../typings/target.types";
21
import { TargetPosition } from "@cursorless/common";
3-
import BaseTarget, { CommonTargetParameters } from "./BaseTarget";
4-
import { removalUnsupportedForPosition } from "./PositionTarget";
2+
import {
3+
BaseTarget,
4+
CommonTargetParameters,
5+
removalUnsupportedForPosition,
6+
} from ".";
7+
import { Target } from "../../typings/target.types";
58

69
export default class NotebookCellTarget extends BaseTarget<CommonTargetParameters> {
710
insertionDelimiter = "\n";

packages/cursorless-engine/src/processTargets/targets/ParagraphTarget.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ import {
55
TextEditor,
66
TextLine,
77
} from "@cursorless/common";
8+
import { BaseTarget, CommonTargetParameters, LineTarget } from ".";
89
import { Target } from "../../typings/target.types";
910
import { expandToFullLine } from "../../util/rangeUtils";
1011
import { constructLineTarget } from "../../util/tryConstructTarget";
1112
import { isSameType } from "../../util/typeUtils";
1213
import { createContinuousLineRange } from "../targetUtil/createContinuousRange";
13-
import type { CommonTargetParameters } from "./BaseTarget";
14-
import BaseTarget from "./BaseTarget";
15-
import LineTarget from "./LineTarget";
1614

1715
export default class ParagraphTarget extends BaseTarget<CommonTargetParameters> {
1816
insertionDelimiter = "\n\n";

packages/cursorless-engine/src/processTargets/targets/PlainTarget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import BaseTarget, { CommonTargetParameters } from "./BaseTarget";
1+
import { BaseTarget, CommonTargetParameters } from ".";
22

33
interface PlainTargetParameters extends CommonTargetParameters {
44
readonly isToken?: boolean;

packages/cursorless-engine/src/processTargets/targets/RawSelectionTarget.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type { CommonTargetParameters } from "./BaseTarget";
2-
import BaseTarget from "./BaseTarget";
1+
import { BaseTarget, CommonTargetParameters } from ".";
32

43
/**
54
* A target that has no leading or trailing delimiters so it's removal range

packages/cursorless-engine/src/processTargets/targets/ScopeTypeTarget.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
import { Range } from "@cursorless/common";
1+
import { Range, SimpleScopeTypeType } from "@cursorless/common";
2+
import {
3+
BaseTarget,
4+
CommonTargetParameters,
5+
InteriorTarget,
6+
PlainTarget,
7+
} from ".";
28
import { Target } from "../../typings/target.types";
3-
import { SimpleScopeTypeType } from "@cursorless/common";
49
import { isSameType } from "../../util/typeUtils";
510
import {
611
createContinuousRange,
@@ -12,9 +17,6 @@ import {
1217
getTokenRemovalRange,
1318
getTokenTrailingDelimiterTarget,
1419
} from "../targetUtil/insertionRemovalBehaviors/TokenInsertionRemovalBehavior";
15-
import BaseTarget, { CommonTargetParameters } from "./BaseTarget";
16-
import InteriorTarget from "./InteriorTarget";
17-
import PlainTarget from "./PlainTarget";
1820

1921
export interface ScopeTypeTargetParameters extends CommonTargetParameters {
2022
readonly scopeTypeType: SimpleScopeTypeType;

packages/cursorless-engine/src/processTargets/targets/SubTokenWordTarget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Range } from "@cursorless/common";
2+
import { BaseTarget, CommonTargetParameters } from ".";
23
import { Target } from "../../typings/target.types";
34
import { tryConstructPlainTarget } from "../../util/tryConstructTarget";
45
import { isSameType } from "../../util/typeUtils";
56
import { createContinuousRange } from "../targetUtil/createContinuousRange";
67
import { getDelimitedSequenceRemovalRange } from "../targetUtil/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior";
7-
import BaseTarget, { CommonTargetParameters } from "./BaseTarget";
88

99
export interface SubTokenTargetParameters extends CommonTargetParameters {
1010
readonly insertionDelimiter: string;

0 commit comments

Comments
 (0)