From f650597054faf76747fff641c91233dbb1d4b396 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 11 Feb 2025 18:36:57 +0200 Subject: #3422 Fix two-sided delimiter tail processing --- indra/llui/llkeywords.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/llkeywords.cpp') diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 7bf43c22c1..ad164ff2cc 100644 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -627,7 +627,7 @@ void LLKeywords::findSegments(std::vector* seg_list, const LLW if( *cur ) { - cur += cur_delimiter->getLengthHead(); + cur += cur_delimiter->getLengthTail(); seg_end = seg_start + between_delimiters + cur_delimiter->getLengthHead() + cur_delimiter->getLengthTail(); } else -- cgit v1.3 From 34c1627b8ca9949bcb3c2b626b5a5f9840b2dee9 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 11 Feb 2025 18:42:12 +0200 Subject: #3422 Process Lua-style comments --- indra/llui/llkeywords.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llui/llkeywords.cpp') diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index ad164ff2cc..bc2247e7e9 100644 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -239,6 +239,10 @@ void LLKeywords::processTokens() addToken(LLKeywordToken::TT_TWO_SIDED_DELIMITER, "/*", LLUIColorTable::instance().getColor("SyntaxLslComment"), "Comment (multi-line)\nNon-functional commentary or disabled code", "*/" ); addToken(LLKeywordToken::TT_DOUBLE_QUOTATION_MARKS, "\"", LLUIColorTable::instance().getColor("SyntaxLslStringLiteral"), "String literal", "\"" ); + // Lua-style comments + addToken(LLKeywordToken::TT_ONE_SIDED_DELIMITER, "--", LLUIColorTable::instance().getColor("SyntaxLslComment"), "Comment (Lua-style single-line)\nNon-functional commentary or disabled code", delimiter); + addToken(LLKeywordToken::TT_TWO_SIDED_DELIMITER, "--[[", LLUIColorTable::instance().getColor("SyntaxLslComment"), "Comment (Lua-style multi-line)\nNon-functional commentary or disabled code", "]]"); + LLSD::map_iterator itr = mSyntax.beginMap(); for ( ; itr != mSyntax.endMap(); ++itr) { -- cgit v1.3