Skip to content

Move the initializer into the constructor for instance members that r… #2867

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

Merged
merged 5 commits into from
Feb 27, 2025
Merged

Move the initializer into the constructor for instance members that r… #2867

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83c23dd
Move the initializer into the constructor for instance members that r…
Feb 26, 2025
64fc028
syntax error
Feb 26, 2025
bb4b33e
syntax error
Feb 26, 2025
50b2363
syntax error
Feb 26, 2025
af2cdaf
Cleanup
AndreasArvidsson Feb 27, 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
285 changes: 175 additions & 110 deletions packages/cursorless-engine/src/actions/Actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,117 +75,182 @@ import { Decrement, Increment } from "./incrementDecrement";
*/
export class Actions implements ActionRecord {
constructor(
private treeSitter: TreeSitter,
private snippets: Snippets,
private rangeUpdater: RangeUpdater,
private modifierStageFactory: ModifierStageFactory,
) {}
treeSitter: TreeSitter,
snippets: Snippets,
rangeUpdater: RangeUpdater,
modifierStageFactory: ModifierStageFactory,
) {
this.addSelection = new AddSelection();
this.addSelectionBefore = new AddSelectionBefore();
this.addSelectionAfter = new AddSelectionAfter();
this.callAsFunction = new Call(this);
this.clearAndSetSelection = new Clear(this);
this.copyToClipboard = new CopyToClipboard(this, rangeUpdater);
this.cutToClipboard = new CutToClipboard(this);
this.decrement = new Decrement(this);
this.deselect = new Deselect();
this.editNew = new EditNew(rangeUpdater, this);
this.editNewLineAfter = new EditNewAfter(this, modifierStageFactory);
this.editNewLineBefore = new EditNewBefore(this, modifierStageFactory);
this.executeCommand = new ExecuteCommand(rangeUpdater);
this.extractVariable = new ExtractVariable(rangeUpdater);
this.findInDocument = new FindInDocument(this);
this.findInWorkspace = new FindInWorkspace(this);
this.flashTargets = new FlashTargets();
this.foldRegion = new Fold(rangeUpdater);
this.followLink = new FollowLink({ openAside: false });
this.followLinkAside = new FollowLink({ openAside: true });
this.generateSnippet = new GenerateSnippet(snippets);
this.getText = new GetText();
this.gitAccept = new GitAccept(rangeUpdater);
this.gitRevert = new GitRevert(rangeUpdater);
this.gitStage = new GitStage(rangeUpdater);
this.gitUnstage = new GitUnstage(rangeUpdater);
this.highlight = new Highlight();
this.increment = new Increment(this);
this.indentLine = new IndentLine(rangeUpdater);
this.insertCopyAfter = new InsertCopyAfter(
rangeUpdater,
modifierStageFactory,
);
this.insertCopyBefore = new InsertCopyBefore(
rangeUpdater,
modifierStageFactory,
);
this.insertEmptyLineAfter = new InsertEmptyLineAfter(
rangeUpdater,
modifierStageFactory,
);
this.insertEmptyLineBefore = new InsertEmptyLineBefore(
rangeUpdater,
modifierStageFactory,
);
this.insertEmptyLinesAround = new InsertEmptyLinesAround(
rangeUpdater,
modifierStageFactory,
);
this.insertSnippet = new InsertSnippet(
rangeUpdater,
snippets,
this,
modifierStageFactory,
);
this.joinLines = new JoinLines(rangeUpdater, modifierStageFactory);
this.breakLine = new BreakLine(rangeUpdater);
this.moveToTarget = new Move(rangeUpdater);
this.outdentLine = new OutdentLine(rangeUpdater);
this.pasteFromClipboard = new PasteFromClipboard(rangeUpdater, this);
this.randomizeTargets = new Random(this);
this.remove = new Remove(rangeUpdater);
this.rename = new Rename(rangeUpdater);
this.replace = new Replace(rangeUpdater);
this.replaceWithTarget = new Bring(rangeUpdater);
this.revealDefinition = new RevealDefinition(rangeUpdater);
this.revealTypeDefinition = new RevealTypeDefinition(rangeUpdater);
this.reverseTargets = new Reverse(this);
this.rewrapWithPairedDelimiter = new Rewrap(
rangeUpdater,
modifierStageFactory,
);
this.scrollToBottom = new ScrollToBottom();
this.scrollToCenter = new ScrollToCenter();
this.scrollToTop = new ScrollToTop();
this.setSelection = new SetSelection();
this.setSelectionAfter = new SetSelectionAfter();
this.setSelectionBefore = new SetSelectionBefore();
this.showDebugHover = new ShowDebugHover(rangeUpdater);
this.showHover = new ShowHover(rangeUpdater);
this.showQuickFix = new ShowQuickFix(rangeUpdater);
this.showReferences = new ShowReferences(rangeUpdater);
this.sortTargets = new Sort(this);
this.swapTargets = new Swap(rangeUpdater);
this.toggleLineBreakpoint = new ToggleBreakpoint(modifierStageFactory);
this.toggleLineComment = new ToggleLineComment(rangeUpdater);
this.unfoldRegion = new Unfold(rangeUpdater);
this.wrapWithPairedDelimiter = new Wrap(rangeUpdater);
this.wrapWithSnippet = new WrapWithSnippet(
rangeUpdater,
snippets,
modifierStageFactory,
);

addSelection = new AddSelection();
addSelectionBefore = new AddSelectionBefore();
addSelectionAfter = new AddSelectionAfter();
callAsFunction = new Call(this);
clearAndSetSelection = new Clear(this);
copyToClipboard = new CopyToClipboard(this, this.rangeUpdater);
cutToClipboard = new CutToClipboard(this);
decrement = new Decrement(this);
deselect = new Deselect();
editNew = new EditNew(this.rangeUpdater, this);
editNewLineAfter: EditNewAfter = new EditNewAfter(
this,
this.modifierStageFactory,
);
editNewLineBefore: EditNewBefore = new EditNewBefore(
this,
this.modifierStageFactory,
);
executeCommand = new ExecuteCommand(this.rangeUpdater);
extractVariable = new ExtractVariable(this.rangeUpdater);
findInDocument = new FindInDocument(this);
findInWorkspace = new FindInWorkspace(this);
flashTargets = new FlashTargets();
foldRegion = new Fold(this.rangeUpdater);
followLink = new FollowLink({ openAside: false });
followLinkAside = new FollowLink({ openAside: true });
generateSnippet = new GenerateSnippet(this.snippets);
getText = new GetText();
gitAccept = new GitAccept(this.rangeUpdater);
gitRevert = new GitRevert(this.rangeUpdater);
gitStage = new GitStage(this.rangeUpdater);
gitUnstage = new GitUnstage(this.rangeUpdater);
highlight = new Highlight();
increment = new Increment(this);
indentLine = new IndentLine(this.rangeUpdater);
insertCopyAfter = new InsertCopyAfter(
this.rangeUpdater,
this.modifierStageFactory,
);
insertCopyBefore = new InsertCopyBefore(
this.rangeUpdater,
this.modifierStageFactory,
);
insertEmptyLineAfter = new InsertEmptyLineAfter(
this.rangeUpdater,
this.modifierStageFactory,
);
insertEmptyLineBefore = new InsertEmptyLineBefore(
this.rangeUpdater,
this.modifierStageFactory,
);
insertEmptyLinesAround = new InsertEmptyLinesAround(
this.rangeUpdater,
this.modifierStageFactory,
);
insertSnippet = new InsertSnippet(
this.rangeUpdater,
this.snippets,
this,
this.modifierStageFactory,
);
joinLines = new JoinLines(this.rangeUpdater, this.modifierStageFactory);
breakLine = new BreakLine(this.rangeUpdater);
moveToTarget = new Move(this.rangeUpdater);
outdentLine = new OutdentLine(this.rangeUpdater);
pasteFromClipboard = new PasteFromClipboard(this.rangeUpdater, this);
randomizeTargets = new Random(this);
remove = new Remove(this.rangeUpdater);
rename = new Rename(this.rangeUpdater);
replace = new Replace(this.rangeUpdater);
replaceWithTarget = new Bring(this.rangeUpdater);
revealDefinition = new RevealDefinition(this.rangeUpdater);
revealTypeDefinition = new RevealTypeDefinition(this.rangeUpdater);
reverseTargets = new Reverse(this);
rewrapWithPairedDelimiter = new Rewrap(
this.rangeUpdater,
this.modifierStageFactory,
);
scrollToBottom = new ScrollToBottom();
scrollToCenter = new ScrollToCenter();
scrollToTop = new ScrollToTop();
setSelection = new SetSelection();
setSelectionAfter = new SetSelectionAfter();
setSelectionBefore = new SetSelectionBefore();
showDebugHover = new ShowDebugHover(this.rangeUpdater);
showHover = new ShowHover(this.rangeUpdater);
showQuickFix = new ShowQuickFix(this.rangeUpdater);
showReferences = new ShowReferences(this.rangeUpdater);
sortTargets = new Sort(this);
swapTargets = new Swap(this.rangeUpdater);
toggleLineBreakpoint = new ToggleBreakpoint(this.modifierStageFactory);
toggleLineComment = new ToggleLineComment(this.rangeUpdater);
unfoldRegion = new Unfold(this.rangeUpdater);
wrapWithPairedDelimiter = new Wrap(this.rangeUpdater);
wrapWithSnippet = new WrapWithSnippet(
this.rangeUpdater,
this.snippets,
this.modifierStageFactory,
);
this["experimental.setInstanceReference"] = new SetSpecialTarget(
"instanceReference",
);

["experimental.setInstanceReference"] = new SetSpecialTarget(
"instanceReference",
);
this["private.showParseTree"] = new ShowParseTree(treeSitter);
this["private.getTargets"] = new GetTargets();
this["private.setKeyboardTarget"] = new SetSpecialTarget("keyboard");
}

