Merge remote-tracking branch 'upstream/master'

R167 · R167 · commit b77b4f93b91c · 2021-02-16T15:37:48.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.13.5 (2021-02-11)
+
+### Bug fixes
+
+Fixes an inefficiency in the parsing of large strings.
+
 ## 0.13.4 (2021-01-27)
 
 ### Bug fixes
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lezer-python",
-  "version": "0.13.4",
+  "version": "0.13.5",
   "description": "Lezer-based Python grammar",
   "main": "dist/index.cjs",
   "type": "module",
diff --git a/src/python.grammar b/src/python.grammar
@@ -242,29 +242,31 @@ FormatReplacement { "{" (YieldExpression | commaSep<"*"? test>) FormatConversion
 
   formatStringSpecChars { ![{}]+ }
 
-  formatString1Content { !['{\\] | "\\" _ | "{{" }
-  formatString2Content { !["{\\] | "\\" _ | "{{" }
+  formatString1Content { (!['{\\] | "\\" _ | "{{")+ }
+  formatString2Content { (!["{\\] | "\\" _ | "{{")+ }
 
   longStringStart<quote> { stringPrefix? quote quote quote }
 
-  longString1Content { !['\\] | "\\" _ | "'" longString1_2 }
+  longString1Content { (!['\\] | "\\" _ | "'" longString1_2)+ }
   longString1_2 { !['\\] | "\\" _ | "'" longString1_3 }
   longString1_3 { !['\\] | "\\" _ }
 
-  longString2Content { !["\\] | "\\" _ | '"' longString2_2 }
+  longString2Content { (!["\\] | "\\" _ | '"' longString2_2)+ }
   longString2_2 { !["\\] | "\\" _ | '"' longString2_3 }
   longString2_3 { !["\\] | "\\" _ }
 
   longFormatStringStart<quote> { formatPrefix quote quote quote }
 
-  longFormatString1Content { !['\\{] | "\\" _ | "'" longFormatString1_2 | "{{" }
+  longFormatString1Content { (!['\\{] | "\\" _ | "'" longFormatString1_2 | "{{")+ }
   longFormatString1_2 { !['\\{] | "\\" _ | "{{" | "'" longFormatString1_3 }
   longFormatString1_3 { !['\\{] | "\\" _ | "{{" }
 
-  longFormatString2Content { !["\\{] | "\\" _ | "'" longFormatString2_2 | "{{" }
+  longFormatString2Content { (!["\\{] | "\\" _ | "'" longFormatString2_2 | "{{")+ }
   longFormatString2_2 { !["\\{] | "\\" _ | "{{" | "'" longFormatString2_3 }
   longFormatString2_3 { !["\\{] | "\\" _ | "{{" }
 
+  @precedence { "{", formatString1Content, formatString2Content, longFormatString1Content, longFormatString2Content }
+
   Number {
     (std.digit ("_" | std.digit)* ("." std.digit ("_" | std.digit)*)? | "." std.digit ("_" | std.digit)*)
       ($[eE] $[+\-]? std.digit ("_" | std.digit)*)? $[jJ]? |
diff --git a/src/tokens.js b/src/tokens.js
@@ -96,7 +96,7 @@ export const newlines = new ExternalTokenizer((input, token, stack) => {
     let ch = input.get(scan)
     if (ch == space) indent++
     else if (ch == tab) indent += 8 - (indent % 8)
-    else if (ch == newline || indent == carriageReturn || ch == hash) {
+    else if (ch == newline || ch == carriageReturn || ch == hash) {
       token.accept(newlineEmpty, token.start + 1)
       return
     } else {
