From b54e26a3dc5cdfbd6d49a1dd0b0c29dbab386044 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 29 Jan 2019 22:24:56 +1100
Subject: Backport: Bug [#1947]. Fix recognizing '"' after "," inside a
 bracketed substitution.

Backport of changeset 7243:f75e25db799e.
---
 lexers/LexTCL.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lexers')

diff --git a/lexers/LexTCL.cxx b/lexers/LexTCL.cxx
index 0948f4880..1ea6ecf6e 100644
--- a/lexers/LexTCL.cxx
+++ b/lexers/LexTCL.cxx
@@ -128,8 +128,10 @@ next:
 				continue;
 			case ',':
 				sc.SetState(SCE_TCL_OPERATOR);
-				if (subParen)
+				if (subParen) {
 					sc.ForwardSetState(SCE_TCL_SUBSTITUTION);
+					goto next;	// Already forwarded so avoid loop's Forward()
+				}
 				continue;
 			default :
 				// maybe spaces should be allowed ???
-- 
cgit v1.2.3