["private.showParseTree"] = new ShowParseTree(this.treeSitter);
["private.getTargets"] = new GetTargets();
["private.setKeyboardTarget"] = new SetSpecialTarget("keyboard");
addSelection;
addSelectionBefore;
addSelectionAfter;
callAsFunction;
clearAndSetSelection;
copyToClipboard;
cutToClipboard;
decrement;
deselect;
editNew;
editNewLineAfter: EditNewAfter;
editNewLineBefore: EditNewBefore;
executeCommand;
extractVariable;
findInDocument;
findInWorkspace;
flashTargets;
foldRegion;
followLink;
followLinkAside;
generateSnippet;
getText;
gitAccept;
gitRevert;
gitStage;
gitUnstage;
highlight;
increment;
indentLine;
insertCopyAfter;
insertCopyBefore;
insertEmptyLineAfter;
insertEmptyLineBefore;
insertEmptyLinesAround;
insertSnippet;
joinLines;
breakLine;
moveToTarget;
outdentLine;
pasteFromClipboard;
randomizeTargets;
remove;
rename;
replace;
replaceWithTarget;
revealDefinition;
revealTypeDefinition;
reverseTargets;
rewrapWithPairedDelimiter;
scrollToBottom;
scrollToCenter;
scrollToTop;
setSelection;
setSelectionAfter;
setSelectionBefore;
showDebugHover;
showHover;
showQuickFix;
showReferences;
sortTargets;
swapTargets;
toggleLineBreakpoint;
toggleLineComment;
unfoldRegion;
wrapWithPairedDelimiter;
wrapWithSnippet;
["experimental.setInstanceReference"];
["private.showParseTree"];
["private.getTargets"];
["private.setKeyboardTarget"];
}
Loading