Skip to content
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
38fbf06
Added interior range to Tree sitter scope type targets
AndreasArvidsson Oct 31, 2025
6e152e9
Update interior scope handler
AndreasArvidsson Oct 31, 2025
fd1577d
Update comment
AndreasArvidsson Oct 31, 2025
3c1df79
Merge branch 'main' into inside
AndreasArvidsson Nov 6, 2025
b3e6f75
Update Java
AndreasArvidsson Nov 6, 2025
4bf62d4
python
AndreasArvidsson Nov 6, 2025
0cc45bc
c
AndreasArvidsson Nov 6, 2025
b0a1062
cpp
AndreasArvidsson Nov 6, 2025
cda80ed
csharp
AndreasArvidsson Nov 6, 2025
895aa39
go
AndreasArvidsson Nov 6, 2025
717179d
html
AndreasArvidsson Nov 6, 2025
a2b1e27
xml
AndreasArvidsson Nov 6, 2025
1f00486
typescript
AndreasArvidsson Nov 6, 2025
a1933d4
scss
AndreasArvidsson Nov 6, 2025
0521934
latex
AndreasArvidsson Nov 6, 2025
7fd57a1
talon
AndreasArvidsson Nov 7, 2025
7a151f9
lua
AndreasArvidsson Nov 7, 2025
f93936c
markdown
AndreasArvidsson Nov 7, 2025
a8c533e
r
AndreasArvidsson Nov 7, 2025
09ea3f4
Update comments
AndreasArvidsson Nov 7, 2025
fceedc5
textual
AndreasArvidsson Nov 7, 2025
976bb42
Use every scope for interiors in typed targets
AndreasArvidsson Nov 10, 2025
d33b6c1
Changelog
AndreasArvidsson Nov 10, 2025
2c20e19
Pass lint
AndreasArvidsson Nov 10, 2025
84626c5
Clean up
AndreasArvidsson Nov 10, 2025
afe0498
Restore head tail
AndreasArvidsson Nov 10, 2025
ea7925b
Added comment
AndreasArvidsson Nov 10, 2025
e2e0968
Remove change log
AndreasArvidsson Nov 10, 2025
af04dbc
Add test
AndreasArvidsson Nov 10, 2025
4d180d5
Update comment
AndreasArvidsson Nov 10, 2025
3c6ebd5
Update tests
AndreasArvidsson Nov 10, 2025
dd93599
latex interior
AndreasArvidsson Nov 10, 2025
079b26d
update tests
AndreasArvidsson Nov 10, 2025
a8989d0
Mark interior as sudo scope
AndreasArvidsson Nov 10, 2025
7530b9d
more latex
AndreasArvidsson Nov 10, 2025
31d4374
Rename default spoke in form for interior scope
AndreasArvidsson Nov 10, 2025
9143031
Update comment
AndreasArvidsson Nov 11, 2025
ed6ca7e
Update lua test
AndreasArvidsson Nov 13, 2025
d1f4aa8
Clean up comments
AndreasArvidsson Nov 13, 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
7 changes: 7 additions & 0 deletions changelog/2025-11-changeInteriorDomain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
tags: [enhancement]
pullRequest: 3099
---

- Interior domain is now same as content range (before shrinking to text content). `"take inside"` with the cursor on a function name will not select function body anymore.
- Interior of typed target now utilities every scope. `"take inside funk"` will select function body. `"take inside state"` will select all branch bodies in an if statement.
4 changes: 2 additions & 2 deletions data/fixtures/recorded/modifiers/changeInside.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ initialState:
def testing():
pass
selections:
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
- anchor: {line: 1, character: 14}
active: {line: 1, character: 14}
marks: {}
finalState:
documentContents: |-
Expand Down
4 changes: 2 additions & 2 deletions data/fixtures/recorded/selectionTypes/clearCore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ command:
initialState:
documentContents: ( )
selections:
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
- anchor: {line: 0, character: 1}
active: {line: 0, character: 1}
marks: {}
finalState:
documentContents: ()
Expand Down
4 changes: 2 additions & 2 deletions data/fixtures/recorded/selectionTypes/clearCore2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ command:
initialState:
documentContents: ()
selections:
- anchor: {line: 0, character: 0}
active: {line: 0, character: 0}
- anchor: {line: 0, character: 1}
active: {line: 0, character: 1}
marks: {}
finalState:
documentContents: ()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ initialState:
finalState:
documentContents: |-

