Fix the escaping of '{' and '}' in fstrings.

vpetrovykh · vpetrovykh · commit e19bb218a96b · 2016-11-18T17:08:25.000-05:00
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -862,7 +862,11 @@ repository:
       }
       {
         name: "constant.character.escape.python"
-        match: "(\\\\[{}])"
+        match: "({{|}})"
+      }
+      {
+        name: "invalid.illegal.brace.python"
+        match: "(}(?!}))"
       }
     ]
   "escape-sequence-unicode":
@@ -3381,7 +3385,7 @@ repository:
         name: "string.quoted.single.python"
         match: '''
           (?x)
-            (.*?)
+            (.+?)
               (
                 (?# .* and .*? in multi-line match need special handling of
                   newlines otherwise SublimeText and Atom will match slightly
@@ -3391,8 +3395,11 @@ repository:
                   lookahead because of special $ matching rule.)
                 ($\\n?)
                 |
-                (?=[\\\\\\{]|(['"])|((?<!\\\\)\\n))
+                (?=[\\\\\\}\\{]|(['"])|((?<!\\\\)\\n))
               )
+            (?# due to how multiline regexps are matched we need a special case
+              for matching a newline character)
+            | \\n
           
         '''
       }
@@ -3450,7 +3457,7 @@ repository:
         name: "string.quoted.multi.python"
         match: '''
           (?x)
-            (.*?)
+            (.+?)
               (
                 (?# .* and .*? in multi-line match need special handling of
                   newlines otherwise SublimeText and Atom will match slightly
@@ -3460,8 +3467,11 @@ repository:
                   lookahead because of special $ matching rule.)
                 ($\\n?)
                 |
-                (?=[\\\\\\{]|\'''|""")
+                (?=[\\\\\\}\\{]|\'''|""")
               )
+            (?# due to how multiline regexps are matched we need a special case
+              for matching a newline character)
+            | \\n
           
         '''
       }
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -1394,7 +1394,13 @@
             <key>name</key>
             <string>constant.character.escape.python</string>
             <key>match</key>
-            <string>(\\[{}])</string>
+            <string>({{|}})</string>
+          </dict>
+          <dict>
+            <key>name</key>
+            <string>invalid.illegal.brace.python</string>
+            <key>match</key>
+            <string>(}(?!}))</string>
           </dict>
         </array>
       </dict>
@@ -5756,7 +5762,7 @@ indirectly through syntactic constructs
             <string>string.quoted.single.python</string>
             <key>match</key>
             <string>(?x)
