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

Clean up targets #2791

Merged
merged 3 commits into from
Jan 30, 2025
Merged

Clean up targets #2791

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
74ed506
Use interior target in document target
AndreasArvidsson Jan 29, 2025
984fb27
Revert
AndreasArvidsson Jan 29, 2025
3005473
Merge branch 'main' into documentTarget
phillco Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/cursorless-engine/src/processTargets/targets/BaseTarget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export abstract class BaseTarget<
get editor() {
return this.state.editor;
}

get isReversed() {
return this.state.isReversed;
}
Expand Down Expand Up @@ -114,6 +115,7 @@ export abstract class BaseTarget<
getInterior(): Target[] | undefined {
return undefined;
}

getBoundary(): Target[] | undefined {
return undefined;
}
Expand Down
25 changes: 13 additions & 12 deletions packages/cursorless-engine/src/processTargets/targets/DocumentTarget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { Range } from "@cursorless/common";
import { shrinkRangeToFitContent } from "../../util/selectionUtils";
import type { CommonTargetParameters } from "./BaseTarget";
import { BaseTarget } from "./BaseTarget";
import { BaseTarget, type CommonTargetParameters } from "./BaseTarget";
import { PlainTarget } from "./PlainTarget";

export class DocumentTarget extends BaseTarget<CommonTargetParameters> {
Expand All @@ -13,16 +12,6 @@ export class DocumentTarget extends BaseTarget<CommonTargetParameters> {
super(parameters);
}

getLeadingDelimiterTarget() {
return undefined;
}
getTrailingDelimiterTarget() {
return undefined;
}
getRemovalRange(): Range {
return this.contentRange;
}

getInterior() {
return [
// Use plain target instead of interior target since we want the same content and removal range for a document interior.
Expand All @@ -34,6 +23,18 @@ export class DocumentTarget extends BaseTarget<CommonTargetParameters> {
];
}

getRemovalRange(): Range {
return this.contentRange;
}

getLeadingDelimiterTarget() {
return undefined;
}

getTrailingDelimiterTarget() {
return undefined;
}

protected getCloneParameters() {
return this.state;
}
Expand Down
Loading