Skip to content
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

Migrate python scopes #2045

Merged
merged 9 commits into from
Nov 26, 2023
Merged

Migrate python scopes #2045

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8841ed4
Migrate python scopes
AndreasArvidsson Nov 20, 2023
3198521
condition
AndreasArvidsson Nov 20, 2023
8f911c5
branch
AndreasArvidsson Nov 20, 2023
1e5c782
trailing key
AndreasArvidsson Nov 22, 2023
4b0a40a
cleanup
AndreasArvidsson Nov 22, 2023
2810c03
cleanup
AndreasArvidsson Nov 25, 2023
0e7e105
Merge branch 'main' into python_scopes
AndreasArvidsson Nov 25, 2023
3b32247
Update condition
AndreasArvidsson Nov 25, 2023
1814c29
clean up comments
AndreasArvidsson Nov 25, 2023
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
37 changes: 1 addition & 36 deletions packages/cursorless-engine/src/languages/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
import { Selection } from "@cursorless/common";
import { Selection, SimpleScopeTypeType } from "@cursorless/common";
import type { SyntaxNode } from "web-tree-sitter";
import { SimpleScopeTypeType } from "@cursorless/common";
import { NodeFinder, NodeMatcherAlternative } from "../typings/Types";
import { argumentNodeFinder, patternFinder } from "../util/nodeFinders";
import {
argumentMatcher,
cascadingMatcher,
conditionMatcher,
createPatternMatchers,
leadingMatcher,
matcher,
patternMatcher,
trailingMatcher,
} from "../util/nodeMatchers";
import {
argumentSelectionExtractor,
childRangeSelector,
} from "../util/nodeSelectors";
import { branchMatcher } from "./branchMatcher";
import { ternaryBranchMatcher } from "./ternaryBranchMatcher";

export const getTypeNode = (node: SyntaxNode) =>
node.children.find((child) => child.type === "type") ?? null;
Expand Down Expand Up @@ -55,38 +48,10 @@ const nodeMatchers: Partial<
argumentSelectionExtractor(),
),
),
collectionKey: trailingMatcher(["pair[key]"], [":"]),
ifStatement: "if_statement",
anonymousFunction: "lambda?.lambda",
pokey marked this conversation as resolved.
Show resolved Hide resolved
functionCall: "call",
functionCallee: "call[function]",
condition: cascadingMatcher(
conditionMatcher("*[condition]"),
pokey marked this conversation as resolved.
Show resolved Hide resolved

// Comprehensions and match statements
leadingMatcher(["*.if_clause![0]"], ["if"]),

// Ternaries
patternMatcher("conditional_expression[1]"),
),
argumentOrParameter: cascadingMatcher(
argumentMatcher("parameters", "argument_list"),
matcher(patternFinder("call.generator_expression!"), childRangeSelector()),
),
branch: cascadingMatcher(
patternMatcher("case_clause"),
branchMatcher("if_statement", ["else_clause", "elif_clause"]),
branchMatcher("while_statement", ["else_clause"]),
branchMatcher("for_statement", ["else_clause"]),
branchMatcher("try_statement", [
"except_clause",
"finally_clause",
"else_clause",
"except_group_clause",
]),
ternaryBranchMatcher("conditional_expression", [0, 2]),
),
switchStatementSubject: "match_statement[subject]",
};

export default createPatternMatchers(nodeMatchers);
8 changes: 7 additions & 1 deletion packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeName2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,10 @@ initialState:
- anchor: {line: 1, character: 4}
active: {line: 1, character: 4}
marks: {}
thrownError: {name: NoContainingScopeError}
finalState:
documentContents: |-
for in bbb:
pass
selections:
- anchor: {line: 0, character: 4}
active: {line: 0, character: 4}
27 changes: 27 additions & 0 deletions packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeName3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
languageId: python
command:
version: 6
spokenForm: change name
action:
name: clearAndSetSelection
target:
type: primitive
modifiers:
- type: containingScope
scopeType: {type: name}
usePrePhraseSnapshot: true
initialState:
documentContents: |-
for name in value:
pass
selections:
- anchor: {line: 1, character: 4}
active: {line: 1, character: 4}
marks: {}
finalState:
documentContents: |-
for in value:
pass
selections:
- anchor: {line: 0, character: 4}
active: {line: 0, character: 4}
8 changes: 7 additions & 1 deletion packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeValue4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,10 @@ initialState:
- anchor: {line: 1, character: 4}
active: {line: 1, character: 4}
marks: {}
thrownError: {name: NoContainingScopeError}
finalState:
documentContents: |-
for aaa in :
pass
selections:
- anchor: {line: 0, character: 11}
active: {line: 0, character: 11}
27 changes: 27 additions & 0 deletions packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/changeValue5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
languageId: python
command:
version: 6
spokenForm: change value
action:
name: clearAndSetSelection
target:
type: primitive
modifiers:
- type: containingScope
scopeType: {type: value}
usePrePhraseSnapshot: true
initialState:
documentContents: |-
for name in value:
pass
selections:
- anchor: {line: 1, character: 4}
active: {line: 1, character: 4}
marks: {}
finalState:
documentContents: |-
for name in :
pass
selections:
- anchor: {line: 0, character: 12}
active: {line: 0, character: 12}
4 changes: 2 additions & 2 deletions ...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/clearCondition6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ initialState:
case a if a > 1:
pass
selections:
- anchor: {line: 2, character: 8}
active: {line: 2, character: 8}
- anchor: {line: 1, character: 11}
active: {line: 1, character: 11}
pokey marked this conversation as resolved.
Show resolved Hide resolved
marks: {}
finalState:
documentContents: |-
Expand Down
8 changes: 4 additions & 4 deletions ...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/python/ditchCondition2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ initialState:
case a if a > 1:
pass
selections:
- anchor: {line: 2, character: 8}
active: {line: 2, character: 8}
- anchor: {line: 1, character: 11}
active: {line: 1, character: 11}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

