Allow line continuation before "->" return anno; issue #51.

MagicStack · Aug 9, 2016 · 1df75f1 · 1df75f1
1 parent b2ca47e
commit 1df75f1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -1184,6 +1184,9 @@ repository:
       {
         include: "#parameters"
       }
+      {
+        include: "#line-continuation"
+      }
       {
         include: "#return-annotation"
       }

diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -18,8 +18,6 @@
       <string>Sconstruct</string>
       <string>sconstruct</string>
       <string>SConscript</string>
-      <string>gyp</string>
-      <string>gypi</string>
     </array>
     <key>first_line_match</key>
     <string>^#!/.*\bpython[\d\.]*\b</string>
@@ -1905,6 +1903,10 @@
             <key>include</key>
             <string>#parameters</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#line-continuation</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#return-annotation</string>

diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
@@ -806,6 +806,7 @@ repository:
     patterns:
       - include: '#function-def-name'
       - include: '#parameters'
+      - include: '#line-continuation'
       - include: '#return-annotation'
 
   function-def-name:

diff --git a/test/functions/decl12.py b/test/functions/decl12.py
@@ -0,0 +1,23 @@
+def get_streaks(s) \
+    -> 'spam': pass
+
+
+
+def           : meta.function.python, source.python, storage.type.function.python
+              : meta.function.python, source.python
+get_streaks   : entity.name.function.python, meta.function.python, source.python
+(             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.begin.python, source.python
+s             : meta.function.parameters.python, meta.function.python, source.python, variable.parameter.function.language.python
+)             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
+              : meta.function.python, source.python
+\             : meta.function.python, separator.continuation.line.python, source.python
+              : meta.function.python, source.python
+              : meta.function.python, source.python
+->            : meta.function.python, punctuation.separator.annotation.result.python, source.python
+              : meta.function.python, source.python
+'             : meta.function.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+spam          : meta.function.python, source.python, string.quoted.single.python
+'             : meta.function.python, punctuation.definition.string.end.python, source.python, string.quoted.single.python
+:             : meta.function.python, punctuation.section.function.begin.python, source.python
+              : source.python
+pass          : keyword.control.flow.python, source.python