"'' 'fsd'"
""
selections:
- anchor: {line: 1, character: 2}
active: {line: 1, character: 2}
- anchor: {line: 1, character: 1}
active: {line: 1, character: 1}
23 changes: 4 additions & 19 deletions data/fixtures/scopes/c/interior/interior.class.scope
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
struct Foo { };
---

[#1 Content] =
[#1 Removal] = 0:12-0:13
[Content] =
[Removal] =
[Domain] = 0:12-0:13
>-<
0| struct Foo { };

[#1 Domain] = 0:0-0:15
>---------------<
0| struct Foo { };

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:12-0:13
>-<
0| struct Foo { };

[#2 Domain] = 0:11-0:14
>---<
0| struct Foo { };

[#2 Insertion delimiter] = " "
[Insertion delimiter] = " "
23 changes: 4 additions & 19 deletions data/fixtures/scopes/c/interior/interior.class2.scope
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
union Foo { };
---

[#1 Content] =
[#1 Removal] = 0:11-0:12
[Content] =
[Removal] =
[Domain] = 0:11-0:12
>-<
0| union Foo { };

[#1 Domain] = 0:0-0:14
>--------------<
0| union Foo { };

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:11-0:12
>-<
0| union Foo { };

[#2 Domain] = 0:10-0:13
>---<
0| union Foo { };

[#2 Insertion delimiter] = " "
[Insertion delimiter] = " "
23 changes: 4 additions & 19 deletions data/fixtures/scopes/c/interior/interior.class3.scope
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
typedef struct { } Foo;
---

[#1 Content] =
[#1 Removal] = 0:16-0:17
[Content] =
[Removal] =
[Domain] = 0:16-0:17
>-<
0| typedef struct { } Foo;

[#1 Domain] = 0:0-0:23
>-----------------------<
0| typedef struct { } Foo;

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:16-0:17
>-<
0| typedef struct { } Foo;

[#2 Domain] = 0:15-0:18
>---<
0| typedef struct { } Foo;

[#2 Insertion delimiter] = " "
[Insertion delimiter] = " "
23 changes: 4 additions & 19 deletions data/fixtures/scopes/c/interior/interior.class4.scope
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
typedef union { } Foo;
---

[#1 Content] =
[#1 Removal] = 0:15-0:16
[Content] =
[Removal] =
[Domain] = 0:15-0:16
>-<
0| typedef union { } Foo;

[#1 Domain] = 0:0-0:22
>----------------------<
0| typedef union { } Foo;

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:15-0:16
>-<
0| typedef union { } Foo;

[#2 Domain] = 0:14-0:17
>---<
0| typedef union { } Foo;

[#2 Insertion delimiter] = " "
[Insertion delimiter] = " "
35 changes: 4 additions & 31 deletions data/fixtures/scopes/c/interior/interior.doWhile.scope
Original file line number Diff line number Diff line change
@@ -1,37 +1,10 @@
do { } while (true);
---

[#1 Content] =
[#1 Removal] = 0:4-0:5
[Content] =
[Removal] =
[Domain] = 0:4-0:5
>-<
0| do { } while (true);

[#1 Domain] = 0:0-0:20
>--------------------<
0| do { } while (true);

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:4-0:5
>-<
0| do { } while (true);

[#2 Domain] = 0:3-0:6
>---<
0| do { } while (true);

[#2 Insertion delimiter] = " "


[#3 Content] =
[#3 Removal] = 0:14-0:18
>----<
0| do { } while (true);

[#3 Domain] = 0:13-0:19
>------<
0| do { } while (true);

[#3 Insertion delimiter] = " "
[Insertion delimiter] = " "
23 changes: 4 additions & 19 deletions data/fixtures/scopes/c/interior/interior.enum.scope
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
enum Foo { };
---

[#1 Content] =
[#1 Removal] = 0:10-0:11
[Content] =
[Removal] =
[Domain] = 0:10-0:11
>-<
0| enum Foo { };

[#1 Domain] = 0:0-0:13
>-------------<
0| enum Foo { };

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:10-0:11
>-<
0| enum Foo { };

[#2 Domain] = 0:9-0:12
>---<
0| enum Foo { };

[#2 Insertion delimiter] = " "
[Insertion delimiter] = " "
23 changes: 4 additions & 19 deletions data/fixtures/scopes/c/interior/interior.enum2.scope
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
typedef enum { } Foo;
---

[#1 Content] =
[#1 Removal] = 0:14-0:15
[Content] =
[Removal] =
[Domain] = 0:14-0:15
>-<
0| typedef enum { } Foo;

[#1 Domain] = 0:0-0:21
>---------------------<
0| typedef enum { } Foo;

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:14-0:15
>-<
0| typedef enum { } Foo;

[#2 Domain] = 0:13-0:16
>---<
0| typedef enum { } Foo;

[#2 Insertion delimiter] = " "
[Insertion delimiter] = " "
35 changes: 4 additions & 31 deletions data/fixtures/scopes/c/interior/interior.for.scope
Original file line number Diff line number Diff line change
@@ -1,37 +1,10 @@
for (int i = 0; i < size; ++i) { }
---

[#1 Content] =
[#1 Removal] = 0:32-0:33
[Content] =
[Removal] =
[Domain] = 0:32-0:33
>-<
0| for (int i = 0; i < size; ++i) { }

[#1 Domain] = 0:0-0:34
>----------------------------------<
0| for (int i = 0; i < size; ++i) { }

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:5-0:29
>------------------------<
0| for (int i = 0; i < size; ++i) { }

[#2 Domain] = 0:4-0:30
>--------------------------<
0| for (int i = 0; i < size; ++i) { }

[#2 Insertion delimiter] = " "


[#3 Content] =
[#3 Removal] = 0:32-0:33
>-<
0| for (int i = 0; i < size; ++i) { }

[#3 Domain] = 0:31-0:34
>---<
0| for (int i = 0; i < size; ++i) { }

[#3 Insertion delimiter] = " "
[Insertion delimiter] = " "
35 changes: 4 additions & 31 deletions data/fixtures/scopes/c/interior/interior.function.scope
Original file line number Diff line number Diff line change
@@ -1,37 +1,10 @@
void foo() { }
---

[#1 Content] =
[#1 Removal] = 0:12-0:13
[Content] =
[Removal] =
[Domain] = 0:12-0:13
>-<
0| void foo() { }

[#1 Domain] = 0:0-0:14
>--------------<
0| void foo() { }

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:9-0:9
><
0| void foo() { }

[#2 Domain] = 0:8-0:10
>--<
0| void foo() { }

[#2 Insertion delimiter] = " "


[#3 Content] =
[#3 Removal] = 0:12-0:13
>-<
0| void foo() { }

[#3 Domain] = 0:11-0:14
>---<
0| void foo() { }

[#3 Insertion delimiter] = " "
[Insertion delimiter] = " "
35 changes: 4 additions & 31 deletions data/fixtures/scopes/c/interior/interior.function2.scope
Original file line number Diff line number Diff line change
@@ -1,37 +1,10 @@
void Foo::bar() { }
---

[#1 Content] =
[#1 Removal] = 0:17-0:18
[Content] =
[Removal] =
[Domain] = 0:17-0:18
>-<
0| void Foo::bar() { }

[#1 Domain] = 0:0-0:19
>-------------------<
0| void Foo::bar() { }

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Removal] = 0:14-0:14
><
0| void Foo::bar() { }

[#2 Domain] = 0:13-0:15
>--<
0| void Foo::bar() { }

[#2 Insertion delimiter] = " "


[#3 Content] =
[#3 Removal] = 0:17-0:18
>-<
0| void Foo::bar() { }

[#3 Domain] = 0:16-0:19
>---<
0| void Foo::bar() { }

[#3 Insertion delimiter] = " "
[Insertion delimiter] = " "
Loading
Loading