-  (.*?)
+  (.+?)
     (
       (?# .* and .*? in multi-line match need special handling of
         newlines otherwise SublimeText and Atom will match slightly
@@ -5766,8 +5772,11 @@ indirectly through syntactic constructs
         lookahead because of special $ matching rule.)
       ($\n?)
       |
-      (?=[\\\{]|(['"])|((?&lt;!\\)\n))
+      (?=[\\\}\{]|(['"])|((?&lt;!\\)\n))
     )
+  (?# due to how multiline regexps are matched we need a special case
+    for matching a newline character)
+  | \n
 </string>
           </dict>
         </array>
@@ -5870,7 +5879,7 @@ indirectly through syntactic constructs
             <string>string.quoted.multi.python</string>
             <key>match</key>
             <string>(?x)
-  (.*?)
+  (.+?)
     (
       (?# .* and .*? in multi-line match need special handling of
         newlines otherwise SublimeText and Atom will match slightly
@@ -5880,8 +5889,11 @@ indirectly through syntactic constructs
         lookahead because of special $ matching rule.)
       ($\n?)
       |
-      (?=[\\\{]|'''|""")
+      (?=[\\\}\{]|'''|""")
     )
+  (?# due to how multiline regexps are matched we need a special case
+    for matching a newline character)
+  | \n
 </string>
           </dict>
         </array>
diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
@@ -608,7 +608,9 @@ repository:
       - include: '#escape-sequence'
       - include: '#string-line-continuation'
       - name: constant.character.escape.python
-        match: (\\[{}])
+        match: ({{|}})
+      - name: invalid.illegal.brace.python
+        match: (}(?!}))
 
   escape-sequence-unicode:
     patterns:
diff --git a/grammars/src/pyfstring.inc.syntax.yaml b/grammars/src/pyfstring.inc.syntax.yaml
@@ -18,7 +18,7 @@ repository:
       - name: string.quoted.${line}.python
         match: |
           (?x)
-            (.*?)
+            (.+?)
               (
                 (?# .* and .*? in multi-line match need special handling of
                   newlines otherwise SublimeText and Atom will match slightly
@@ -28,8 +28,11 @@ repository:
                   lookahead because of special $ matching rule.)
                 ($\n?)
                 |
-                (?=[\\\{]|${marker}${guard})
+                (?=[\\\}\{]|${marker}${guard})
               )
+            (?# due to how multiline regexps are matched we need a special case
+              for matching a newline character)
+            | \n
 
   fstring-${line}-brace:
     comment: value interpolation using { ... }
diff --git a/misc/scopes b/misc/scopes
@@ -31,6 +31,7 @@ invalid.deprecated.backtick.python
 invalid.deprecated.prefix.python
 invalid.deprecated.semicolon.python
 invalid.illegal.annotation.python
+invalid.illegal.brace.python
 invalid.illegal.dec.python
 invalid.illegal.decorator.python
 invalid.illegal.line.continuation.python
diff --git a/test/fstrings/simple2.py b/test/fstrings/simple2.py
@@ -1,4 +1,4 @@
-a = f"normal \{ normal \} normal {10!r} normal {fo.__add__!s}"
+a = f"normal {{ normal }} normal } {10!r} normal {fo.__add__!s}"
 
 
 
@@ -9,10 +9,12 @@
 f             : source.python, storage.type.string.python, string.quoted.single.python
 "             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 normal        : source.python, string.quoted.single.python
-\{            : constant.character.escape.python, source.python
+{{            : constant.character.escape.python, source.python
  normal       : source.python, string.quoted.single.python
-\}            : constant.character.escape.python, source.python
+}}            : constant.character.escape.python, source.python
  normal       : source.python, string.quoted.single.python
+}             : invalid.illegal.brace.python, source.python
+              : source.python, string.quoted.single.python
 {             : constant.character.format.placeholder.other.python, source.python
 10            : constant.numeric.dec.python, source.python
 !r            : source.python, storage.type.format.python
diff --git a/test/fstrings/simple7.py b/test/fstrings/simple7.py
@@ -0,0 +1,10 @@
+f'abc \ efg'
+
+
+
+
+f             : source.python, storage.type.string.python, string.quoted.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+abc           : source.python, string.quoted.single.python
+\ efg         : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
diff --git a/test/fstrings/simple8.py b/test/fstrings/simple8.py
@@ -0,0 +1,24 @@
+f'abc \} }} }}} }}}} }}}}} efg'
+
+
+
+
+f             : source.python, storage.type.string.python, string.quoted.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
+abc           : source.python, string.quoted.single.python
+\             : source.python, string.quoted.single.python
+}             : invalid.illegal.brace.python, source.python
+              : source.python, string.quoted.single.python
+}}            : constant.character.escape.python, source.python
+              : source.python, string.quoted.single.python
+}}            : constant.character.escape.python, source.python
+}             : invalid.illegal.brace.python, source.python
+              : source.python, string.quoted.single.python
+}}            : constant.character.escape.python, source.python
+}}            : constant.character.escape.python, source.python
+              : source.python, string.quoted.single.python
+}}            : constant.character.escape.python, source.python
+}}            : constant.character.escape.python, source.python
+}             : invalid.illegal.brace.python, source.python
+ efg          : source.python, string.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.quoted.single.python

Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,11 @@ repository:`
`862`	`862`	`}`
`863`	`863`	`{`
`864`	`864`	`name: "constant.character.escape.python"`
`865`		`- match: "(\\\\[{}])"`
	`865`	`+ match: "({{\|}})"`
	`866`	`+ }`
	`867`	`+ {`
	`868`	`+ name: "invalid.illegal.brace.python"`
	`869`	`+ match: "(}(?!}))"`
`866`	`870`	`}`
`867`	`871`	`]`
`868`	`872`	`"escape-sequence-unicode":`
`@@ -3381,7 +3385,7 @@ repository:`
`3381`	`3385`	`name: "string.quoted.single.python"`
`3382`	`3386`	`match: '''`
`3383`	`3387`	`(?x)`
`3384`		`- (.*?)`
	`3388`	`+ (.+?)`
`3385`	`3389`	`(`
`3386`	`3390`	`(?# .* and .*? in multi-line match need special handling of`
`3387`	`3391`	`newlines otherwise SublimeText and Atom will match slightly`
`@@ -3391,8 +3395,11 @@ repository:`
`3391`	`3395`	`lookahead because of special $ matching rule.)`
`3392`	`3396`	`($\\n?)`
`3393`	`3397`	`\|`
`3394`		`- (?=[\\\\\\{]\|(['"])\|((?<!\\\\)\\n))`
	`3398`	`+ (?=[\\\\\\}\\{]\|(['"])\|((?<!\\\\)\\n))`
`3395`	`3399`	`)`
	`3400`	`+ (?# due to how multiline regexps are matched we need a special case`
	`3401`	`+ for matching a newline character)`
	`3402`	`+ \| \\n`
`3396`	`3403`
`3397`	`3404`	`'''`
`3398`	`3405`	`}`
`@@ -3450,7 +3457,7 @@ repository:`
`3450`	`3457`	`name: "string.quoted.multi.python"`
`3451`	`3458`	`match: '''`
`3452`	`3459`	`(?x)`
`3453`		`- (.*?)`
	`3460`	`+ (.+?)`
`3454`	`3461`	`(`
`3455`	`3462`	`(?# .* and .*? in multi-line match need special handling of`
`3456`	`3463`	`newlines otherwise SublimeText and Atom will match slightly`
`@@ -3460,8 +3467,11 @@ repository:`
`3460`	`3467`	`lookahead because of special $ matching rule.)`
`3461`	`3468`	`($\\n?)`
`3462`	`3469`	`\|`
`3463`		`- (?=[\\\\\\{]\|\'''\|""")`
	`3470`	`+ (?=[\\\\\\}\\{]\|\'''\|""")`
`3464`	`3471`	`)`
	`3472`	`+ (?# due to how multiline regexps are matched we need a special case`
	`3473`	`+ for matching a newline character)`
	`3474`	`+ \| \\n`
`3465`	`3475`
`3466`	`3476`	`'''`
`3467`	`3477`	`}`