Merge branch 'develop' into text-mate

This commit is contained in:
Martín Lucas Golini
2025-05-19 14:43:01 -03:00
6 changed files with 30 additions and 24 deletions

View File

@@ -4,9 +4,9 @@
author: 'NullPlane'
author_link: 'github.com/NullPlane'
collaborators: [ 'SpartanJ', 'NullPlane' ]
version: '0.7.1_r00'
version: '0.7.1_r01'
created: 2024-02-08
updated: 2025-04-15
updated: 2025-05-17
language: 'de'
format: 'xml'
file: 'de.xml'
@@ -568,7 +568,7 @@ Bitte die Anwendung neu starten.</string>
<string name="open_containing_folder_ellipsis">Ordner aktueller Datei öffnen...</string>
<string name="open_context_menu">Kontextmenü öffnen</string>
<string name="open_document_symbol_search">Dokumentsymbolsuche öffnen</string>
<string name="open_documents">Dokumente öffnen</string>
<string name="open_documents">Geöffnete Dokumente</string>
<string name="open_file">Datei öffnen</string>
<string name="open_file_ellipsis">Datei öffnen...</string>
<string name="open_file_from_web_ellipsis">Datei aus dem Netz öffnen...</string>

View File

@@ -18,6 +18,10 @@ void addC() {
{ { "'", "'", "\\" }, "string" },
{ { "c_number_parser" }, "number", "", SyntaxPatternMatchType::Parser },
{ { "[%+%-=/%*%^%%<>!~|&]" }, "operator" },
{ { "(if|for|while|switch|sizeof|_Alignof|defined)\\s*(?=\\()" },
{ "normal", "keyword", "keyword" },
"",
SyntaxPatternMatchType::RegEx },
{ { "[%a_][%w_]*%f[(]" }, "function" },
{ { "#[%a_][%w_]*" }, "symbol" },
{ { "[%a_][%w_]*" }, "symbol" },

View File

@@ -25,6 +25,10 @@ void addCPP() {
{ "keyword", "keyword", "literal" } },
{ { "cpp_number_parser" }, "number", "", SyntaxPatternMatchType::Parser },
{ { "[%+%-=/%*%^%%<>!~|&]" }, "operator" },
{ { "(if|for|while|switch|catch|sizeof|typeid|defined)\\s*(?=\\()" },
{ "normal", "keyword", "keyword" },
"",
SyntaxPatternMatchType::RegEx },
{ { "[%a_][%w_]*%f[(]" }, "function" },
{ { "std%:%:[%w_]*" }, "keyword2" },
{ { "(%[)(%[)(%a[%w_]+)(%])(%])" },
@@ -92,7 +96,7 @@ void addCPP() {
{ "bitor", "keyword" }, { "thread_local", "keyword" },
{ "uint64_t", "keyword2" }, { "char32_t", "keyword2" },
{ "alignas", "keyword" }, { "export", "keyword" },
{ "ssize_t", "keyword2" },
{ "ssize_t", "keyword2" }, { "signed", "keyword2" },
{ "#if", "keyword" }, { "#ifdef", "keyword" },
{ "#ifndef", "keyword" }, { "#else", "keyword" },
@@ -101,7 +105,7 @@ void addCPP() {
{ "#endif", "keyword" }, { "#include", "keyword" },
{ "#define", "keyword" }, { "#undef", "keyword" },
{ "#line", "keyword" }, { "#error", "keyword" },
{ "#pragma", "keyword" }, { "signed", "keyword2" },
{ "#pragma", "keyword" }, { "#warning", "keyword" },
},
"//",

View File

@@ -20,6 +20,10 @@ void addJavaScript() {
"string" },
{ { "js_number_parser" }, "number", "", SyntaxPatternMatchType::Parser },
{ { "[%+%-=/%*%^%%<>!~|&]" }, "operator" },
{ { "(if|for|while|switch|catch|with)\\s*(?=\\()" },
{ "normal", "keyword", "keyword" },
"",
SyntaxPatternMatchType::RegEx },
{ { "([%w_][%w_]+)%.([%w_][%w%d_]*)%s*(=)%s*(function)" },
{ "normal", "keyword2", "function", "operator", "keyword" } },
{ { "([%w_][%w_]+)%.([%w_][%w%d_]*)%s*(=)%s*(async%s*function)" },

View File

@@ -23,6 +23,10 @@ void addTypeScript() {
{ { "[%+%-=/%*%^%%<>!~|&]" }, "operator" },
{ { "(interface%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } },
{ { "(type%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } },
{ { "(if|for|while|switch|catch|with)\\s*(?=\\()" },
{ "normal", "keyword", "keyword" },
"",
SyntaxPatternMatchType::RegEx },
{ { "[%a_][%w_$]*%f[(]" }, "function" },
{ { "[%a_][%w_]*" }, "symbol" },

View File

@@ -10,27 +10,16 @@ void addU() {
{ "Ü",
{ "%.u$", "%.uh$" },
{
{ { "//.-\n" }, "comment" },
{ { "/%*", "%*/" }, "comment" },
{ { "\"", "[\"\n]", "\\" }, "string" },
{ { "'", "'", "\\" }, "string" },
{ { "(class|template|namespace|enum)\\s+([A-Za-z]\\w*)" },
{ "keyword", "keyword", "keyword2" },
"",
SyntaxPatternMatchType::RegEx },
{ { "$%(([%a_]%w*)%)" }, { "operator", "keyword2", "keyword2" } },
{ { "^%s*(import)%s+([<%\"][%w%d%.%\\%/%_%-]+[>%\"])" },
{ "keyword", "keyword", "literal" } },
{ { "cpp_number_parser" }, "number", "", SyntaxPatternMatchType::Parser },
{ { "[%+%-=/%*%^%%<>!~|&]" }, "operator" },
{ { "[%a_][%w_]*%f[(]" }, "function" },
{ { "ust%:%:[%w_]*" }, "keyword2" },
{ { "[%a_][%w_]*" }, "symbol" },
{ { "//.-\n" }, "comment" }, // Single-line comments.
{ { "/%*", "%*/" }, "comment" }, // Multi-line comments.
{ { "\"", "[\"\n]", "\\" }, "string" }, // String literals.
{ { "'", "'", "\\" }, "string" }, // Char literals.
{ { "cpp_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, // Numbers. TODO - support Ü-specific formats.
{ { "[%+%-=/%*%^%%<>!~|&$:.@?]" }, "operator" }, // Various operators.
{ { "[%a_][%w_]*" }, "symbol" }, // Regular identifiers.
},
{
{ "pretty_main", "function" },
// Keywords.
{ "fn", "keyword" },
{ "op", "keyword" },
{ "var", "keyword" },
@@ -119,6 +108,7 @@ void addU() {
{ "cast_ref_unsafe", "keyword" },
{ "cast_mut", "keyword" },
{ "uninitialized", "keyword" },
// Built-in type keywords.
{ "void", "keyword2" },
{ "bool", "keyword2" },
{ "i8", "keyword2" },