Skip to content

Commit ade9890

Browse files
Migrate argument
1 parent 89cc422 commit ade9890

File tree

12 files changed

+102
-77
lines changed

12 files changed

+102
-77
lines changed

data/fixtures/recorded/languages/rust/changeArgBlueAir.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,4 @@ initialState:
2121
blue.a:
2222
start: {line: 0, character: 18}
2323
end: {line: 0, character: 19}
24-
finalState:
25-
documentContents: |
26-
struct S<'a, , T>;
27-
selections:
28-
- anchor: {line: 0, character: 13}
29-
active: {line: 0, character: 13}
24+
thrownError: {name: NoContainingScopeError}

data/fixtures/recorded/languages/rust/changeArgSun.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ initialState:
2424
default.s:
2525
start: {line: 0, character: 20}
2626
end: {line: 0, character: 27}
27-
finalState:
28-
documentContents: |-
29-
fn some_function<, U: Clone + Debug>(t: &T, u: &U) -> i32 {
30-
}
31-
selections:
32-
- anchor: {line: 0, character: 17}
33-
active: {line: 0, character: 17}
27+
thrownError: {name: NoContainingScopeError}

data/fixtures/recorded/languages/rust/changeArgTrap.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,4 @@ initialState:
2121
default.t:
2222
start: {line: 0, character: 21}
2323
end: {line: 0, character: 22}
24-
finalState:
25-
documentContents: |
26-
struct S<'a, 'b: 'a, > {};
27-
selections:
28-
- anchor: {line: 0, character: 21}
29-
active: {line: 0, character: 21}
24+
thrownError: {name: NoContainingScopeError}

data/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,4 @@ initialState:
3131
blue.t:
3232
start: {line: 0, character: 11}
3333
end: {line: 0, character: 12}
34-
finalState:
35-
documentContents: |
36-
enum Maybe<> {
37-
Just(),
38-
Nothing,
39-
}
40-
selections:
41-
- anchor: {line: 0, character: 11}
42-
active: {line: 0, character: 11}
43-
- anchor: {line: 1, character: 9}
44-
active: {line: 1, character: 9}
34+
thrownError: {name: NoContainingScopeError}

data/fixtures/recorded/languages/rust/chuckArgAir.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,4 @@ initialState:
2121
default.a:
2222
start: {line: 0, character: 10}
2323
end: {line: 0, character: 11}
24-
finalState:
25-
documentContents: |
26-
struct S<'b: 'a, T>;
27-
selections:
28-
- anchor: {line: 1, character: 0}
29-
active: {line: 1, character: 0}
24+
thrownError: {name: NoContainingScopeError}

data/fixtures/recorded/languages/rust/chuckArgBlueAir.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,4 @@ initialState:
2121
blue.a:
2222
start: {line: 0, character: 18}
2323
end: {line: 0, character: 19}
24-
finalState:
25-
documentContents: |
26-
struct S<'a, T>;
27-
selections:
28-
- anchor: {line: 1, character: 0}
29-
active: {line: 1, character: 0}
24+
thrownError: {name: NoContainingScopeError}

data/fixtures/recorded/languages/rust/chuckArgSun2.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@ initialState:
2424
default.s:
2525
start: {line: 0, character: 20}
2626
end: {line: 0, character: 27}
27-
finalState:
28-
documentContents: |-
29-
fn some_function<U: Clone + Debug>(t: &T, u: &U) -> i32 {
30-
}
31-
selections:
32-
- anchor: {line: 1, character: 1}
33-
active: {line: 1, character: 1}
27+
thrownError: {name: NoContainingScopeError}

data/fixtures/recorded/languages/rust/chuckArgTrap.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,4 @@ initialState:
2121
default.t:
2222
start: {line: 0, character: 21}
2323
end: {line: 0, character: 22}
24-
finalState:
25-
documentContents: |
26-
struct S<'a, 'b: 'a> {};
27-
selections:
28-
- anchor: {line: 1, character: 0}
29-
active: {line: 1, character: 0}
24+
thrownError: {name: NoContainingScopeError}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
* The language IDs that we have full tree-sitter support for using our legacy
33
* modifiers.
44
*/
5-
export const legacyLanguageIds = ["clojure", "latex", "rust"] as const;
5+
export const legacyLanguageIds = ["clojure", "latex"] as const;
66

77
export type LegacyLanguageId = (typeof legacyLanguageIds)[number];

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type { SimpleScopeTypeType } from "@cursorless/common";
12
import { UnsupportedLanguageError } from "@cursorless/common";
23
import type { Node } from "web-tree-sitter";
3-
import type { SimpleScopeTypeType } from "@cursorless/common";
44
import type {
55
NodeMatcher,
66
NodeMatcherValue,
@@ -9,9 +9,8 @@ import type {
99
import { notSupported } from "../util/nodeMatchers";
1010
import { selectionWithEditorFromRange } from "../util/selectionUtils";
1111
import clojure from "./clojure";
12-
import type { LegacyLanguageId } from "./LegacyLanguageId";
1312
import latex from "./latex";
14-
import rust from "./rust";
13+
import type { LegacyLanguageId } from "./LegacyLanguageId";
1514

1615
export function getNodeMatcher(
1716
languageId: string,
@@ -43,7 +42,6 @@ export const languageMatchers: Record<
4342
> = {
4443
clojure,
4544
latex,
46-
rust,
4745
};
4846

4947
function matcherIncludeSiblings(matcher: NodeMatcher): NodeMatcher {

0 commit comments

Comments
 (0)