Initial Perl support and some tests #1301
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| import { | ||
| argumentMatcher, | ||
| cascadingMatcher, | ||
| createPatternMatchers, | ||
| matcher, | ||
| patternMatcher, | ||
| } from "../util/nodeMatchers"; | ||
| import { NodeMatcherAlternative } from "../typings/Types"; | ||
| import { SimpleScopeTypeType } from "@cursorless/common"; | ||
| import { | ||
| childRangeSelector, | ||
| unwrapSelectionExtractor, | ||
| } from "../util/nodeSelectors"; | ||
| import { patternFinder } from "../util/nodeFinders"; | ||
| import { branchMatcher } from "./branchMatcher"; | ||
|
|
||
| const nodeMatchers: Partial< | ||
| Record<SimpleScopeTypeType, NodeMatcherAlternative> | ||
| > = { | ||
| map: "hash", | ||
| list: "array", | ||
| condition: matcher( | ||
|
There was a problem hiding this comment. missing ternaries. prob not a showstopper to ship without it; depending how common ternaries are in Perl |
||
| patternFinder( | ||
| "while_statement[condition]", | ||
| "for_statement_1[condition]", | ||
| "for_statement_2.binary_expression!", | ||
| "for_statement_2.array_variable!", | ||
| "for_simple_statement.binary_expression!", | ||
| "for_simple_statement.array_variable!", | ||
| "if_statement[condition]", | ||
| "unless_statement[condition]", | ||
| ), | ||
| unwrapSelectionExtractor, | ||
| ), | ||
| string: [ | ||
| "string_single_quoted", | ||
| "string_double_quoted", | ||
| "string_q_quoted", | ||
| "string_qq_quoted", | ||
| ], | ||
| ifStatement: "if_statement", | ||
| functionCall: [ | ||
| "call_expression", | ||
| "call_expression_with_just_name", | ||
| "method_invocation", | ||
| ], | ||
| functionCallee: cascadingMatcher( | ||
| patternMatcher("call_expression_with_just_name"), | ||
| matcher( | ||
| patternFinder("call_expression", "method_invocation"), | ||
| childRangeSelector( | ||
| ["arguments", "argument", "empty_parenthesized_argument"], | ||
| [], | ||
| ), | ||
| ), | ||
| ), | ||
| comment: "comments", | ||
| namedFunction: ["function_definition"], | ||
| anonymousFunction: "anonymous_function", | ||
| regularExpression: [ | ||
| "patter_matcher_m", // Mistype (?) but that is the name in tree-sitter-perl; it must come before pattern_matcher | ||
| "pattern_matcher", | ||
| "regex_pattern_qr", | ||
| "substitution_pattern_s", | ||
| ], | ||
| collectionKey: "key_value_pair[key]", | ||
| collectionItem: "hash[variable]", | ||
| argumentOrParameter: argumentMatcher("arguments"), | ||
| class: [ | ||
| "package_statement!.block[body]", | ||
| "source_file!.package_statement", | ||
| "package_statement", | ||
| "source_file", | ||
| ], | ||
| className: "package_statement.package_name!", | ||
| name: ["function_definition[name]", "*[key]"], | ||
|
There was a problem hiding this comment.
|
||
| value: ["*[value]"], | ||
| branch: cascadingMatcher( | ||
|
There was a problem hiding this comment. missing ternaries. prob not a showstopper to ship without it; depending how common ternaries are in Perl |
||
| branchMatcher("if_statement", ["else_clause", "elsif_clause"]), | ||
| ), | ||
| }; | ||
|
|
||
| export const patternMatchers = createPatternMatchers(nodeMatchers); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| languageId: perl | ||
Leeft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| command: | ||
| version: 4 | ||
| spokenForm: change arg | ||
| action: { name: clearAndSetSelection } | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: { type: argumentOrParameter } | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: some_funky_func( "and", "three", "args" ) | ||
| selections: | ||
| - anchor: { line: 0, character: 36 } | ||
| active: { line: 0, character: 36 } | ||
| marks: {} | ||
| finalState: | ||
| documentContents: some_funky_func( "and", "three", ) | ||
| selections: | ||
| - anchor: { line: 0, character: 33 } | ||
| active: { line: 0, character: 33 } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 4 | ||
| spokenForm: change arg | ||
| action: {name: clearAndSetSelection} | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: {type: argumentOrParameter} | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: some_funky_func( "and", "three", "args" ) | ||
| selections: | ||
| - anchor: {line: 0, character: 29} | ||
| active: {line: 0, character: 29} | ||
| marks: {} | ||
| finalState: | ||
| documentContents: some_funky_func( "and", , "args" ) | ||
| selections: | ||
| - anchor: {line: 0, character: 24} | ||
| active: {line: 0, character: 24} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 4 | ||
| spokenForm: change arg | ||
| action: {name: clearAndSetSelection} | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: {type: argumentOrParameter} | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: some_funky_func( "and", "three", "args" ) | ||
| selections: | ||
| - anchor: {line: 0, character: 21} | ||
| active: {line: 0, character: 21} | ||
| marks: {} | ||
| finalState: | ||
| documentContents: some_funky_func( , "three", "args" ) | ||
| selections: | ||
| - anchor: {line: 0, character: 17} | ||
| active: {line: 0, character: 17} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 5 | ||
| spokenForm: change arg | ||
| action: {name: clearAndSetSelection} | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: {type: argumentOrParameter} | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: some_funky_func( "and", "three", "args" ) | ||
| selections: | ||
| - anchor: {line: 0, character: 16} | ||
| active: {line: 0, character: 16} | ||
| marks: {} | ||
| thrownError: {name: NoContainingScopeError} | ||
|
There was a problem hiding this comment. I have mixed feelings about adding a test for behaviour that we don't actually want to preserve. any thoughts @AndreasArvidsson? some schools of thought support it; I believe it's called "characterization testing" in the literature |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 5 | ||
| spokenForm: change branch | ||
| action: {name: clearAndSetSelection} | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: {type: branch} | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: | | ||
| if ( 1 ) { | ||
| 2; | ||
| } elsif ( 3 ) { | ||
| 4; | ||
| } else { | ||
| 5; | ||
| } | ||
| selections: | ||
| - anchor: {line: 0, character: 0} | ||
| active: {line: 0, character: 0} | ||
| marks: {} | ||
| finalState: | ||
| documentContents: |2 | ||
| elsif ( 3 ) { | ||
| 4; | ||
| } else { | ||
| 5; | ||
| } | ||
| selections: | ||
| - anchor: {line: 0, character: 0} | ||
| active: {line: 0, character: 0} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| languageId: perl | ||
|
|
||
| command: | ||
| version: 5 | ||
| spokenForm: change branch | ||
| action: {name: clearAndSetSelection} | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: {type: branch} | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: | | ||
| if ( 1 ) { | ||
| 2; | ||
| } elsif ( 3 ) { | ||
| 4; | ||
| } else { | ||
| 5; | ||
| } | ||
| selections: | ||
| - anchor: {line: 2, character: 2} | ||
| active: {line: 2, character: 2} | ||
| marks: {} | ||
| finalState: | ||
| documentContents: | | ||
| if ( 1 ) { | ||
| 2; | ||
| } else { | ||
| 5; | ||
| } | ||
| selections: | ||
| - anchor: {line: 2, character: 2} | ||
| active: {line: 2, character: 2} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 5 | ||
| spokenForm: change branch | ||
| action: {name: clearAndSetSelection} | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: {type: branch} | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: | | ||
| if ( 1 ) { | ||
| 2; | ||
| } elsif ( 3 ) { | ||
| 4; | ||
| } else { | ||
| 5; | ||
| } | ||
| selections: | ||
| - anchor: {line: 4, character: 2} | ||
| active: {line: 4, character: 2} | ||
| marks: {} | ||
| finalState: | ||
| documentContents: | | ||
| if ( 1 ) { | ||
| 2; | ||
| } elsif ( 3 ) { | ||
| 4; | ||
| } | ||
| selections: | ||
| - anchor: {line: 4, character: 2} | ||
| active: {line: 4, character: 2} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 4 | ||
| spokenForm: change call | ||
| action: { name: clearAndSetSelection } | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: { type: functionCall } | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: |- | ||
| my $var = 1; | ||
| $var = func(); | ||
| $var = 2; | ||
| selections: | ||
| - anchor: { line: 1, character: 12 } | ||
| active: { line: 1, character: 12 } | ||
| marks: {} | ||
| finalState: | ||
| documentContents: |- | ||
| my $var = 1; | ||
| $var = ; | ||
| $var = 2; | ||
| selections: | ||
| - anchor: { line: 1, character: 7 } | ||
| active: { line: 1, character: 7 } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 4 | ||
| spokenForm: change call | ||
| action: { name: clearAndSetSelection } | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: { type: functionCall } | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: |- | ||
| my $var = 1; | ||
| $var = func_with_params( $var ); | ||
| $var = 2; | ||
| selections: | ||
| - anchor: { line: 1, character: 27 } | ||
| active: { line: 1, character: 27 } | ||
| marks: {} | ||
| finalState: | ||
| documentContents: |- | ||
| my $var = 1; | ||
| $var = ; | ||
| $var = 2; | ||
| selections: | ||
| - anchor: { line: 1, character: 7 } | ||
| active: { line: 1, character: 7 } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| languageId: perl | ||
| command: | ||
| version: 4 | ||
| spokenForm: change call | ||
| action: { name: clearAndSetSelection } | ||
| targets: | ||
| - type: primitive | ||
| modifiers: | ||
| - type: containingScope | ||
| scopeType: { type: functionCall } | ||
| usePrePhraseSnapshot: true | ||
| initialState: | ||
| documentContents: |- | ||
| my $var = 1; | ||
| $var = $object->method( ); | ||
| $var = 2; | ||
| selections: | ||
| - anchor: { line: 1, character: 24 } | ||
| active: { line: 1, character: 24 } | ||
| marks: {} | ||
| finalState: | ||
| documentContents: |- | ||
| my $var = 1; | ||
| $var = ; | ||
| $var = 2; | ||
| selections: | ||
| - anchor: { line: 1, character: 7 } | ||
| active: { line: 1, character: 7 } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing "state" (
statement)