Fix issue handling multi-line tempated strings pasted to REPL (2v26 regression)

gfwilliams · gfwilliams · commit 2c62ad022086 · 2025-05-21T09:47:39.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@
             Ensure jshPushIOCharEvent is more stable when the FIFO is full
             Bangle.js: g.findFont now attempts to use Intl:2 if there's room. Also fix memory leak
             nRF52840: Add E.getVDDH() method to get VDDH voltage
+            Fix issue handling multi-line tempated strings pasted to REPL (2v26 regression)
 
      2v26 : nRF5x: ensure TIMER1_IRQHandler doesn't always wake idle loop up (fix #1900)
             Puck.js: On v2.1 ensure Puck.mag behaves like other variants - just returning the last reading (avoids glitches when used with Puck.magOn)
diff --git a/src/jslex.c b/src/jslex.c
@@ -505,7 +505,7 @@ static void jslLexString() {
   else lex->tk = LEX_STR;
   // unfinished strings
   if (lex->currCh!=delim)
-    lex->tk++; // +1 gets you to 'unfinished X'
+    lex->tk = (delim=='`') ? LEX_UNFINISHED_TEMPLATE_LITERAL : LEX_UNFINISHED_STR;
   jslGetNextCh();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ static void jslLexString() {`
`505`	`505`	`else lex->tk = LEX_STR;`
`506`	`506`	`// unfinished strings`
`507`	`507`	`if (lex->currCh!=delim)`
`508`		`- lex->tk++; // +1 gets you to 'unfinished X'`
	`508`	+ lex->tk = (delim=='`') ? LEX_UNFINISHED_TEMPLATE_LITERAL : LEX_UNFINISHED_STR;
`509`	`509`	`jslGetNextCh();`
`510`	`510`	`}`
`511`	`511`