General cleanup

.vscode/settings.json

@@ -6,6 +6,9 @@
     "search.exclude": {
         "out": true // set this to false to include "out" folder in search results
     },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
     "typescript.tsc.autoDetect": "off",
     "cSpell.words": [

src/actions/BringMoveSwap.ts

@@ -5,15 +5,15 @@ import {
   Graph,
   TypedSelection,
   Edit,
-} from "../Types";
-import { runForEachEditor } from "../targetUtils";
+} from "../typings/Types";
+import { runForEachEditor } from "../util/targetUtils";
 import update from "immutability-helper";
-import displayPendingEditDecorations from "../editDisplayUtils";
-import { performOutsideAdjustment } from "../performInsideOutsideAdjustment";
+import displayPendingEditDecorations from "../util/editDisplayUtils";
+import { performOutsideAdjustment } from "../util/performInsideOutsideAdjustment";
 import { flatten, zip } from "lodash";
 import { Selection, TextEditor, Range } from "vscode";
-import { performEditsAndUpdateSelections } from "../updateSelections";
-import { getTextWithPossibleDelimiter } from "../getTextWithPossibleDelimiter";
+import { performEditsAndUpdateSelections } from "../util/updateSelections";
+import { getTextWithPossibleDelimiter } from "../util/getTextWithPossibleDelimiter";
 
 type ActionType = "bring" | "move" | "swap";
 

src/actions/Call.ts

@@ -4,11 +4,14 @@ import {
   ActionPreferences,
   Graph,
   TypedSelection,
-} from "../Types";
-import { ensureSingleTarget } from "../targetUtils";
+} from "../typings/Types";
+import { ensureSingleTarget } from "../util/targetUtils";
 
 export default class Call implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  targetPreferences: ActionPreferences[] = [
+    { insideOutsideType: "inside" },
+    { insideOutsideType: "inside" },
+  ];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/clear.ts → src/actions/Clear.ts

@@ -4,9 +4,9 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import { ensureSingleEditor } from "../targetUtils";
-import { setSelectionsAndFocusEditor } from "../setSelectionsAndFocusEditor";
+} from "../typings/Types";
+import { ensureSingleEditor } from "../util/targetUtils";
+import { setSelectionsAndFocusEditor } from "../util/setSelectionsAndFocusEditor";
 
 export default class Clear implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];

src/CommandAction.ts → src/actions/CommandAction.ts

@@ -6,13 +6,13 @@ import {
   Graph,
   TypedSelection,
   SelectionWithEditor,
-} from "./Types";
-import displayPendingEditDecorations from "./editDisplayUtils";
-import { runOnTargetsForEachEditor } from "./targetUtils";
-import { focusEditor } from "./setSelectionsAndFocusEditor";
+} from "../typings/Types";
+import displayPendingEditDecorations from "../util/editDisplayUtils";
+import { runOnTargetsForEachEditor } from "../util/targetUtils";
+import { focusEditor } from "../util/setSelectionsAndFocusEditor";
 import { flatten } from "lodash";
-import { callFunctionAndUpdateSelections } from "./updateSelections";
-import { ensureSingleEditor } from "./targetUtils";
+import { callFunctionAndUpdateSelections } from "../util/updateSelections";
+import { ensureSingleEditor } from "../util/targetUtils";
 
 export default class CommandAction implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];

src/actions/Comment.ts

@@ -1,5 +1,5 @@
-import { Graph } from "../Types";
-import CommandAction from "../CommandAction";
+import { Graph } from "../typings/Types";
+import CommandAction from "./CommandAction";
 
 export class CommentLines extends CommandAction {
   constructor(graph: Graph) {

src/actions/CopyLines.ts

@@ -4,14 +4,14 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
+} from "../typings/Types";
 import { Range, Selection, TextEditor } from "vscode";
-import { performEditsAndUpdateSelections } from "../updateSelections";
-import { displayPendingEditDecorationsForSelection } from "../editDisplayUtils";
-import { runOnTargetsForEachEditor } from "../targetUtils";
+import { performEditsAndUpdateSelections } from "../util/updateSelections";
+import { displayPendingEditDecorationsForSelection } from "../util/editDisplayUtils";
+import { runOnTargetsForEachEditor } from "../util/targetUtils";
 import { flatten } from "lodash";
-import unifyRanges from "../unifyRanges";
-import expandToContainingLine from "../expandToContainingLine";
+import unifyRanges from "../util/unifyRanges";
+import expandToContainingLine from "../util/expandToContainingLine";
 
 class CopyLines implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];

src/actions/CutCopyPaste.ts

