Skip to content

Commit 5e68be8

Browse files
Remove legacy language machinery
1 parent 3bba069 commit 5e68be8

27 files changed

+33
-1687
lines changed

packages/cursorless-engine/src/api/CursorlessEngineApi.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export interface CursorlessEngine {
2121
storedTargets: StoredTargetMap;
2222
hatTokenMap: HatTokenMap;
2323
injectIde: (ide: IDE | undefined) => void;
24-
runIntegrationTests: () => Promise<void>;
2524
addCommandRunnerDecorator: (
2625
commandRunnerDecorator: CommandRunnerDecorator,
2726
) => void;

packages/cursorless-engine/src/cursorlessEngine.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
import { ModifierStageFactoryImpl } from "./processTargets/ModifierStageFactoryImpl";
3636
import { ScopeHandlerFactoryImpl } from "./processTargets/modifiers/scopeHandlers";
3737
import { runCommand } from "./runCommand";
38-
import { runIntegrationTests } from "./runIntegrationTests";
3938
import { ScopeInfoProvider } from "./scopeProviders/ScopeInfoProvider";
4039
import { ScopeRangeProvider } from "./scopeProviders/ScopeRangeProvider";
4140
import { ScopeRangeWatcher } from "./scopeProviders/ScopeRangeWatcher";
@@ -142,8 +141,6 @@ export async function createCursorlessEngine({
142141
storedTargets,
143142
hatTokenMap,
144143
injectIde,
145-
runIntegrationTests: () =>
146-
runIntegrationTests(treeSitter, languageDefinitions),
147144
addCommandRunnerDecorator: (decorator: CommandRunnerDecorator) => {
148145
commandRunnerDecorators.push(decorator);
149146
},

packages/cursorless-engine/src/languages/LegacyLanguageId.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Position, TextDocument } from "@cursorless/common";
22
import { type TreeSitter } from "@cursorless/common";
33
import type * as treeSitter from "web-tree-sitter";
44
import { ide } from "../../singletons/ide.singleton";
5-
import { getNodeRange } from "../../util/nodeSelectors";
5+
import { getNodeRange } from "./getNodeRange";
66
import type {
77
MutableQueryCapture,
88
MutableQueryMatch,
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Range } from "@cursorless/common";
2+
import type { Node } from "web-tree-sitter";
3+
4+
export function getNodeRange(node: Node) {
5+
return new Range(
6+
node.startPosition.row,
7+
node.startPosition.column,
8+
node.endPosition.row,
9+
node.endPosition.column,
10+
);
11+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Range } from "@cursorless/common";
2+
import type { Point } from "web-tree-sitter";
3+
4+
export function makeRangeFromPositions(
5+
startPosition: Point,
6+
endPosition: Point,
7+
) {
8+
return new Range(
9+
startPosition.row,
10+
startPosition.column,
11+
endPosition.row,
12+
endPosition.column,
13+
);
14+
}

packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Position } from "@cursorless/common";
22
import { Range, adjustPosition } from "@cursorless/common";
33
import { z } from "zod";
4-
import { makeRangeFromPositions } from "../../util/nodeSelectors";
4+
import { makeRangeFromPositions } from "./makeRangeFromPositions";
55
import type { MutableQueryCapture } from "./QueryCapture";
66
import { QueryPredicateOperator } from "./QueryPredicateOperator";
77
import { isEven } from "./isEven";

packages/cursorless-engine/src/languages/elseIfExtractor.ts

Lines changed: 0 additions & 95 deletions
This file was deleted.

packages/cursorless-engine/src/languages/getNodeMatcher.ts

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)