fix(Python parser): Use Declare for functions

stencila · Jan 26, 2022 · 60095f7 · 60095f7
1 parent b5fcfa6
commit 60095f7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/rust/parser-py/src/lib.rs b/rust/parser-py/src/lib.rs
@@ -93,10 +93,14 @@ impl ParserTrait for PyParser {
                         5 => "Function",
                         _ => unreachable!(),
                     };
-                    Some((
-                        relations::assigns(range),
-                        resources::symbol(path, &name, kind),
-                    ))
+
+                    let symbol = resources::symbol(path, &name, kind);
+                    let relation = match pattern {
+                        4 => relations::assigns(range),
+                        5 => relations::declares(range),
+                        _ => unreachable!(),
+                    };
+                    Some((relation, symbol))
                 }
                 6 => {
                     // Uses an identifier assigned elsewhere

diff --git a/rust/parser-py/src/snapshots/parse_py_fragments@assigns.py.snap b/rust/parser-py/src/snapshots/parse_py_fragments@assigns.py.snap
@@ -1,6 +1,6 @@
 ---
 source: rust/parser-py/src/lib.rs
-assertion_line: 209
+assertion_line: 213
 expression: resource_info
 input_file: fixtures/fragments/py/assigns.py
 
@@ -50,7 +50,7 @@ input_file: fixtures/fragments/py/assigns.py
     ],
     [
       {
-        "type": "Assign",
+        "type": "Declare",
         "range": [
           3,
           4,

diff --git a/rust/parser-py/src/snapshots/parse_py_fragments@reads.py.snap b/rust/parser-py/src/snapshots/parse_py_fragments@reads.py.snap
@@ -1,6 +1,6 @@
 ---
 source: rust/parser-py/src/lib.rs
-assertion_line: 209
+assertion_line: 213
 expression: resource_info
 input_file: fixtures/fragments/py/reads.py
 
@@ -138,7 +138,7 @@ input_file: fixtures/fragments/py/reads.py
     ],
     [
       {
-        "type": "Assign",
+        "type": "Declare",
         "range": [
           16,
           4,

diff --git a/rust/parser-py/src/snapshots/parse_py_fragments@uses.py.snap b/rust/parser-py/src/snapshots/parse_py_fragments@uses.py.snap
@@ -1,6 +1,6 @@
 ---
 source: rust/parser-py/src/lib.rs
-assertion_line: 209
+assertion_line: 213
 expression: resource_info
 input_file: fixtures/fragments/py/uses.py
 
@@ -373,7 +373,7 @@ input_file: fixtures/fragments/py/uses.py
     ],
     [
       {
-        "type": "Assign",
+        "type": "Declare",
         "range": [
           31,
           4,

diff --git a/rust/parser-py/src/snapshots/parse_py_fragments@writes.py.snap b/rust/parser-py/src/snapshots/parse_py_fragments@writes.py.snap
@@ -1,6 +1,6 @@
 ---
 source: rust/parser-py/src/lib.rs
-assertion_line: 209
+assertion_line: 213
 expression: resource_info
 input_file: fixtures/fragments/py/writes.py
 
@@ -127,7 +127,7 @@ input_file: fixtures/fragments/py/writes.py
     ],
     [
       {
-        "type": "Assign",
+        "type": "Declare",
         "range": [
           10,
           4,