From bb94e22d3423fe458de4bc9621379ddebb7fe7e3 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+orbitalquark@users.noreply.github.com>
Date: Wed, 1 Oct 2025 12:30:00 +0200
Subject: lua/lexers: synchronization with new release scintillua_6.6

    Bugfixes:
     - Fixed Pascal numeric literals.
     - Fixed folding of HTML/XML comments and XML processing
       instructions.
     - Fixed incorrectly highlighting '..' range operators between
       numbers.
    Changes:
     - Added Janet and todo.txt lexers.
     - Updated Python lexer to recognize t-strings.
     - Migrated ini and Dart lexers.
     - Updated org lexer word lists.
---
 lua/lexers/dart.lua | 68 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 24 deletions(-)

(limited to 'lua/lexers/dart.lua')

diff --git a/lua/lexers/dart.lua b/lua/lexers/dart.lua
index 2634202..48de025 100644
--- a/lua/lexers/dart.lua
+++ b/lua/lexers/dart.lua
@@ -1,56 +1,76 @@
 -- Copyright 2013-2025 Mitchell. See LICENSE.
 -- Dart LPeg lexer.
 -- Written by Brian Schott (@Hackerpilot on Github).
+-- Migrated by Jamie Drinkell
 
-local lexer = require('lexer')
-local token, word_match = lexer.token, lexer.word_match
+local lexer = lexer
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('dart')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
-lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
-	'assert', 'break', 'case', 'catch', 'class', 'const', 'continue', 'default', 'do', 'else', 'enum',
-	'extends', 'false', 'final', 'finally', 'for', 'if', 'in', 'is', 'new', 'null', 'rethrow',
-	'return', 'super', 'switch', 'this', 'throw', 'true', 'try', 'var', 'void', 'while', 'with'
-}))
-
+lex:add_rule('keyword', lex:tag(lexer.KEYWORD, lex:word_match(lexer.KEYWORD)))
 -- Built-ins.
-lex:add_rule('builtin', token(lexer.CONSTANT, word_match{
-	'abstract', 'as', 'dynamic', 'export', 'external', 'factory', 'get', 'implements', 'import',
-	'library', 'operator', 'part', 'set', 'static', 'typedef'
-}))
+lex:add_rule('constant', lex:tag(lexer.CONSTANT_BUILTIN, lex:word_match(lexer.CONSTANT_BUILTIN)))
+-- Types.
+lex:add_rule('type', lex:tag(lexer.TYPE, lex:word_match(lexer.TYPE)))
+-- Directives
+lex:add_rule('directive', lex:tag(lexer.PREPROCESSOR, lex:word_match(lexer.PREPROCESSOR)))
 
 -- Strings.
 local sq_str = S('r')^-1 * lexer.range("'", true)
 local dq_str = S('r')^-1 * lexer.range('"', true)
 local tq_str = S('r')^-1 * (lexer.range("'''") + lexer.range('"""'))
-lex:add_rule('string', token(lexer.STRING, tq_str + sq_str + dq_str))
+lex:add_rule('string', lex:tag(lexer.STRING, tq_str + sq_str + dq_str))
+
+-- Functions.
+lex:add_rule('function', lex:tag(lexer.FUNCTION, lexer.word) * #(lexer.space^0 * '('))
 
 -- Identifiers.
-lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
+lex:add_rule('identifier', lex:tag(lexer.IDENTIFIER, lexer.word))
 
 -- Comments.
 local line_comment = lexer.to_eol('//', true)
-local block_comment = lexer.range('/*', '*/', false, false, true)
-lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', lex:tag(lexer.COMMENT, line_comment + block_comment))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, lexer.number))
+lex:add_rule('number', lex:tag(lexer.NUMBER, lexer.number))
 
 -- Operators.
-lex:add_rule('operator', token(lexer.OPERATOR, S('#?=!<>+-*$/%&|^~.,;()[]{}')))
+lex:add_rule('operator', lex:tag(lexer.OPERATOR, S('#?=!<>+-*$/%&|^~.,;()[]{}')))
 
 -- Annotations.
-lex:add_rule('annotation', token(lexer.ANNOTATION, '@' * lexer.word^1))
+lex:add_rule('annotation', lex:tag(lexer.ANNOTATION, '@' * lexer.word^1))
 
--- Fold points.
+-- Fold points (add for most bracket pairs due to Flutter's usual formatting).
 lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.OPERATOR, '(', ')')
+lex:add_fold_point(lexer.OPERATOR, '[', ']')
 lex:add_fold_point(lexer.COMMENT, '/*', '*/')
 
+lex:set_word_list(lexer.KEYWORD, {
+	'abstract', 'as', 'assert', 'async', 'await', 'break', 'case', 'catch', 'class', 'continue',
+	'covariant', 'default', 'do', 'else', 'enum', 'extends', 'factory', 'finally', 'for', 'get', 'if',
+	'implements', 'in', 'interface', 'is', 'mixin', 'on', 'operator', 'rethrow', 'return', 'set',
+	'super', 'switch', 'sync', 'this', 'throw', 'try', 'with', 'while', 'yield', --
+	'base', 'extension', 'external', 'late', 'of', 'required', 'sealed', 'when'
+})
+
+lex:set_word_list(lexer.PREPROCESSOR, {
+	'deferred', 'export', 'hide', 'import', 'library', 'part'
+})
+
+lex:set_word_list(lexer.CONSTANT_BUILTIN, {
+	'false', 'true', 'null'
+})
+
+lex:set_word_list(lexer.TYPE, {
+	'const', 'dynamic', 'final', 'Function', 'new', 'static', 'typedef', 'var', 'void', 'int',
+	'double', 'String', 'bool', 'List', 'Set', 'Map', 'Future', 'Stream', 'Iterable', 'Object',
+	'Null', 'type'
+})
+
 lexer.property['scintillua.comment'] = '//'
 
 return lex
-- 
cgit v1.2.3