@@ -4,11 +4,11 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import { performInsideOutsideAdjustment } from "../performInsideOutsideAdjustment";
-import CommandAction from "../CommandAction";
-import displayPendingEditDecorations from "../editDisplayUtils";
-import { getOutsideOverflow } from "../targetUtils";
+} from "../typings/Types";
+import { performInsideOutsideAdjustment } from "../util/performInsideOutsideAdjustment";
+import CommandAction from "./CommandAction";
+import displayPendingEditDecorations from "../util/editDisplayUtils";
+import { getOutsideOverflow } from "../util/targetUtils";
 import { zip } from "lodash";
 
 export class Cut implements Action {

src/actions/delete.ts → src/actions/Delete.ts

@@ -4,11 +4,11 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import { runOnTargetsForEachEditor } from "../targetUtils";
-import displayPendingEditDecorations from "../editDisplayUtils";
+} from "../typings/Types";
+import { runOnTargetsForEachEditor } from "../util/targetUtils";
+import displayPendingEditDecorations from "../util/editDisplayUtils";
 import { flatten } from "lodash";
-import { performEditsAndUpdateSelections } from "../updateSelections";
+import { performEditsAndUpdateSelections } from "../util/updateSelections";
 
 export default class Delete implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "outside" }];

src/actions/EditNewLine.ts

@@ -4,7 +4,7 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
+} from "../typings/Types";
 import { commands, Selection } from "vscode";
 
 class EditNewLine implements Action {

src/actions/extractVariable.ts → src/actions/ExtractVariable.ts

@@ -4,8 +4,8 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import { ensureSingleTarget } from "../targetUtils";
+} from "../typings/Types";
+import { ensureSingleTarget } from "../util/targetUtils";
 import { commands } from "vscode";
 
 export default class ExtractVariable implements Action {

src/actions/Find.ts

@@ -4,9 +4,9 @@ import {
   ActionPreferences,
   Graph,
   TypedSelection,
-} from "../Types";
+} from "../typings/Types";
 import { commands } from "vscode";
-import { ensureSingleTarget } from "../targetUtils";
+import { ensureSingleTarget } from "../util/targetUtils";
 
 export class FindInFiles implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];

src/actions/fold.ts → src/actions/Fold.ts

@@ -5,8 +5,8 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import { ensureSingleEditor } from "../targetUtils";
+} from "../typings/Types";
+import { ensureSingleEditor } from "../util/targetUtils";
 
 class FoldAction implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "outside" }];

src/actions/GetText.ts

@@ -4,9 +4,9 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import displayPendingEditDecorations from "../editDisplayUtils";
-import { ensureSingleTarget } from "../targetUtils";
+} from "../typings/Types";
+import displayPendingEditDecorations from "../util/editDisplayUtils";
+import { ensureSingleTarget } from "../util/targetUtils";
 
 export default class GetText implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];

src/actions/Indent.ts

@@ -1,5 +1,5 @@
-import { Graph } from "../Types";
-import CommandAction from "../CommandAction";
+import { Graph } from "../typings/Types";
+import CommandAction from "./CommandAction";
 
 export class IndentLines extends CommandAction {
   constructor(graph: Graph) {

src/actions/InsertEmptyLines.ts

@@ -4,11 +4,11 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
+} from "../typings/Types";
 import { Selection, Range } from "vscode";
-import { displayPendingEditDecorationsForSelection } from "../editDisplayUtils";
-import { runOnTargetsForEachEditor } from "../targetUtils";
-import { performEditsAndUpdateSelections } from "../updateSelections";
+import { displayPendingEditDecorationsForSelection } from "../util/editDisplayUtils";
+import { runOnTargetsForEachEditor } from "../util/targetUtils";
+import { performEditsAndUpdateSelections } from "../util/updateSelections";
 import { flatten } from "lodash";
 
 class InsertEmptyLines implements Action {

src/actions/Replace.ts

@@ -4,12 +4,12 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import displayPendingEditDecorations from "../editDisplayUtils";
-import { runForEachEditor } from "../targetUtils";
+} from "../typings/Types";
+import displayPendingEditDecorations from "../util/editDisplayUtils";
+import { runForEachEditor } from "../util/targetUtils";
 import { flatten, zip } from "lodash";
-import { maybeAddDelimiter } from "../getTextWithPossibleDelimiter";
-import { performEditsAndUpdateSelections } from "../updateSelections";
+import { maybeAddDelimiter } from "../util/getTextWithPossibleDelimiter";
+import { performEditsAndUpdateSelections } from "../util/updateSelections";
 
 type RangeGenerator = { start: number };
 

src/actions/Scroll.ts

@@ -4,11 +4,11 @@ import {
   ActionReturnValue,
   Graph,
   TypedSelection,
-} from "../Types";
-import { displayDecorationsWhileRunningFunc } from "../editDisplayUtils";
-import { groupBy } from "../itertools";
+} from "../typings/Types";
+import { displayDecorationsWhileRunningFunc } from "../util/editDisplayUtils";
+import { groupBy } from "../util/itertools";
 import { commands, window, workspace } from "vscode";
-import { focusEditor } from "../setSelectionsAndFocusEditor";
+import { focusEditor } from "../util/setSelectionsAndFocusEditor";
 
 class Scroll implements Action {
   targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];