marks: {}
finalState:
documentContents: |-
match 0:
case a :
pass
selections:
- anchor: {line: 2, character: 8}
active: {line: 2, character: 8}
- anchor: {line: 1, character: 11}
active: {line: 1, character: 11}
210 changes: 210 additions & 0 deletions queries/python.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,213 @@
"(" @value.iteration.start.endOf @name.iteration.start.endOf @type.iteration.start.endOf
")" @value.iteration.end.startOf @name.iteration.end.startOf @type.iteration.end.startOf
)

;;!! if true: pass
;;! ^^^^^^^^^^^^^
(if_statement) @ifStatement

;;!! foo()
;;! ^^^^^
(call) @functionCall

;;!! foo()
;;! ^^^^^
(call
function: (_) @functionCallee
) @_.domain

;;!! lambda _: pass
;;! ^^^^^^^^^^^^^^
(lambda) @anonymousFunction

;;!! match value:
;;! ^^^^^
(match_statement
subject: (_) @switchStatementSubject
) @_.domain

;;!! { "value": 0 }
;;! ^^^^^^^
;;! xxxxxxxxx
(pair
key: (_) @collectionKey @_.removal.start
value: (_) @_.removal.end.startOf
AndreasArvidsson marked this conversation as resolved.
Show resolved Hide resolved
) @_.domain

;;!! if True:
;;! ^^^^
(if_statement
condition: (_) @condition
) @_.domain

;;!! elif True:
;;! ^^^^
(elif_clause
condition: (_) @condition
) @_.domain

;;!! while True:
;;! ^^^^
(while_statement
condition: (_) @condition
) @_.domain

;;!! match value:
;;! ^^^^^
(case_clause
pattern: (_) @condition
) @_.domain

;;!! case a if a > 1:
;;! ^^^^^
;;! xxxxxxxx
;;! --------
(case_clause
(if_clause
"if"
(_) @condition
) @_.domain @_.removal
)

;;!! case 0: pass
;;! ^^^^^^^^^^^^
(case_clause) @branch

(match_statement) @branch.iteration @condition.iteration

;;!! 1 if True else 0
;;! ^^^^
;;! ----------------
(
(conditional_expression
"if"
.
(_) @condition
) @_.domain
)

;;!! 1 if True else 0
;;! ^
(
(conditional_expression
(_) @branch
.
"if"
)
)

;;!! 1 if True else 0
;;! ^
(
(conditional_expression
"else"
.
(_) @branch
)
)

(conditional_expression) @branch.iteration

;;!! [aaa for aaa in bbb if ccc]
;;! ^^^
;;! xxxxxx
;;! ---------------------------
(list_comprehension
(if_clause
"if"
(_) @condition
) @_.removal
) @_.domain
AndreasArvidsson marked this conversation as resolved.
Show resolved Hide resolved

;;!! (aaa for aaa in bbb if ccc)
;;! ^^^
;;! xxxxxx
;;! ---------------------------
(generator_expression
(if_clause
"if"
(_) @condition
) @_.removal
) @_.domain

;;!! {aaa for aaa in bbb if ccc}
;;! ^^^
;;! xxxxxx
;;! ---------------------------
(set_comprehension
(if_clause
"if"
(_) @condition
) @_.removal
) @_.domain

;;!! {aaa: aaa for aaa in bbb if ccc}
;;! ^^^
;;! xxxxxx
;;! --------------------------------
(dictionary_comprehension
(if_clause
"if"
(_) @condition
) @_.removal
) @_.domain

;;!! for name in value:
;;! ^^^^ ^^^^^
;;! ------------------
(for_statement
left: (_) @name
right: (_) @value
) @_.domain

;;!! if True: pass
;;! ^^^^^^^^^^^^^
(if_statement
"if" @branch.start
consequence: (_) @branch.end
)

;;!! elif True: pass
;;! ^^^^^^^^^^^^^^^
(elif_clause) @branch

;;!! else: pass
;;! ^^^^^^^^^^
(else_clause) @branch

(if_statement) @branch.iteration

;;!! try: pass
;;! ^^^^^^^^^
(try_statement
"try" @branch.start
body: (_) @branch.end
)

;;!! except: pass
;;! ^^^^^^^^^^^^
(except_clause) @branch

;;!! finally: pass
;;! ^^^^^^^^^^^^^
(finally_clause) @branch

(try_statement) @branch.iteration

;;!! while True: pass
;;! ^^^^^^^^^^^^^^^^
(while_statement
"while" @branch.start
body: (_) @branch.end
)

(while_statement) @branch.iteration

;;!! for aaa in bbb: pass
;;! ^^^^^^^^^^^^^^^^^^^^
(for_statement
"for" @branch.start
body: (_) @branch.end
)

(for_statement) @branch.iteration