From c156b53e4b7d3ab06064f382282b9a8282338c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 1 Jun 2025 20:07:23 -0300 Subject: [PATCH] Rename "keyword2" to "type" and "keyword3" to "parameter". Added some String overloaded functions. --- .ecode/project_build.json | 2 +- bin/assets/colorschemes/colorschemes.conf | 100 +- include/eepp/core/string.hpp | 12 + include/eepp/ui/doc/syntaxcolorscheme.hpp | 10 +- projects/linux/ee.creator.user | 95 +- src/eepp/core/string.cpp | 11 + src/eepp/ui/doc/languages/c.cpp | 24 +- src/eepp/ui/doc/languages/configfile.cpp | 4 +- src/eepp/ui/doc/languages/cpp.cpp | 212 ++- src/eepp/ui/doc/languages/css.cpp | 8 +- src/eepp/ui/doc/languages/html.cpp | 2 +- src/eepp/ui/doc/languages/javascript.cpp | 16 +- src/eepp/ui/doc/languages/lua.cpp | 2 +- src/eepp/ui/doc/languages/markdown.cpp | 8 +- src/eepp/ui/doc/languages/python.cpp | 2 +- src/eepp/ui/doc/languages/xml.cpp | 2 +- src/eepp/ui/doc/syntaxcolorscheme.cpp | 15 +- src/eepp/ui/doc/syntaxdefinition.cpp | 8 +- src/eepp/ui/doc/syntaxdefinitionmanager.cpp | 26 +- .../eterm/terminal/terminalcolorscheme.hpp | 16 - .../src/eepp/ui/doc/languages/ada.cpp | 132 +- .../src/eepp/ui/doc/languages/ada.hpp | 2 +- .../src/eepp/ui/doc/languages/adept.cpp | 43 +- .../src/eepp/ui/doc/languages/adept.hpp | 2 +- .../src/eepp/ui/doc/languages/angelscript.cpp | 26 +- .../src/eepp/ui/doc/languages/awkscript.cpp | 8 +- .../src/eepp/ui/doc/languages/batchscript.hpp | 2 +- .../src/eepp/ui/doc/languages/bazel.cpp | 28 +- .../src/eepp/ui/doc/languages/bend.cpp | 10 +- .../src/eepp/ui/doc/languages/blade.cpp | 2 +- .../src/eepp/ui/doc/languages/blueprint.cpp | 34 +- .../src/eepp/ui/doc/languages/brainfuck.cpp | 4 +- .../src/eepp/ui/doc/languages/buzz.cpp | 8 +- .../src/eepp/ui/doc/languages/c2.cpp | 70 +- .../src/eepp/ui/doc/languages/c3.cpp | 144 +- .../src/eepp/ui/doc/languages/carbon.cpp | 32 +- .../src/eepp/ui/doc/languages/clojure.cpp | 18 +- .../src/eepp/ui/doc/languages/cmake.cpp | 1208 ++++++++--------- .../eepp/ui/doc/languages/containerfile.cpp | 28 +- .../src/eepp/ui/doc/languages/covscript.cpp | 12 +- .../src/eepp/ui/doc/languages/crystal.cpp | 70 +- .../src/eepp/ui/doc/languages/csharp.cpp | 28 +- .../src/eepp/ui/doc/languages/d.cpp | 46 +- .../src/eepp/ui/doc/languages/d.hpp | 2 +- .../src/eepp/ui/doc/languages/dart.cpp | 24 +- .../src/eepp/ui/doc/languages/difffile.cpp | 2 +- .../src/eepp/ui/doc/languages/ec.cpp | 62 +- .../src/eepp/ui/doc/languages/elena.cpp | 40 +- .../src/eepp/ui/doc/languages/elixir.cpp | 12 +- .../src/eepp/ui/doc/languages/elm.cpp | 8 +- .../eepp/ui/doc/languages/environmentfile.cpp | 8 +- .../src/eepp/ui/doc/languages/fantom.cpp | 30 +- .../src/eepp/ui/doc/languages/fennel.cpp | 386 +++--- .../src/eepp/ui/doc/languages/fixscript.cpp | 42 +- .../src/eepp/ui/doc/languages/flow9.cpp | 14 +- .../src/eepp/ui/doc/languages/fortran.cpp | 75 +- .../src/eepp/ui/doc/languages/fstab.cpp | 43 +- .../src/eepp/ui/doc/languages/gdscript.cpp | 54 +- .../src/eepp/ui/doc/languages/gleam.cpp | 4 +- .../src/eepp/ui/doc/languages/glsl.cpp | 186 +-- .../src/eepp/ui/doc/languages/glsl.hpp | 2 +- .../src/eepp/ui/doc/languages/go.cpp | 72 +- .../src/eepp/ui/doc/languages/graphql.cpp | 2 +- .../src/eepp/ui/doc/languages/groovy.cpp | 2 +- .../src/eepp/ui/doc/languages/hare.cpp | 68 +- .../src/eepp/ui/doc/languages/haxe.cpp | 47 +- .../src/eepp/ui/doc/languages/hlsl.cpp | 190 +-- .../src/eepp/ui/doc/languages/hlsl.hpp | 2 +- .../src/eepp/ui/doc/languages/htaccess.cpp | 22 +- .../src/eepp/ui/doc/languages/htaccess.hpp | 2 +- .../src/eepp/ui/doc/languages/ispc.cpp | 44 +- .../src/eepp/ui/doc/languages/jai.cpp | 42 +- .../src/eepp/ui/doc/languages/jai.hpp | 2 +- .../src/eepp/ui/doc/languages/janet.cpp | 4 +- .../src/eepp/ui/doc/languages/java.cpp | 14 +- .../src/eepp/ui/doc/languages/jsx.cpp | 6 +- .../src/eepp/ui/doc/languages/jule.cpp | 40 +- .../src/eepp/ui/doc/languages/julia.cpp | 44 +- .../src/eepp/ui/doc/languages/kotlin.cpp | 110 +- .../src/eepp/ui/doc/languages/latex.cpp | 2 +- .../src/eepp/ui/doc/languages/lbstanza.cpp | 40 +- .../src/eepp/ui/doc/languages/lisp.cpp | 6 +- .../src/eepp/ui/doc/languages/lobster.cpp | 72 +- .../src/eepp/ui/doc/languages/makefile.cpp | 144 +- .../src/eepp/ui/doc/languages/modula2.cpp | 13 +- .../src/eepp/ui/doc/languages/modula3.cpp | 12 +- .../src/eepp/ui/doc/languages/moonscript.cpp | 16 +- .../src/eepp/ui/doc/languages/nelua.cpp | 79 +- .../src/eepp/ui/doc/languages/nim.cpp | 8 +- .../src/eepp/ui/doc/languages/objeck.cpp | 96 +- .../src/eepp/ui/doc/languages/objeck.hpp | 2 +- .../src/eepp/ui/doc/languages/objective-c.cpp | 26 +- .../src/eepp/ui/doc/languages/ocaml.cpp | 8 +- .../src/eepp/ui/doc/languages/odin.cpp | 188 +-- .../src/eepp/ui/doc/languages/openscad.cpp | 4 +- .../src/eepp/ui/doc/languages/pascal.cpp | 38 +- .../src/eepp/ui/doc/languages/pascal.hpp | 2 +- .../src/eepp/ui/doc/languages/perl.cpp | 2 +- .../src/eepp/ui/doc/languages/perl.hpp | 2 +- .../src/eepp/ui/doc/languages/php.cpp | 140 +- .../src/eepp/ui/doc/languages/pico-8.cpp | 14 +- .../src/eepp/ui/doc/languages/pico-8.hpp | 2 +- .../src/eepp/ui/doc/languages/pony.cpp | 50 +- .../src/eepp/ui/doc/languages/pony.hpp | 2 +- .../src/eepp/ui/doc/languages/postgresql.cpp | 240 ++-- .../src/eepp/ui/doc/languages/postgresql.hpp | 2 +- .../src/eepp/ui/doc/languages/powershell.cpp | 4 +- .../src/eepp/ui/doc/languages/racket.cpp | 6 +- .../src/eepp/ui/doc/languages/rave.cpp | 60 +- .../src/eepp/ui/doc/languages/rave.hpp | 2 +- .../src/eepp/ui/doc/languages/rescript.cpp | 18 +- .../src/eepp/ui/doc/languages/ring.cpp | 120 +- .../src/eepp/ui/doc/languages/ruby.cpp | 6 +- .../src/eepp/ui/doc/languages/rust.cpp | 42 +- .../src/eepp/ui/doc/languages/rust.hpp | 2 +- .../src/eepp/ui/doc/languages/sass.cpp | 12 +- .../src/eepp/ui/doc/languages/sass.hpp | 2 +- .../src/eepp/ui/doc/languages/scala.cpp | 36 +- .../src/eepp/ui/doc/languages/shellscript.cpp | 8 +- .../src/eepp/ui/doc/languages/smallbasic.cpp | 503 +++---- .../src/eepp/ui/doc/languages/smallbasic.hpp | 2 +- .../src/eepp/ui/doc/languages/solidity.cpp | 177 +-- .../src/eepp/ui/doc/languages/solidity.hpp | 2 +- .../src/eepp/ui/doc/languages/sql.cpp | 240 ++-- .../src/eepp/ui/doc/languages/sql.hpp | 2 +- .../src/eepp/ui/doc/languages/squirrel.cpp | 12 +- .../src/eepp/ui/doc/languages/svelte.cpp | 10 +- .../src/eepp/ui/doc/languages/swift.cpp | 186 +-- .../src/eepp/ui/doc/languages/swift.hpp | 2 +- .../src/eepp/ui/doc/languages/tcl.cpp | 10 +- .../src/eepp/ui/doc/languages/teal.cpp | 22 +- .../src/eepp/ui/doc/languages/typescript.cpp | 28 +- .../src/eepp/ui/doc/languages/typst.cpp | 2 +- .../src/eepp/ui/doc/languages/u.cpp | 278 ++-- .../src/eepp/ui/doc/languages/v.cpp | 113 +- .../src/eepp/ui/doc/languages/v1.cpp | 68 +- .../src/eepp/ui/doc/languages/vala.cpp | 22 +- .../src/eepp/ui/doc/languages/vb.cpp | 20 +- .../src/eepp/ui/doc/languages/vb.hpp | 2 +- .../src/eepp/ui/doc/languages/vue.cpp | 5 +- .../src/eepp/ui/doc/languages/wren.cpp | 2 +- .../src/eepp/ui/doc/languages/x86assembly.cpp | 164 +-- .../src/eepp/ui/doc/languages/x86assembly.hpp | 2 +- .../src/eepp/ui/doc/languages/xtend.cpp | 108 +- .../src/eepp/ui/doc/languages/yaml.cpp | 2 +- .../src/eepp/ui/doc/languages/yuescript.cpp | 16 +- .../src/eepp/ui/doc/languages/zephir.cpp | 79 +- .../src/eepp/ui/doc/languages/zig.cpp | 50 +- .../plugins/discordRPC/discordRPCplugin.hpp | 2 - src/tools/ecode/plugins/git/gitplugin.cpp | 4 +- .../ecode/plugins/lsp/lspdocumentclient.cpp | 8 +- 151 files changed, 3903 insertions(+), 4007 deletions(-) diff --git a/.ecode/project_build.json b/.ecode/project_build.json index e59e5e1f5..f2c49d429 100644 --- a/.ecode/project_build.json +++ b/.ecode/project_build.json @@ -169,7 +169,7 @@ "eepp-linux": { "build": [ { - "args": "--disable-static-build --with-text-shaper --with-debug-symbols gmake", + "args": "--disable-static-build --with-text-shaper --with-debug-symbols --with-mold-linker gmake", "command": "premake4", "working_dir": "${project_root}" }, diff --git a/bin/assets/colorschemes/colorschemes.conf b/bin/assets/colorschemes/colorschemes.conf index 90a9b48d6..641858e45 100644 --- a/bin/assets/colorschemes/colorschemes.conf +++ b/bin/assets/colorschemes/colorschemes.conf @@ -30,8 +30,8 @@ normal = #e1e1e6 symbol = #e1e1e6 comment = #cd8b00 keyword = #ff79c6,shadow -keyword2 = #8be9fd,shadow -keyword3 = #feb86c +type = #8be9fd,shadow +parameter = #feb86c number = #ffd24a literal = #f1fa8c,shadow string = #ffcd8b @@ -72,8 +72,8 @@ normal = #cfcfcf symbol = #cfcfcf comment = #cd8b00 keyword = #8a98ff,bold -keyword2 = #8abdff,bold -keyword3 = #cfcfcf,bold +type = #8abdff,bold +parameter = #cfcfcf,bold number = #f0ad6d literal = #ffcd8b string = #ffcd8b @@ -114,8 +114,8 @@ normal = #aab2c0 symbol = #aab2c0 comment = #5c6370 keyword = #d372e3 -keyword2 = #f6c976 -keyword3 = #ff7285 +type = #f6c976 +parameter = #ff7285 number = #edba54 literal = #f1fa8c string = #9bdc7c @@ -145,8 +145,8 @@ normal = #e1e1e6 symbol = #e1e1e6 comment = #676b6f keyword = #E58AC9 -keyword2 = #F77483 -keyword3 = #FFA94D +type = #F77483 +parameter = #FFA94D number = #FFA94D literal = #FFA94D string = #f7c95c @@ -169,8 +169,8 @@ normal = #efdab9 symbol = #efdab9 comment = #615d5f keyword = #d36e2d -keyword2 = #ef6179 -keyword3 = #ffd152 +type = #ef6179 +parameter = #ffd152 number = #ffd152 literal = #ffd152 string = #ffd152 @@ -193,8 +193,8 @@ normal = #181818 symbol = #181818 comment = #22a21f keyword = #fb6620 -keyword2 = #fc1785 -keyword3 = #1586d2 +type = #fc1785 +parameter = #1586d2 number = #1586d2 literal = #1586d2 string = #1586d2 @@ -222,8 +222,8 @@ normal = #f8f8f2 symbol = #f8f8f2 comment = #6272a4 keyword = #ff79c6 -keyword2 = #8be9fd -keyword3 = #ffb86c +type = #8be9fd +parameter = #ffb86c number = #bd93f9 literal = #f1fa8c string = #f1fa8c @@ -244,8 +244,8 @@ normal = #ebdbb2 symbol = #ebdbb2 comment = #928374 keyword = #fb4934 -keyword2 = #83a598 -keyword3 = #d3869b +type = #83a598 +parameter = #d3869b number = #d3869b literal = #d3869b string = #b8bb26 @@ -266,8 +266,8 @@ normal = #d4be98 symbol = #d4be98 comment = #a9b665 keyword = #e86861 -keyword2 = #e78a4e -keyword3 = #d3869b +type = #e78a4e +parameter = #d3869b number = #d3869b literal = #d3869b string = #d8a657 @@ -290,8 +290,8 @@ normal = #abb2bf symbol = #71a9d7 comment = #5c6370 keyword = #98c875 -keyword2 = #ffffff -keyword3 = #a3b2cf +type = #ffffff +parameter = #a3b2cf number = #ffffff literal = #ea5964 string = #ea5964 @@ -313,8 +313,8 @@ normal = #a0a0a0 symbol = #a0a0a0 comment = #404040 keyword = #f0f0f0 -keyword2 = #f0f0f0 -keyword3 = #f0f0f0 +type = #f0f0f0 +parameter = #f0f0f0 number = #f0f0f0 literal = #f0f0f0 string = #f0f0f0 @@ -335,8 +335,8 @@ normal = #F8F8F2 symbol = #F8F8F2 comment = #75715E keyword = #F92672 -keyword2 = #66DAEF -keyword3 = #AE81FF +type = #66DAEF +parameter = #AE81FF number = #AE81FF literal = #AE81FF string = #E6DB74 @@ -357,8 +357,8 @@ normal = #f5faff symbol = #f5faff comment = #6272a4 keyword = #ff79c6 -keyword2 = #8be9fd -keyword3 = #bd93f9 +type = #8be9fd +parameter = #bd93f9 number = #bd93f9 literal = #bd93f9 string = #f1fa8c @@ -379,8 +379,8 @@ normal = #24292e symbol = #24292e comment = #6a737d keyword = #d73a49 -keyword2 = #d73a49 -keyword3 = #005cc5 +type = #d73a49 +parameter = #005cc5 number = #005cc5 literal = #005cc5 string = #032f62 @@ -414,8 +414,8 @@ normal = #657b83 symbol = #657b83 comment = #93a1a1 keyword = #859900 -keyword2 = #268bd2 -keyword3 = #d33682 +type = #268bd2 +parameter = #d33682 number = #d33682 literal = #2aa198 string = #2aa198 @@ -443,8 +443,8 @@ normal = #00d1d1 symbol = #00ff7f comment = #6c71c4 keyword = #6c71c4 -keyword2 = #6c71c4 -keyword3 = #00ff7f +type = #6c71c4 +parameter = #00ff7f number = #00ff7f literal = #1586d2 string = #f7f97d @@ -465,8 +465,8 @@ normal = #a0a0a0 symbol = #a0a0a0 comment = #404040 keyword = #dfdfdf -keyword2 = #dfdfdf -keyword3 = #dfdfdf +type = #dfdfdf +parameter = #dfdfdf number = #dfdfdf literal = #dfdfdf string = #dfdfdf @@ -487,8 +487,8 @@ normal = #cccccc symbol = #cccccc comment = #6a9955 keyword = #C586C0 -keyword2 = #4CC1A9 -keyword3 = #99D7F8 +type = #4CC1A9 +parameter = #99D7F8 number = #B5CEA8 literal = #CE9178 string = #CE9178 @@ -509,8 +509,8 @@ normal = #dcdccc symbol = #dcdccc comment = #7f9f7f keyword = #f0dfaf -keyword2 = #dfdfbf -keyword3 = #8cd0d3 +type = #dfdfbf +parameter = #8cd0d3 number = #8cd0d3 literal = #dfaf8f string = #cc9393 @@ -531,8 +531,8 @@ normal = #ECEFF4 symbol = #D8DEE9 comment = #4C566A keyword = #81A1C1 -keyword2 = #81A1C1 -keyword3 = #B48EAD +type = #81A1C1 +parameter = #B48EAD number = #B48EAD literal = #81A1C1 string = #A3BE8C @@ -555,8 +555,8 @@ normal = #e1e1e6 symbol = #97e1f1 comment = #676b6f keyword = #E58AC9 -keyword2 = #F77483 -keyword3 = #FFA94D +type = #F77483 +parameter = #FFA94D number = #FFA94D literal = #ee6666 string = #f7c95c @@ -577,8 +577,8 @@ normal = #181818 symbol = #181818 comment = #43cdbd keyword = #5f7dcd -keyword2 = #9c53c6 -keyword3 = #3daee9 +type = #9c53c6 +parameter = #3daee9 number = #3daee9 literal = #3daee9 string = #3daee9 @@ -609,8 +609,8 @@ normal = #3e3c37 symbol = #4c4f82 comment = #93a1a1 keyword = #d33682 -keyword2 = #6c71c4 -keyword3 = #859900 +type = #6c71c4 +parameter = #859900 number = #859900 literal = #b58900 string = #cb4b16 @@ -660,8 +660,8 @@ normal = #cad3f5 symbol = #cad3f5 comment = #6e738d keyword = #c6a0f6,shadow -keyword2 = #eed49f,shadow -keyword3 = #ee99a0,shadow +type = #eed49f,shadow +parameter = #ee99a0,shadow number = #f5a97f literal = #ed8796,shadow string = #a6da95 @@ -702,8 +702,8 @@ normal = #000000 symbol = #000000 comment = #d00000 keyword = #00007f,bold -keyword2 = #007f7f,bold -keyword3 = #404080,bold +type = #007f7f,bold +parameter = #404080,bold number = #007f00 literal = #000080,bold string = #ff8000 diff --git a/include/eepp/core/string.hpp b/include/eepp/core/string.hpp index a1ba56068..1595781b8 100644 --- a/include/eepp/core/string.hpp +++ b/include/eepp/core/string.hpp @@ -352,6 +352,12 @@ class EE_API String { */ static bool contains( const String& haystack, const String& needle ); + /** @return True if a string contains a substring. + * @param haystack The string to search in. + * @param needle The searched string. + */ + static bool contains( std::string_view haystack, std::string_view needle ); + /** @return True if a string contains a substring. Case-insensitive check. * @param haystack The string to search in. * @param needle The searched string. @@ -364,6 +370,12 @@ class EE_API String { */ static bool icontains( const String& haystack, const String& needle ); + /** @return True if a string contains a substring. Case-insensitive check. + * @param haystack The string to search in. + * @param needle The searched string. + */ + static bool icontains( std::string_view haystack, std::string_view needle ); + static int fuzzyMatchSimple( const std::string& pattern, const std::string& string, bool allowUneven = false, bool permissive = false ); diff --git a/include/eepp/ui/doc/syntaxcolorscheme.hpp b/include/eepp/ui/doc/syntaxcolorscheme.hpp index e2bb7b3d7..522605222 100644 --- a/include/eepp/ui/doc/syntaxcolorscheme.hpp +++ b/include/eepp/ui/doc/syntaxcolorscheme.hpp @@ -27,8 +27,10 @@ class SyntaxStyleTypes { static constexpr auto Symbol = "symbol"_sst; static constexpr auto Comment = "comment"_sst; static constexpr auto Keyword = "keyword"_sst; - static constexpr auto Keyword2 = "keyword2"_sst; - static constexpr auto Keyword3 = "keyword3"_sst; + static constexpr auto Type = "type"_sst; + static constexpr auto Keyword2 = "keyword2"_sst; // @deprecated in favor of "type" + static constexpr auto Parameter = "parameter"_sst; + static constexpr auto Keyword3 = "keyword3"_sst; // @deprecated in favor of "parameter" static constexpr auto Number = "number"_sst; static constexpr auto Literal = "literal"_sst; static constexpr auto String = "string"_sst; @@ -239,8 +241,8 @@ constexpr auto SyntaxStyleEmpty() { /** * Syntax colors types accepted/used are: - * "normal", "symbol", "comment", "keyword", "keyword2", - * "number", "literal", "string", "operator", "function", + * "normal", "symbol", "comment", "keyword", "type" (or "keyword2"), + * "number", "literal", "string", "operator", "function", "parameter" (or "keyword3") * "link" * * Editor colors types accepted/used are: diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index e484a3a9d..9eab2f9c1 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1605,6 +1605,95 @@ ProjectExplorer.Project.Target.1 + + Desktop + Python 3.7.3 + Python 3.7.3 + {72ccb97b-2fde-4964-8343-fac47210c736} + 0 + 0 + 0 + + /home/programming/eepp/projects/linux + + + + all + + true + GenericProjectManager.GenericMakeStep + + 1 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + + clean + + true + GenericProjectManager.GenericMakeStep + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Default + GenericProjectManager.GenericBuildConfiguration + + 1 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + 0 + false + false + false + /usr/bin/kcachegrind + 2 + 2 + true + true + /usr/bin/valgrind + + + 2 + + false + -e cpu-cycles --call-graph dwarf,4096 -F 250 + + ProjectExplorer.CustomExecutableRunConfiguration + + false + true + true + + 1 + + + + ProjectExplorer.Project.Target.2 Desktop Python 2.7.18 @@ -1693,7 +1782,7 @@ - ProjectExplorer.Project.Target.2 + ProjectExplorer.Project.Target.3 Desktop Python 2.7.18 @@ -1783,7 +1872,7 @@ ProjectExplorer.Project.TargetCount - 3 + 4 ProjectExplorer.Project.Updater.FileVersion diff --git a/src/eepp/core/string.cpp b/src/eepp/core/string.cpp index 8aff4c47f..eb93d2d04 100644 --- a/src/eepp/core/string.cpp +++ b/src/eepp/core/string.cpp @@ -1293,6 +1293,10 @@ bool String::contains( const String& haystack, const String& needle ) { return haystack.find( needle ) != String::InvalidPos; } +bool String::contains( std::string_view haystack, std::string_view needle ) { + return haystack.find( needle ) != String::InvalidPos; +} + bool String::icontains( const std::string& haystack, const std::string& needle ) { return std::search( haystack.begin(), haystack.end(), needle.begin(), needle.end(), []( char ch1, char ch2 ) { @@ -1307,6 +1311,13 @@ bool String::icontains( const String& haystack, const String& needle ) { } ) != haystack.end(); } +bool String::icontains( std::string_view haystack, std::string_view needle ) { + return std::search( haystack.begin(), haystack.end(), needle.begin(), needle.end(), + []( char ch1, char ch2 ) { + return std::tolower( ch1 ) == std::tolower( ch2 ); + } ) != haystack.end(); +} + void String::replaceAll( std::string& target, const std::string& that, const std::string& with ) { std::string::size_type pos = 0; diff --git a/src/eepp/ui/doc/languages/c.cpp b/src/eepp/ui/doc/languages/c.cpp index 43a3dea0a..52ac697ca 100644 --- a/src/eepp/ui/doc/languages/c.cpp +++ b/src/eepp/ui/doc/languages/c.cpp @@ -27,20 +27,20 @@ void addC() { }, { - { "elseif", "keyword" }, { "int", "keyword2" }, { "then", "keyword" }, - { "unsigned", "keyword2" }, { "continue", "keyword" }, { "default", "keyword" }, - { "volatile", "keyword" }, { "switch", "keyword" }, { "char", "keyword2" }, - { "double", "keyword2" }, { "auto", "keyword" }, { "bool", "keyword2" }, + { "elseif", "keyword" }, { "int", "type" }, { "then", "keyword" }, + { "unsigned", "type" }, { "continue", "keyword" }, { "default", "keyword" }, + { "volatile", "keyword" }, { "switch", "keyword" }, { "char", "type" }, + { "double", "type" }, { "auto", "keyword" }, { "bool", "type" }, { "return", "keyword" }, { "extern", "keyword" }, { "NULL", "literal" }, - { "long", "keyword2" }, { "void", "keyword" }, { "union", "keyword" }, - { "short", "keyword2" }, { "static", "keyword" }, { "inline", "keyword" }, + { "long", "type" }, { "void", "keyword" }, { "union", "keyword" }, + { "short", "type" }, { "static", "keyword" }, { "inline", "keyword" }, { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, - { "while", "keyword" }, { "const", "keyword" }, { "int32_t", "keyword2" }, - { "int16_t", "keyword2" }, { "uint16_t", "keyword2" }, { "typedef", "keyword" }, - { "true", "literal" }, { "else", "keyword" }, { "uint32_t", "keyword2" }, - { "enum", "keyword" }, { "int8_t", "keyword2" }, { "int64_t", "keyword2" }, - { "float", "keyword2" }, { "struct", "keyword" }, { "break", "keyword" }, - { "uint8_t", "keyword2" }, { "uint64_t", "keyword2" }, { "case", "keyword" }, + { "while", "keyword" }, { "const", "keyword" }, { "int32_t", "type" }, + { "int16_t", "type" }, { "uint16_t", "type" }, { "typedef", "keyword" }, + { "true", "literal" }, { "else", "keyword" }, { "uint32_t", "type" }, + { "enum", "keyword" }, { "int8_t", "type" }, { "int64_t", "type" }, + { "float", "type" }, { "struct", "keyword" }, { "break", "keyword" }, + { "uint8_t", "type" }, { "uint64_t", "type" }, { "case", "keyword" }, { "if", "keyword" }, { "do", "keyword" }, { "#if", "keyword" }, { "#ifdef", "keyword" }, { "#ifndef", "keyword" }, diff --git a/src/eepp/ui/doc/languages/configfile.cpp b/src/eepp/ui/doc/languages/configfile.cpp index 51c43b990..b9de62f19 100644 --- a/src/eepp/ui/doc/languages/configfile.cpp +++ b/src/eepp/ui/doc/languages/configfile.cpp @@ -19,8 +19,8 @@ void addConfigFile() { { { "[%a_][%w-+_%s%p]-%f[=]" }, "keyword" }, { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, - { { "^%[.-%]" }, "keyword2" }, - { { "%s%[.-%]" }, "keyword2" }, + { { "^%[.-%]" }, "type" }, + { { "%s%[.-%]" }, "type" }, { { "=" }, "operator" }, { { "https?://[%w_.~!*:@&+$/?%%#-]-%w[-.%w]*%.%w%w%w?%w?:?%d*/?[%w_.~!*:@&+$/" "?%%#=-]*" }, diff --git a/src/eepp/ui/doc/languages/cpp.cpp b/src/eepp/ui/doc/languages/cpp.cpp index b54fec856..bc7f7ab94 100644 --- a/src/eepp/ui/doc/languages/cpp.cpp +++ b/src/eepp/ui/doc/languages/cpp.cpp @@ -11,10 +11,10 @@ void addCPP() { { "%.cpp$", "%.cc$", "%.cxx$", "%.c++$", "%.hh$", "%.inl$", "%.hxx$", "%.hpp$", "%.h++$", "%.tcc$", "%.C$", "%.H$", "%.h++$", "%.ino$", "%.cu$", "%.cuh$" }, { - { { "R%\"(xml)%(", "%)(xml)%\"" }, { "string", "keyword2", "keyword2" }, "XML" }, - { { "R%\"(css)%(", "%)(css)%\"" }, { "string", "keyword2", "keyword2" }, "CSS" }, - { { "R%\"(html)%(", "%)(html)%\"" }, { "string", "keyword2", "keyword2" }, "HTML" }, - { { "R%\"(json)%(", "%)(json)%\"" }, { "string", "keyword2", "keyword2" }, "JSON" }, + { { "R%\"(xml)%(", "%)(xml)%\"" }, { "string", "type", "type" }, "XML" }, + { { "R%\"(css)%(", "%)(css)%\"" }, { "string", "type", "type" }, "CSS" }, + { { "R%\"(html)%(", "%)(html)%\"" }, { "string", "type", "type" }, "HTML" }, + { { "R%\"(json)%(", "%)(json)%\"" }, { "string", "type", "type" }, "JSON" }, { { "R\"[%a-\"]+%(", "%)[%a-\"]+%\"" }, "string" }, { { "R\"%(", "%)\"" }, "string" }, { { "//.-\n" }, "comment" }, @@ -32,81 +32,147 @@ void addCPP() { "", SyntaxPatternMatchType::RegEx }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "std%:%:[%w_]*" }, "keyword2" }, + { { "std%:%:[%w_]*" }, "type" }, { { "(%[)(%[)(%a[%w_]+)(%])(%])" }, - { "normal", "keyword", "keyword3", "keyword2", "keyword3", "keyword" } }, + { "normal", "keyword", "parameter", "type", "parameter", "keyword" } }, { { "#?[%a_][%w_]*" }, "symbol" }, }, { - { "int", "keyword2" }, { "then", "keyword" }, - { "new", "keyword" }, { "reinterpret_cast", "keyword" }, - { "this", "keyword" }, { "long", "keyword2" }, - { "Uint64", "keyword2" }, { "Vector2i", "keyword2" }, - { "String", "keyword2" }, { "Int8", "keyword2" }, - { "short", "keyword2" }, { "nullptr", "keyword" }, - { "dynamic_cast", "keyword" }, { "for", "keyword" }, - { "goto", "keyword" }, { "while", "keyword" }, - { "const", "keyword" }, { "enum", "keyword" }, - { "break", "keyword" }, { "Uint32", "keyword2" }, - { "Uint8", "keyword2" }, { "or", "keyword" }, - { "compl", "keyword" }, { "char8_t", "keyword2" }, - { "friend", "keyword" }, { "alignof", "keyword" }, - { "volatile", "keyword" }, { "noexcept", "keyword" }, - { "decltype", "keyword" }, { "auto", "keyword2" }, - { "constinit", "keyword" }, { "class", "keyword" }, - { "constexpr", "keyword" }, { "void", "keyword" }, - { "char16_t", "keyword2" }, { "static", "keyword" }, - { "inline", "keyword" }, { "typedef", "keyword" }, - { "const_cast", "keyword" }, { "co_return", "keyword" }, - { "throw", "keyword" }, { "true", "keyword2" }, - { "float", "keyword2" }, { "Vector2f", "keyword2" }, - { "bitand", "keyword" }, { "size_t", "keyword2" }, - { "Uint16", "keyword2" }, { "case", "keyword" }, - { "mutable", "keyword" }, { "protected", "keyword" }, - { "do", "keyword" }, { "continue", "keyword" }, - { "asm", "keyword" }, { "default", "keyword" }, - { "Recti", "keyword2" }, { "char", "keyword2" }, - { "bool", "keyword2" }, { "Rectf", "keyword2" }, - { "requires", "keyword" }, { "extern", "keyword" }, - { "not_eq", "keyword" }, { "static_cast", "keyword" }, - { "namespace", "keyword" }, { "union", "keyword" }, - { "xor", "keyword" }, { "Int64", "keyword2" }, - { "false", "keyword2" }, { "int32_t", "keyword2" }, - { "int16_t", "keyword2" }, { "uint16_t", "keyword2" }, - { "concept", "keyword" }, { "typename", "keyword" }, - { "else", "keyword" }, { "co_yield", "keyword" }, - { "uint32_t", "keyword2" }, { "operator", "keyword" }, - { "Int32", "keyword2" }, { "struct", "keyword" }, - { "if", "keyword" }, { "and_eq", "keyword" }, - { "Int16", "keyword2" }, { "xor_eq", "keyword" }, - { "elseif", "keyword" }, { "public", "keyword" }, - { "virtual", "keyword" }, { "unsigned", "keyword2" }, - { "and", "keyword" }, { "Float", "keyword2" }, - { "private", "keyword" }, { "or_eq", "keyword" }, - { "switch", "keyword" }, { "using", "keyword" }, - { "double", "keyword2" }, { "typeid", "keyword" }, - { "delete", "keyword" }, { "return", "keyword" }, - { "NULL", "literal" }, { "static_assert", "keyword" }, - { "try", "keyword" }, { "consteval", "keyword" }, - { "Color", "keyword2" }, { "register", "keyword" }, - { "explicit", "keyword" }, { "catch", "keyword" }, - { "co_wait", "keyword" }, { "override", "keyword" }, - { "not", "keyword" }, { "template", "keyword" }, - { "int64_t", "keyword2" }, { "wchar_t", "keyword2" }, - { "bitor", "keyword" }, { "thread_local", "keyword" }, - { "uint64_t", "keyword2" }, { "char32_t", "keyword2" }, - { "alignas", "keyword" }, { "export", "keyword" }, - { "ssize_t", "keyword2" }, { "signed", "keyword2" }, + { "int", "type" }, + { "then", "keyword" }, + { "new", "keyword" }, + { "reinterpret_cast", "keyword" }, + { "this", "keyword" }, + { "long", "type" }, + { "Uint64", "type" }, + { "Vector2i", "type" }, + { "String", "type" }, + { "Int8", "type" }, + { "short", "type" }, + { "nullptr", "keyword" }, + { "dynamic_cast", "keyword" }, + { "for", "keyword" }, + { "goto", "keyword" }, + { "while", "keyword" }, + { "const", "keyword" }, + { "enum", "keyword" }, + { "break", "keyword" }, + { "Uint32", "type" }, + { "Uint8", "type" }, + { "or", "keyword" }, + { "compl", "keyword" }, + { "char8_t", "type" }, + { "friend", "keyword" }, + { "alignof", "keyword" }, + { "volatile", "keyword" }, + { "noexcept", "keyword" }, + { "decltype", "keyword" }, + { "auto", "type" }, + { "constinit", "keyword" }, + { "class", "keyword" }, + { "constexpr", "keyword" }, + { "void", "keyword" }, + { "char16_t", "type" }, + { "static", "keyword" }, + { "inline", "keyword" }, + { "typedef", "keyword" }, + { "const_cast", "keyword" }, + { "co_return", "keyword" }, + { "throw", "keyword" }, + { "true", "type" }, + { "float", "type" }, + { "Vector2f", "type" }, + { "bitand", "keyword" }, + { "size_t", "type" }, + { "Uint16", "type" }, + { "case", "keyword" }, + { "mutable", "keyword" }, + { "protected", "keyword" }, + { "do", "keyword" }, + { "continue", "keyword" }, + { "asm", "keyword" }, + { "default", "keyword" }, + { "Recti", "type" }, + { "char", "type" }, + { "bool", "type" }, + { "Rectf", "type" }, + { "requires", "keyword" }, + { "extern", "keyword" }, + { "not_eq", "keyword" }, + { "static_cast", "keyword" }, + { "namespace", "keyword" }, + { "union", "keyword" }, + { "xor", "keyword" }, + { "Int64", "type" }, + { "false", "type" }, + { "int32_t", "type" }, + { "int16_t", "type" }, + { "uint16_t", "type" }, + { "concept", "keyword" }, + { "typename", "keyword" }, + { "else", "keyword" }, + { "co_yield", "keyword" }, + { "uint32_t", "type" }, + { "operator", "keyword" }, + { "Int32", "type" }, + { "struct", "keyword" }, + { "if", "keyword" }, + { "and_eq", "keyword" }, + { "Int16", "type" }, + { "xor_eq", "keyword" }, + { "elseif", "keyword" }, + { "public", "keyword" }, + { "virtual", "keyword" }, + { "unsigned", "type" }, + { "and", "keyword" }, + { "Float", "type" }, + { "private", "keyword" }, + { "or_eq", "keyword" }, + { "switch", "keyword" }, + { "using", "keyword" }, + { "double", "type" }, + { "typeid", "keyword" }, + { "delete", "keyword" }, + { "return", "keyword" }, + { "NULL", "literal" }, + { "static_assert", "keyword" }, + { "try", "keyword" }, + { "consteval", "keyword" }, + { "Color", "type" }, + { "register", "keyword" }, + { "explicit", "keyword" }, + { "catch", "keyword" }, + { "co_wait", "keyword" }, + { "override", "keyword" }, + { "not", "keyword" }, + { "template", "keyword" }, + { "int64_t", "type" }, + { "wchar_t", "type" }, + { "bitor", "keyword" }, + { "thread_local", "keyword" }, + { "uint64_t", "type" }, + { "char32_t", "type" }, + { "alignas", "keyword" }, + { "export", "keyword" }, + { "ssize_t", "type" }, + { "signed", "type" }, - { "#if", "keyword" }, { "#ifdef", "keyword" }, - { "#ifndef", "keyword" }, { "#else", "keyword" }, - { "#elif", "keyword" }, { "#elifdef", "keyword" }, // C++23 - { "#elifndef", "keyword" }, // C++23 - { "#endif", "keyword" }, { "#include", "keyword" }, - { "#define", "keyword" }, { "#undef", "keyword" }, - { "#line", "keyword" }, { "#error", "keyword" }, - { "#pragma", "keyword" }, { "#warning", "keyword" }, + { "#if", "keyword" }, + { "#ifdef", "keyword" }, + { "#ifndef", "keyword" }, + { "#else", "keyword" }, + { "#elif", "keyword" }, + { "#elifdef", "keyword" }, // C++23 + { "#elifndef", "keyword" }, // C++23 + { "#endif", "keyword" }, + { "#include", "keyword" }, + { "#define", "keyword" }, + { "#undef", "keyword" }, + { "#line", "keyword" }, + { "#error", "keyword" }, + { "#pragma", "keyword" }, + { "#warning", "keyword" }, }, "//", diff --git a/src/eepp/ui/doc/languages/css.cpp b/src/eepp/ui/doc/languages/css.cpp index 9c39cd24c..43e4f7d8e 100644 --- a/src/eepp/ui/doc/languages/css.cpp +++ b/src/eepp/ui/doc/languages/css.cpp @@ -16,14 +16,14 @@ void addCSS() { { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, { { "#%x%x%x%x?%x?%x?%x?%x?%f[%W]" }, "string" }, - { { "#[%a%_%-][%w%_%-]*" }, "keyword2" }, - { { "%-%-%a[%w%-%_]*" }, "keyword2" }, + { { "#[%a%_%-][%w%_%-]*" }, "type" }, + { { "%-%-%a[%w%-%_]*" }, "type" }, { { "-?%d+[%d%.]*p[xt]" }, "number" }, { { "-?%d+[%d%.]*dp" }, "number" }, { { "-?%d+[%d%.]*deg" }, "number" }, { { "-?%d+[%d%.]*" }, "number" }, - { { "@[%a][%w%_%-]*" }, "keyword2" }, - { { "%.[%a%_%-][%w%_%-]*" }, "keyword2" }, + { { "@[%a][%w%_%-]*" }, "type" }, + { { "%.[%a%_%-][%w%_%-]*" }, "type" }, { { "(:)(hover)" }, { "normal", "operator", "literal" } }, { { "(:)(focus%-within)" }, { "normal", "operator", "literal" } }, { { "(:)(focus)" }, { "normal", "operator", "literal" } }, diff --git a/src/eepp/ui/doc/languages/html.cpp b/src/eepp/ui/doc/languages/html.cpp index 91818f612..57f482867 100644 --- a/src/eepp/ui/doc/languages/html.cpp +++ b/src/eepp/ui/doc/languages/html.cpp @@ -35,7 +35,7 @@ void addHTML() { { { "0x[%da-fA-F]+" }, "number" }, { { "-?%d+[%d%.]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "[%a_][%w_]*" }, "keyword" }, diff --git a/src/eepp/ui/doc/languages/javascript.cpp b/src/eepp/ui/doc/languages/javascript.cpp index bd184afce..48a933a98 100644 --- a/src/eepp/ui/doc/languages/javascript.cpp +++ b/src/eepp/ui/doc/languages/javascript.cpp @@ -26,36 +26,36 @@ void addJavaScript() { "", SyntaxPatternMatchType::RegEx }, { { "([%w_][%w_]+)%.([%w_][%w%d_]*)%s*(=)%s*(function)" }, - { "normal", "keyword2", "function", "operator", "keyword" } }, + { "normal", "type", "function", "operator", "keyword" } }, { { "([%w_][%w_]+)%.([%w_][%w%d_]*)%s*(=)%s*(async%s*function)" }, - { "normal", "keyword2", "function", "operator", "keyword" } }, + { "normal", "type", "function", "operator", "keyword" } }, { { "([%w_][%w_]+)%.([%w_][%w%d_]*)%s*(=)%s*%f[(]" }, - { "normal", "keyword2", "function", "operator" } }, + { "normal", "type", "function", "operator" } }, { { "([%w_][%w_]+)%.([%w_][%w%d_]*)%s*(=)%s*(async)%s*%f[(]" }, - { "normal", "keyword2", "function", "operator", "function" } }, + { "normal", "type", "function", "operator", "function" } }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, }, { { "new", "keyword" }, { "continue", "keyword" }, { "default", "keyword" }, - { "set", "keyword" }, { "this", "keyword2" }, { "Array", "keyword2" }, + { "set", "keyword" }, { "this", "type" }, { "Array", "type" }, { "namespace", "keyword" }, { "any", "keyword" }, { "of", "keyword" }, { "typeof", "keyword" }, { "extends", "keyword" }, { "with", "keyword" }, { "undefined", "literal" }, { "false", "literal" }, { "for", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, { "get", "keyword" }, { "from", "keyword" }, { "null", "literal" }, { "function", "keyword" }, { "else", "keyword" }, { "enum", "keyword" }, { "async", "keyword" }, - { "break", "keyword" }, { "declare", "keyword" }, { "arguments", "keyword2" }, + { "break", "keyword" }, { "declare", "keyword" }, { "arguments", "type" }, { "if", "keyword" }, { "await", "keyword" }, { "let", "keyword" }, { "in", "keyword" }, { "public", "keyword" }, { "debugger", "keyword" }, - { "private", "keyword" }, { "NaN", "keyword2" }, { "finally", "keyword" }, + { "private", "keyword" }, { "NaN", "type" }, { "finally", "keyword" }, { "switch", "keyword" }, { "delete", "keyword" }, { "return", "keyword" }, { "var", "keyword" }, { "import", "keyword" }, { "try", "keyword" }, { "class", "keyword" }, { "void", "keyword" }, { "yield", "keyword" }, { "static", "keyword" }, { "super", "keyword" }, { "throw", "keyword" }, { "catch", "keyword" }, { "true", "literal" }, { "implements", "keyword" }, - { "instanceof", "keyword" }, { "Infinity", "keyword2" }, { "case", "keyword" }, + { "instanceof", "keyword" }, { "Infinity", "type" }, { "case", "keyword" }, { "export", "keyword" }, { "protected", "keyword" }, { "do", "keyword" }, }, diff --git a/src/eepp/ui/doc/languages/lua.cpp b/src/eepp/ui/doc/languages/lua.cpp index 26870f5e7..99d1ba90a 100644 --- a/src/eepp/ui/doc/languages/lua.cpp +++ b/src/eepp/ui/doc/languages/lua.cpp @@ -30,7 +30,7 @@ void addLua() { { "elseif", "keyword" }, { "false", "literal" }, { "in", "keyword" }, { "then", "keyword" }, { "for", "keyword" }, { "goto", "keyword" }, { "while", "keyword" }, { "and", "keyword" }, { "function", "keyword" }, - { "self", "keyword2" }, { "true", "literal" }, { "else", "keyword" }, + { "self", "type" }, { "true", "literal" }, { "else", "keyword" }, { "nil", "literal" }, { "not", "keyword" }, { "return", "keyword" }, { "local", "keyword" }, { "break", "keyword" }, { "or", "keyword" }, { "end", "keyword" }, { "until", "keyword" }, { "if", "keyword" }, diff --git a/src/eepp/ui/doc/languages/markdown.cpp b/src/eepp/ui/doc/languages/markdown.cpp index 93bc8426a..0433b19a2 100644 --- a/src/eepp/ui/doc/languages/markdown.cpp +++ b/src/eepp/ui/doc/languages/markdown.cpp @@ -21,14 +21,14 @@ void addMarkdown() { { { "```", "```" }, "string" }, { { "``", "``" }, "string" }, { { "`", "`" }, "string" }, - { { "~~", "~~", "\\" }, "keyword2" }, + { { "~~", "~~", "\\" }, "type" }, { { "%-%-%-+" }, "comment" }, { { "%*%s+" }, "operator" }, { { "%*", "[%*\n]", "\\" }, "operator" }, - { { "%s%_", "[%_\n]", "\\" }, "keyword2" }, - { { "^%_", "[%_\n]", "\\" }, "keyword2" }, + { { "%s%_", "[%_\n]", "\\" }, "type" }, + { { "^%_", "[%_\n]", "\\" }, "type" }, { { "^#.-\n" }, "keyword" }, - { { "\n%_", "[%_\n]", "\\" }, "keyword2" }, + { { "\n%_", "[%_\n]", "\\" }, "type" }, { { "%[!%[([^%]].-)%]%((https?://[%w_.~!*:@&+$/?%%#-]-%w[-.%w]*%.%w%w%w?%w?:?%d*/" "?[%w_.~!*:@&+$/?%%#=-]*)%)%]%((https?://[%w_.~!*:@&+$/" "?%%#-]-%w[-.%w]*%.%w%w%w?%w?:?%d*/?[%w_.~!*:@&+$/?%%#=-]*)%)" }, diff --git a/src/eepp/ui/doc/languages/python.cpp b/src/eepp/ui/doc/languages/python.cpp index d18e3d34d..fce80982d 100644 --- a/src/eepp/ui/doc/languages/python.cpp +++ b/src/eepp/ui/doc/languages/python.cpp @@ -31,7 +31,7 @@ void addPython() { { "raise", "keyword" }, { "yield", "keyword" }, { "with", "keyword" }, { "for", "keyword" }, { "while", "keyword" }, { "assert", "keyword" }, { "from", "keyword" }, { "elif", "keyword" }, { "def", "keyword" }, - { "self", "keyword2" }, { "else", "keyword" }, { "global", "keyword" }, + { "self", "type" }, { "else", "keyword" }, { "global", "keyword" }, { "not", "keyword" }, { "break", "keyword" }, { "nonlocal", "keyword" }, { "is", "keyword" }, { "or", "keyword" }, { "if", "keyword" }, { "except", "keyword" }, diff --git a/src/eepp/ui/doc/languages/xml.cpp b/src/eepp/ui/doc/languages/xml.cpp index a50efc323..2c955c40c 100644 --- a/src/eepp/ui/doc/languages/xml.cpp +++ b/src/eepp/ui/doc/languages/xml.cpp @@ -22,7 +22,7 @@ void addXML() { { { "0x[%da-fA-F]+" }, "number" }, { { "-?%d+[%d%.]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "[%a_][%w_]*" }, "keyword" }, diff --git a/src/eepp/ui/doc/syntaxcolorscheme.cpp b/src/eepp/ui/doc/syntaxcolorscheme.cpp index ae137b8c1..fdd58d50b 100644 --- a/src/eepp/ui/doc/syntaxcolorscheme.cpp +++ b/src/eepp/ui/doc/syntaxcolorscheme.cpp @@ -45,8 +45,8 @@ SyntaxColorScheme SyntaxColorScheme::getDefault() { { "symbol"_sst, Color( "#e1e1e6" ) }, { "comment"_sst, Color( "#cd8b00" ) }, { "keyword"_sst, { Color( "#ff79c6" ), Color::Transparent, Text::Shadow } }, - { "keyword2"_sst, { Color( "#8be9fd" ), Color::Transparent, Text::Shadow } }, - { "keyword3"_sst, { Color( "#ffb86c" ), Color::Transparent, Text::Shadow } }, + { "type"_sst, { Color( "#8be9fd" ), Color::Transparent, Text::Shadow } }, + { "parameter"_sst, { Color( "#ffb86c" ), Color::Transparent, Text::Shadow } }, { "number"_sst, Color( "#ffd24a" ) }, { "literal"_sst, { Color( "#f1fa8c" ), Color::Transparent, Text::Shadow } }, { "string"_sst, Color( "#ffcd8b" ) }, @@ -130,9 +130,10 @@ SyntaxColorScheme::Style parseStyle( } } else if ( syntaxColors && ( "normal" == val || "symbol" == val || "comment" == val || - "keyword" == val || "keyword2" == val || "number" == val || - "literal" == val || "string" == val || "opetaror" == val || - "function" == val || "link" == val || "link_hover" == val ) ) { + "keyword" == val || "keyword2" == val || "keyword3" == val || + "number" == val || "literal" == val || "string" == val || + "opetaror" == val || "function" == val || "link" == val || + "link_hover" == val || "type" == val || "parameter" == val ) ) { auto styleIt = syntaxColors->find( toSyntaxStyleType( val ) ); if ( styleIt != syntaxColors->end() ) { style = styleIt->second; @@ -221,7 +222,11 @@ SyntaxColorScheme::getSyntaxStyle( const SyntaxStyleType& type ) const { auto it = mSyntaxColors.find( type ); if ( it != mSyntaxColors.end() ) return it->second; + else if ( type == "keyword2"_sst ) + return getSyntaxStyle( "type"_sst ); else if ( type == "keyword3"_sst ) + return getSyntaxStyle( "parameter"_sst ); + else if ( type == "parameter"_sst ) return getSyntaxStyle( "symbol"_sst ); else if ( type == "link"_sst || type == "link_hover"_sst ) return getSyntaxStyle( "function"_sst ); diff --git a/src/eepp/ui/doc/syntaxdefinition.cpp b/src/eepp/ui/doc/syntaxdefinition.cpp index 864419ade..1ecbf9c71 100644 --- a/src/eepp/ui/doc/syntaxdefinition.cpp +++ b/src/eepp/ui/doc/syntaxdefinition.cpp @@ -16,16 +16,16 @@ static void liftContentPatternsRecursive( SyntaxDefinition& def, SyntaxPattern& Uint64& uniqueIdCounter ) { for ( Uint64 i = 0; i < pattern.contentPatterns.size(); ++i ) { // Pass a new prefix seed for children to ensure unique names - std::string childPrefixSeed = namePrefixSeed + "_cp" + String::toString( i ); + std::string childPrefixSeed = String::format( "%s_cp%zu", namePrefixSeed, i ); liftContentPatternsRecursive( def, pattern.contentPatterns[i], childPrefixSeed, uniqueIdCounter ); } if ( !pattern.contentPatterns.empty() ) { // Generate a unique repository name for this pattern's content scope - std::string contentRepoName = "$CONTENT_" + def.getLanguageNameForFileSystem() + "_" + - namePrefixSeed + "_uid" + - String::toString( uniqueIdCounter++ ); + std::string contentRepoName = + String::format( "$CONTENT_%s_%s_uid%zu", def.getLanguageNameForFileSystem(), + namePrefixSeed, uniqueIdCounter++ ); pattern.contentScopeRepoHash = String::hash( contentRepoName ); def.addRepository( std::move( contentRepoName ), std::move( pattern.contentPatterns ) ); } diff --git a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp index b02eb01f8..fc38a0f41 100644 --- a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp +++ b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp @@ -38,24 +38,24 @@ class TextMateScopeMapper { // -- Most Specific -- { "markup.underline.link", "link" }, // Specific markup { "constant.character.escape", "string" }, // Escapes within strings - { "variable.parameter", "keyword3" }, // Function parameters + { "variable.parameter", "parameter" }, // Function parameters { "variable.language", "literal" }, // Language constants like 'this', 'self', 'null'? { "variable.identifier", "normal" }, { "variable.function", "function" }, - { "storage.type", "keyword" }, // Class, struct, int, bool etc. (declaration) - { "entity.name.function", "function" }, // Function definition name - { "entity.name.type", "keyword2" }, // Type name (class, struct, etc.) in definition - { "entity.name.class", "keyword2" }, // Class name in definition - { "entity.name.struct", "keyword2" }, // Struct name in definition - { "entity.name.interface", "keyword2" }, // Interface name in definition - { "entity.name.tag", "keyword2" }, // HTML/XML tag name - { "keyword.control", "keyword" }, // if, else, for, while, return etc. - { "keyword.operator", "operator" }, // +, -, =, and, or, etc. + { "storage.type", "keyword" }, // Class, struct, int, bool etc. (declaration) + { "entity.name.function", "function" }, // Function definition name + { "entity.name.type", "type" }, // Type name (class, struct, etc.) in definition + { "entity.name.class", "type" }, // Class name in definition + { "entity.name.struct", "type" }, // Struct name in definition + { "entity.name.interface", "type" }, // Interface name in definition + { "entity.name.tag", "type" }, // HTML/XML tag name + { "keyword.control", "keyword" }, // if, else, for, while, return etc. + { "keyword.operator", "operator" }, // +, -, =, and, or, etc. { "punctuation.definition.string", "string" }, // <, >, , #include #include -#include #include using namespace EE; @@ -13,21 +12,6 @@ using namespace EE::System; namespace eterm { namespace Terminal { -/** - * Syntax colors types accepted/used are: - * "normal", "symbol", "comment", "keyword", "keyword2", - * "number", "literal", "string", "operator", "function", - * "link" - * - * Editor colors types accepted/used are: - * "background", "text", "caret" - * "selection", "gutter_background", - * "line_number", "line_number2", "line_highlight", - * "gutter_background", "whitespace", "line_break_column", - * "matching_bracket", "matching_selection", "suggestion", "suggestion_selected" - * - * Following the lite editor syntax colors (https://github.com/rxi/lite). - */ class TerminalColorScheme { public: static TerminalColorScheme getDefault(); diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.cpp index a7000f0ca..2a70f2f1f 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.cpp @@ -20,94 +20,50 @@ SyntaxDefinition& addAda() { }, { - { "abort", "keyword" }, - { "abs", "keyword" }, - { "abstract", "keyword" }, - { "accept", "keyword" }, - { "access", "keyword" }, - { "aliased", "keyword" }, - { "all", "keyword" }, - { "and", "keyword" }, - { "array", "keyword" }, - { "at", "keyword" }, - { "begin", "keyword" }, - { "body", "keyword" }, - { "case", "keyword" }, - { "constant", "keyword" }, - { "declare", "keyword" }, - { "delay", "keyword" }, - { "delta", "keyword" }, - { "digits", "keyword" }, - { "do", "keyword" }, - { "else", "keyword" }, - { "elsif", "keyword" }, - { "end", "keyword" }, - { "entry", "keyword" }, - { "exception", "keyword" }, - { "exit", "keyword" }, - { "for", "keyword" }, - { "function", "keyword" }, - { "generic", "keyword" }, - { "goto", "keyword" }, - { "if", "keyword" }, - { "in", "keyword" }, - { "interface", "keyword" }, - { "is", "keyword" }, - { "limited", "keyword" }, - { "loop", "keyword" }, - { "mod", "keyword" }, - { "new", "keyword" }, - { "not", "keyword" }, - { "null", "keyword" }, - { "of", "keyword" }, - { "or", "keyword" }, - { "others", "keyword" }, - { "out", "keyword" }, - { "overriding", "keyword" }, - { "package", "keyword" }, - { "parallel", "keyword" }, - { "pragma", "keyword" }, - { "private", "keyword" }, - { "procedure", "keyword" }, - { "protected", "keyword" }, - { "raise", "keyword" }, - { "range", "keyword" }, - { "record", "keyword" }, - { "rem", "keyword" }, - { "renames", "keyword" }, - { "requeue", "keyword" }, - { "return", "keyword" }, - { "reverse", "keyword" }, - { "select", "keyword" }, - { "separate", "keyword" }, - { "some", "keyword" }, - { "subtype", "keyword" }, - { "synchronized", "keyword" }, - { "tagged", "keyword" }, - { "task", "keyword" }, - { "terminate", "keyword" }, - { "then", "keyword" }, - { "type", "keyword" }, - { "until", "keyword" }, - { "use", "keyword" }, - { "when", "keyword" }, - { "while", "keyword" }, - { "with", "keyword" }, - { "xor", "keyword" }, - { "true", "keyword" }, - { "false", "keyword" }, - { "boolean", "keyword2" }, - { "character", "keyword2" }, - { "count", "keyword2" }, - { "duration", "keyword2" }, - { "float", "keyword2" }, - { "integer", "keyword2" }, - { "long_float", "keyword2" }, - { "long_integer", "keyword2" }, - { "priority", "keyword2" }, - { "short_float", "keyword2" }, - { "short_integer", "keyword2" }, - { "string", "keyword2" }, + { "abort", "keyword" }, { "abs", "keyword" }, + { "abstract", "keyword" }, { "accept", "keyword" }, + { "access", "keyword" }, { "aliased", "keyword" }, + { "all", "keyword" }, { "and", "keyword" }, + { "array", "keyword" }, { "at", "keyword" }, + { "begin", "keyword" }, { "body", "keyword" }, + { "case", "keyword" }, { "constant", "keyword" }, + { "declare", "keyword" }, { "delay", "keyword" }, + { "delta", "keyword" }, { "digits", "keyword" }, + { "do", "keyword" }, { "else", "keyword" }, + { "elsif", "keyword" }, { "end", "keyword" }, + { "entry", "keyword" }, { "exception", "keyword" }, + { "exit", "keyword" }, { "for", "keyword" }, + { "function", "keyword" }, { "generic", "keyword" }, + { "goto", "keyword" }, { "if", "keyword" }, + { "in", "keyword" }, { "interface", "keyword" }, + { "is", "keyword" }, { "limited", "keyword" }, + { "loop", "keyword" }, { "mod", "keyword" }, + { "new", "keyword" }, { "not", "keyword" }, + { "null", "keyword" }, { "of", "keyword" }, + { "or", "keyword" }, { "others", "keyword" }, + { "out", "keyword" }, { "overriding", "keyword" }, + { "package", "keyword" }, { "parallel", "keyword" }, + { "pragma", "keyword" }, { "private", "keyword" }, + { "procedure", "keyword" }, { "protected", "keyword" }, + { "raise", "keyword" }, { "range", "keyword" }, + { "record", "keyword" }, { "rem", "keyword" }, + { "renames", "keyword" }, { "requeue", "keyword" }, + { "return", "keyword" }, { "reverse", "keyword" }, + { "select", "keyword" }, { "separate", "keyword" }, + { "some", "keyword" }, { "subtype", "keyword" }, + { "synchronized", "keyword" }, { "tagged", "keyword" }, + { "task", "keyword" }, { "terminate", "keyword" }, + { "then", "keyword" }, { "type", "keyword" }, + { "until", "keyword" }, { "use", "keyword" }, + { "when", "keyword" }, { "while", "keyword" }, + { "with", "keyword" }, { "xor", "keyword" }, + { "true", "keyword" }, { "false", "keyword" }, + { "boolean", "type" }, { "character", "type" }, + { "count", "type" }, { "duration", "type" }, + { "float", "type" }, { "integer", "type" }, + { "long_float", "type" }, { "long_integer", "type" }, + { "priority", "type" }, { "short_float", "type" }, + { "short_integer", "type" }, { "string", "type" }, }, "--", {} diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.hpp index 0d521bae5..10eb2531e 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ada.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addAda(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.cpp index 366224df5..4dc88942a 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.cpp @@ -5,6 +5,7 @@ namespace EE { namespace UI { namespace Doc { namespace Language { SyntaxDefinition& addAdept() { auto& sd = SyntaxDefinitionManager::instance()->add( + { "Adept", { "%.adept$" }, { @@ -99,27 +100,27 @@ SyntaxDefinition& addAdept() { { "it", "keyword" }, { "idx", "keyword" }, { "volatile", "keyword" }, - { "bool", "keyword2" }, - { "ptr", "keyword2" }, - { "byte", "keyword2" }, - { "ubyte", "keyword2" }, - { "short", "keyword2" }, - { "ushort", "keyword2" }, - { "int", "keyword2" }, - { "uint", "keyword2" }, - { "long", "keyword2" }, - { "ulong", "keyword2" }, - { "usize", "keyword2" }, - { "double", "keyword2" }, - { "float", "keyword2" }, - { "String", "keyword2" }, - { "List", "keyword2" }, - { "Array", "keyword2" }, - { "Matrix4f", "keyword2" }, - { "Vector3f", "keyword2" }, - { "FILE", "keyword2" }, - { "va_list", "keyword2" }, - { "successful", "keyword2" }, + { "bool", "type" }, + { "ptr", "type" }, + { "byte", "type" }, + { "ubyte", "type" }, + { "short", "type" }, + { "ushort", "type" }, + { "int", "type" }, + { "uint", "type" }, + { "long", "type" }, + { "ulong", "type" }, + { "usize", "type" }, + { "double", "type" }, + { "float", "type" }, + { "String", "type" }, + { "List", "type" }, + { "Array", "type" }, + { "Matrix4f", "type" }, + { "Vector3f", "type" }, + { "FILE", "type" }, + { "va_list", "type" }, + { "successful", "type" }, { "true", "literal" }, { "false", "literal" }, { "null", "literal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.hpp index cead6447e..e5c81076c 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/adept.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addAdept(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/angelscript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/angelscript.cpp index 821030129..44ca8f531 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/angelscript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/angelscript.cpp @@ -23,31 +23,31 @@ SyntaxDefinition& addAngelScript() { { { "&inout" }, "keyword" }, { { "&in" }, "keyword" }, { { "&out" }, "keyword" }, - { { "[%a_][%w_]*@" }, "keyword2" }, + { { "[%a_][%w_]*@" }, "type" }, { { "[%-%+!~@%?:&|%^<>%*/=%%]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "float", "keyword2" }, { "uint64", "keyword2" }, { "uint", "keyword2" }, - { "int64", "keyword2" }, { "mixin", "keyword" }, { "set", "keyword" }, - { "get", "keyword" }, { "uint16", "keyword2" }, { "funcdef", "keyword" }, - { "false", "literal" }, { "shared", "keyword" }, { "uint32", "keyword2" }, - { "override", "keyword" }, { "class", "keyword" }, { "int16", "keyword2" }, - { "external", "keyword" }, { "default", "keyword" }, { "uint8", "keyword2" }, - { "protected", "keyword" }, { "int8", "keyword2" }, { "typedef", "keyword" }, + { "float", "type" }, { "uint64", "type" }, { "uint", "type" }, + { "int64", "type" }, { "mixin", "keyword" }, { "set", "keyword" }, + { "get", "keyword" }, { "uint16", "type" }, { "funcdef", "keyword" }, + { "false", "literal" }, { "shared", "keyword" }, { "uint32", "type" }, + { "override", "keyword" }, { "class", "keyword" }, { "int16", "type" }, + { "external", "keyword" }, { "default", "keyword" }, { "uint8", "type" }, + { "protected", "keyword" }, { "int8", "type" }, { "typedef", "keyword" }, { "switch", "keyword" }, { "private", "keyword" }, { "final", "keyword" }, - { "if", "keyword" }, { "int", "keyword2" }, { "import", "keyword" }, + { "if", "keyword" }, { "int", "type" }, { "import", "keyword" }, { "catch", "keyword" }, { "return", "keyword" }, { "case", "keyword" }, { "and", "operator" }, { "while", "keyword" }, { "do", "keyword" }, { "cast", "keyword" }, { "break", "keyword" }, { "continue", "keyword" }, { "else", "keyword" }, { "try", "keyword" }, { "true", "literal" }, - { "function", "keyword" }, { "bool", "keyword2" }, { "is", "operator" }, - { "property", "keyword" }, { "const", "keyword" }, { "void", "keyword2" }, + { "function", "keyword" }, { "bool", "type" }, { "is", "operator" }, + { "property", "keyword" }, { "const", "keyword" }, { "void", "type" }, { "abstract", "keyword" }, { "or", "operator" }, { "for", "keyword" }, - { "explicit", "keyword" }, { "int32", "keyword2" }, { "xor", "operator" }, - { "auto", "keyword" }, { "namespace", "keyword" }, { "double", "keyword2" }, + { "explicit", "keyword" }, { "int32", "type" }, { "xor", "operator" }, + { "auto", "keyword" }, { "namespace", "keyword" }, { "double", "type" }, { "null", "literal" }, { "enum", "keyword" }, { "interface", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/awkscript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/awkscript.cpp index 598ff37a7..2e742b11f 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/awkscript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/awkscript.cpp @@ -10,7 +10,7 @@ SyntaxDefinition& addAwkScript() { { "Awk Script", { "%.awk$" }, { - { { "%$[%a_@*#][%w_]*" }, "keyword2" }, + { { "%$[%a_@*#][%w_]*" }, "type" }, { { "#.*" }, "comment" }, { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, @@ -23,9 +23,9 @@ SyntaxDefinition& addAwkScript() { { "normal", "function", "normal", "number" } }, { { "(%s%-%a[%w_%-]*)(%s+)(%a[%a%-_:=]+)" }, { "normal", "function", "normal", "symbol" } }, - { { "[_%a][%w_]+%f[%+=]" }, "keyword2" }, - { { "%${.-}" }, "keyword2" }, - { { "%$[%d%$%a_@*][%w_]*" }, "keyword2" }, + { { "[_%a][%w_]+%f[%+=]" }, "type" }, + { { "%${.-}" }, "type" }, + { { "%$[%d%$%a_@*][%w_]*" }, "type" }, { { "([%a_%-][%w_%-]*)(%s*%f[(])" }, { "normal", "function", "normal" } }, { { "[%a_][%w_]*" }, "symbol" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/batchscript.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/batchscript.hpp index 1679a0c3d..acd2c22d2 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/batchscript.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/batchscript.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addBatchScript(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bazel.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bazel.cpp index 5d9210c93..a7638e9ae 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bazel.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bazel.cpp @@ -20,22 +20,22 @@ SyntaxDefinition& addBazel() { }, { - { "int", "literal" }, { "str", "literal" }, { "in", "keyword2" }, - { "continue", "keyword" }, { "enumerate", "literal" }, { "finally", "keyword2" }, + { "int", "literal" }, { "str", "literal" }, { "in", "type" }, + { "continue", "keyword" }, { "enumerate", "literal" }, { "finally", "type" }, { "False", "keyword" }, { "getattr", "literal" }, { "True", "keyword" }, - { "len", "literal" }, { "dict", "literal" }, { "lambda", "keyword2" }, - { "bool", "literal" }, { "del", "keyword2" }, { "return", "keyword" }, - { "pass", "keyword" }, { "import", "keyword2" }, { "max", "literal" }, - { "try", "keyword2" }, { "min", "literal" }, { "as", "keyword2" }, - { "class", "keyword2" }, { "raise", "keyword2" }, { "reversed", "literal" }, - { "yield", "keyword2" }, { "any", "literal" }, { "sorted", "literal" }, - { "hasattr", "literal" }, { "load", "literal" }, { "with", "keyword2" }, - { "for", "keyword" }, { "while", "keyword2" }, { "assert", "keyword2" }, - { "tuple", "literal" }, { "from", "keyword2" }, { "elif", "keyword" }, - { "list", "literal" }, { "else", "keyword" }, { "global", "keyword2" }, + { "len", "literal" }, { "dict", "literal" }, { "lambda", "type" }, + { "bool", "literal" }, { "del", "type" }, { "return", "keyword" }, + { "pass", "keyword" }, { "import", "type" }, { "max", "literal" }, + { "try", "type" }, { "min", "literal" }, { "as", "type" }, + { "class", "type" }, { "raise", "type" }, { "reversed", "literal" }, + { "yield", "type" }, { "any", "literal" }, { "sorted", "literal" }, + { "hasattr", "literal" }, { "load", "literal" }, { "with", "type" }, + { "for", "keyword" }, { "while", "type" }, { "assert", "type" }, + { "tuple", "literal" }, { "from", "type" }, { "elif", "keyword" }, + { "list", "literal" }, { "else", "keyword" }, { "global", "type" }, { "repr", "literal" }, { "all", "literal" }, { "break", "keyword" }, - { "dir", "literal" }, { "nonlocal", "keyword2" }, { "is", "keyword2" }, - { "if", "keyword" }, { "except", "keyword2" }, { "hash", "literal" }, + { "dir", "literal" }, { "nonlocal", "type" }, { "is", "type" }, + { "if", "keyword" }, { "except", "type" }, { "hash", "literal" }, { "zip", "literal" }, { "type", "literal" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bend.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bend.cpp index e8b33c28e..a33d9e64b 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bend.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/bend.cpp @@ -33,16 +33,16 @@ SyntaxDefinition& addBend() { }, { - { "Nil", "keyword2" }, { "Name", "keyword" }, { "bind", "keyword" }, - { "switch", "keyword" }, { "data", "keyword" }, { "None", "keyword2" }, + { "Nil", "type" }, { "Name", "keyword" }, { "bind", "keyword" }, + { "switch", "keyword" }, { "data", "keyword" }, { "None", "type" }, { "return", "keyword" }, { "identity", "keyword" }, { "ask", "keyword" }, { "object", "keyword" }, { "match", "keyword" }, { "with", "keyword" }, { "fold", "keyword" }, { "false", "literal" }, { "def", "keyword" }, { "true", "literal" }, { "else", "keyword" }, { "λ", "keyword" }, - { "Bool", "keyword" }, { "when", "keyword" }, { "bend", "keyword2" }, + { "Bool", "keyword" }, { "when", "keyword" }, { "bend", "type" }, { "use", "keyword" }, { "case", "keyword" }, { "if", "keyword" }, - { "let", "keyword" }, { "Result", "keyword2" }, { "do", "keyword" }, - { "open", "keyword" }, { "Some", "keyword" }, { "type", "keyword2" }, + { "let", "keyword" }, { "Result", "type" }, { "do", "keyword" }, + { "open", "keyword" }, { "Some", "keyword" }, { "type", "type" }, }, "#", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blade.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blade.cpp index edd46f2ea..521e4d58c 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blade.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blade.cpp @@ -32,7 +32,7 @@ SyntaxDefinition& addBlade() { { "iter", "keyword" }, { "class", "keyword" }, { "static", "keyword" }, { "echo", "function" }, { "false", "literal" }, { "for", "keyword" }, { "while", "keyword" }, { "assert", "keyword" }, { "def", "keyword" }, - { "self", "keyword2" }, { "catch", "keyword" }, { "true", "literal" }, + { "self", "type" }, { "catch", "keyword" }, { "true", "literal" }, { "else", "keyword" }, { "nil", "literal" }, { "when", "keyword" }, { "break", "keyword" }, { "die", "keyword" }, { "or", "keyword" }, { "if", "keyword" }, { "do", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blueprint.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blueprint.cpp index 312dc8c12..b8be482f1 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blueprint.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/blueprint.cpp @@ -19,8 +19,8 @@ SyntaxDefinition& addBlueprint() { { { "%$" }, "operator" }, { { "(=>%s*%$)(.*)(%(%))" }, { "normal", "operator", "function", "normal" } }, { { "([%w-_]+)(%s*:)" }, { "normal", "keyword", "normal" } }, - { { "([%w_-%.]+%s*)({)" }, { "normal", "keyword2", "normal" } }, - { { "([%w_-%.]+%s*)([%w_-]+%s*{)" }, { "normal", "keyword2", "normal" } }, + { { "([%w_-%.]+%s*)({)" }, { "normal", "type", "normal" } }, + { { "([%w_-%.]+%s*)([%w_-]+%s*{)" }, { "normal", "type", "normal" } }, { { "[%w-_]+" }, "symbol" }, }, @@ -28,39 +28,39 @@ SyntaxDefinition& addBlueprint() { { "no-sync-create", "keyword" }, { "section", "keyword" }, { "bind", "keyword" }, - { "setters", "keyword2" }, + { "setters", "type" }, { "default", "keyword" }, { "suggested", "keyword" }, { "using", "keyword" }, - { "strings", "keyword2" }, + { "strings", "type" }, { "swapped", "keyword" }, - { "accessibility", "keyword2" }, - { "responses", "keyword2" }, - { "mime-types", "keyword2" }, + { "accessibility", "type" }, + { "responses", "type" }, + { "mime-types", "type" }, { "after", "keyword" }, { "menu", "keyword" }, - { "mark", "keyword2" }, + { "mark", "type" }, { "destructive", "keyword" }, { "submenu", "keyword" }, - { "suffixes", "keyword2" }, - { "patterns", "keyword2" }, - { "item", "keyword2" }, + { "suffixes", "type" }, + { "patterns", "type" }, + { "item", "type" }, { "false", "literal" }, - { "condition", "keyword2" }, + { "condition", "type" }, { "null", "literal" }, { "bidirectional", "keyword" }, { "inverted", "keyword" }, { "true", "literal" }, { "bind-property", "keyword" }, - { "marks", "keyword2" }, + { "marks", "type" }, { "C_", "operator" }, { "sync-create", "keyword" }, { "template", "keyword" }, - { "widgets", "keyword2" }, + { "widgets", "type" }, { "_", "operator" }, - { "styles", "keyword2" }, - { "items", "keyword2" }, - { "layout", "keyword2" }, + { "styles", "type" }, + { "items", "type" }, + { "layout", "type" }, { "disabled", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/brainfuck.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/brainfuck.cpp index 4d43b1dd2..a5c979e1a 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/brainfuck.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/brainfuck.cpp @@ -13,8 +13,8 @@ SyntaxDefinition& addBrainfuck() { { { "%[" }, "operator" }, { { "%]" }, "operator" }, { { "%-" }, "keyword" }, - { { "<" }, "keyword2" }, - { { ">" }, "keyword2" }, + { { "<" }, "type" }, + { { ">" }, "type" }, { { "+" }, "string" }, { { "," }, "literal" }, { { "%." }, "string" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/buzz.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/buzz.cpp index 929ed0a99..61d182165 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/buzz.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/buzz.cpp @@ -26,17 +26,17 @@ SyntaxDefinition& addBuzz() { { "int", "keyword" }, { "str", "keyword" }, { "in", "literal" }, { "resume", "keyword" }, { "and", "keyword" }, { "continue", "keyword" }, { "ud", "keyword" }, { "lambda", "keyword" }, { "bool", "keyword" }, - { "this", "keyword2" }, { "std", "keyword2" }, { "return", "keyword" }, + { "this", "type" }, { "std", "type" }, { "return", "keyword" }, { "var", "keyword" }, { "extern", "keyword" }, { "import", "keyword" }, { "try", "keyword" }, { "foreach", "keyword" }, { "as", "keyword" }, { "pat", "keyword" }, { "namespace", "keyword" }, { "void", "keyword" }, - { "yield", "keyword" }, { "static", "keyword2" }, { "any", "keyword" }, - { "typeof", "keyword" }, { "io", "keyword2" }, { "object", "keyword" }, + { "yield", "keyword" }, { "static", "type" }, { "any", "keyword" }, + { "typeof", "keyword" }, { "io", "type" }, { "object", "keyword" }, { "match", "keyword" }, { "false", "literal" }, { "for", "keyword" }, { "test", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, { "null", "literal" }, { "zdef", "keyword" }, { "catch", "keyword" }, { "true", "literal" }, { "else", "keyword" }, { "global", "keyword" }, - { "enum", "keyword" }, { "not", "keyword2" }, { "float", "keyword" }, + { "enum", "keyword" }, { "not", "type" }, { "float", "keyword" }, { "resolve", "keyword" }, { "is", "keyword" }, { "or", "keyword" }, { "protocol", "keyword" }, { "if", "keyword" }, { "export", "keyword" }, { "do", "keyword" }, { "fun", "keyword" }, { "type", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c2.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c2.cpp index cec5750b7..c438c446e 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c2.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c2.cpp @@ -16,7 +16,7 @@ SyntaxDefinition& addC2() { { { "'", "'", "\\" }, "string" }, { { "`", "`" }, "string" }, { { "(type|struct|union)\\s+([A-Za-z][\\w_]*)" }, - { "keyword", "keyword", "keyword2" }, + { "keyword", "keyword", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "^%s*(import)%s+([%a][%w_%:,%s]*)%f[@;\n]" }, @@ -24,11 +24,11 @@ SyntaxDefinition& addC2() { { { "^%s*(module)%s+([%a][%w_%:%s%{%},]*)%s*%f[@;\n]" }, { "normal", "keyword", "literal" } }, { { "(fn)%s+([%a][%w_]*%*?%\?\?)%s+([%a][%w_]*)%.([%a_][%w_]*)%f[%(]" }, - { "normal", "keyword", "keyword2", "keyword2", "function" } }, + { "normal", "keyword", "type", "type", "function" } }, { { "(macro)%s+([%a][%w_]*%*?%\?\?)%s+([%a][%w_]*)%.([%a_][%w_]*)%f[%(]" }, - { "normal", "keyword", "keyword2", "keyword2", "function" } }, + { "normal", "keyword", "type", "type", "function" } }, { { "(fn)%s+([%a][%w_]*%*?%\?\?)%s+([%a][%w_]*)%f[%(]" }, - { "normal", "keyword", "keyword2", "function" } }, + { "normal", "keyword", "type", "function" } }, { { "common_number_parser_o" }, "number", "", SyntaxPatternMatchType::Parser }, { { "(if|for|while|switch)\\s*(?=\\()" }, { "normal", "keyword", "keyword" }, @@ -89,37 +89,37 @@ SyntaxDefinition& addC2() { { "auto_line", "keyword" }, { "pure", "keyword" }, - { "bool", "keyword2" }, - { "f32", "keyword2" }, - { "f64", "keyword2" }, - { "i8", "keyword2" }, - { "i16", "keyword2" }, - { "i32", "keyword2" }, - { "i64", "keyword2" }, - { "isize", "keyword2" }, - { "u8", "keyword2" }, - { "u16", "keyword2" }, - { "u32", "keyword2" }, - { "u64", "keyword2" }, - { "usize", "keyword2" }, - { "char", "keyword2" }, - { "void", "keyword2" }, - { "reg8", "keyword2" }, - { "reg16", "keyword2" }, - { "reg32", "keyword2" }, - { "reg64", "keyword2" }, - { "c_char", "keyword2" }, - { "c_uchar", "keyword2" }, - { "c_int", "keyword2" }, - { "c_uint", "keyword2" }, - { "c_long", "keyword2" }, - { "c_longlong", "keyword2" }, - { "c_ulong", "keyword2" }, - { "c_ulonglong", "keyword2" }, - { "c_size", "keyword2" }, - { "c_ssize", "keyword2" }, - { "c_float", "keyword2" }, - { "c_double", "keyword2" }, + { "bool", "type" }, + { "f32", "type" }, + { "f64", "type" }, + { "i8", "type" }, + { "i16", "type" }, + { "i32", "type" }, + { "i64", "type" }, + { "isize", "type" }, + { "u8", "type" }, + { "u16", "type" }, + { "u32", "type" }, + { "u64", "type" }, + { "usize", "type" }, + { "char", "type" }, + { "void", "type" }, + { "reg8", "type" }, + { "reg16", "type" }, + { "reg32", "type" }, + { "reg64", "type" }, + { "c_char", "type" }, + { "c_uchar", "type" }, + { "c_int", "type" }, + { "c_uint", "type" }, + { "c_long", "type" }, + { "c_longlong", "type" }, + { "c_ulong", "type" }, + { "c_ulonglong", "type" }, + { "c_size", "type" }, + { "c_ssize", "type" }, + { "c_float", "type" }, + { "c_double", "type" }, { "nil", "literal" }, { "buildtime", "literal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c3.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c3.cpp index 9a731802c..5755bf83b 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c3.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/c3.cpp @@ -17,7 +17,7 @@ SyntaxDefinition& addC3() { { { "'", "'", "\\" }, "string" }, { { "`", "`" }, "string" }, { { "(enum|interface|alias|struct|typedef)\\s+([A-Za-z][\\w_]*)" }, - { "keyword", "keyword", "keyword2" }, + { "keyword", "keyword", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "^%s*(import)%s+([%a][%w_%:,%s]*)%f[@;\n]" }, @@ -25,16 +25,16 @@ SyntaxDefinition& addC3() { { { "^%s*(module)%s+([%a][%w_%:%s%{%},]*)%s*%f[@;\n]" }, { "normal", "keyword", "literal" } }, { { "(fn)%s+([%a][%w_]*%*?%\?\?)%s+([%a][%w_]*)%.([%a_][%w_]*)%f[%(]" }, - { "normal", "keyword", "keyword2", "keyword2", "function" } }, + { "normal", "keyword", "type", "type", "function" } }, { { "(macro)%s+([%a][%w_]*%*?%\?\?)%s+([%a][%w_]*)%.([%a_][%w_]*)%f[%(]" }, - { "normal", "keyword", "keyword2", "keyword2", "function" } }, + { "normal", "keyword", "type", "type", "function" } }, { { "(fn)%s+([%a][%w_]*%*?%\?\?)%s+([%a][%w_]*)%f[%(]" }, - { "normal", "keyword", "keyword2", "function" } }, + { "normal", "keyword", "type", "function" } }, { { "common_number_parser_ob" }, "number", "", SyntaxPatternMatchType::Parser }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "[<>~=+-*/%?]=" }, "operator" }, { { "%.%." }, "operator" }, - { { "(#[%a][%w_]*)" }, "keyword3" }, + { { "(#[%a][%w_]*)" }, "parameter" }, { { "(@)([%a][%w_]*)" }, { "normal", "operator", "keyword" } }, { { "%$?%$?[%a_][%w_]*" }, "symbol" }, @@ -89,35 +89,35 @@ SyntaxDefinition& addC3() { { "distinct", "keyword" }, { "do", "keyword" }, - { "anyfault", "keyword2" }, - { "int", "keyword2" }, - { "BigInt", "keyword2" }, - { "char", "keyword2" }, - { "isz", "keyword2" }, - { "bool", "keyword2" }, - { "long", "keyword2" }, - { "short", "keyword2" }, - { "float16", "keyword2" }, - { "any", "keyword2" }, - { "usz", "keyword2" }, - { "float128", "keyword2" }, - { "uptr", "keyword2" }, - { "double", "keyword2" }, - { "typeid", "keyword2" }, - { "ulong", "keyword2" }, - { "int128", "keyword2" }, - { "byte", "keyword2" }, - { "uint", "keyword2" }, - { "iptr", "keyword2" }, - { "ushort", "keyword2" }, - { "float", "keyword2" }, - { "uint128", "keyword2" }, - { "ichar", "keyword2" }, + { "anyfault", "type" }, + { "int", "type" }, + { "BigInt", "type" }, + { "char", "type" }, + { "isz", "type" }, + { "bool", "type" }, + { "long", "type" }, + { "short", "type" }, + { "float16", "type" }, + { "any", "type" }, + { "usz", "type" }, + { "float128", "type" }, + { "uptr", "type" }, + { "double", "type" }, + { "typeid", "type" }, + { "ulong", "type" }, + { "int128", "type" }, + { "byte", "type" }, + { "uint", "type" }, + { "iptr", "type" }, + { "ushort", "type" }, + { "float", "type" }, + { "uint128", "type" }, + { "ichar", "type" }, - { "String", "keyword2" }, - { "List", "keyword2" }, - { "File", "keyword2" }, - { "Path", "keyword2" }, + { "String", "type" }, + { "List", "type" }, + { "File", "type" }, + { "Path", "type" }, { "$alignof", "keyword" }, { "$assert", "keyword" }, @@ -155,45 +155,45 @@ SyntaxDefinition& addC3() { { "$vaexpr", "keyword" }, { "$vasplat", "keyword" }, - { "@align", "keyword2" }, - { "@benchmark", "keyword2" }, - { "@bigendian", "keyword2" }, - { "@builtin", "keyword2" }, - { "@cdecl", "keyword2" }, - { "@deprecated", "keyword2" }, - { "@dynamic", "keyword2" }, - { "@export", "keyword2" }, - { "@extern", "keyword2" }, - { "@extname", "keyword2" }, - { "@inline", "keyword2" }, - { "@interface", "keyword2" }, - { "@littleendian", "keyword2" }, - { "@local", "keyword2" }, - { "@maydiscard", "keyword2" }, - { "@naked", "keyword2" }, - { "@nodiscard", "keyword2" }, - { "@noinit", "keyword2" }, - { "@noinline", "keyword2" }, - { "@noreturn", "keyword2" }, - { "@nostrip", "keyword2" }, - { "@obfuscate", "keyword2" }, - { "@operator", "keyword2" }, - { "@overlap", "keyword2" }, - { "@packed", "keyword2" }, - { "@priority", "keyword2" }, - { "@private", "keyword2" }, - { "@public", "keyword2" }, - { "@pure", "keyword2" }, - { "@reflect", "keyword2" }, - { "@section", "keyword2" }, - { "@stdcall", "keyword2" }, - { "@test", "keyword2" }, - { "@unused", "keyword2" }, - { "@used", "keyword2" }, - { "@veccall", "keyword2" }, - { "@wasm", "keyword2" }, - { "@weak", "keyword2" }, - { "@winmain", "keyword2" }, + { "@align", "type" }, + { "@benchmark", "type" }, + { "@bigendian", "type" }, + { "@builtin", "type" }, + { "@cdecl", "type" }, + { "@deprecated", "type" }, + { "@dynamic", "type" }, + { "@export", "type" }, + { "@extern", "type" }, + { "@extname", "type" }, + { "@inline", "type" }, + { "@interface", "type" }, + { "@littleendian", "type" }, + { "@local", "type" }, + { "@maydiscard", "type" }, + { "@naked", "type" }, + { "@nodiscard", "type" }, + { "@noinit", "type" }, + { "@noinline", "type" }, + { "@noreturn", "type" }, + { "@nostrip", "type" }, + { "@obfuscate", "type" }, + { "@operator", "type" }, + { "@overlap", "type" }, + { "@packed", "type" }, + { "@priority", "type" }, + { "@private", "type" }, + { "@public", "type" }, + { "@pure", "type" }, + { "@reflect", "type" }, + { "@section", "type" }, + { "@stdcall", "type" }, + { "@test", "type" }, + { "@unused", "type" }, + { "@used", "type" }, + { "@veccall", "type" }, + { "@wasm", "type" }, + { "@weak", "type" }, + { "@winmain", "type" }, { "$$BENCHMARK_FNS", "literal" }, { "$$BENCHMARK_NAMES", "literal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/carbon.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/carbon.cpp index 2eb3d9ded..a0bcb3023 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/carbon.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/carbon.cpp @@ -30,22 +30,22 @@ SyntaxDefinition& addCarbon() { }, { - { "impl", "keyword2" }, { "virtual", "keyword" }, { "f32", "keyword" }, - { "default", "keyword" }, { "i32", "keyword" }, { "abstract", "keyword" }, - { "f8", "keyword" }, { "extend", "keyword" }, { "i16", "keyword" }, - { "Int", "keyword" }, { "auto", "keyword" }, { "bool", "keyword" }, - { "Base", "keyword" }, { "return", "keyword" }, { "f16", "keyword" }, - { "var", "keyword" }, { "u8", "keyword" }, { "import", "keyword" }, - { "i8", "keyword" }, { "u32", "keyword" }, { "String", "keyword" }, - { "class", "keyword" }, { "partial", "keyword2" }, { "Self", "keyword" }, - { "api", "keyword" }, { "match", "keyword" }, { "i64", "keyword" }, - { "for", "keyword" }, { "while", "keyword" }, { "u64", "keyword" }, - { "i256", "keyword" }, { "i128", "keyword" }, { "else", "keyword" }, - { "f128", "keyword" }, { "f64", "keyword" }, { "UInt", "keyword" }, - { "File", "keyword" }, { "package", "keyword" }, { "template", "keyword2" }, - { "base", "keyword" }, { "u128", "keyword" }, { "fn", "keyword" }, - { "case", "keyword" }, { "if", "keyword" }, { "returned", "keyword" }, - { "u256", "keyword" }, { "let", "keyword" }, { "u16", "keyword" }, + { "impl", "type" }, { "virtual", "keyword" }, { "f32", "keyword" }, + { "default", "keyword" }, { "i32", "keyword" }, { "abstract", "keyword" }, + { "f8", "keyword" }, { "extend", "keyword" }, { "i16", "keyword" }, + { "Int", "keyword" }, { "auto", "keyword" }, { "bool", "keyword" }, + { "Base", "keyword" }, { "return", "keyword" }, { "f16", "keyword" }, + { "var", "keyword" }, { "u8", "keyword" }, { "import", "keyword" }, + { "i8", "keyword" }, { "u32", "keyword" }, { "String", "keyword" }, + { "class", "keyword" }, { "partial", "type" }, { "Self", "keyword" }, + { "api", "keyword" }, { "match", "keyword" }, { "i64", "keyword" }, + { "for", "keyword" }, { "while", "keyword" }, { "u64", "keyword" }, + { "i256", "keyword" }, { "i128", "keyword" }, { "else", "keyword" }, + { "f128", "keyword" }, { "f64", "keyword" }, { "UInt", "keyword" }, + { "File", "keyword" }, { "package", "keyword" }, { "template", "type" }, + { "base", "keyword" }, { "u128", "keyword" }, { "fn", "keyword" }, + { "case", "keyword" }, { "if", "keyword" }, { "returned", "keyword" }, + { "u256", "keyword" }, { "let", "keyword" }, { "u16", "keyword" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/clojure.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/clojure.cpp index e70f3fd14..f05c9379a 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/clojure.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/clojure.cpp @@ -17,9 +17,9 @@ SyntaxDefinition& addClojure() { { { "\"\"\"", "\"\"\"", "\\" }, "string" }, { { "(Retention)(%s+)([%a_][%w_/]*)" }, { "normal", "keyword", "normal", "literal" } }, - { { ":[%a_][%w_/%-]*" }, "keyword2" }, + { { ":[%a_][%w_/%-]*" }, "type" }, { { "([%a_][%w_]*)(%.)([%a_][%w_/%-]*)" }, - { "normal", "keyword", "operator", "keyword2" } }, + { "normal", "keyword", "operator", "type" } }, { { "(%()(def)(%s+)([%a_][%w_%-]*)" }, { "normal", "normal", "keyword", "literal", "literal" } }, { { "(%()(def[%a_][%w_]*)(%s+)([%a_][%w_%-]*)" }, @@ -35,13 +35,13 @@ SyntaxDefinition& addClojure() { }, { - { "int", "literal" }, { "str", "keyword" }, { "false", "keyword2" }, - { "get", "keyword" }, { "def", "keyword" }, { "Deprecated", "keyword" }, - { "catch", "keyword" }, { "true", "keyword2" }, { "defn", "keyword" }, - { "apply", "keyword" }, { "vector", "keyword" }, { "nil", "literal" }, - { "require", "keyword2" }, { "try", "keyword" }, { "String", "keyword" }, - { "fn", "keyword" }, { "ns", "keyword" }, { "cond", "keyword" }, - { "if", "keyword" }, { "let", "keyword" }, { "Retention", "keyword" }, + { "int", "literal" }, { "str", "keyword" }, { "false", "type" }, + { "get", "keyword" }, { "def", "keyword" }, { "Deprecated", "keyword" }, + { "catch", "keyword" }, { "true", "type" }, { "defn", "keyword" }, + { "apply", "keyword" }, { "vector", "keyword" }, { "nil", "literal" }, + { "require", "type" }, { "try", "keyword" }, { "String", "keyword" }, + { "fn", "keyword" }, { "ns", "keyword" }, { "cond", "keyword" }, + { "if", "keyword" }, { "let", "keyword" }, { "Retention", "keyword" }, { "println", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp index db1301ac6..1e85ac2b4 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/cmake.cpp @@ -22,79 +22,79 @@ SyntaxDefinition& addCMake() { "link" }, { { "/?[%w_]+/[%w_][%w_/]+%.?%w+" }, "normal" }, { { "%u[%u%d_]*_[%u%d_]+" }, "keyword" }, - { { "%${[%a_][%w_]*%}" }, "keyword2" }, + { { "%${[%a_][%w_]*%}" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, { { "REPLACE", "literal" }, - { "SOURCES", "keyword2" }, + { "SOURCES", "type" }, { "REGEX", "literal" }, { "RUNTIME", "literal" }, - { "LANGUAGE", "keyword2" }, + { "LANGUAGE", "type" }, { "C", "literal" }, { "TOLOWER", "literal" }, { "FALSE", "literal" }, - { "DEPRECATION", "keyword2" }, + { "DEPRECATION", "type" }, { "LIBTYPE", "literal" }, - { "DISABLED", "keyword2" }, - { "VARIABLES", "keyword2" }, - { "PREFIX", "keyword2" }, + { "DISABLED", "type" }, + { "VARIABLES", "type" }, + { "PREFIX", "type" }, { "APPEND", "literal" }, { "OFF", "literal" }, - { "XCTEST", "keyword2" }, - { "HELPSTRING", "keyword2" }, - { "AUTORCC", "keyword2" }, - { "TESTS", "keyword2" }, + { "XCTEST", "type" }, + { "HELPSTRING", "type" }, + { "AUTORCC", "type" }, + { "TESTS", "type" }, { "TARGET", "literal" }, - { "NAME", "keyword2" }, - { "LABELS", "keyword2" }, - { "VALUE", "keyword2" }, - { "TYPE", "keyword2" }, + { "NAME", "type" }, + { "LABELS", "type" }, + { "VALUE", "type" }, + { "TYPE", "type" }, { "TRUE", "literal" }, - { "EchoString", "keyword2" }, + { "EchoString", "type" }, { "ARCHIVE", "literal" }, { "IMMEDIATE", "literal" }, { "DESTINATION", "literal" }, { "INTERFACE", "literal" }, - { "PROCESSORS", "keyword2" }, - { "ENVIRONMENT", "keyword2" }, - { "SUFFIX", "keyword2" }, + { "PROCESSORS", "type" }, + { "ENVIRONMENT", "type" }, + { "SUFFIX", "type" }, { "TOUPPER", "literal" }, - { "ENV", "keyword2" }, + { "ENV", "type" }, { "STATUS", "literal" }, - { "BUNDLE", "keyword2" }, - { "SOVERSION", "keyword2" }, - { "SUBDIRECTORIES", "keyword2" }, - { "SYMBOLIC", "keyword2" }, - { "COST", "keyword2" }, - { "ABSTRACT", "keyword2" }, - { "IMPORTED", "keyword2" }, - { "MODIFIED", "keyword2" }, + { "BUNDLE", "type" }, + { "SOVERSION", "type" }, + { "SUBDIRECTORIES", "type" }, + { "SYMBOLIC", "type" }, + { "COST", "type" }, + { "ABSTRACT", "type" }, + { "IMPORTED", "type" }, + { "MODIFIED", "type" }, { "GLOB", "literal" }, - { "MACROS", "keyword2" }, - { "LOCATION", "keyword2" }, + { "MACROS", "type" }, + { "LOCATION", "type" }, { "CXX", "literal" }, { "WARNING", "literal" }, - { "TIMEOUT", "keyword2" }, - { "CACHE", "keyword2" }, + { "TIMEOUT", "type" }, + { "CACHE", "type" }, { "EXPR", "literal" }, - { "FRAMEWORK", "keyword2" }, - { "DEPENDS", "keyword2" }, + { "FRAMEWORK", "type" }, + { "DEPENDS", "type" }, { "LIBRARY", "literal" }, - { "MEASUREMENT", "keyword2" }, - { "GENERATED", "keyword2" }, - { "STRINGS", "keyword2" }, - { "VERSION", "keyword2" }, - { "KEEP_EXTENSION", "keyword2" }, - { "RESOURCE", "keyword2" }, - { "ADVANCED", "keyword2" }, - { "LANGUAGES", "keyword2" }, + { "MEASUREMENT", "type" }, + { "GENERATED", "type" }, + { "STRINGS", "type" }, + { "VERSION", "type" }, + { "KEEP_EXTENSION", "type" }, + { "RESOURCE", "type" }, + { "ADVANCED", "type" }, + { "LANGUAGES", "type" }, { "ON", "literal" }, { "OFF", "literal" }, { "On", "literal" }, { "Off", "literal" }, - { "STRING", "keyword2" }, - { "COMMENT", "keyword2" }, + { "STRING", "type" }, + { "COMMENT", "type" }, { "IF", "keyword" }, { "BOOL", "keyword" }, @@ -410,566 +410,566 @@ SyntaxDefinition& addCMake() { { "UseSWIG", "keyword" }, { "UsewxWidgets", "keyword" }, - { "CMAKE_AR", "keyword2" }, - { "CMAKE_ARGC", "keyword2" }, - { "CMAKE_ARGV0", "keyword2" }, - { "CMAKE_BINARY_DIR", "keyword2" }, - { "CMAKE_BUILD_TOOL", "keyword2" }, - { "CMAKE_CACHE_MAJOR_VERSION", "keyword2" }, - { "CMAKE_CACHE_MINOR_VERSION", "keyword2" }, - { "CMAKE_CACHE_PATCH_VERSION", "keyword2" }, - { "CMAKE_CACHEFILE_DIR", "keyword2" }, - { "CMAKE_CFG_INTDIR", "keyword2" }, - { "CMAKE_COMMAND", "keyword2" }, - { "CMAKE_CPACK_COMMAND", "keyword2" }, - { "CMAKE_CROSSCOMPILING", "keyword2" }, - { "CMAKE_CROSSCOMPILING_EMULATOR", "keyword2" }, - { "CMAKE_CTEST_COMMAND", "keyword2" }, - { "CMAKE_CURRENT_BINARY_DIR", "keyword2" }, - { "CMAKE_CURRENT_FUNCTION", "keyword2" }, - { "CMAKE_CURRENT_FUNCTION_LIST_DIR", "keyword2" }, - { "CMAKE_CURRENT_FUNCTION_LIST_FILE", "keyword2" }, - { "CMAKE_CURRENT_FUNCTION_LIST_LINE", "keyword2" }, - { "CMAKE_CURRENT_LIST_DIR", "keyword2" }, - { "CMAKE_CURRENT_LIST_FILE", "keyword2" }, - { "CMAKE_CURRENT_LIST_LINE", "keyword2" }, - { "CMAKE_CURRENT_SOURCE_DIR", "keyword2" }, - { "CMAKE_DEBUG_TARGET_PROPERTIES", "keyword2" }, - { "CMAKE_DIRECTORY_LABELS", "keyword2" }, - { "CMAKE_DL_LIBS", "keyword2" }, - { "CMAKE_DOTNET_SDK", "keyword2" }, - { "CMAKE_DOTNET_TARGET_FRAMEWORK", "keyword2" }, - { "CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION", "keyword2" }, - { "CMAKE_EDIT_COMMAND", "keyword2" }, - { "CMAKE_EXECUTABLE_SUFFIX", "keyword2" }, - { "CMAKE_EXTRA_GENERATOR", "keyword2" }, - { "CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES", "keyword2" }, - { "CMAKE_FIND_DEBUG_MODE", "keyword2" }, - { "CMAKE_FIND_PACKAGE_NAME", "keyword2" }, - { "CMAKE_FIND_PACKAGE_REDIRECTS_DIR", "keyword2" }, - { "CMAKE_FIND_PACKAGE_SORT_DIRECTION", "keyword2" }, - { "CMAKE_FIND_PACKAGE_SORT_ORDER", "keyword2" }, - { "CMAKE_GENERATOR", "keyword2" }, - { "CMAKE_GENERATOR_INSTANCE", "keyword2" }, - { "CMAKE_GENERATOR_PLATFORM", "keyword2" }, - { "CMAKE_GENERATOR_TOOLSET", "keyword2" }, - { "CMAKE_IMPORT_LIBRARY_PREFIX", "keyword2" }, - { "CMAKE_IMPORT_LIBRARY_SUFFIX", "keyword2" }, - { "CMAKE_JOB_POOL_COMPILE", "keyword2" }, - { "CMAKE_JOB_POOL_LINK", "keyword2" }, - { "CMAKE_JOB_POOL_PRECOMPILE_HEADER", "keyword2" }, - { "CMAKE_JOB_POOLS", "keyword2" }, - { "CMAKE_LINK_LIBRARY_SUFFIX", "keyword2" }, - { "CMAKE_LINK_SEARCH_END_STATIC", "keyword2" }, - { "CMAKE_LINK_SEARCH_START_STATIC", "keyword2" }, - { "CMAKE_MAJOR_VERSION", "keyword2" }, - { "CMAKE_MAKE_PROGRAM", "keyword2" }, - { "CMAKE_MATCH_COUNT", "keyword2" }, - { "CMAKE_MINIMUM_REQUIRED_VERSION", "keyword2" }, - { "CMAKE_MINOR_VERSION", "keyword2" }, - { "CMAKE_NETRC", "keyword2" }, - { "CMAKE_NETRC_FILE", "keyword2" }, - { "CMAKE_PARENT_LIST_FILE", "keyword2" }, - { "CMAKE_PATCH_VERSION", "keyword2" }, - { "CMAKE_PROJECT_DESCRIPTION", "keyword2" }, - { "CMAKE_PROJECT_HOMEPAGE_URL", "keyword2" }, - { "CMAKE_PROJECT_NAME", "keyword2" }, - { "CMAKE_PROJECT_VERSION", "keyword2" }, - { "CMAKE_PROJECT_VERSION_MAJOR", "keyword2" }, - { "CMAKE_PROJECT_VERSION_MINOR", "keyword2" }, - { "CMAKE_PROJECT_VERSION_PATCH", "keyword2" }, - { "CMAKE_PROJECT_VERSION_TWEAK", "keyword2" }, - { "CMAKE_RANLIB", "keyword2" }, - { "CMAKE_ROOT", "keyword2" }, - { "CMAKE_RULE_MESSAGES", "keyword2" }, - { "CMAKE_SCRIPT_MODE_FILE", "keyword2" }, - { "CMAKE_SHARED_LIBRARY_PREFIX", "keyword2" }, - { "CMAKE_SHARED_LIBRARY_SUFFIX", "keyword2" }, - { "CMAKE_SHARED_MODULE_PREFIX", "keyword2" }, - { "CMAKE_SHARED_MODULE_SUFFIX", "keyword2" }, - { "CMAKE_SIZEOF_VOID_P", "keyword2" }, - { "CMAKE_SKIP_INSTALL_RULES", "keyword2" }, - { "CMAKE_SKIP_RPATH", "keyword2" }, - { "CMAKE_SOURCE_DIR", "keyword2" }, - { "CMAKE_STATIC_LIBRARY_PREFIX", "keyword2" }, - { "CMAKE_STATIC_LIBRARY_SUFFIX", "keyword2" }, - { "CMAKE_Swift_MODULE_DIRECTORY", "keyword2" }, - { "CMAKE_Swift_NUM_THREADS", "keyword2" }, - { "CMAKE_TOOLCHAIN_FILE", "keyword2" }, - { "CMAKE_TWEAK_VERSION", "keyword2" }, - { "CMAKE_VERBOSE_MAKEFILE", "keyword2" }, - { "CMAKE_VERSION", "keyword2" }, - { "CMAKE_VS_DEVENV_COMMAND", "keyword2" }, - { "CMAKE_VS_MSBUILD_COMMAND", "keyword2" }, - { "CMAKE_VS_NsightTegra_VERSION", "keyword2" }, - { "CMAKE_VS_NUGET_PACKAGE_RESTORE", "keyword2" }, - { "CMAKE_VS_PLATFORM_NAME", "keyword2" }, - { "CMAKE_VS_PLATFORM_NAME_DEFAULT", "keyword2" }, - { "CMAKE_VS_PLATFORM_TOOLSET", "keyword2" }, - { "CMAKE_VS_PLATFORM_TOOLSET_CUDA", "keyword2" }, - { "CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR", "keyword2" }, - { "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE", "keyword2" }, - { "CMAKE_VS_PLATFORM_TOOLSET_VERSION", "keyword2" }, - { "CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER", "keyword2" }, - { "CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION", "keyword2" }, - { "CMAKE_VS_TARGET_FRAMEWORK_VERSION", "keyword2" }, - { "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION", "keyword2" }, - { "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM", "keyword2" }, - { "CMAKE_XCODE_BUILD_SYSTEM", "keyword2" }, - { "CMAKE_XCODE_PLATFORM_TOOLSET", "keyword2" }, - { "PROJECT_BINARY_DIR", "keyword2" }, - { "PROJECT_DESCRIPTION", "keyword2" }, - { "PROJECT_HOMEPAGE_URL", "keyword2" }, - { "PROJECT_IS_TOP_LEVEL", "keyword2" }, - { "PROJECT_NAME", "keyword2" }, - { "PROJECT_SOURCE_DIR", "keyword2" }, - { "PROJECT_VERSION", "keyword2" }, - { "PROJECT_VERSION_MAJOR", "keyword2" }, - { "PROJECT_VERSION_MINOR", "keyword2" }, - { "PROJECT_VERSION_PATCH", "keyword2" }, - { "PROJECT_VERSION_TWEAK", "keyword2" }, - { "BUILD_SHARED_LIBS", "keyword2" }, - { "BUILD_STATIC_LIBS", "keyword2" }, - { "CMAKE_ABSOLUTE_DESTINATION_FILES", "keyword2" }, - { "CMAKE_APPBUNDLE_PATH", "keyword2" }, - { "CMAKE_AUTOMOC_RELAXED_MODE", "keyword2" }, - { "CMAKE_BACKWARDS_COMPATIBILITY", "keyword2" }, - { "CMAKE_BUILD_TYPE", "keyword2" }, - { "CMAKE_CLANG_VFS_OVERLAY", "keyword2" }, - { "CMAKE_CODEBLOCKS_COMPILER_ID", "keyword2" }, - { "CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES", "keyword2" }, - { "CMAKE_CODELITE_USE_TARGETS", "keyword2" }, - { "CMAKE_COLOR_DIAGNOSTICS", "keyword2" }, - { "CMAKE_COLOR_MAKEFILE", "keyword2" }, - { "CMAKE_CONFIGURATION_TYPES", "keyword2" }, - { "CMAKE_DEPENDS_IN_PROJECT_ONLY", "keyword2" }, - { "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES", "keyword2" }, - { "CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT", "keyword2" }, - { "CMAKE_ECLIPSE_MAKE_ARGUMENTS", "keyword2" }, - { "CMAKE_ECLIPSE_RESOURCE_ENCODING", "keyword2" }, - { "CMAKE_ECLIPSE_VERSION", "keyword2" }, - { "CMAKE_ERROR_DEPRECATED", "keyword2" }, - { "CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION", "keyword2" }, - { "CMAKE_EXECUTE_PROCESS_COMMAND_ECHO", "keyword2" }, - { "CMAKE_EXPORT_COMPILE_COMMANDS", "keyword2" }, - { "CMAKE_EXPORT_PACKAGE_REGISTRY", "keyword2" }, - { "CMAKE_EXPORT_NO_PACKAGE_REGISTRY", "keyword2" }, - { "CMAKE_FIND_APPBUNDLE", "keyword2" }, - { "CMAKE_FIND_FRAMEWORK", "keyword2" }, - { "CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX", "keyword2" }, - { "CMAKE_FIND_LIBRARY_PREFIXES", "keyword2" }, - { "CMAKE_FIND_LIBRARY_SUFFIXES", "keyword2" }, - { "CMAKE_FIND_NO_INSTALL_PREFIX", "keyword2" }, - { "CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY", "keyword2" }, - { "CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY", "keyword2" }, - { "CMAKE_FIND_PACKAGE_PREFER_CONFIG", "keyword2" }, - { "CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS", "keyword2" }, - { "CMAKE_FIND_PACKAGE_TARGETS_GLOBAL", "keyword2" }, - { "CMAKE_FIND_PACKAGE_WARN_NO_MODULE", "keyword2" }, - { "CMAKE_FIND_ROOT_PATH", "keyword2" }, - { "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE", "keyword2" }, - { "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY", "keyword2" }, - { "CMAKE_FIND_ROOT_PATH_MODE_PACKAGE", "keyword2" }, - { "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM", "keyword2" }, - { "CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH", "keyword2" }, - { "CMAKE_FIND_USE_CMAKE_PATH", "keyword2" }, - { "CMAKE_FIND_USE_CMAKE_SYSTEM_PATH", "keyword2" }, - { "CMAKE_FIND_USE_INSTALL_PREFIX", "keyword2" }, - { "CMAKE_FIND_USE_PACKAGE_REGISTRY", "keyword2" }, - { "CMAKE_FIND_USE_PACKAGE_ROOT_PATH", "keyword2" }, - { "CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH", "keyword2" }, - { "CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY", "keyword2" }, - { "CMAKE_FRAMEWORK_PATH", "keyword2" }, - { "CMAKE_IGNORE_PATH", "keyword2" }, - { "CMAKE_IGNORE_PREFIX_PATH", "keyword2" }, - { "CMAKE_INCLUDE_DIRECTORIES_BEFORE", "keyword2" }, - { "CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE", "keyword2" }, - { "CMAKE_INCLUDE_PATH", "keyword2" }, - { "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME", "keyword2" }, - { "CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS", "keyword2" }, - { "CMAKE_INSTALL_MESSAGE", "keyword2" }, - { "CMAKE_INSTALL_PREFIX", "keyword2" }, - { "CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT", "keyword2" }, - { "CMAKE_LIBRARY_PATH", "keyword2" }, - { "CMAKE_LINK_DIRECTORIES_BEFORE", "keyword2" }, - { "CMAKE_LINK_LIBRARIES_ONLY_TARGETS", "keyword2" }, - { "CMAKE_MAXIMUM_RECURSION_DEPTH", "keyword2" }, - { "CMAKE_MESSAGE_CONTEXT", "keyword2" }, - { "CMAKE_MESSAGE_CONTEXT_SHOW", "keyword2" }, - { "CMAKE_MESSAGE_INDENT", "keyword2" }, - { "CMAKE_MESSAGE_LOG_LEVEL", "keyword2" }, - { "CMAKE_MFC_FLAG", "keyword2" }, - { "CMAKE_MODULE_PATH", "keyword2" }, - { "CMAKE_PREFIX_PATH", "keyword2" }, - { "CMAKE_PROGRAM_PATH", "keyword2" }, - { "CMAKE_PROJECT_INCLUDE", "keyword2" }, - { "CMAKE_PROJECT_INCLUDE_BEFORE", "keyword2" }, - { "CMAKE_PROJECT_TOP_LEVEL_INCLUDES", "keyword2" }, - { "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY", "keyword2" }, - { "CMAKE_STAGING_PREFIX", "keyword2" }, - { "CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS", "keyword2" }, - { "CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE", "keyword2" }, - { "CMAKE_SUPPRESS_REGENERATION", "keyword2" }, - { "CMAKE_SYSROOT", "keyword2" }, - { "CMAKE_SYSROOT_COMPILE", "keyword2" }, - { "CMAKE_SYSROOT_LINK", "keyword2" }, - { "CMAKE_SYSTEM_APPBUNDLE_PATH", "keyword2" }, - { "CMAKE_SYSTEM_FRAMEWORK_PATH", "keyword2" }, - { "CMAKE_SYSTEM_IGNORE_PATH", "keyword2" }, - { "CMAKE_SYSTEM_IGNORE_PREFIX_PATH", "keyword2" }, - { "CMAKE_SYSTEM_INCLUDE_PATH", "keyword2" }, - { "CMAKE_SYSTEM_LIBRARY_PATH", "keyword2" }, - { "CMAKE_SYSTEM_PREFIX_PATH", "keyword2" }, - { "CMAKE_SYSTEM_PROGRAM_PATH", "keyword2" }, - { "CMAKE_TLS_CAINFO", "keyword2" }, - { "CMAKE_TLS_VERIFY", "keyword2" }, - { "CMAKE_USER_MAKE_RULES_OVERRIDE", "keyword2" }, - { "CMAKE_WARN_DEPRECATED", "keyword2" }, - { "CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION", "keyword2" }, - { "CMAKE_XCODE_GENERATE_SCHEME", "keyword2" }, - { "CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY", "keyword2" }, - { "CMAKE_XCODE_LINK_BUILD_PHASE_MODE", "keyword2" }, - { "CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER", "keyword2" }, - { "CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN", "keyword2" }, - { "CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING", "keyword2" }, - { "CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER", "keyword2" }, - { "CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS", "keyword2" }, - { "CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE", "keyword2" }, - { "CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION", "keyword2" }, - { "CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE", "keyword2" }, - { "CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION", "keyword2" }, - { "CMAKE_XCODE_SCHEME_ENVIRONMENT", "keyword2" }, - { "CMAKE_XCODE_SCHEME_GUARD_MALLOC", "keyword2" }, - { "CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION", "keyword2" }, - { "CMAKE_XCODE_SCHEME_LAUNCH_MODE", "keyword2" }, - { "CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP", "keyword2" }, - { "CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES", "keyword2" }, - { "CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE", "keyword2" }, - { "CMAKE_XCODE_SCHEME_MALLOC_STACK", "keyword2" }, - { "CMAKE_XCODE_SCHEME_THREAD_SANITIZER", "keyword2" }, - { "CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP", "keyword2" }, - { "CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER", "keyword2" }, - { "CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP", "keyword2" }, - { "CMAKE_XCODE_SCHEME_WORKING_DIRECTORY", "keyword2" }, - { "CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS", "keyword2" }, - { "CMAKE_XCODE_XCCONFIG", "keyword2" }, - { "ANDROID", "keyword2" }, - { "APPLE", "keyword2" }, - { "BORLAND", "keyword2" }, - { "BSD", "keyword2" }, - { "CMAKE_ANDROID_NDK_VERSION", "keyword2" }, - { "CMAKE_CL_64", "keyword2" }, - { "CMAKE_COMPILER_2005", "keyword2" }, - { "CMAKE_HOST_APPLE", "keyword2" }, - { "CMAKE_HOST_BSD", "keyword2" }, - { "CMAKE_HOST_LINUX", "keyword2" }, - { "CMAKE_HOST_SOLARIS", "keyword2" }, - { "CMAKE_HOST_SYSTEM", "keyword2" }, - { "CMAKE_HOST_SYSTEM_NAME", "keyword2" }, - { "CMAKE_HOST_SYSTEM_PROCESSOR", "keyword2" }, - { "CMAKE_HOST_SYSTEM_VERSION", "keyword2" }, - { "CMAKE_HOST_UNIX", "keyword2" }, - { "CMAKE_HOST_WIN32", "keyword2" }, - { "CMAKE_LIBRARY_ARCHITECTURE", "keyword2" }, - { "CMAKE_LIBRARY_ARCHITECTURE_REGEX", "keyword2" }, - { "CMAKE_OBJECT_PATH_MAX", "keyword2" }, - { "CMAKE_SYSTEM", "keyword2" }, - { "CMAKE_SYSTEM_NAME", "keyword2" }, - { "CMAKE_SYSTEM_PROCESSOR", "keyword2" }, - { "CMAKE_SYSTEM_VERSION", "keyword2" }, - { "CYGWIN", "keyword2" }, - { "GHSMULTI", "keyword2" }, - { "IOS", "keyword2" }, - { "LINUX", "keyword2" }, - { "MINGW", "keyword2" }, - { "MSVC", "keyword2" }, - { "MSVC10", "keyword2" }, - { "MSVC11", "keyword2" }, - { "MSVC12", "keyword2" }, - { "MSVC14", "keyword2" }, - { "MSVC60", "keyword2" }, - { "MSVC70", "keyword2" }, - { "MSVC71", "keyword2" }, - { "MSVC80", "keyword2" }, - { "MSVC90", "keyword2" }, - { "MSVC_IDE", "keyword2" }, - { "MSVC_TOOLSET_VERSION", "keyword2" }, - { "MSVC_VERSION", "keyword2" }, - { "MSYS", "keyword2" }, - { "UNIX", "keyword2" }, - { "WIN32", "keyword2" }, - { "WINCE", "keyword2" }, - { "WINDOWS_PHONE", "keyword2" }, - { "WINDOWS_STORE", "keyword2" }, - { "XCODE", "keyword2" }, - { "XCODE_VERSION", "keyword2" }, - { "CMAKE_ADSP_ROOT", "keyword2" }, - { "CMAKE_AIX_EXPORT_ALL_SYMBOLS", "keyword2" }, - { "CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS", "keyword2" }, - { "CMAKE_ANDROID_API", "keyword2" }, - { "CMAKE_ANDROID_API_MIN", "keyword2" }, - { "CMAKE_ANDROID_ARCH", "keyword2" }, - { "CMAKE_ANDROID_ARCH_ABI", "keyword2" }, - { "CMAKE_ANDROID_ARM_MODE", "keyword2" }, - { "CMAKE_ANDROID_ARM_NEON", "keyword2" }, - { "CMAKE_ANDROID_ASSETS_DIRECTORIES", "keyword2" }, - { "CMAKE_ANDROID_EXCEPTIONS", "keyword2" }, - { "CMAKE_ANDROID_GUI", "keyword2" }, - { "CMAKE_ANDROID_JAR_DEPENDENCIES", "keyword2" }, - { "CMAKE_ANDROID_JAR_DIRECTORIES", "keyword2" }, - { "CMAKE_ANDROID_JAVA_SOURCE_DIR", "keyword2" }, - { "CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES", "keyword2" }, - { "CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES", "keyword2" }, - { "CMAKE_ANDROID_NDK", "keyword2" }, - { "CMAKE_ANDROID_NDK_DEPRECATED_HEADERS", "keyword2" }, - { "CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG", "keyword2" }, - { "CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION", "keyword2" }, - { "CMAKE_ANDROID_PROCESS_MAX", "keyword2" }, - { "CMAKE_ANDROID_PROGUARD", "keyword2" }, - { "CMAKE_ANDROID_PROGUARD_CONFIG_PATH", "keyword2" }, - { "CMAKE_ANDROID_RTTI", "keyword2" }, - { "CMAKE_ANDROID_SECURE_PROPS_PATH", "keyword2" }, - { "CMAKE_ANDROID_SKIP_ANT_STEP", "keyword2" }, - { "CMAKE_ANDROID_STANDALONE_TOOLCHAIN", "keyword2" }, - { "CMAKE_ANDROID_STL_TYPE", "keyword2" }, - { "CMAKE_APPLE_SILICON_PROCESSOR", "keyword2" }, - { "CMAKE_ARCHIVE_OUTPUT_DIRECTORY", "keyword2" }, - { "CMAKE_AUTOGEN_ORIGIN_DEPENDS", "keyword2" }, - { "CMAKE_AUTOGEN_PARALLEL", "keyword2" }, - { "CMAKE_AUTOGEN_VERBOSE", "keyword2" }, - { "CMAKE_AUTOMOC", "keyword2" }, - { "CMAKE_AUTOMOC_COMPILER_PREDEFINES", "keyword2" }, - { "CMAKE_AUTOMOC_DEPEND_FILTERS", "keyword2" }, - { "CMAKE_AUTOMOC_MACRO_NAMES", "keyword2" }, - { "CMAKE_AUTOMOC_MOC_OPTIONS", "keyword2" }, - { "CMAKE_AUTOMOC_PATH_PREFIX", "keyword2" }, - { "CMAKE_AUTORCC", "keyword2" }, - { "CMAKE_AUTORCC_OPTIONS", "keyword2" }, - { "CMAKE_AUTOUIC", "keyword2" }, - { "CMAKE_AUTOUIC_OPTIONS", "keyword2" }, - { "CMAKE_AUTOUIC_SEARCH_PATHS", "keyword2" }, - { "CMAKE_BUILD_RPATH", "keyword2" }, - { "CMAKE_BUILD_RPATH_USE_ORIGIN", "keyword2" }, - { "CMAKE_BUILD_WITH_INSTALL_NAME_DIR", "keyword2" }, - { "CMAKE_BUILD_WITH_INSTALL_RPATH", "keyword2" }, - { "CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY", "keyword2" }, - { "CMAKE_COMPILE_WARNING_AS_ERROR", "keyword2" }, - { "CMAKE_CROSS_CONFIGS", "keyword2" }, - { "CMAKE_CTEST_ARGUMENTS", "keyword2" }, - { "CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS", "keyword2" }, - { "CMAKE_CUDA_RUNTIME_LIBRARY", "keyword2" }, - { "CMAKE_CUDA_SEPARABLE_COMPILATION", "keyword2" }, - { "CMAKE_DEBUG_POSTFIX", "keyword2" }, - { "CMAKE_DEFAULT_BUILD_TYPE", "keyword2" }, - { "CMAKE_DEFAULT_CONFIGS", "keyword2" }, - { "CMAKE_DEPENDS_USE_COMPILER", "keyword2" }, - { "CMAKE_DISABLE_PRECOMPILE_HEADERS", "keyword2" }, - { "CMAKE_ENABLE_EXPORTS", "keyword2" }, - { "CMAKE_EXE_LINKER_FLAGS", "keyword2" }, - { "CMAKE_EXE_LINKER_FLAGS_INIT", "keyword2" }, - { "CMAKE_FOLDER", "keyword2" }, - { "CMAKE_Fortran_FORMAT", "keyword2" }, - { "CMAKE_Fortran_MODULE_DIRECTORY", "keyword2" }, - { "CMAKE_Fortran_PREPROCESS", "keyword2" }, - { "CMAKE_FRAMEWORK", "keyword2" }, - { "CMAKE_GHS_NO_SOURCE_GROUP_FILE", "keyword2" }, - { "CMAKE_GLOBAL_AUTOGEN_TARGET", "keyword2" }, - { "CMAKE_GLOBAL_AUTOGEN_TARGET_NAME", "keyword2" }, - { "CMAKE_GLOBAL_AUTORCC_TARGET", "keyword2" }, - { "CMAKE_GLOBAL_AUTORCC_TARGET_NAME", "keyword2" }, - { "CMAKE_GNUtoMS", "keyword2" }, - { "CMAKE_INCLUDE_CURRENT_DIR", "keyword2" }, - { "CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE", "keyword2" }, - { "CMAKE_INSTALL_NAME_DIR", "keyword2" }, - { "CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH", "keyword2" }, - { "CMAKE_INSTALL_RPATH", "keyword2" }, - { "CMAKE_INSTALL_RPATH_USE_LINK_PATH", "keyword2" }, - { "CMAKE_INTERPROCEDURAL_OPTIMIZATION", "keyword2" }, - { "CMAKE_IOS_INSTALL_COMBINED", "keyword2" }, - { "CMAKE_LIBRARY_OUTPUT_DIRECTORY", "keyword2" }, - { "CMAKE_LIBRARY_PATH_FLAG", "keyword2" }, - { "CMAKE_LINK_DEF_FILE_FLAG", "keyword2" }, - { "CMAKE_LINK_DEPENDS_NO_SHARED", "keyword2" }, - { "CMAKE_LINK_INTERFACE_LIBRARIES", "keyword2" }, - { "CMAKE_LINK_LIBRARY_FILE_FLAG", "keyword2" }, - { "CMAKE_LINK_LIBRARY_FLAG", "keyword2" }, - { "CMAKE_LINK_WHAT_YOU_USE", "keyword2" }, - { "CMAKE_LINK_WHAT_YOU_USE_CHECK", "keyword2" }, - { "CMAKE_MACOSX_BUNDLE", "keyword2" }, - { "CMAKE_MACOSX_RPATH", "keyword2" }, - { "CMAKE_MODULE_LINKER_FLAGS", "keyword2" }, - { "CMAKE_MODULE_LINKER_FLAGS_INIT", "keyword2" }, - { "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT", "keyword2" }, - { "CMAKE_MSVC_RUNTIME_LIBRARY", "keyword2" }, - { "CMAKE_MSVCIDE_RUN_PATH", "keyword2" }, - { "CMAKE_NINJA_OUTPUT_PATH_PREFIX", "keyword2" }, - { "CMAKE_NO_BUILTIN_CHRPATH", "keyword2" }, - { "CMAKE_NO_SYSTEM_FROM_IMPORTED", "keyword2" }, - { "CMAKE_OPTIMIZE_DEPENDENCIES", "keyword2" }, - { "CMAKE_OSX_ARCHITECTURES", "keyword2" }, - { "CMAKE_OSX_DEPLOYMENT_TARGET", "keyword2" }, - { "CMAKE_OSX_SYSROOT", "keyword2" }, - { "CMAKE_PCH_INSTANTIATE_TEMPLATES", "keyword2" }, - { "CMAKE_PCH_WARN_INVALID", "keyword2" }, - { "CMAKE_PDB_OUTPUT_DIRECTORY", "keyword2" }, - { "CMAKE_PLATFORM_NO_VERSIONED_SONAME", "keyword2" }, - { "CMAKE_POSITION_INDEPENDENT_CODE", "keyword2" }, - { "CMAKE_RUNTIME_OUTPUT_DIRECTORY", "keyword2" }, - { "CMAKE_SHARED_LINKER_FLAGS", "keyword2" }, - { "CMAKE_SHARED_LINKER_FLAGS_INIT", "keyword2" }, - { "CMAKE_SKIP_BUILD_RPATH", "keyword2" }, - { "CMAKE_SKIP_INSTALL_RPATH", "keyword2" }, - { "CMAKE_STATIC_LINKER_FLAGS", "keyword2" }, - { "CMAKE_STATIC_LINKER_FLAGS_INIT", "keyword2" }, - { "CMAKE_TASKING_TOOLSET", "keyword2" }, - { "CMAKE_TRY_COMPILE_CONFIGURATION", "keyword2" }, - { "CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES", "keyword2" }, - { "CMAKE_TRY_COMPILE_PLATFORM_VARIABLES", "keyword2" }, - { "CMAKE_TRY_COMPILE_TARGET_TYPE", "keyword2" }, - { "CMAKE_UNITY_BUILD", "keyword2" }, - { "CMAKE_UNITY_BUILD_BATCH_SIZE", "keyword2" }, - { "CMAKE_UNITY_BUILD_UNIQUE_ID", "keyword2" }, - { "CMAKE_USE_RELATIVE_PATHS", "keyword2" }, - { "CMAKE_VERIFY_INTERFACE_HEADER_SETS", "keyword2" }, - { "CMAKE_VISIBILITY_INLINES_HIDDEN", "keyword2" }, - { "CMAKE_VS_GLOBALS", "keyword2" }, - { "CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD", "keyword2" }, - { "CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD", "keyword2" }, - { "CMAKE_VS_JUST_MY_CODE_DEBUGGING", "keyword2" }, - { "CMAKE_VS_NO_COMPILE_BATCHING", "keyword2" }, - { "CMAKE_VS_SDK_EXCLUDE_DIRECTORIES", "keyword2" }, - { "CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES", "keyword2" }, - { "CMAKE_VS_SDK_INCLUDE_DIRECTORIES", "keyword2" }, - { "CMAKE_VS_SDK_LIBRARY_DIRECTORIES", "keyword2" }, - { "CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES", "keyword2" }, - { "CMAKE_VS_SDK_REFERENCE_DIRECTORIES", "keyword2" }, - { "CMAKE_VS_SDK_SOURCE_DIRECTORIES", "keyword2" }, - { "CMAKE_VS_WINRT_BY_DEFAULT", "keyword2" }, - { "CMAKE_WATCOM_RUNTIME_LIBRARY", "keyword2" }, - { "CMAKE_WIN32_EXECUTABLE", "keyword2" }, - { "CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS", "keyword2" }, - { "EXECUTABLE_OUTPUT_PATH", "keyword2" }, - { "LIBRARY_OUTPUT_PATH", "keyword2" }, - { "CMAKE_C_COMPILE_FEATURES", "keyword2" }, - { "CMAKE_C_EXTENSIONS", "keyword2" }, - { "CMAKE_C_STANDARD", "keyword2" }, - { "CMAKE_C_STANDARD_REQUIRED", "keyword2" }, - { "CMAKE_COMPILER_IS_GNUCC", "keyword2" }, - { "CMAKE_COMPILER_IS_GNUCXX", "keyword2" }, - { "CMAKE_COMPILER_IS_GNUG77", "keyword2" }, - { "CMAKE_CUDA_ARCHITECTURES", "keyword2" }, - { "CMAKE_CUDA_COMPILE_FEATURES", "keyword2" }, - { "CMAKE_CUDA_EXTENSIONS", "keyword2" }, - { "CMAKE_CUDA_HOST_COMPILER", "keyword2" }, - { "CMAKE_CUDA_STANDARD", "keyword2" }, - { "CMAKE_CUDA_STANDARD_REQUIRED", "keyword2" }, - { "CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES", "keyword2" }, - { "CMAKE_CXX_COMPILE_FEATURES", "keyword2" }, - { "CMAKE_CXX_EXTENSIONS", "keyword2" }, - { "CMAKE_CXX_STANDARD", "keyword2" }, - { "CMAKE_CXX_STANDARD_REQUIRED", "keyword2" }, - { "CMAKE_Fortran_MODDIR_DEFAULT", "keyword2" }, - { "CMAKE_Fortran_MODDIR_FLAG", "keyword2" }, - { "CMAKE_Fortran_MODOUT_FLAG", "keyword2" }, - { "CMAKE_HIP_ARCHITECTURES", "keyword2" }, - { "CMAKE_HIP_EXTENSIONS", "keyword2" }, - { "CMAKE_HIP_STANDARD", "keyword2" }, - { "CMAKE_HIP_STANDARD_REQUIRED", "keyword2" }, - { "CMAKE_ISPC_HEADER_DIRECTORY", "keyword2" }, - { "CMAKE_ISPC_HEADER_SUFFIX", "keyword2" }, - { "CMAKE_ISPC_INSTRUCTION_SETS", "keyword2" }, - { "CMAKE_OBJC_EXTENSIONS", "keyword2" }, - { "CMAKE_OBJC_STANDARD", "keyword2" }, - { "CMAKE_OBJC_STANDARD_REQUIRED", "keyword2" }, - { "CMAKE_OBJCXX_EXTENSIONS", "keyword2" }, - { "CMAKE_OBJCXX_STANDARD", "keyword2" }, - { "CMAKE_OBJCXX_STANDARD_REQUIRED", "keyword2" }, - { "CMAKE_Swift_LANGUAGE_VERSION", "keyword2" }, - { "CTEST_BINARY_DIRECTORY", "keyword2" }, - { "CTEST_BUILD_COMMAND", "keyword2" }, - { "CTEST_BUILD_NAME", "keyword2" }, - { "CTEST_BZR_COMMAND", "keyword2" }, - { "CTEST_BZR_UPDATE_OPTIONS", "keyword2" }, - { "CTEST_CHANGE_ID", "keyword2" }, - { "CTEST_CHECKOUT_COMMAND", "keyword2" }, - { "CTEST_CONFIGURATION_TYPE", "keyword2" }, - { "CTEST_CONFIGURE_COMMAND", "keyword2" }, - { "CTEST_COVERAGE_COMMAND", "keyword2" }, - { "CTEST_COVERAGE_EXTRA_FLAGS", "keyword2" }, - { "CTEST_CURL_OPTIONS", "keyword2" }, - { "CTEST_CUSTOM_COVERAGE_EXCLUDE", "keyword2" }, - { "CTEST_CUSTOM_ERROR_EXCEPTION", "keyword2" }, - { "CTEST_CUSTOM_ERROR_MATCH", "keyword2" }, - { "CTEST_CUSTOM_ERROR_POST_CONTEXT", "keyword2" }, - { "CTEST_CUSTOM_ERROR_PRE_CONTEXT", "keyword2" }, - { "CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE", "keyword2" }, - { "CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS", "keyword2" }, - { "CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS", "keyword2" }, - { "CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE", "keyword2" }, - { "CTEST_CUSTOM_MEMCHECK_IGNORE", "keyword2" }, - { "CTEST_CUSTOM_POST_MEMCHECK", "keyword2" }, - { "CTEST_CUSTOM_POST_TEST", "keyword2" }, - { "CTEST_CUSTOM_PRE_MEMCHECK", "keyword2" }, - { "CTEST_CUSTOM_PRE_TEST", "keyword2" }, - { "CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION", "keyword2" }, - { "CTEST_CUSTOM_TESTS_IGNORE", "keyword2" }, - { "CTEST_CUSTOM_WARNING_EXCEPTION", "keyword2" }, - { "CTEST_CUSTOM_WARNING_MATCH", "keyword2" }, - { "CTEST_CVS_CHECKOUT", "keyword2" }, - { "CTEST_CVS_COMMAND", "keyword2" }, - { "CTEST_CVS_UPDATE_OPTIONS", "keyword2" }, - { "CTEST_DROP_LOCATION", "keyword2" }, - { "CTEST_DROP_METHOD", "keyword2" }, - { "CTEST_DROP_SITE", "keyword2" }, - { "CTEST_DROP_SITE_CDASH", "keyword2" }, - { "CTEST_DROP_SITE_PASSWORD", "keyword2" }, - { "CTEST_DROP_SITE_USER", "keyword2" }, - { "CTEST_EXTRA_COVERAGE_GLOB", "keyword2" }, - { "CTEST_GIT_COMMAND", "keyword2" }, - { "CTEST_GIT_INIT_SUBMODULES", "keyword2" }, - { "CTEST_GIT_UPDATE_CUSTOM", "keyword2" }, - { "CTEST_GIT_UPDATE_OPTIONS", "keyword2" }, - { "CTEST_HG_COMMAND", "keyword2" }, - { "CTEST_HG_UPDATE_OPTIONS", "keyword2" }, - { "CTEST_LABELS_FOR_SUBPROJECTS", "keyword2" }, - { "CTEST_MEMORYCHECK_COMMAND", "keyword2" }, - { "CTEST_MEMORYCHECK_COMMAND_OPTIONS", "keyword2" }, - { "CTEST_MEMORYCHECK_SANITIZER_OPTIONS", "keyword2" }, - { "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE", "keyword2" }, - { "CTEST_MEMORYCHECK_TYPE", "keyword2" }, - { "CTEST_NIGHTLY_START_TIME", "keyword2" }, - { "CTEST_P4_CLIENT", "keyword2" }, - { "CTEST_P4_COMMAND", "keyword2" }, - { "CTEST_P4_OPTIONS", "keyword2" }, - { "CTEST_P4_UPDATE_OPTIONS", "keyword2" }, - { "CTEST_RESOURCE_SPEC_FILE", "keyword2" }, - { "CTEST_RUN_CURRENT_SCRIPT", "keyword2" }, - { "CTEST_SCP_COMMAND", "keyword2" }, - { "CTEST_SCRIPT_DIRECTORY", "keyword2" }, - { "CTEST_SITE", "keyword2" }, - { "CTEST_SOURCE_DIRECTORY", "keyword2" }, - { "CTEST_SUBMIT_INACTIVITY_TIMEOUT", "keyword2" }, - { "CTEST_SUBMIT_URL", "keyword2" }, - { "CTEST_SVN_COMMAND", "keyword2" }, - { "CTEST_SVN_OPTIONS", "keyword2" }, - { "CTEST_SVN_UPDATE_OPTIONS", "keyword2" }, - { "CTEST_TEST_LOAD", "keyword2" }, - { "CTEST_TEST_TIMEOUT", "keyword2" }, - { "CTEST_TRIGGER_SITE", "keyword2" }, - { "CTEST_UPDATE_COMMAND", "keyword2" }, - { "CTEST_UPDATE_OPTIONS", "keyword2" }, - { "CTEST_UPDATE_VERSION_ONLY", "keyword2" }, - { "CTEST_UPDATE_VERSION_OVERRIDE", "keyword2" }, - { "CTEST_USE_LAUNCHERS", "keyword2" }, - { "CPACK_ABSOLUTE_DESTINATION_FILES", "keyword2" }, - { "CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY", "keyword2" }, - { "CPACK_CUSTOM_INSTALL_VARIABLES", "keyword2" }, - { "CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION", "keyword2" }, - { "CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "keyword2" }, - { "CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS", "keyword2" }, - { "CPACK_PACKAGING_INSTALL_PREFIX", "keyword2" }, - { "CPACK_SET_DESTDIR", "keyword2" }, - { "CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION", "keyword2" }, + { "CMAKE_AR", "type" }, + { "CMAKE_ARGC", "type" }, + { "CMAKE_ARGV0", "type" }, + { "CMAKE_BINARY_DIR", "type" }, + { "CMAKE_BUILD_TOOL", "type" }, + { "CMAKE_CACHE_MAJOR_VERSION", "type" }, + { "CMAKE_CACHE_MINOR_VERSION", "type" }, + { "CMAKE_CACHE_PATCH_VERSION", "type" }, + { "CMAKE_CACHEFILE_DIR", "type" }, + { "CMAKE_CFG_INTDIR", "type" }, + { "CMAKE_COMMAND", "type" }, + { "CMAKE_CPACK_COMMAND", "type" }, + { "CMAKE_CROSSCOMPILING", "type" }, + { "CMAKE_CROSSCOMPILING_EMULATOR", "type" }, + { "CMAKE_CTEST_COMMAND", "type" }, + { "CMAKE_CURRENT_BINARY_DIR", "type" }, + { "CMAKE_CURRENT_FUNCTION", "type" }, + { "CMAKE_CURRENT_FUNCTION_LIST_DIR", "type" }, + { "CMAKE_CURRENT_FUNCTION_LIST_FILE", "type" }, + { "CMAKE_CURRENT_FUNCTION_LIST_LINE", "type" }, + { "CMAKE_CURRENT_LIST_DIR", "type" }, + { "CMAKE_CURRENT_LIST_FILE", "type" }, + { "CMAKE_CURRENT_LIST_LINE", "type" }, + { "CMAKE_CURRENT_SOURCE_DIR", "type" }, + { "CMAKE_DEBUG_TARGET_PROPERTIES", "type" }, + { "CMAKE_DIRECTORY_LABELS", "type" }, + { "CMAKE_DL_LIBS", "type" }, + { "CMAKE_DOTNET_SDK", "type" }, + { "CMAKE_DOTNET_TARGET_FRAMEWORK", "type" }, + { "CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION", "type" }, + { "CMAKE_EDIT_COMMAND", "type" }, + { "CMAKE_EXECUTABLE_SUFFIX", "type" }, + { "CMAKE_EXTRA_GENERATOR", "type" }, + { "CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES", "type" }, + { "CMAKE_FIND_DEBUG_MODE", "type" }, + { "CMAKE_FIND_PACKAGE_NAME", "type" }, + { "CMAKE_FIND_PACKAGE_REDIRECTS_DIR", "type" }, + { "CMAKE_FIND_PACKAGE_SORT_DIRECTION", "type" }, + { "CMAKE_FIND_PACKAGE_SORT_ORDER", "type" }, + { "CMAKE_GENERATOR", "type" }, + { "CMAKE_GENERATOR_INSTANCE", "type" }, + { "CMAKE_GENERATOR_PLATFORM", "type" }, + { "CMAKE_GENERATOR_TOOLSET", "type" }, + { "CMAKE_IMPORT_LIBRARY_PREFIX", "type" }, + { "CMAKE_IMPORT_LIBRARY_SUFFIX", "type" }, + { "CMAKE_JOB_POOL_COMPILE", "type" }, + { "CMAKE_JOB_POOL_LINK", "type" }, + { "CMAKE_JOB_POOL_PRECOMPILE_HEADER", "type" }, + { "CMAKE_JOB_POOLS", "type" }, + { "CMAKE_LINK_LIBRARY_SUFFIX", "type" }, + { "CMAKE_LINK_SEARCH_END_STATIC", "type" }, + { "CMAKE_LINK_SEARCH_START_STATIC", "type" }, + { "CMAKE_MAJOR_VERSION", "type" }, + { "CMAKE_MAKE_PROGRAM", "type" }, + { "CMAKE_MATCH_COUNT", "type" }, + { "CMAKE_MINIMUM_REQUIRED_VERSION", "type" }, + { "CMAKE_MINOR_VERSION", "type" }, + { "CMAKE_NETRC", "type" }, + { "CMAKE_NETRC_FILE", "type" }, + { "CMAKE_PARENT_LIST_FILE", "type" }, + { "CMAKE_PATCH_VERSION", "type" }, + { "CMAKE_PROJECT_DESCRIPTION", "type" }, + { "CMAKE_PROJECT_HOMEPAGE_URL", "type" }, + { "CMAKE_PROJECT_NAME", "type" }, + { "CMAKE_PROJECT_VERSION", "type" }, + { "CMAKE_PROJECT_VERSION_MAJOR", "type" }, + { "CMAKE_PROJECT_VERSION_MINOR", "type" }, + { "CMAKE_PROJECT_VERSION_PATCH", "type" }, + { "CMAKE_PROJECT_VERSION_TWEAK", "type" }, + { "CMAKE_RANLIB", "type" }, + { "CMAKE_ROOT", "type" }, + { "CMAKE_RULE_MESSAGES", "type" }, + { "CMAKE_SCRIPT_MODE_FILE", "type" }, + { "CMAKE_SHARED_LIBRARY_PREFIX", "type" }, + { "CMAKE_SHARED_LIBRARY_SUFFIX", "type" }, + { "CMAKE_SHARED_MODULE_PREFIX", "type" }, + { "CMAKE_SHARED_MODULE_SUFFIX", "type" }, + { "CMAKE_SIZEOF_VOID_P", "type" }, + { "CMAKE_SKIP_INSTALL_RULES", "type" }, + { "CMAKE_SKIP_RPATH", "type" }, + { "CMAKE_SOURCE_DIR", "type" }, + { "CMAKE_STATIC_LIBRARY_PREFIX", "type" }, + { "CMAKE_STATIC_LIBRARY_SUFFIX", "type" }, + { "CMAKE_Swift_MODULE_DIRECTORY", "type" }, + { "CMAKE_Swift_NUM_THREADS", "type" }, + { "CMAKE_TOOLCHAIN_FILE", "type" }, + { "CMAKE_TWEAK_VERSION", "type" }, + { "CMAKE_VERBOSE_MAKEFILE", "type" }, + { "CMAKE_VERSION", "type" }, + { "CMAKE_VS_DEVENV_COMMAND", "type" }, + { "CMAKE_VS_MSBUILD_COMMAND", "type" }, + { "CMAKE_VS_NsightTegra_VERSION", "type" }, + { "CMAKE_VS_NUGET_PACKAGE_RESTORE", "type" }, + { "CMAKE_VS_PLATFORM_NAME", "type" }, + { "CMAKE_VS_PLATFORM_NAME_DEFAULT", "type" }, + { "CMAKE_VS_PLATFORM_TOOLSET", "type" }, + { "CMAKE_VS_PLATFORM_TOOLSET_CUDA", "type" }, + { "CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR", "type" }, + { "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE", "type" }, + { "CMAKE_VS_PLATFORM_TOOLSET_VERSION", "type" }, + { "CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER", "type" }, + { "CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION", "type" }, + { "CMAKE_VS_TARGET_FRAMEWORK_VERSION", "type" }, + { "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION", "type" }, + { "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM", "type" }, + { "CMAKE_XCODE_BUILD_SYSTEM", "type" }, + { "CMAKE_XCODE_PLATFORM_TOOLSET", "type" }, + { "PROJECT_BINARY_DIR", "type" }, + { "PROJECT_DESCRIPTION", "type" }, + { "PROJECT_HOMEPAGE_URL", "type" }, + { "PROJECT_IS_TOP_LEVEL", "type" }, + { "PROJECT_NAME", "type" }, + { "PROJECT_SOURCE_DIR", "type" }, + { "PROJECT_VERSION", "type" }, + { "PROJECT_VERSION_MAJOR", "type" }, + { "PROJECT_VERSION_MINOR", "type" }, + { "PROJECT_VERSION_PATCH", "type" }, + { "PROJECT_VERSION_TWEAK", "type" }, + { "BUILD_SHARED_LIBS", "type" }, + { "BUILD_STATIC_LIBS", "type" }, + { "CMAKE_ABSOLUTE_DESTINATION_FILES", "type" }, + { "CMAKE_APPBUNDLE_PATH", "type" }, + { "CMAKE_AUTOMOC_RELAXED_MODE", "type" }, + { "CMAKE_BACKWARDS_COMPATIBILITY", "type" }, + { "CMAKE_BUILD_TYPE", "type" }, + { "CMAKE_CLANG_VFS_OVERLAY", "type" }, + { "CMAKE_CODEBLOCKS_COMPILER_ID", "type" }, + { "CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES", "type" }, + { "CMAKE_CODELITE_USE_TARGETS", "type" }, + { "CMAKE_COLOR_DIAGNOSTICS", "type" }, + { "CMAKE_COLOR_MAKEFILE", "type" }, + { "CMAKE_CONFIGURATION_TYPES", "type" }, + { "CMAKE_DEPENDS_IN_PROJECT_ONLY", "type" }, + { "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES", "type" }, + { "CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT", "type" }, + { "CMAKE_ECLIPSE_MAKE_ARGUMENTS", "type" }, + { "CMAKE_ECLIPSE_RESOURCE_ENCODING", "type" }, + { "CMAKE_ECLIPSE_VERSION", "type" }, + { "CMAKE_ERROR_DEPRECATED", "type" }, + { "CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION", "type" }, + { "CMAKE_EXECUTE_PROCESS_COMMAND_ECHO", "type" }, + { "CMAKE_EXPORT_COMPILE_COMMANDS", "type" }, + { "CMAKE_EXPORT_PACKAGE_REGISTRY", "type" }, + { "CMAKE_EXPORT_NO_PACKAGE_REGISTRY", "type" }, + { "CMAKE_FIND_APPBUNDLE", "type" }, + { "CMAKE_FIND_FRAMEWORK", "type" }, + { "CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX", "type" }, + { "CMAKE_FIND_LIBRARY_PREFIXES", "type" }, + { "CMAKE_FIND_LIBRARY_SUFFIXES", "type" }, + { "CMAKE_FIND_NO_INSTALL_PREFIX", "type" }, + { "CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY", "type" }, + { "CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY", "type" }, + { "CMAKE_FIND_PACKAGE_PREFER_CONFIG", "type" }, + { "CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS", "type" }, + { "CMAKE_FIND_PACKAGE_TARGETS_GLOBAL", "type" }, + { "CMAKE_FIND_PACKAGE_WARN_NO_MODULE", "type" }, + { "CMAKE_FIND_ROOT_PATH", "type" }, + { "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE", "type" }, + { "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY", "type" }, + { "CMAKE_FIND_ROOT_PATH_MODE_PACKAGE", "type" }, + { "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM", "type" }, + { "CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH", "type" }, + { "CMAKE_FIND_USE_CMAKE_PATH", "type" }, + { "CMAKE_FIND_USE_CMAKE_SYSTEM_PATH", "type" }, + { "CMAKE_FIND_USE_INSTALL_PREFIX", "type" }, + { "CMAKE_FIND_USE_PACKAGE_REGISTRY", "type" }, + { "CMAKE_FIND_USE_PACKAGE_ROOT_PATH", "type" }, + { "CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH", "type" }, + { "CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY", "type" }, + { "CMAKE_FRAMEWORK_PATH", "type" }, + { "CMAKE_IGNORE_PATH", "type" }, + { "CMAKE_IGNORE_PREFIX_PATH", "type" }, + { "CMAKE_INCLUDE_DIRECTORIES_BEFORE", "type" }, + { "CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE", "type" }, + { "CMAKE_INCLUDE_PATH", "type" }, + { "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME", "type" }, + { "CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS", "type" }, + { "CMAKE_INSTALL_MESSAGE", "type" }, + { "CMAKE_INSTALL_PREFIX", "type" }, + { "CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT", "type" }, + { "CMAKE_LIBRARY_PATH", "type" }, + { "CMAKE_LINK_DIRECTORIES_BEFORE", "type" }, + { "CMAKE_LINK_LIBRARIES_ONLY_TARGETS", "type" }, + { "CMAKE_MAXIMUM_RECURSION_DEPTH", "type" }, + { "CMAKE_MESSAGE_CONTEXT", "type" }, + { "CMAKE_MESSAGE_CONTEXT_SHOW", "type" }, + { "CMAKE_MESSAGE_INDENT", "type" }, + { "CMAKE_MESSAGE_LOG_LEVEL", "type" }, + { "CMAKE_MFC_FLAG", "type" }, + { "CMAKE_MODULE_PATH", "type" }, + { "CMAKE_PREFIX_PATH", "type" }, + { "CMAKE_PROGRAM_PATH", "type" }, + { "CMAKE_PROJECT_INCLUDE", "type" }, + { "CMAKE_PROJECT_INCLUDE_BEFORE", "type" }, + { "CMAKE_PROJECT_TOP_LEVEL_INCLUDES", "type" }, + { "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY", "type" }, + { "CMAKE_STAGING_PREFIX", "type" }, + { "CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS", "type" }, + { "CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE", "type" }, + { "CMAKE_SUPPRESS_REGENERATION", "type" }, + { "CMAKE_SYSROOT", "type" }, + { "CMAKE_SYSROOT_COMPILE", "type" }, + { "CMAKE_SYSROOT_LINK", "type" }, + { "CMAKE_SYSTEM_APPBUNDLE_PATH", "type" }, + { "CMAKE_SYSTEM_FRAMEWORK_PATH", "type" }, + { "CMAKE_SYSTEM_IGNORE_PATH", "type" }, + { "CMAKE_SYSTEM_IGNORE_PREFIX_PATH", "type" }, + { "CMAKE_SYSTEM_INCLUDE_PATH", "type" }, + { "CMAKE_SYSTEM_LIBRARY_PATH", "type" }, + { "CMAKE_SYSTEM_PREFIX_PATH", "type" }, + { "CMAKE_SYSTEM_PROGRAM_PATH", "type" }, + { "CMAKE_TLS_CAINFO", "type" }, + { "CMAKE_TLS_VERIFY", "type" }, + { "CMAKE_USER_MAKE_RULES_OVERRIDE", "type" }, + { "CMAKE_WARN_DEPRECATED", "type" }, + { "CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION", "type" }, + { "CMAKE_XCODE_GENERATE_SCHEME", "type" }, + { "CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY", "type" }, + { "CMAKE_XCODE_LINK_BUILD_PHASE_MODE", "type" }, + { "CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER", "type" }, + { "CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN", "type" }, + { "CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING", "type" }, + { "CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER", "type" }, + { "CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS", "type" }, + { "CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE", "type" }, + { "CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION", "type" }, + { "CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE", "type" }, + { "CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION", "type" }, + { "CMAKE_XCODE_SCHEME_ENVIRONMENT", "type" }, + { "CMAKE_XCODE_SCHEME_GUARD_MALLOC", "type" }, + { "CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION", "type" }, + { "CMAKE_XCODE_SCHEME_LAUNCH_MODE", "type" }, + { "CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP", "type" }, + { "CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES", "type" }, + { "CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE", "type" }, + { "CMAKE_XCODE_SCHEME_MALLOC_STACK", "type" }, + { "CMAKE_XCODE_SCHEME_THREAD_SANITIZER", "type" }, + { "CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP", "type" }, + { "CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER", "type" }, + { "CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP", "type" }, + { "CMAKE_XCODE_SCHEME_WORKING_DIRECTORY", "type" }, + { "CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS", "type" }, + { "CMAKE_XCODE_XCCONFIG", "type" }, + { "ANDROID", "type" }, + { "APPLE", "type" }, + { "BORLAND", "type" }, + { "BSD", "type" }, + { "CMAKE_ANDROID_NDK_VERSION", "type" }, + { "CMAKE_CL_64", "type" }, + { "CMAKE_COMPILER_2005", "type" }, + { "CMAKE_HOST_APPLE", "type" }, + { "CMAKE_HOST_BSD", "type" }, + { "CMAKE_HOST_LINUX", "type" }, + { "CMAKE_HOST_SOLARIS", "type" }, + { "CMAKE_HOST_SYSTEM", "type" }, + { "CMAKE_HOST_SYSTEM_NAME", "type" }, + { "CMAKE_HOST_SYSTEM_PROCESSOR", "type" }, + { "CMAKE_HOST_SYSTEM_VERSION", "type" }, + { "CMAKE_HOST_UNIX", "type" }, + { "CMAKE_HOST_WIN32", "type" }, + { "CMAKE_LIBRARY_ARCHITECTURE", "type" }, + { "CMAKE_LIBRARY_ARCHITECTURE_REGEX", "type" }, + { "CMAKE_OBJECT_PATH_MAX", "type" }, + { "CMAKE_SYSTEM", "type" }, + { "CMAKE_SYSTEM_NAME", "type" }, + { "CMAKE_SYSTEM_PROCESSOR", "type" }, + { "CMAKE_SYSTEM_VERSION", "type" }, + { "CYGWIN", "type" }, + { "GHSMULTI", "type" }, + { "IOS", "type" }, + { "LINUX", "type" }, + { "MINGW", "type" }, + { "MSVC", "type" }, + { "MSVC10", "type" }, + { "MSVC11", "type" }, + { "MSVC12", "type" }, + { "MSVC14", "type" }, + { "MSVC60", "type" }, + { "MSVC70", "type" }, + { "MSVC71", "type" }, + { "MSVC80", "type" }, + { "MSVC90", "type" }, + { "MSVC_IDE", "type" }, + { "MSVC_TOOLSET_VERSION", "type" }, + { "MSVC_VERSION", "type" }, + { "MSYS", "type" }, + { "UNIX", "type" }, + { "WIN32", "type" }, + { "WINCE", "type" }, + { "WINDOWS_PHONE", "type" }, + { "WINDOWS_STORE", "type" }, + { "XCODE", "type" }, + { "XCODE_VERSION", "type" }, + { "CMAKE_ADSP_ROOT", "type" }, + { "CMAKE_AIX_EXPORT_ALL_SYMBOLS", "type" }, + { "CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS", "type" }, + { "CMAKE_ANDROID_API", "type" }, + { "CMAKE_ANDROID_API_MIN", "type" }, + { "CMAKE_ANDROID_ARCH", "type" }, + { "CMAKE_ANDROID_ARCH_ABI", "type" }, + { "CMAKE_ANDROID_ARM_MODE", "type" }, + { "CMAKE_ANDROID_ARM_NEON", "type" }, + { "CMAKE_ANDROID_ASSETS_DIRECTORIES", "type" }, + { "CMAKE_ANDROID_EXCEPTIONS", "type" }, + { "CMAKE_ANDROID_GUI", "type" }, + { "CMAKE_ANDROID_JAR_DEPENDENCIES", "type" }, + { "CMAKE_ANDROID_JAR_DIRECTORIES", "type" }, + { "CMAKE_ANDROID_JAVA_SOURCE_DIR", "type" }, + { "CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES", "type" }, + { "CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES", "type" }, + { "CMAKE_ANDROID_NDK", "type" }, + { "CMAKE_ANDROID_NDK_DEPRECATED_HEADERS", "type" }, + { "CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG", "type" }, + { "CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION", "type" }, + { "CMAKE_ANDROID_PROCESS_MAX", "type" }, + { "CMAKE_ANDROID_PROGUARD", "type" }, + { "CMAKE_ANDROID_PROGUARD_CONFIG_PATH", "type" }, + { "CMAKE_ANDROID_RTTI", "type" }, + { "CMAKE_ANDROID_SECURE_PROPS_PATH", "type" }, + { "CMAKE_ANDROID_SKIP_ANT_STEP", "type" }, + { "CMAKE_ANDROID_STANDALONE_TOOLCHAIN", "type" }, + { "CMAKE_ANDROID_STL_TYPE", "type" }, + { "CMAKE_APPLE_SILICON_PROCESSOR", "type" }, + { "CMAKE_ARCHIVE_OUTPUT_DIRECTORY", "type" }, + { "CMAKE_AUTOGEN_ORIGIN_DEPENDS", "type" }, + { "CMAKE_AUTOGEN_PARALLEL", "type" }, + { "CMAKE_AUTOGEN_VERBOSE", "type" }, + { "CMAKE_AUTOMOC", "type" }, + { "CMAKE_AUTOMOC_COMPILER_PREDEFINES", "type" }, + { "CMAKE_AUTOMOC_DEPEND_FILTERS", "type" }, + { "CMAKE_AUTOMOC_MACRO_NAMES", "type" }, + { "CMAKE_AUTOMOC_MOC_OPTIONS", "type" }, + { "CMAKE_AUTOMOC_PATH_PREFIX", "type" }, + { "CMAKE_AUTORCC", "type" }, + { "CMAKE_AUTORCC_OPTIONS", "type" }, + { "CMAKE_AUTOUIC", "type" }, + { "CMAKE_AUTOUIC_OPTIONS", "type" }, + { "CMAKE_AUTOUIC_SEARCH_PATHS", "type" }, + { "CMAKE_BUILD_RPATH", "type" }, + { "CMAKE_BUILD_RPATH_USE_ORIGIN", "type" }, + { "CMAKE_BUILD_WITH_INSTALL_NAME_DIR", "type" }, + { "CMAKE_BUILD_WITH_INSTALL_RPATH", "type" }, + { "CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY", "type" }, + { "CMAKE_COMPILE_WARNING_AS_ERROR", "type" }, + { "CMAKE_CROSS_CONFIGS", "type" }, + { "CMAKE_CTEST_ARGUMENTS", "type" }, + { "CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS", "type" }, + { "CMAKE_CUDA_RUNTIME_LIBRARY", "type" }, + { "CMAKE_CUDA_SEPARABLE_COMPILATION", "type" }, + { "CMAKE_DEBUG_POSTFIX", "type" }, + { "CMAKE_DEFAULT_BUILD_TYPE", "type" }, + { "CMAKE_DEFAULT_CONFIGS", "type" }, + { "CMAKE_DEPENDS_USE_COMPILER", "type" }, + { "CMAKE_DISABLE_PRECOMPILE_HEADERS", "type" }, + { "CMAKE_ENABLE_EXPORTS", "type" }, + { "CMAKE_EXE_LINKER_FLAGS", "type" }, + { "CMAKE_EXE_LINKER_FLAGS_INIT", "type" }, + { "CMAKE_FOLDER", "type" }, + { "CMAKE_Fortran_FORMAT", "type" }, + { "CMAKE_Fortran_MODULE_DIRECTORY", "type" }, + { "CMAKE_Fortran_PREPROCESS", "type" }, + { "CMAKE_FRAMEWORK", "type" }, + { "CMAKE_GHS_NO_SOURCE_GROUP_FILE", "type" }, + { "CMAKE_GLOBAL_AUTOGEN_TARGET", "type" }, + { "CMAKE_GLOBAL_AUTOGEN_TARGET_NAME", "type" }, + { "CMAKE_GLOBAL_AUTORCC_TARGET", "type" }, + { "CMAKE_GLOBAL_AUTORCC_TARGET_NAME", "type" }, + { "CMAKE_GNUtoMS", "type" }, + { "CMAKE_INCLUDE_CURRENT_DIR", "type" }, + { "CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE", "type" }, + { "CMAKE_INSTALL_NAME_DIR", "type" }, + { "CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH", "type" }, + { "CMAKE_INSTALL_RPATH", "type" }, + { "CMAKE_INSTALL_RPATH_USE_LINK_PATH", "type" }, + { "CMAKE_INTERPROCEDURAL_OPTIMIZATION", "type" }, + { "CMAKE_IOS_INSTALL_COMBINED", "type" }, + { "CMAKE_LIBRARY_OUTPUT_DIRECTORY", "type" }, + { "CMAKE_LIBRARY_PATH_FLAG", "type" }, + { "CMAKE_LINK_DEF_FILE_FLAG", "type" }, + { "CMAKE_LINK_DEPENDS_NO_SHARED", "type" }, + { "CMAKE_LINK_INTERFACE_LIBRARIES", "type" }, + { "CMAKE_LINK_LIBRARY_FILE_FLAG", "type" }, + { "CMAKE_LINK_LIBRARY_FLAG", "type" }, + { "CMAKE_LINK_WHAT_YOU_USE", "type" }, + { "CMAKE_LINK_WHAT_YOU_USE_CHECK", "type" }, + { "CMAKE_MACOSX_BUNDLE", "type" }, + { "CMAKE_MACOSX_RPATH", "type" }, + { "CMAKE_MODULE_LINKER_FLAGS", "type" }, + { "CMAKE_MODULE_LINKER_FLAGS_INIT", "type" }, + { "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT", "type" }, + { "CMAKE_MSVC_RUNTIME_LIBRARY", "type" }, + { "CMAKE_MSVCIDE_RUN_PATH", "type" }, + { "CMAKE_NINJA_OUTPUT_PATH_PREFIX", "type" }, + { "CMAKE_NO_BUILTIN_CHRPATH", "type" }, + { "CMAKE_NO_SYSTEM_FROM_IMPORTED", "type" }, + { "CMAKE_OPTIMIZE_DEPENDENCIES", "type" }, + { "CMAKE_OSX_ARCHITECTURES", "type" }, + { "CMAKE_OSX_DEPLOYMENT_TARGET", "type" }, + { "CMAKE_OSX_SYSROOT", "type" }, + { "CMAKE_PCH_INSTANTIATE_TEMPLATES", "type" }, + { "CMAKE_PCH_WARN_INVALID", "type" }, + { "CMAKE_PDB_OUTPUT_DIRECTORY", "type" }, + { "CMAKE_PLATFORM_NO_VERSIONED_SONAME", "type" }, + { "CMAKE_POSITION_INDEPENDENT_CODE", "type" }, + { "CMAKE_RUNTIME_OUTPUT_DIRECTORY", "type" }, + { "CMAKE_SHARED_LINKER_FLAGS", "type" }, + { "CMAKE_SHARED_LINKER_FLAGS_INIT", "type" }, + { "CMAKE_SKIP_BUILD_RPATH", "type" }, + { "CMAKE_SKIP_INSTALL_RPATH", "type" }, + { "CMAKE_STATIC_LINKER_FLAGS", "type" }, + { "CMAKE_STATIC_LINKER_FLAGS_INIT", "type" }, + { "CMAKE_TASKING_TOOLSET", "type" }, + { "CMAKE_TRY_COMPILE_CONFIGURATION", "type" }, + { "CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES", "type" }, + { "CMAKE_TRY_COMPILE_PLATFORM_VARIABLES", "type" }, + { "CMAKE_TRY_COMPILE_TARGET_TYPE", "type" }, + { "CMAKE_UNITY_BUILD", "type" }, + { "CMAKE_UNITY_BUILD_BATCH_SIZE", "type" }, + { "CMAKE_UNITY_BUILD_UNIQUE_ID", "type" }, + { "CMAKE_USE_RELATIVE_PATHS", "type" }, + { "CMAKE_VERIFY_INTERFACE_HEADER_SETS", "type" }, + { "CMAKE_VISIBILITY_INLINES_HIDDEN", "type" }, + { "CMAKE_VS_GLOBALS", "type" }, + { "CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD", "type" }, + { "CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD", "type" }, + { "CMAKE_VS_JUST_MY_CODE_DEBUGGING", "type" }, + { "CMAKE_VS_NO_COMPILE_BATCHING", "type" }, + { "CMAKE_VS_SDK_EXCLUDE_DIRECTORIES", "type" }, + { "CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES", "type" }, + { "CMAKE_VS_SDK_INCLUDE_DIRECTORIES", "type" }, + { "CMAKE_VS_SDK_LIBRARY_DIRECTORIES", "type" }, + { "CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES", "type" }, + { "CMAKE_VS_SDK_REFERENCE_DIRECTORIES", "type" }, + { "CMAKE_VS_SDK_SOURCE_DIRECTORIES", "type" }, + { "CMAKE_VS_WINRT_BY_DEFAULT", "type" }, + { "CMAKE_WATCOM_RUNTIME_LIBRARY", "type" }, + { "CMAKE_WIN32_EXECUTABLE", "type" }, + { "CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS", "type" }, + { "EXECUTABLE_OUTPUT_PATH", "type" }, + { "LIBRARY_OUTPUT_PATH", "type" }, + { "CMAKE_C_COMPILE_FEATURES", "type" }, + { "CMAKE_C_EXTENSIONS", "type" }, + { "CMAKE_C_STANDARD", "type" }, + { "CMAKE_C_STANDARD_REQUIRED", "type" }, + { "CMAKE_COMPILER_IS_GNUCC", "type" }, + { "CMAKE_COMPILER_IS_GNUCXX", "type" }, + { "CMAKE_COMPILER_IS_GNUG77", "type" }, + { "CMAKE_CUDA_ARCHITECTURES", "type" }, + { "CMAKE_CUDA_COMPILE_FEATURES", "type" }, + { "CMAKE_CUDA_EXTENSIONS", "type" }, + { "CMAKE_CUDA_HOST_COMPILER", "type" }, + { "CMAKE_CUDA_STANDARD", "type" }, + { "CMAKE_CUDA_STANDARD_REQUIRED", "type" }, + { "CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES", "type" }, + { "CMAKE_CXX_COMPILE_FEATURES", "type" }, + { "CMAKE_CXX_EXTENSIONS", "type" }, + { "CMAKE_CXX_STANDARD", "type" }, + { "CMAKE_CXX_STANDARD_REQUIRED", "type" }, + { "CMAKE_Fortran_MODDIR_DEFAULT", "type" }, + { "CMAKE_Fortran_MODDIR_FLAG", "type" }, + { "CMAKE_Fortran_MODOUT_FLAG", "type" }, + { "CMAKE_HIP_ARCHITECTURES", "type" }, + { "CMAKE_HIP_EXTENSIONS", "type" }, + { "CMAKE_HIP_STANDARD", "type" }, + { "CMAKE_HIP_STANDARD_REQUIRED", "type" }, + { "CMAKE_ISPC_HEADER_DIRECTORY", "type" }, + { "CMAKE_ISPC_HEADER_SUFFIX", "type" }, + { "CMAKE_ISPC_INSTRUCTION_SETS", "type" }, + { "CMAKE_OBJC_EXTENSIONS", "type" }, + { "CMAKE_OBJC_STANDARD", "type" }, + { "CMAKE_OBJC_STANDARD_REQUIRED", "type" }, + { "CMAKE_OBJCXX_EXTENSIONS", "type" }, + { "CMAKE_OBJCXX_STANDARD", "type" }, + { "CMAKE_OBJCXX_STANDARD_REQUIRED", "type" }, + { "CMAKE_Swift_LANGUAGE_VERSION", "type" }, + { "CTEST_BINARY_DIRECTORY", "type" }, + { "CTEST_BUILD_COMMAND", "type" }, + { "CTEST_BUILD_NAME", "type" }, + { "CTEST_BZR_COMMAND", "type" }, + { "CTEST_BZR_UPDATE_OPTIONS", "type" }, + { "CTEST_CHANGE_ID", "type" }, + { "CTEST_CHECKOUT_COMMAND", "type" }, + { "CTEST_CONFIGURATION_TYPE", "type" }, + { "CTEST_CONFIGURE_COMMAND", "type" }, + { "CTEST_COVERAGE_COMMAND", "type" }, + { "CTEST_COVERAGE_EXTRA_FLAGS", "type" }, + { "CTEST_CURL_OPTIONS", "type" }, + { "CTEST_CUSTOM_COVERAGE_EXCLUDE", "type" }, + { "CTEST_CUSTOM_ERROR_EXCEPTION", "type" }, + { "CTEST_CUSTOM_ERROR_MATCH", "type" }, + { "CTEST_CUSTOM_ERROR_POST_CONTEXT", "type" }, + { "CTEST_CUSTOM_ERROR_PRE_CONTEXT", "type" }, + { "CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE", "type" }, + { "CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS", "type" }, + { "CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS", "type" }, + { "CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE", "type" }, + { "CTEST_CUSTOM_MEMCHECK_IGNORE", "type" }, + { "CTEST_CUSTOM_POST_MEMCHECK", "type" }, + { "CTEST_CUSTOM_POST_TEST", "type" }, + { "CTEST_CUSTOM_PRE_MEMCHECK", "type" }, + { "CTEST_CUSTOM_PRE_TEST", "type" }, + { "CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION", "type" }, + { "CTEST_CUSTOM_TESTS_IGNORE", "type" }, + { "CTEST_CUSTOM_WARNING_EXCEPTION", "type" }, + { "CTEST_CUSTOM_WARNING_MATCH", "type" }, + { "CTEST_CVS_CHECKOUT", "type" }, + { "CTEST_CVS_COMMAND", "type" }, + { "CTEST_CVS_UPDATE_OPTIONS", "type" }, + { "CTEST_DROP_LOCATION", "type" }, + { "CTEST_DROP_METHOD", "type" }, + { "CTEST_DROP_SITE", "type" }, + { "CTEST_DROP_SITE_CDASH", "type" }, + { "CTEST_DROP_SITE_PASSWORD", "type" }, + { "CTEST_DROP_SITE_USER", "type" }, + { "CTEST_EXTRA_COVERAGE_GLOB", "type" }, + { "CTEST_GIT_COMMAND", "type" }, + { "CTEST_GIT_INIT_SUBMODULES", "type" }, + { "CTEST_GIT_UPDATE_CUSTOM", "type" }, + { "CTEST_GIT_UPDATE_OPTIONS", "type" }, + { "CTEST_HG_COMMAND", "type" }, + { "CTEST_HG_UPDATE_OPTIONS", "type" }, + { "CTEST_LABELS_FOR_SUBPROJECTS", "type" }, + { "CTEST_MEMORYCHECK_COMMAND", "type" }, + { "CTEST_MEMORYCHECK_COMMAND_OPTIONS", "type" }, + { "CTEST_MEMORYCHECK_SANITIZER_OPTIONS", "type" }, + { "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE", "type" }, + { "CTEST_MEMORYCHECK_TYPE", "type" }, + { "CTEST_NIGHTLY_START_TIME", "type" }, + { "CTEST_P4_CLIENT", "type" }, + { "CTEST_P4_COMMAND", "type" }, + { "CTEST_P4_OPTIONS", "type" }, + { "CTEST_P4_UPDATE_OPTIONS", "type" }, + { "CTEST_RESOURCE_SPEC_FILE", "type" }, + { "CTEST_RUN_CURRENT_SCRIPT", "type" }, + { "CTEST_SCP_COMMAND", "type" }, + { "CTEST_SCRIPT_DIRECTORY", "type" }, + { "CTEST_SITE", "type" }, + { "CTEST_SOURCE_DIRECTORY", "type" }, + { "CTEST_SUBMIT_INACTIVITY_TIMEOUT", "type" }, + { "CTEST_SUBMIT_URL", "type" }, + { "CTEST_SVN_COMMAND", "type" }, + { "CTEST_SVN_OPTIONS", "type" }, + { "CTEST_SVN_UPDATE_OPTIONS", "type" }, + { "CTEST_TEST_LOAD", "type" }, + { "CTEST_TEST_TIMEOUT", "type" }, + { "CTEST_TRIGGER_SITE", "type" }, + { "CTEST_UPDATE_COMMAND", "type" }, + { "CTEST_UPDATE_OPTIONS", "type" }, + { "CTEST_UPDATE_VERSION_ONLY", "type" }, + { "CTEST_UPDATE_VERSION_OVERRIDE", "type" }, + { "CTEST_USE_LAUNCHERS", "type" }, + { "CPACK_ABSOLUTE_DESTINATION_FILES", "type" }, + { "CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY", "type" }, + { "CPACK_CUSTOM_INSTALL_VARIABLES", "type" }, + { "CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION", "type" }, + { "CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "type" }, + { "CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS", "type" }, + { "CPACK_PACKAGING_INSTALL_PREFIX", "type" }, + { "CPACK_SET_DESTDIR", "type" }, + { "CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION", "type" }, }, "#", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/containerfile.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/containerfile.cpp index c14e34cca..a3ad22ecf 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/containerfile.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/containerfile.cpp @@ -19,22 +19,22 @@ SyntaxDefinition& addContainerFile() { }, { - { "EXPOSE", "keyword2" }, + { "EXPOSE", "type" }, { "FROM", "keyword" }, - { "STOPSIGNAL", "keyword2" }, - { "HEALTHCHECK", "keyword2" }, - { "SHELL", "keyword2" }, - { "ENV", "keyword2" }, - { "RUN", "keyword2" }, + { "STOPSIGNAL", "type" }, + { "HEALTHCHECK", "type" }, + { "SHELL", "type" }, + { "ENV", "type" }, + { "RUN", "type" }, { "ENTRYPOINT", "function" }, - { "VOLUME", "keyword2" }, - { "WORKDIR", "keyword2" }, - { "LABEL", "keyword2" }, - { "USER", "keyword2" }, - { "ONBUILD", "keyword2" }, - { "COPY", "keyword2" }, - { "ARG", "keyword2" }, - { "ADD", "keyword2" }, + { "VOLUME", "type" }, + { "WORKDIR", "type" }, + { "LABEL", "type" }, + { "USER", "type" }, + { "ONBUILD", "type" }, + { "COPY", "type" }, + { "ARG", "type" }, + { "ADD", "type" }, { "CMD", "function" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/covscript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/covscript.cpp index 99c4d9418..7267d1403 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/covscript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/covscript.cpp @@ -14,17 +14,17 @@ SyntaxDefinition& addCovScript() { { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, { { "(import)%s+([%a_][%w/_]+)(%s+as%s+)([%a_][%w_]*)" }, - { "normal", "keyword", "literal", "keyword", "keyword2" } }, + { "normal", "keyword", "literal", "keyword", "type" } }, { { "(import)%s+([%a_][%w/_]+)" }, { "keyword", "keyword", "literal" } }, { { "(class)%s+([%a_][%w_]+)(%s+extends%s+)([%a_][%w_]+)" }, - { "keyword", "keyword", "keyword2", "keyword", "keyword2" } }, - { { "(class)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "keyword2" } }, - { { "(struct)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "keyword2" } }, + { "keyword", "keyword", "type", "keyword", "type" } }, + { { "(class)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "type" } }, + { { "(struct)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "type" } }, { { "(package)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "literal" } }, { { "(using)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "literal" } }, { { "common_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, - { { "(@[A-Za-z_]%w*)%s*(%:%s*%w+%s*)$" }, { "normal", "keyword", "keyword2" } }, + { { "(@[A-Za-z_]%w*)%s*(%:%s*%w+%s*)$" }, { "normal", "keyword", "type" } }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "@[%a_][%w_]*" }, "symbol" }, { { "[%a_][%w_]*" }, "symbol" }, @@ -52,7 +52,7 @@ SyntaxDefinition& addCovScript() { { "initialize", "keyword" }, { "local", "keyword" }, { "move", "keyword" }, { "case", "keyword" }, { "clone", "keyword" }, { "do", "keyword" }, { "type", "keyword" }, { "@begin", "keyword" }, { "@end", "keyword" }, - { "array", "keyword2" }, { "string", "keyword2" }, { "hash_map", "keyword2" }, + { "array", "type" }, { "string", "type" }, { "hash_map", "type" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/crystal.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/crystal.cpp index 3e4c72464..8858adf29 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/crystal.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/crystal.cpp @@ -20,63 +20,31 @@ SyntaxDefinition& addCrystal() { { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "[%a_][%w_]*%f[(?]" }, "function" }, { { "%.[%a_][%w_]*%f[(%s]" }, "function" }, - { { "@?@[%a_][%w_]*" }, "keyword2" }, - { { ":-[%u_][%u%d_]*%f[^%w]" }, "keyword2" }, + { { "@?@[%a_][%w_]*" }, "type" }, + { { ":-[%u_][%u%d_]*%f[^%w]" }, "type" }, { { "::[%w_]*" }, "symbol" }, { { ":[%w_]*" }, "symbol" }, - { { "[%a_][%w_]*:[^:]" }, "keyword2" }, + { { "[%a_][%w_]*:[^:]" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "end", "keyword" }, - { "END", "keyword" }, - { "else", "keyword" }, - { "case", "keyword" }, - { "BEGIN", "keyword" }, - { "__FILE__", "keyword" }, - { "annotation", "keyword2" }, - { "__LINE__", "keyword" }, - { "until", "keyword" }, - { "abstract", "keyword" }, - { "Void", "literal" }, - { "fun", "keyword" }, - { "alias", "keyword" }, - { "self", "keyword2" }, - { "break", "keyword" }, - { "class", "keyword" }, - { "yield", "keyword" }, - { "then", "keyword" }, - { "unless", "keyword" }, - { "include", "keyword" }, - { "when", "keyword" }, - { "extend", "keyword" }, - { "next", "keyword" }, - { "enum", "keyword2" }, - { "nil", "literal" }, - { "begin", "keyword" }, - { "if", "keyword" }, - { "out", "function" }, - { "false", "literal" }, - { "in", "keyword" }, - { "def", "keyword" }, - { "elsif", "keyword" }, - { "responds_to?", "function" }, - { "module", "keyword" }, - { "ensure", "keyword" }, - { "while", "keyword" }, - { "do", "keyword" }, - { "require", "keyword" }, - { "defined?", "keyword" }, - { "private", "keyword2" }, - { "rescue", "keyword" }, - { "p!", "function" }, - { "puts", "function" }, - { "true", "literal" }, - { "__ENCODING__", "keyword" }, - { "return", "keyword" }, - { "super", "keyword2" }, - { "undef", "keyword" }, + { "end", "keyword" }, { "END", "keyword" }, { "else", "keyword" }, + { "case", "keyword" }, { "BEGIN", "keyword" }, { "__FILE__", "keyword" }, + { "annotation", "type" }, { "__LINE__", "keyword" }, { "until", "keyword" }, + { "abstract", "keyword" }, { "Void", "literal" }, { "fun", "keyword" }, + { "alias", "keyword" }, { "self", "type" }, { "break", "keyword" }, + { "class", "keyword" }, { "yield", "keyword" }, { "then", "keyword" }, + { "unless", "keyword" }, { "include", "keyword" }, { "when", "keyword" }, + { "extend", "keyword" }, { "next", "keyword" }, { "enum", "type" }, + { "nil", "literal" }, { "begin", "keyword" }, { "if", "keyword" }, + { "out", "function" }, { "false", "literal" }, { "in", "keyword" }, + { "def", "keyword" }, { "elsif", "keyword" }, { "responds_to?", "function" }, + { "module", "keyword" }, { "ensure", "keyword" }, { "while", "keyword" }, + { "do", "keyword" }, { "require", "keyword" }, { "defined?", "keyword" }, + { "private", "type" }, { "rescue", "keyword" }, { "p!", "function" }, + { "puts", "function" }, { "true", "literal" }, { "__ENCODING__", "keyword" }, + { "return", "keyword" }, { "super", "type" }, { "undef", "keyword" }, }, "#", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/csharp.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/csharp.cpp index 44c3061db..4a74d77a1 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/csharp.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/csharp.cpp @@ -28,13 +28,13 @@ SyntaxDefinition& addCSharp() { }, { - { "internal", "keyword" }, { "int", "keyword2" }, { "new", "keyword" }, + { "internal", "keyword" }, { "int", "type" }, { "new", "keyword" }, { "continue", "keyword" }, { "default", "keyword" }, { "remove", "keyword" }, - { "sizeof", "keyword" }, { "char", "keyword2" }, { "set", "keyword" }, - { "bool", "keyword2" }, { "this", "keyword" }, { "extern", "keyword" }, - { "long", "keyword2" }, { "foreach", "keyword" }, { "namespace", "keyword" }, - { "partial", "keyword" }, { "short", "keyword2" }, { "typeof", "keyword" }, - { "object", "keyword2" }, { "false", "literal" }, { "for", "keyword" }, + { "sizeof", "keyword" }, { "char", "type" }, { "set", "keyword" }, + { "bool", "type" }, { "this", "keyword" }, { "extern", "keyword" }, + { "long", "type" }, { "foreach", "keyword" }, { "namespace", "keyword" }, + { "partial", "keyword" }, { "short", "type" }, { "typeof", "keyword" }, + { "object", "type" }, { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, { "get", "keyword" }, { "delegate", "keyword" }, { "add", "keyword" }, { "null", "literal" }, { "unsafe", "keyword" }, { "fixed", "keyword" }, @@ -42,20 +42,20 @@ SyntaxDefinition& addCSharp() { { "record", "keyword" }, { "enum", "keyword" }, { "value", "keyword" }, { "lock", "keyword" }, { "operator", "keyword" }, { "when", "keyword" }, { "struct", "keyword" }, { "break", "keyword" }, { "is", "keyword" }, - { "decimal", "keyword2" }, { "string", "keyword2" }, { "if", "keyword" }, + { "decimal", "type" }, { "string", "type" }, { "if", "keyword" }, { "await", "keyword" }, { "in", "keyword" }, { "public", "keyword" }, { "virtual", "keyword" }, { "dynamic", "keyword" }, { "private", "keyword" }, { "finally", "keyword" }, { "abstract", "keyword" }, { "unchecked", "keyword" }, { "volatile", "keyword" }, { "switch", "keyword" }, { "using", "keyword" }, - { "checked", "keyword" }, { "double", "keyword2" }, { "event", "keyword" }, - { "ulong", "keyword2" }, { "return", "keyword" }, { "var", "keyword" }, + { "checked", "keyword" }, { "double", "type" }, { "event", "keyword" }, + { "ulong", "type" }, { "return", "keyword" }, { "var", "keyword" }, { "out", "keyword" }, { "try", "keyword" }, { "as", "keyword" }, - { "class", "keyword" }, { "void", "keyword" }, { "byte", "keyword2" }, - { "yield", "keyword" }, { "static", "keyword" }, { "uint", "keyword2" }, - { "explicit", "keyword" }, { "sbyte", "keyword2" }, { "throw", "keyword" }, + { "class", "keyword" }, { "void", "keyword" }, { "byte", "type" }, + { "yield", "keyword" }, { "static", "keyword" }, { "uint", "type" }, + { "explicit", "keyword" }, { "sbyte", "type" }, { "throw", "keyword" }, { "where", "keyword" }, { "catch", "keyword" }, { "true", "literal" }, - { "ushort", "keyword2" }, { "override", "keyword" }, { "sealed", "keyword" }, - { "float", "keyword2" }, { "params", "keyword" }, { "readonly", "keyword" }, + { "ushort", "type" }, { "override", "keyword" }, { "sealed", "keyword" }, + { "float", "type" }, { "params", "keyword" }, { "readonly", "keyword" }, { "base", "keyword" }, { "case", "keyword" }, { "interface", "keyword" }, { "protected", "keyword" }, { "do", "keyword" }, { "implicit", "keyword" }, { "ref", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.cpp index 7e7c41f7d..69ca9afcb 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.cpp @@ -37,12 +37,12 @@ SyntaxDefinition& addD() { { "catch", "keyword" }, { "macro", "keyword" }, { "package", "keyword" }, - { "ireal", "keyword2" }, + { "ireal", "type" }, { "foreach", "keyword" }, - { "int", "keyword2" }, + { "int", "type" }, { "immutable", "keyword" }, { "final", "keyword" }, - { "ifloat", "keyword2" }, + { "ifloat", "type" }, { "lazy", "keyword" }, { "do", "keyword" }, { "goto", "keyword" }, @@ -50,12 +50,12 @@ SyntaxDefinition& addD() { { "function", "keyword" }, { "delegate", "keyword" }, { "import", "keyword" }, - { "long", "keyword2" }, + { "long", "type" }, { "continue", "keyword" }, - { "idouble", "keyword2" }, + { "idouble", "type" }, { "ref", "keyword" }, { "for", "keyword" }, - { "float", "keyword2" }, + { "float", "type" }, { "version", "keyword" }, { "finally", "keyword" }, { "if", "keyword" }, @@ -66,7 +66,7 @@ SyntaxDefinition& addD() { { "__vector", "keyword" }, { "false", "literal" }, { "export", "keyword" }, - { "byte", "keyword2" }, + { "byte", "type" }, { "enum", "keyword" }, { "cast", "keyword" }, { "case", "keyword" }, @@ -74,7 +74,7 @@ SyntaxDefinition& addD() { { "null", "literal" }, { "__MODULE__", "keyword" }, { "asm", "keyword" }, - { "double", "keyword2" }, + { "double", "type" }, { "default", "keyword" }, { "inout", "keyword" }, { "pragma", "keyword" }, @@ -84,15 +84,15 @@ SyntaxDefinition& addD() { { "scope", "keyword" }, { "override", "keyword" }, { "shared", "keyword" }, - { "real", "keyword2" }, - { "short", "keyword2" }, + { "real", "type" }, + { "short", "type" }, { "struct", "keyword" }, - { "uint", "keyword2" }, + { "uint", "type" }, { "return", "keyword" }, { "super", "keyword" }, { "throw", "keyword" }, { "__traits", "keyword" }, - { "ubyte", "keyword2" }, + { "ubyte", "type" }, { "true", "literal" }, { "__FUNCTION__", "keyword" }, { "this", "keyword" }, @@ -100,40 +100,40 @@ SyntaxDefinition& addD() { { "void", "keyword" }, { "__FILE__", "keyword" }, { "switch", "keyword" }, - { "ucent", "keyword2" }, - { "ushort", "keyword2" }, + { "ucent", "type" }, + { "ushort", "type" }, { "with", "keyword" }, { "typeof", "keyword" }, { "typeid", "keyword" }, - { "ulong", "keyword2" }, + { "ulong", "type" }, { "out", "keyword" }, { "nothrow", "keyword" }, - { "char", "keyword2" }, + { "char", "type" }, { "synchronized", "keyword" }, { "debug", "keyword" }, { "assert", "keyword" }, { "foreach_reverse", "keyword" }, { "unittest", "keyword" }, - { "dchar", "keyword2" }, + { "dchar", "type" }, { "__PRETTY_FUNCTION__", "keyword" }, { "class", "keyword" }, - { "cent", "keyword2" }, + { "cent", "type" }, { "align", "keyword" }, { "__LINE__", "keyword" }, - { "cdouble", "keyword2" }, + { "cdouble", "type" }, { "abstract", "keyword" }, { "__gshared", "keyword" }, { "alias", "keyword" }, { "deprecated", "keyword" }, { "body", "keyword" }, - { "wchar", "keyword2" }, + { "wchar", "type" }, { "template", "keyword" }, { "is", "keyword" }, { "private", "keyword" }, - { "creal", "keyword2" }, - { "cfloat", "keyword2" }, + { "creal", "type" }, + { "cfloat", "type" }, { "try", "keyword" }, - { "bool", "keyword2" }, + { "bool", "type" }, { "public", "keyword" }, { "union", "keyword" }, { "const", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.hpp index 470e55748..9db1406bc 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/d.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addD(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/dart.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/dart.cpp index ee2be5749..01b674b68 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/dart.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/dart.cpp @@ -28,18 +28,18 @@ SyntaxDefinition& addDart() { }, { - { "int", "keyword2" }, { "in", "keyword" }, { "then", "keyword" }, - { "dynamic", "keyword2" }, { "new", "keyword" }, { "continue", "keyword" }, - { "finally", "keyword" }, { "default", "keyword" }, { "switch", "keyword" }, - { "double", "keyword2" }, { "bool", "keyword2" }, { "this", "keyword2" }, - { "return", "keyword" }, { "var", "keyword" }, { "part of", "keyword" }, - { "String", "keyword2" }, { "class", "keyword" }, { "void", "keyword" }, - { "static", "keyword" }, { "false", "literal" }, { "for", "keyword" }, - { "while", "keyword" }, { "const", "keyword" }, { "null", "literal" }, - { "true", "literal" }, { "else", "keyword" }, { "final", "keyword" }, - { "enum", "keyword" }, { "print", "keyword" }, { "Map", "keyword2" }, - { "break", "keyword" }, { "List", "keyword2" }, { "Function", "keyword2" }, - { "case", "keyword" }, { "if", "keyword" }, { "await", "keyword" }, + { "int", "type" }, { "in", "keyword" }, { "then", "keyword" }, + { "dynamic", "type" }, { "new", "keyword" }, { "continue", "keyword" }, + { "finally", "keyword" }, { "default", "keyword" }, { "switch", "keyword" }, + { "double", "type" }, { "bool", "type" }, { "this", "type" }, + { "return", "keyword" }, { "var", "keyword" }, { "part of", "keyword" }, + { "String", "type" }, { "class", "keyword" }, { "void", "keyword" }, + { "static", "keyword" }, { "false", "literal" }, { "for", "keyword" }, + { "while", "keyword" }, { "const", "keyword" }, { "null", "literal" }, + { "true", "literal" }, { "else", "keyword" }, { "final", "keyword" }, + { "enum", "keyword" }, { "print", "keyword" }, { "Map", "type" }, + { "break", "keyword" }, { "List", "type" }, { "Function", "type" }, + { "case", "keyword" }, { "if", "keyword" }, { "await", "keyword" }, { "do", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/difffile.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/difffile.cpp index e3c685d45..5be0a2480 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/difffile.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/difffile.cpp @@ -16,7 +16,7 @@ SyntaxDefinition& addDiff() { { { "^index%s.-\n" }, "comment" }, { { "^@@.-\n" }, "number" }, { { "^%+.-\n" }, "function" }, - { { "^%-.-\n" }, "keyword2" }, + { { "^%-.-\n" }, "type" }, }, { diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ec.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ec.cpp index 6028ede04..3896978b4 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ec.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ec.cpp @@ -18,11 +18,11 @@ SyntaxDefinition& addeC() { { { "\"", "[\"\n]", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, { { "(class|struct)\\s+([A-Za-z]\\w*)\\s*:\\s*([A-Za-z]\\w*)" }, - { "keyword", "keyword", "keyword2", "keyword2" }, + { "keyword", "keyword", "type", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "(class|struct)\\s+([A-Za-z]\\w*)" }, - { "keyword", "keyword", "keyword2" }, + { "keyword", "keyword", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "c_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, @@ -39,24 +39,24 @@ SyntaxDefinition& addeC() { { { "elseif", "keyword" }, - { "int", "keyword2" }, + { "int", "type" }, { "then", "keyword" }, - { "unsigned", "keyword2" }, + { "unsigned", "type" }, { "continue", "keyword" }, { "default", "keyword" }, { "volatile", "keyword" }, { "switch", "keyword" }, - { "char", "keyword2" }, - { "double", "keyword2" }, + { "char", "type" }, + { "double", "type" }, { "auto", "keyword" }, - { "bool", "keyword2" }, + { "bool", "type" }, { "return", "keyword" }, { "extern", "keyword" }, { "NULL", "literal" }, - { "long", "keyword2" }, + { "long", "type" }, { "void", "keyword" }, { "union", "keyword" }, - { "short", "keyword2" }, + { "short", "type" }, { "static", "keyword" }, { "inline", "keyword" }, { "false", "literal" }, @@ -64,21 +64,21 @@ SyntaxDefinition& addeC() { { "goto", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, - { "int32_t", "keyword2" }, - { "int16_t", "keyword2" }, - { "uint16_t", "keyword2" }, + { "int32_t", "type" }, + { "int16_t", "type" }, + { "uint16_t", "type" }, { "typedef", "keyword" }, { "true", "literal" }, { "else", "keyword" }, - { "uint32_t", "keyword2" }, + { "uint32_t", "type" }, { "enum", "keyword" }, - { "int8_t", "keyword2" }, - { "int64_t", "keyword2" }, - { "float", "keyword2" }, + { "int8_t", "type" }, + { "int64_t", "type" }, + { "float", "type" }, { "struct", "keyword" }, { "break", "keyword" }, - { "uint8_t", "keyword2" }, - { "uint64_t", "keyword2" }, + { "uint8_t", "type" }, + { "uint64_t", "type" }, { "case", "keyword" }, { "if", "keyword" }, { "do", "keyword" }, @@ -144,19 +144,19 @@ SyntaxDefinition& addeC() { { "database_open", "keyword" }, { "dbfield", "keyword" }, - { "uint", "keyword2" }, - { "uint32", "keyword2" }, - { "uint16", "keyword2" }, - { "uint64", "keyword2" }, - { "bool", "keyword2" }, - { "byte", "keyword2" }, - { "int64", "keyword2" }, - { "uintptr", "keyword2" }, - { "intptr", "keyword2" }, - { "intsize", "keyword2" }, - { "uintsize", "keyword2" }, - { "string", "keyword2" }, - { "unichar", "keyword2" }, + { "uint", "type" }, + { "uint32", "type" }, + { "uint16", "type" }, + { "uint64", "type" }, + { "bool", "type" }, + { "byte", "type" }, + { "int64", "type" }, + { "uintptr", "type" }, + { "intptr", "type" }, + { "intsize", "type" }, + { "uintsize", "type" }, + { "string", "type" }, + { "unichar", "type" }, { "this", "keyword" }, { "false", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elena.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elena.cpp index 76d590c4b..8ef622260 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elena.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elena.cpp @@ -19,10 +19,10 @@ SyntaxDefinition& addElena() { { { "^%s*(import)%s+([%a_][%w_']*)%s*%f[%;]" }, { "normal", "keyword", "literal" } }, { { "(class%s+)([%a_][%w_]*)%s*(:)%s*([%a_][%w_]*)" }, - { "normal", "keyword", "keyword2", "operator", "keyword2" } }, - { { "(class%s+)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(singleton%s+)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(extension%s+)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, + { "normal", "keyword", "type", "operator", "type" } }, + { { "(class%s+)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(singleton%s+)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(extension%s+)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, { { "-?0x%x+" }, "number" }, { { "-?%d+[%d%.eE]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, @@ -34,15 +34,15 @@ SyntaxDefinition& addElena() { }, { - { "internal", "keyword" }, { "int", "keyword2" }, + { "internal", "keyword" }, { "int", "type" }, { "new", "keyword" }, { "continue", "keyword" }, { "default", "keyword" }, { "remove", "keyword" }, - { "sizeof", "keyword" }, { "char", "keyword2" }, - { "set", "keyword" }, { "bool", "keyword2" }, - { "extern", "keyword" }, { "long", "keyword2" }, + { "sizeof", "keyword" }, { "char", "type" }, + { "set", "keyword" }, { "bool", "type" }, + { "extern", "keyword" }, { "long", "type" }, { "foreach", "keyword" }, { "namespace", "keyword" }, - { "partial", "keyword" }, { "short", "keyword2" }, - { "typeof", "keyword" }, { "object", "keyword2" }, + { "partial", "keyword" }, { "short", "type" }, + { "typeof", "keyword" }, { "object", "type" }, { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, { "get", "keyword" }, @@ -54,32 +54,32 @@ SyntaxDefinition& addElena() { { "value", "keyword" }, { "lock", "keyword" }, { "operator", "keyword" }, { "when", "keyword" }, { "struct", "keyword" }, { "break", "keyword" }, - { "is", "keyword" }, { "decimal", "keyword2" }, - { "string", "keyword2" }, { "if", "keyword" }, + { "is", "keyword" }, { "decimal", "type" }, + { "string", "type" }, { "if", "keyword" }, { "await", "keyword" }, { "in", "keyword" }, { "public", "keyword" }, { "virtual", "keyword" }, { "dynamic", "keyword" }, { "private", "keyword" }, { "finally", "keyword" }, { "abstract", "keyword" }, { "unchecked", "keyword" }, { "volatile", "keyword" }, { "switch", "keyword" }, { "using", "keyword" }, - { "checked", "keyword" }, { "double", "keyword2" }, + { "checked", "keyword" }, { "double", "type" }, { "event", "keyword" }, { "auto", "keyword" }, - { "ulong", "keyword2" }, { "var", "keyword" }, + { "ulong", "type" }, { "var", "keyword" }, { "out", "keyword" }, { "try", "keyword" }, { "as", "keyword" }, { "class", "keyword" }, - { "byte", "keyword2" }, { "yield", "keyword" }, + { "byte", "type" }, { "yield", "keyword" }, { "static", "keyword" }, { "super", "keyword" }, - { "uint", "keyword2" }, { "explicit", "keyword" }, - { "sbyte", "keyword2" }, { "throw", "keyword" }, + { "uint", "type" }, { "explicit", "keyword" }, + { "sbyte", "type" }, { "throw", "keyword" }, { "self", "keyword" }, { "catch", "keyword" }, - { "true", "literal" }, { "ushort", "keyword2" }, + { "true", "literal" }, { "ushort", "type" }, { "override", "keyword" }, { "sealed", "keyword" }, - { "float", "keyword2" }, { "params", "keyword" }, + { "float", "type" }, { "params", "keyword" }, { "readonly", "keyword" }, { "interface", "keyword" }, { "protected", "keyword" }, { "do", "keyword" }, { "implicit", "keyword" }, { "ref", "keyword" }, { "constructor", "keyword" }, { "singleton", "keyword" }, - { "real", "keyword2" }, { "ifnot", "keyword" }, + { "real", "type" }, { "ifnot", "keyword" }, { "symbol", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elixir.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elixir.cpp index ac4b2ec39..2388e8459 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elixir.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elixir.cpp @@ -23,14 +23,14 @@ SyntaxDefinition& addElixir() { { { ":\"?[%a_][%w_]*\"?" }, "number" }, { { "[%a][%w_!?]*%f[(]" }, "function" }, { { "%u%w+" }, "normal" }, - { { "@[%a_][%w_]*" }, "keyword2" }, - { { "_%a[%w_]*" }, "keyword2" }, + { { "@[%a_][%w_]*" }, "type" }, + { { "_%a[%w_]*" }, "type" }, { { "[%+%-=/%*<>!|&]" }, "operator" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "raise", "keyword" }, { "use", "keyword2" }, + { "raise", "keyword" }, { "use", "type" }, { "try", "keyword" }, { "defrecordp", "keyword" }, { "unless", "keyword" }, { "for", "keyword" }, { "receive", "keyword" }, { "or", "operator" }, @@ -42,8 +42,8 @@ SyntaxDefinition& addElixir() { { "defdelegate", "keyword" }, { "else", "keyword" }, { "end", "keyword" }, { "quote", "keyword" }, { "super", "keyword" }, { "do", "keyword" }, - { "require", "keyword2" }, { "unquote_splicing", "keyword" }, - { "alias", "keyword2" }, { "nil", "literal" }, + { "require", "type" }, { "unquote_splicing", "keyword" }, + { "alias", "type" }, { "nil", "literal" }, { "true", "literal" }, { "unquote", "keyword" }, { "defmacro", "keyword" }, { "def", "keyword" }, { "defrecord", "keyword" }, { "false", "literal" }, @@ -52,7 +52,7 @@ SyntaxDefinition& addElixir() { { "defmodule", "keyword" }, { "defguardp", "keyword" }, { "defmacrop", "keyword" }, { "defimpl", "keyword" }, { "defstruct", "keyword" }, { "catch", "keyword" }, - { "import", "keyword2" }, { "defguard", "keyword" }, + { "import", "type" }, { "defguard", "keyword" }, }, "#", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elm.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elm.cpp index d7b50074b..eb36f9c1d 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elm.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/elm.cpp @@ -26,12 +26,12 @@ SyntaxDefinition& addElm() { { { "import", "keyword" }, { "port", "keyword" }, { "type", "keyword" }, { "case", "keyword" }, { "in", "keyword" }, { "let", "keyword" }, - { "not", "keyword" }, { "module", "keyword" }, { "number", "keyword2" }, - { "Bool", "keyword2" }, { "of", "keyword" }, { "if", "keyword" }, + { "not", "keyword" }, { "module", "keyword" }, { "number", "type" }, + { "Bool", "type" }, { "of", "keyword" }, { "if", "keyword" }, { "or", "keyword" }, { "as", "keyword" }, { "then", "keyword" }, - { "and", "keyword" }, { "Int", "keyword2" }, { "else", "keyword" }, + { "and", "keyword" }, { "Int", "type" }, { "else", "keyword" }, { "exposing", "keyword" }, { "False", "literal" }, { "True", "literal" }, - { "String", "keyword2" }, { "Float", "keyword2" }, { "Char", "keyword2" }, + { "String", "type" }, { "Float", "type" }, { "Char", "type" }, { "xor", "keyword" }, { "alias", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/environmentfile.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/environmentfile.cpp index b9c68d373..317559412 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/environmentfile.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/environmentfile.cpp @@ -13,13 +13,13 @@ SyntaxDefinition& addEnvironmentFile() { { { "#.-\n" }, "comment" }, { { "\\[nrtfb\\\"']" }, "literal" }, { { "'?\\u%x%x%x%x'?" }, "literal" }, - { { "(%${)([%w]+[%w_]*)(})" }, { "keyword", "keyword", "keyword2", "keyword" } }, - { { "%$[%w]+[%w_]*" }, "keyword2" }, + { { "(%${)([%w]+[%w_]*)(})" }, { "keyword", "keyword", "type", "keyword" } }, + { { "%$[%w]+[%w_]*" }, "type" }, { { "[%a_][%w-+_%s%p]-%f[=]" }, "keyword" }, { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, - { { "^%[.-%]" }, "keyword2" }, - { { "%s%[.-%]" }, "keyword2" }, + { { "^%[.-%]" }, "type" }, + { { "%s%[.-%]" }, "type" }, { { "=" }, "operator" }, { { "https?://[%w_.~!*:@&+$/?%%#-]-%w[-.%w]*%.%w%w%w?%w?:?%d*/?[%w_.~!*:@&+$/" "?%%#=-]*" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fantom.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fantom.cpp index e141fd047..3214aa9d0 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fantom.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fantom.cpp @@ -94,21 +94,21 @@ SyntaxDefinition& addFantom() { { "protected", "keyword" }, { "private", "keyword" }, { "abstract", "keyword" }, - { "Void", "keyword2" }, - { "Bool", "keyword2" }, - { "Int", "keyword2" }, - { "Float", "keyword2" }, - { "Decimal", "keyword2" }, - { "Str", "keyword2" }, - { "Duration", "keyword2" }, - { "Uri", "keyword2" }, - { "Type", "keyword2" }, - { "Range", "keyword2" }, - { "List", "keyword2" }, - { "Map", "keyword2" }, - { "Obj", "keyword2" }, - { "Err", "keyword2" }, - { "Env", "keyword2" }, + { "Void", "type" }, + { "Bool", "type" }, + { "Int", "type" }, + { "Float", "type" }, + { "Decimal", "type" }, + { "Str", "type" }, + { "Duration", "type" }, + { "Uri", "type" }, + { "Type", "type" }, + { "Range", "type" }, + { "List", "type" }, + { "Map", "type" }, + { "Obj", "type" }, + { "Err", "type" }, + { "Env", "type" }, }, "//", {} diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fennel.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fennel.cpp index 881d7e6e2..6a3e25105 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fennel.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fennel.cpp @@ -20,226 +20,226 @@ SyntaxDefinition& addFennel() { }, { - { "math.cos", "keyword2" }, - { "coroutine", "keyword2" }, - { "pcall", "keyword2" }, - { "bit32.rrotate", "keyword2" }, - { "math.max", "keyword2" }, + { "math.cos", "type" }, + { "coroutine", "type" }, + { "pcall", "type" }, + { "bit32.rrotate", "type" }, + { "math.max", "type" }, { "=", "keyword" }, - { "string.upper", "keyword2" }, - { "debug.getmetatable", "keyword2" }, - { "os.time", "keyword2" }, - { "os.difftime", "keyword2" }, - { "string.char", "keyword2" }, - { "debug.getregistry", "keyword2" }, - { "string.format", "keyword2" }, + { "string.upper", "type" }, + { "debug.getmetatable", "type" }, + { "os.time", "type" }, + { "os.difftime", "type" }, + { "string.char", "type" }, + { "debug.getregistry", "type" }, + { "string.format", "type" }, { "-", "keyword" }, { "->>", "keyword" }, - { "math", "keyword2" }, - { "io.lines", "keyword2" }, - { "import-macros", "keyword2" }, - { "string.sub", "keyword2" }, - { "while", "keyword2" }, - { "select", "keyword2" }, - { "math.log", "keyword2" }, - { "debug.gethook", "keyword2" }, - { "eval-compiler", "keyword2" }, - { "collect", "keyword2" }, - { "when", "keyword2" }, - { "rshift", "keyword2" }, - { "tset", "keyword2" }, - { "math.ldexp", "keyword2" }, + { "math", "type" }, + { "io.lines", "type" }, + { "import-macros", "type" }, + { "string.sub", "type" }, + { "while", "type" }, + { "select", "type" }, + { "math.log", "type" }, + { "debug.gethook", "type" }, + { "eval-compiler", "type" }, + { "collect", "type" }, + { "when", "type" }, + { "rshift", "type" }, + { "tset", "type" }, + { "math.ldexp", "type" }, { "#", "keyword" }, - { "or", "keyword2" }, - { "let", "keyword2" }, - { "os.execute", "keyword2" }, - { "coroutine.resume", "keyword2" }, - { "table.maxn", "keyword2" }, - { "coroutine.wrap", "keyword2" }, - { "dofile", "keyword2" }, - { "math.deg", "keyword2" }, - { "debug.setlocal", "keyword2" }, - { "each", "keyword2" }, - { "include", "keyword2" }, + { "or", "type" }, + { "let", "type" }, + { "os.execute", "type" }, + { "coroutine.resume", "type" }, + { "table.maxn", "type" }, + { "coroutine.wrap", "type" }, + { "dofile", "type" }, + { "math.deg", "type" }, + { "debug.setlocal", "type" }, + { "each", "type" }, + { "include", "type" }, { "//", "keyword" }, - { "table", "keyword2" }, - { "os", "keyword2" }, - { "math.atan", "keyword2" }, - { "error", "keyword2" }, - { "io.read", "keyword2" }, - { "rawset", "keyword2" }, - { "io.write", "keyword2" }, - { "os.setlocale", "keyword2" }, - { "fcollect", "keyword2" }, - { "tostring", "keyword2" }, - { "unpack", "keyword2" }, - { "table.insert", "keyword2" }, - { "values", "keyword2" }, - { "setmetatable", "keyword2" }, - { "assert", "keyword2" }, - { "bxor", "keyword2" }, - { "macros", "keyword2" }, - { "io.tmpfile", "keyword2" }, - { "io.popen", "keyword2" }, - { "io.flush", "keyword2" }, - { "os.rename", "keyword2" }, - { "package.seeall", "keyword2" }, + { "table", "type" }, + { "os", "type" }, + { "math.atan", "type" }, + { "error", "type" }, + { "io.read", "type" }, + { "rawset", "type" }, + { "io.write", "type" }, + { "os.setlocale", "type" }, + { "fcollect", "type" }, + { "tostring", "type" }, + { "unpack", "type" }, + { "table.insert", "type" }, + { "values", "type" }, + { "setmetatable", "type" }, + { "assert", "type" }, + { "bxor", "type" }, + { "macros", "type" }, + { "io.tmpfile", "type" }, + { "io.popen", "type" }, + { "io.flush", "type" }, + { "os.rename", "type" }, + { "package.seeall", "type" }, { "..", "keyword" }, { ":", "keyword" }, - { "debug.getupvalue", "keyword2" }, - { "do", "keyword2" }, + { "debug.getupvalue", "type" }, + { "do", "type" }, { "/", "keyword" }, - { "string.lower", "keyword2" }, - { "math.randomseed", "keyword2" }, - { "debug.getlocal", "keyword2" }, - { "debug.upvaluejoin", "keyword2" }, + { "string.lower", "type" }, + { "math.randomseed", "type" }, + { "debug.getlocal", "type" }, + { "debug.upvaluejoin", "type" }, { "-?>", "keyword" }, - { "bit32.arshift", "keyword2" }, - { "debug.debug", "keyword2" }, - { "math.asin", "keyword2" }, - { "math.sqrt", "keyword2" }, - { "math.acos", "keyword2" }, - { "loadfile", "keyword2" }, + { "bit32.arshift", "type" }, + { "debug.debug", "type" }, + { "math.asin", "type" }, + { "math.sqrt", "type" }, + { "math.acos", "type" }, + { "loadfile", "type" }, { "_G", "keyword" }, - { "string.rep", "keyword2" }, - { "coroutine.create", "keyword2" }, - { "io.output", "keyword2" }, - { "next", "keyword2" }, - { "os.exit", "keyword2" }, - { "os.getenv", "keyword2" }, - { "string", "keyword2" }, - { "math.pow", "keyword2" }, - { "io.open", "keyword2" }, - { "macro", "keyword2" }, - { "math.frexp", "keyword2" }, - { "debug.getinfo", "keyword2" }, - { "string.gmatch", "keyword2" }, - { "bit32.bxor", "keyword2" }, + { "string.rep", "type" }, + { "coroutine.create", "type" }, + { "io.output", "type" }, + { "next", "type" }, + { "os.exit", "type" }, + { "os.getenv", "type" }, + { "string", "type" }, + { "math.pow", "type" }, + { "io.open", "type" }, + { "macro", "type" }, + { "math.frexp", "type" }, + { "debug.getinfo", "type" }, + { "string.gmatch", "type" }, + { "bit32.bxor", "type" }, { "%", "keyword" }, - { "lambda", "keyword2" }, - { "math.modf", "keyword2" }, - { "getmetatable", "keyword2" }, - { "var", "keyword2" }, + { "lambda", "type" }, + { "math.modf", "type" }, + { "getmetatable", "type" }, + { "var", "type" }, { "<", "keyword" }, - { "os.clock", "keyword2" }, - { "length", "keyword2" }, - { "table.sort", "keyword2" }, - { "math.exp", "keyword2" }, - { "debug.upvalueid", "keyword2" }, - { "pairs", "keyword2" }, - { "os.remove", "keyword2" }, - { "coroutine.yield", "keyword2" }, - { "bit32", "keyword2" }, - { "not", "keyword2" }, - { "bit32.rshift", "keyword2" }, - { "debug.setupvalue", "keyword2" }, - { "coroutine.status", "keyword2" }, - { "math.cosh", "keyword2" }, - { "lua", "keyword2" }, - { "type", "keyword2" }, - { "debug", "keyword2" }, - { "debug.setmetatable", "keyword2" }, - { "math.min", "keyword2" }, - { "bit32.band", "keyword2" }, - { "table.pack", "keyword2" }, - { "io.input", "keyword2" }, - { "math.log10", "keyword2" }, - { "partial", "keyword2" }, + { "os.clock", "type" }, + { "length", "type" }, + { "table.sort", "type" }, + { "math.exp", "type" }, + { "debug.upvalueid", "type" }, + { "pairs", "type" }, + { "os.remove", "type" }, + { "coroutine.yield", "type" }, + { "bit32", "type" }, + { "not", "type" }, + { "bit32.rshift", "type" }, + { "debug.setupvalue", "type" }, + { "coroutine.status", "type" }, + { "math.cosh", "type" }, + { "lua", "type" }, + { "type", "type" }, + { "debug", "type" }, + { "debug.setmetatable", "type" }, + { "math.min", "type" }, + { "bit32.band", "type" }, + { "table.pack", "type" }, + { "io.input", "type" }, + { "math.log10", "type" }, + { "partial", "type" }, { "+", "keyword" }, - { "string.match", "keyword2" }, - { "bit32.extract", "keyword2" }, - { "math.floor", "keyword2" }, - { "xpcall", "keyword2" }, - { "string.find", "keyword2" }, - { "match", "keyword2" }, - { "math.ceil", "keyword2" }, - { "for", "keyword2" }, - { "bor", "keyword2" }, - { "math.tan", "keyword2" }, + { "string.match", "type" }, + { "bit32.extract", "type" }, + { "math.floor", "type" }, + { "xpcall", "type" }, + { "string.find", "type" }, + { "match", "type" }, + { "math.ceil", "type" }, + { "for", "type" }, + { "bor", "type" }, + { "math.tan", "type" }, { ">=", "keyword" }, - { "string.len", "keyword2" }, + { "string.len", "type" }, { ".", "keyword" }, - { "string.byte", "keyword2" }, - { "table.concat", "keyword2" }, - { "bnot", "keyword2" }, - { "string.gsub", "keyword2" }, - { "icollect", "keyword2" }, - { "match-try", "keyword2" }, - { "package.loadlib", "keyword2" }, - { "band", "keyword2" }, - { "comment", "keyword2" }, - { "math.fmod", "keyword2" }, - { "pick-values", "keyword2" }, - { "macrodebug", "keyword2" }, - { "io.close", "keyword2" }, - { "bit32.bnot", "keyword2" }, - { "pick-args", "keyword2" }, - { "math.sin", "keyword2" }, - { "module", "keyword2" }, + { "string.byte", "type" }, + { "table.concat", "type" }, + { "bnot", "type" }, + { "string.gsub", "type" }, + { "icollect", "type" }, + { "match-try", "type" }, + { "package.loadlib", "type" }, + { "band", "type" }, + { "comment", "type" }, + { "math.fmod", "type" }, + { "pick-values", "type" }, + { "macrodebug", "type" }, + { "io.close", "type" }, + { "bit32.bnot", "type" }, + { "pick-args", "type" }, + { "math.sin", "type" }, + { "module", "type" }, { "true", "literal" }, - { "math.abs", "keyword2" }, + { "math.abs", "type" }, { "λ", "keyword" }, - { "not=", "keyword2" }, - { "require", "keyword2" }, - { "hashfn", "keyword2" }, + { "not=", "type" }, + { "require", "type" }, + { "hashfn", "type" }, { "<=", "keyword" }, - { "fn", "keyword2" }, - { "doto", "keyword2" }, - { "coroutine.running", "keyword2" }, - { "set-forcibly!", "keyword2" }, - { "debug.traceback", "keyword2" }, - { "bit32.lshift", "keyword2" }, - { "rawlen", "keyword2" }, + { "fn", "type" }, + { "doto", "type" }, + { "coroutine.running", "type" }, + { "set-forcibly!", "type" }, + { "debug.traceback", "type" }, + { "bit32.lshift", "type" }, + { "rawlen", "type" }, { "?.", "keyword" }, - { "set", "keyword2" }, - { "load", "keyword2" }, - { "arg", "keyword2" }, - { "io", "keyword2" }, - { "rawget", "keyword2" }, + { "set", "type" }, + { "load", "type" }, + { "arg", "type" }, + { "io", "type" }, + { "rawget", "type" }, { "false", "literal" }, - { "string.dump", "keyword2" }, - { "bit32.lrotate", "keyword2" }, - { "math.rad", "keyword2" }, - { "global", "keyword2" }, - { "print", "keyword2" }, - { "math.random", "keyword2" }, - { "table.remove", "keyword2" }, - { "os.tmpname", "keyword2" }, - { "debug.sethook", "keyword2" }, - { "ipairs", "keyword2" }, - { "bit32.replace", "keyword2" }, - { "package.searchpath", "keyword2" }, + { "string.dump", "type" }, + { "bit32.lrotate", "type" }, + { "math.rad", "type" }, + { "global", "type" }, + { "print", "type" }, + { "math.random", "type" }, + { "table.remove", "type" }, + { "os.tmpname", "type" }, + { "debug.sethook", "type" }, + { "ipairs", "type" }, + { "bit32.replace", "type" }, + { "package.searchpath", "type" }, { "^", "keyword" }, - { "if", "keyword2" }, + { "if", "type" }, { "->", "keyword" }, { "*", "keyword" }, - { "math.tanh", "keyword2" }, - { "debug.setuservalue", "keyword2" }, + { "math.tanh", "type" }, + { "debug.setuservalue", "type" }, { ">", "keyword" }, - { "string.reverse", "keyword2" }, - { "and", "keyword2" }, - { "require-macros", "keyword2" }, - { "lshift", "keyword2" }, - { "bit32.bor", "keyword2" }, - { "loadstring", "keyword2" }, - { "quote", "keyword2" }, - { "bit32.btest", "keyword2" }, - { "rawequal", "keyword2" }, - { "accumulate", "keyword2" }, - { "math.atan2", "keyword2" }, - { "debug.getuservalue", "keyword2" }, - { "table.unpack", "keyword2" }, - { "collectgarbage", "keyword2" }, - { "tonumber", "keyword2" }, - { "package", "keyword2" }, - { "math.sinh", "keyword2" }, + { "string.reverse", "type" }, + { "and", "type" }, + { "require-macros", "type" }, + { "lshift", "type" }, + { "bit32.bor", "type" }, + { "loadstring", "type" }, + { "quote", "type" }, + { "bit32.btest", "type" }, + { "rawequal", "type" }, + { "accumulate", "type" }, + { "math.atan2", "type" }, + { "debug.getuservalue", "type" }, + { "table.unpack", "type" }, + { "collectgarbage", "type" }, + { "tonumber", "type" }, + { "package", "type" }, + { "math.sinh", "type" }, { "nil", "literal" }, { "-?>>", "keyword" }, - { "os.date", "keyword2" }, - { "local", "keyword2" }, - { "with-open", "keyword2" }, + { "os.date", "type" }, + { "local", "type" }, + { "with-open", "type" }, { "~=", "keyword" }, - { "io.type", "keyword2" }, + { "io.type", "type" }, }, ";", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fixscript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fixscript.cpp index a7a7d0ec6..1445e2a7b 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fixscript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fixscript.cpp @@ -16,10 +16,10 @@ SyntaxDefinition& addFixScript() { { { "'", "'", "\\" }, "string" }, { { "common_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, { { "(class)%s+([@%a_][%w_]+)(%s*%:%s*)([%a_][%w_]+)" }, - { "keyword", "keyword", "keyword2", "operator", "keyword2" } }, - { { "(class)%s+([@%a_][%w_]+)" }, { "keyword", "keyword", "keyword2" } }, - { { "(struct)%s+([@%a_][%w_]+)" }, { "keyword", "keyword", "keyword2" } }, - { { "([@%a_][%w_]+)::([%a_][%w_]+)%f[(]" }, { "operator", "keyword2", "function" } }, + { "keyword", "keyword", "type", "operator", "type" } }, + { { "(class)%s+([@%a_][%w_]+)" }, { "keyword", "keyword", "type" } }, + { { "(struct)%s+([@%a_][%w_]+)" }, { "keyword", "keyword", "type" } }, + { { "([@%a_][%w_]+)::([%a_][%w_]+)%f[(]" }, { "operator", "type", "function" } }, { { "[%+%-=/%*%^%%<>!~|&@]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, @@ -27,29 +27,29 @@ SyntaxDefinition& addFixScript() { }, { - { "do", "keyword" }, { "if", "keyword" }, { "for", "keyword" }, - { "use", "keyword" }, { "var", "keyword" }, { "case", "keyword" }, - { "else", "keyword" }, { "break", "keyword" }, { "const", "keyword" }, - { "while", "keyword" }, { "import", "keyword" }, { "return", "keyword" }, - { "switch", "keyword" }, { "default", "keyword" }, { "continue", "keyword" }, + { "do", "keyword" }, { "if", "keyword" }, { "for", "keyword" }, + { "use", "keyword" }, { "var", "keyword" }, { "case", "keyword" }, + { "else", "keyword" }, { "break", "keyword" }, { "const", "keyword" }, + { "while", "keyword" }, { "import", "keyword" }, { "return", "keyword" }, + { "switch", "keyword" }, { "default", "keyword" }, { "continue", "keyword" }, { "function", "keyword" }, - { "macro", "keyword" }, { "generate", "keyword" }, { "output", "keyword" }, + { "macro", "keyword" }, { "generate", "keyword" }, { "output", "keyword" }, - { "foreach", "keyword" }, { "class", "keyword" }, { "struct", "keyword" }, - { "static", "keyword" }, { "virtual", "keyword" }, { "override", "keyword" }, - { "new", "keyword" }, { "in", "keyword" }, { "as", "keyword" }, - { "throw", "keyword" }, { "constructor", "keyword" }, { "operator", "keyword" }, - { "super", "keyword" }, { "this", "keyword" }, + { "foreach", "keyword" }, { "class", "keyword" }, { "struct", "keyword" }, + { "static", "keyword" }, { "virtual", "keyword" }, { "override", "keyword" }, + { "new", "keyword" }, { "in", "keyword" }, { "as", "keyword" }, + { "throw", "keyword" }, { "constructor", "keyword" }, { "operator", "keyword" }, + { "super", "keyword" }, { "this", "keyword" }, - { "optional", "keyword" }, { "transaction", "keyword" }, + { "optional", "keyword" }, { "transaction", "keyword" }, - { "Dynamic", "keyword2" }, { "Void", "keyword2" }, { "Byte", "keyword2" }, - { "Short", "keyword2" }, { "Integer", "keyword2" }, { "Float", "keyword2" }, - { "Boolean", "keyword2" }, { "String", "keyword2" }, { "Long", "keyword2" }, - { "Double", "keyword2" }, + { "Dynamic", "type" }, { "Void", "type" }, { "Byte", "type" }, + { "Short", "type" }, { "Integer", "type" }, { "Float", "type" }, + { "Boolean", "type" }, { "String", "type" }, { "Long", "type" }, + { "Double", "type" }, - { "true", "literal" }, { "false", "literal" }, { "null", "literal" }, + { "true", "literal" }, { "false", "literal" }, { "null", "literal" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/flow9.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/flow9.cpp index 79c700e1e..00fae7ca4 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/flow9.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/flow9.cpp @@ -22,13 +22,13 @@ SyntaxDefinition& addFlow9() { }, { - { "int", "keyword2" }, { "false", "literal" }, { "native", "keyword" }, - { "default", "keyword" }, { "true", "literal" }, { "else", "keyword" }, - { "switch", "keyword" }, { "UInt64", "keyword2" }, { "forbid", "keyword" }, - { "flow", "keyword2" }, { "double", "keyword2" }, { "bool", "keyword2" }, - { "import", "keyword" }, { "void", "keyword2" }, { "string", "keyword2" }, - { "if", "keyword" }, { "export", "keyword" }, { "unittest", "keyword" }, - { "io", "keyword2" }, { "ref", "keyword2" }, + { "int", "type" }, { "false", "literal" }, { "native", "keyword" }, + { "default", "keyword" }, { "true", "literal" }, { "else", "keyword" }, + { "switch", "keyword" }, { "UInt64", "type" }, { "forbid", "keyword" }, + { "flow", "type" }, { "double", "type" }, { "bool", "type" }, + { "import", "keyword" }, { "void", "type" }, { "string", "type" }, + { "if", "keyword" }, { "export", "keyword" }, { "unittest", "keyword" }, + { "io", "type" }, { "ref", "type" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fortran.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fortran.cpp index b0c5d6eef..335f3c6a0 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fortran.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fortran.cpp @@ -26,31 +26,56 @@ SyntaxDefinition& addFortran() { { { "[%a_][%w_]*" }, "symbol" }, }, - { { "then", "keyword" }, { "public", "keyword" }, - { "allocatable", "keyword" }, { "private", "keyword" }, - { "concurrent", "keyword" }, { "only", "keyword" }, - { "none", "keyword2" }, { ".or.", "keyword2" }, - { "cycle", "keyword" }, { "len", "keyword2" }, - { ".le.", "keyword2" }, { ".not.", "keyword2" }, - { "sequence", "keyword" }, { ".false.", "keyword2" }, - { ".eq.", "keyword2" }, { ".lt.", "keyword2" }, - { "end", "keyword" }, { "subroutine", "keyword" }, - { "extends", "keyword" }, { ".neqv.", "keyword2" }, - { "complex", "keyword" }, { "module", "keyword" }, - { "result", "keyword" }, { "call", "keyword" }, - { ".true.", "keyword2" }, { "function", "keyword" }, - { "logical", "keyword" }, { "else", "keyword" }, - { ".ge", "keyword2" }, { "parameter", "keyword" }, - { "contains", "keyword" }, { "print", "keyword" }, - { "write", "keyword" }, { ".eqv.", "keyword2" }, - { ".and.", "keyword2" }, { "struct", "keyword" }, - { "character", "keyword" }, { "integer", "keyword" }, - { ".ne.", "keyword2" }, { "real", "keyword" }, - { "use", "keyword" }, { "if", "keyword" }, - { "protected", "keyword" }, { "do", "keyword" }, - { ".gt.", "keyword2" }, { "program", "keyword" }, - { "implicit", "keyword" }, { "stop", "keyword" }, - { "type", "keyword" }, { "endif", "keyword" }, + { { "then", "keyword" }, + { "public", "keyword" }, + { "allocatable", "keyword" }, + { "private", "keyword" }, + { "concurrent", "keyword" }, + { "only", "keyword" }, + { "none", "type" }, + { ".or.", "type" }, + { "cycle", "keyword" }, + { "len", "type" }, + { ".le.", "type" }, + { ".not.", "type" }, + { "sequence", "keyword" }, + { ".false.", "type" }, + { ".eq.", "type" }, + { ".lt.", "type" }, + { "end", "keyword" }, + { "subroutine", "keyword" }, + { "extends", "keyword" }, + { ".neqv.", "type" }, + { "complex", "keyword" }, + { "module", "keyword" }, + { "result", "keyword" }, + { "call", "keyword" }, + { ".true.", "type" }, + { "function", "keyword" }, + { "logical", "keyword" }, + { "else", "keyword" }, + { ".ge", "type" }, + { "parameter", "keyword" }, + { "contains", "keyword" }, + { "print", "keyword" }, + { "write", "keyword" }, + { ".eqv.", "type" }, + { ".and.", "type" }, + { "struct", "keyword" }, + { "character", "keyword" }, + { "integer", "keyword" }, + { ".ne.", "type" }, + { "real", "keyword" }, + { "use", "keyword" }, + { "if", "keyword" }, + { "protected", "keyword" }, + { "do", "keyword" }, + { ".gt.", "type" }, + { "program", "keyword" }, + { "implicit", "keyword" }, + { "stop", "keyword" }, + { "type", "keyword" }, + { "endif", "keyword" }, { "enddo", "keyword" } }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fstab.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fstab.cpp index 08039d5cf..2973ed2be 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fstab.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/fstab.cpp @@ -21,32 +21,23 @@ SyntaxDefinition& addFstab() { }, { - { "vfat", "keyword2" }, { "ecryptfs", "keyword2" }, - { "devpts", "keyword2" }, { "squashfs", "keyword2" }, - { "LABEL", "keyword" }, { "aufs", "keyword2" }, - { "hugetlbfs", "keyword2" }, { "proc", "keyword2" }, - { "btrfs", "keyword2" }, { "binder", "keyword2" }, - { "binfmt_misc", "keyword2" }, { "securityfs", "keyword2" }, - { "cgroup", "keyword2" }, { "cgroup2", "keyword2" }, - { "sockfs", "keyword2" }, { "swap", "keyword2" }, - { "pipefs", "keyword2" }, { "sysfs", "keyword2" }, - { "none", "literal" }, { "mqueue", "keyword2" }, - { "configfs", "keyword2" }, { "UUID", "keyword" }, - { "rpc_pipefs", "keyword2" }, { "hfs", "keyword2" }, - { "bdev", "keyword2" }, { "fusectl", "keyword2" }, - { "ntfs", "keyword2" }, { "tmpfs", "keyword2" }, - { "hfsplus", "keyword2" }, { "devtmpfs", "keyword2" }, - { "fuseblk", "keyword2" }, { "debugfs", "keyword2" }, - { "autofs", "keyword2" }, { "cpuset", "keyword2" }, - { "ufs", "keyword2" }, { "nfs", "keyword2" }, - { "jfs", "keyword2" }, { "fuse", "keyword2" }, - { "bpf", "keyword2" }, { "nfs4", "keyword2" }, - { "pstore", "keyword2" }, { "ext2", "keyword2" }, - { "ext3", "keyword2" }, { "tracefs", "keyword2" }, - { "minix", "keyword2" }, { "msdos", "keyword2" }, - { "xfs", "keyword2" }, { "ext4", "keyword2" }, - { "ramfs", "keyword2" }, { "nfsd", "keyword2" }, - { "qnx4", "keyword2" }, + { "vfat", "type" }, { "ecryptfs", "type" }, { "devpts", "type" }, + { "squashfs", "type" }, { "LABEL", "keyword" }, { "aufs", "type" }, + { "hugetlbfs", "type" }, { "proc", "type" }, { "btrfs", "type" }, + { "binder", "type" }, { "binfmt_misc", "type" }, { "securityfs", "type" }, + { "cgroup", "type" }, { "cgroup2", "type" }, { "sockfs", "type" }, + { "swap", "type" }, { "pipefs", "type" }, { "sysfs", "type" }, + { "none", "literal" }, { "mqueue", "type" }, { "configfs", "type" }, + { "UUID", "keyword" }, { "rpc_pipefs", "type" }, { "hfs", "type" }, + { "bdev", "type" }, { "fusectl", "type" }, { "ntfs", "type" }, + { "tmpfs", "type" }, { "hfsplus", "type" }, { "devtmpfs", "type" }, + { "fuseblk", "type" }, { "debugfs", "type" }, { "autofs", "type" }, + { "cpuset", "type" }, { "ufs", "type" }, { "nfs", "type" }, + { "jfs", "type" }, { "fuse", "type" }, { "bpf", "type" }, + { "nfs4", "type" }, { "pstore", "type" }, { "ext2", "type" }, + { "ext3", "type" }, { "tracefs", "type" }, { "minix", "type" }, + { "msdos", "type" }, { "xfs", "type" }, { "ext4", "type" }, + { "ramfs", "type" }, { "nfsd", "type" }, { "qnx4", "type" }, }, "#", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gdscript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gdscript.cpp index 3a58b345e..1097c5f69 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gdscript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gdscript.cpp @@ -22,53 +22,53 @@ SyntaxDefinition& addGDScript() { }, { - { "Array", "keyword2" }, - { "RID", "keyword2" }, - { "NodePath", "keyword2" }, - { "Basis", "keyword2" }, - { "Transform", "keyword2" }, - { "Quat", "keyword2" }, - { "void", "keyword2" }, - { "Transform2D", "keyword2" }, - { "AABB", "keyword2" }, + { "Array", "type" }, + { "RID", "type" }, + { "NodePath", "type" }, + { "Basis", "type" }, + { "Transform", "type" }, + { "Quat", "type" }, + { "void", "type" }, + { "Transform2D", "type" }, + { "AABB", "type" }, { "true", "literal" }, - { "Vector3", "keyword2" }, - { "int", "keyword2" }, + { "Vector3", "type" }, + { "int", "type" }, { "mastersync", "keyword" }, { "is", "keyword" }, { "signal", "keyword" }, { "class", "keyword" }, - { "Rect2", "keyword2" }, + { "Rect2", "type" }, { "pass", "keyword" }, { "elif", "keyword" }, - { "PoolStringArray", "keyword2" }, + { "PoolStringArray", "type" }, { "as", "keyword" }, { "TAU", "literal" }, { "INF", "literal" }, { "and", "keyword" }, - { "PoolVector2Array", "keyword2" }, + { "PoolVector2Array", "type" }, { "for", "keyword" }, - { "Color", "keyword2" }, - { "PoolIntArray", "keyword2" }, + { "Color", "type" }, + { "PoolIntArray", "type" }, { "tool", "keyword" }, - { "bool", "keyword2" }, + { "bool", "type" }, { "continue", "keyword" }, - { "Object", "keyword2" }, + { "Object", "type" }, { "NAN", "literal" }, - { "Dictionary", "keyword2" }, + { "Dictionary", "type" }, { "self", "keyword" }, { "const", "keyword" }, { "or", "keyword" }, { "false", "literal" }, - { "PoolByteArray", "keyword2" }, + { "PoolByteArray", "type" }, { "PI", "literal" }, { "var", "keyword" }, { "while", "keyword" }, - { "PoolVector3Array", "keyword2" }, + { "PoolVector3Array", "type" }, { "func", "keyword" }, { "if", "keyword" }, { "setget", "keyword" }, - { "String", "keyword2" }, + { "String", "type" }, { "else", "keyword" }, { "in", "keyword" }, { "onready", "keyword" }, @@ -77,9 +77,9 @@ SyntaxDefinition& addGDScript() { { "match", "keyword" }, { "static", "keyword" }, { "extends", "keyword" }, - { "PoolColorArray", "keyword2" }, - { "float", "keyword2" }, - { "Plane", "keyword2" }, + { "PoolColorArray", "type" }, + { "float", "type" }, + { "Plane", "type" }, { "puppet", "keyword" }, { "remotesync", "keyword" }, { "return", "keyword" }, @@ -87,7 +87,7 @@ SyntaxDefinition& addGDScript() { { "enum", "keyword" }, { "breakpoint", "keyword" }, { "null", "literal" }, - { "Vector2", "keyword2" }, + { "Vector2", "type" }, { "preload", "keyword" }, { "export", "keyword" }, { "yield", "keyword" }, @@ -95,7 +95,7 @@ SyntaxDefinition& addGDScript() { { "assert", "keyword" }, { "remote", "keyword" }, { "master", "keyword" }, - { "PoolRealArray", "keyword2" }, + { "PoolRealArray", "type" }, }, "#", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gleam.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gleam.cpp index 4f504075d..963611fb9 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gleam.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/gleam.cpp @@ -97,7 +97,7 @@ SyntaxDefinition& addGleam() { } }, { { "\\b([[:lower:]][[:word:]]*):\\s" }, - "keyword3", + "parameter", "", SyntaxPatternMatchType::RegEx }, { { "\\b([[:lower:]][[:word:]]*):" }, @@ -151,7 +151,7 @@ SyntaxDefinition& addGleam() { {}, "", SyntaxPatternMatchType::LuaPattern }, - { { "[[:upper:]][[:alnum:]]*" }, "keyword2", "", SyntaxPatternMatchType::RegEx }, + { { "[[:upper:]][[:alnum:]]*" }, "type", "", SyntaxPatternMatchType::RegEx }, } }, { "comments", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.cpp index 93832aa89..fac5a9daa 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.cpp @@ -19,14 +19,14 @@ SyntaxDefinition& addGLSL() { { { "-?%d+[%d%.eE]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, - { { "ivec[2-4]" }, "keyword2" }, - { { "bvec[2-4]" }, "keyword2" }, - { { "uvec[2-4]" }, "keyword2" }, - { { "vec[2-4]" }, "keyword2" }, - { { "dmat[2-4]x[2-4]" }, "keyword2" }, - { { "dmat[2-4]" }, "keyword2" }, - { { "mat[2-4]x[2-4]" }, "keyword2" }, - { { "mat[2-4]" }, "keyword2" }, + { { "ivec[2-4]" }, "type" }, + { { "bvec[2-4]" }, "type" }, + { { "uvec[2-4]" }, "type" }, + { { "vec[2-4]" }, "type" }, + { { "dmat[2-4]x[2-4]" }, "type" }, + { { "dmat[2-4]" }, "type" }, + { { "mat[2-4]x[2-4]" }, "type" }, + { { "mat[2-4]" }, "type" }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, @@ -37,7 +37,7 @@ SyntaxDefinition& addGLSL() { { "imageAtomicMax", "keyword" }, { "atomicAnd", "keyword" }, { "step", "keyword" }, - { "uimage2DArray", "keyword2" }, + { "uimage2DArray", "type" }, { "atomicMax", "keyword" }, { "atomicCounterCompSwap", "keyword" }, { "atomicCounterExchange", "keyword" }, @@ -52,7 +52,7 @@ SyntaxDefinition& addGLSL() { { "utextureBuffer", "keyword" }, { "textureProjGrad", "keyword" }, { "textureGrad", "keyword" }, - { "sampler2DMS", "keyword2" }, + { "sampler2DMS", "type" }, { "textureProjLodOffset", "keyword" }, { "textureProjLod", "keyword" }, { "textureLodOffset", "keyword" }, @@ -80,12 +80,12 @@ SyntaxDefinition& addGLSL() { { "greaterThanEqual", "keyword" }, { "greaterThan", "keyword" }, { "lessThanEqual", "keyword" }, - { "isampler1D", "keyword2" }, + { "isampler1D", "type" }, { "atomicCompSwap", "keyword" }, { "lessThan", "keyword" }, { "determinant", "keyword" }, { "imageAtomicAdd", "keyword" }, - { "isampler1DArray", "keyword2" }, + { "isampler1DArray", "type" }, { "matrixCompMult", "keyword" }, { "floatBitsToInt", "keyword" }, { "refract", "keyword" }, @@ -106,21 +106,21 @@ SyntaxDefinition& addGLSL() { { "isnan", "keyword" }, { "mix", "keyword" }, { "exp2", "keyword" }, - { "isampler3D", "keyword2" }, + { "isampler3D", "type" }, { "false", "literal" }, - { "sampler2DMSArray", "keyword2" }, + { "sampler2DMSArray", "type" }, { "packHalf2x16", "keyword" }, - { "sampler2DArrayShadow", "keyword2" }, + { "sampler2DArrayShadow", "type" }, { "lowp", "keyword" }, { "length", "keyword" }, { "imageLoad", "keyword" }, { "imulExtended", "keyword" }, { "smooth", "keyword" }, - { "sampler1DShadow", "keyword2" }, + { "sampler1DShadow", "type" }, { "utexture2DArray", "keyword" }, - { "isampler2D", "keyword2" }, - { "iimage1D", "keyword2" }, - { "uimageCubeArray", "keyword2" }, + { "isampler2D", "type" }, + { "iimage1D", "type" }, + { "uimageCubeArray", "type" }, { "memoryBarrierAtomicCounter", "keyword" }, { "utexture2DMS", "keyword" }, { "tanh", "keyword" }, @@ -128,97 +128,97 @@ SyntaxDefinition& addGLSL() { { "invariant", "keyword" }, { "layout", "keyword" }, { "imageStore", "keyword" }, - { "sampler2DRectShadow", "keyword2" }, + { "sampler2DRectShadow", "type" }, { "fwidth", "keyword" }, { "volatile", "keyword" }, - { "imageBuffer", "keyword2" }, - { "usampler1DArray", "keyword2" }, - { "usampler2DArray", "keyword2" }, + { "imageBuffer", "type" }, + { "usampler1DArray", "type" }, + { "usampler2DArray", "type" }, { "utextureCubeArray", "keyword" }, { "findLSB", "keyword" }, { "texelFetch", "keyword" }, { "dot", "keyword" }, { "atomicOr", "keyword" }, { "isinf", "keyword" }, - { "imageCube", "keyword2" }, + { "imageCube", "type" }, { "true", "literal" }, { "texture1D", "keyword" }, { "inverse", "keyword" }, { "dFdyFine", "keyword" }, { "memoryBarrierShared", "keyword" }, { "atomicCounterOr", "keyword" }, - { "usampler1D", "keyword2" }, + { "usampler1D", "type" }, { "uniform", "keyword" }, - { "image1DArray", "keyword2" }, + { "image1DArray", "type" }, { "writeonly", "keyword" }, { "itexture2DRect", "keyword" }, { "precision", "keyword" }, { "imageSamples", "keyword" }, - { "isampler2DMSArray", "keyword2" }, + { "isampler2DMSArray", "type" }, { "dFdx", "keyword" }, - { "image1D", "keyword2" }, + { "image1D", "type" }, { "atomicCounterIncrement", "keyword" }, - { "image2D", "keyword2" }, - { "image2DArray", "keyword2" }, + { "image2D", "type" }, + { "image2DArray", "type" }, { "any", "keyword" }, - { "uimageCube", "keyword2" }, - { "iimage2DArray", "keyword2" }, + { "uimageCube", "type" }, + { "iimage2DArray", "type" }, { "memoryBarrierBuffer", "keyword" }, { "allInvocationsEqual", "keyword" }, - { "sampler3D", "keyword2" }, + { "sampler3D", "type" }, { "subpassLoad", "keyword" }, { "itexture2D", "keyword" }, - { "image2DMS", "keyword2" }, + { "image2DMS", "type" }, { "itexture1DArray", "keyword" }, { "centroid", "keyword" }, { "dFdyCoarse", "keyword" }, { "texture2DArray", "keyword" }, - { "iimage2DRect", "keyword2" }, + { "iimage2DRect", "type" }, { "utexture2D", "keyword" }, { "texture3D", "keyword" }, { "itextureCube", "keyword" }, { "degrees", "keyword" }, { "texture2DMS", "keyword" }, { "itexture2DMS", "keyword" }, - { "iimage2DMS", "keyword2" }, - { "isubpassInput", "keyword2" }, + { "iimage2DMS", "type" }, + { "isubpassInput", "type" }, { "imageAtomicXor", "keyword" }, - { "samplerShadow", "keyword2" }, - { "iimage2D", "keyword2" }, - { "usampler3D", "keyword2" }, + { "samplerShadow", "type" }, + { "iimage2D", "type" }, + { "usampler3D", "type" }, { "itexture2DMSArray", "keyword" }, { "sin", "keyword" }, { "utexture2DRect", "keyword" }, { "do", "keyword" }, { "groupMemoryBarrier", "keyword" }, - { "image3D", "keyword2" }, - { "usubpassInput", "keyword2" }, - { "isampler2DMS", "keyword2" }, - { "samplerBuffer", "keyword2" }, + { "image3D", "type" }, + { "usubpassInput", "type" }, + { "isampler2DMS", "type" }, + { "samplerBuffer", "type" }, { "texture2DRect", "keyword" }, { "while", "keyword" }, { "memoryBarrier", "keyword" }, - { "samplerCubeArrayShadow", "keyword2" }, + { "samplerCubeArrayShadow", "type" }, { "outerProduct", "keyword" }, { "interpolateAtCentroid", "keyword" }, - { "subpassInput", "keyword2" }, + { "subpassInput", "type" }, { "noperspective", "keyword" }, { "textureBuffer", "keyword" }, { "EmitVertex", "keyword" }, - { "usubpassInputMS", "keyword2" }, - { "iimageCubeArray", "keyword2" }, + { "usubpassInputMS", "type" }, + { "iimageCubeArray", "type" }, { "interpolateAtSample", "keyword" }, { "const", "keyword" }, - { "uimage2DMSArray", "keyword2" }, - { "uimage1D", "keyword2" }, + { "uimage2DMSArray", "type" }, + { "uimage1D", "type" }, { "texture2D", "keyword" }, - { "subpassInputMS", "keyword2" }, + { "subpassInputMS", "type" }, { "textureGatherOffsets", "keyword" }, { "EmitStreamVertex", "keyword" }, { "precise", "keyword" }, - { "uimage2DRect", "keyword2" }, + { "uimage2DRect", "type" }, { "textureCube", "keyword" }, - { "uimage2DMS", "keyword2" }, + { "uimage2DMS", "type" }, { "EndPrimitive", "keyword" }, { "utexture3D", "keyword" }, { "utextureCube", "keyword" }, @@ -226,8 +226,8 @@ SyntaxDefinition& addGLSL() { { "varying", "keyword" }, { "itexture1D", "keyword" }, { "dFdxCoarse", "keyword" }, - { "imageCubeArray", "keyword2" }, - { "image2DMSArray", "keyword2" }, + { "imageCubeArray", "type" }, + { "image2DMSArray", "type" }, { "dFdxFine", "keyword" }, { "EndStreamPrimitive", "keyword" }, { "imageAtomicExchange", "keyword" }, @@ -243,49 +243,49 @@ SyntaxDefinition& addGLSL() { { "itexture3D", "keyword" }, { "modf", "keyword" }, { "unpackDouble2x32", "keyword" }, - { "usampler2DMSArray", "keyword2" }, + { "usampler2DMSArray", "type" }, { "acos", "keyword" }, { "smoothstep", "keyword" }, { "atomicCounterDecrement", "keyword" }, - { "iimageCube", "keyword2" }, - { "uimage3D", "keyword2" }, - { "samplerCube", "keyword2" }, + { "iimageCube", "type" }, + { "uimage3D", "type" }, + { "samplerCube", "type" }, { "mod", "keyword" }, { "clamp", "keyword" }, - { "isubpassInputMS", "keyword2" }, + { "isubpassInputMS", "type" }, { "textureGradOffset", "keyword" }, { "asin", "keyword" }, { "attribute", "keyword" }, - { "sampler2DArray", "keyword2" }, - { "image2DRect", "keyword2" }, + { "sampler2DArray", "type" }, + { "image2DRect", "type" }, { "notEqual", "keyword" }, { "log2", "keyword" }, { "readonly", "keyword" }, - { "uimageBuffer", "keyword2" }, + { "uimageBuffer", "type" }, { "floatBitsToUint", "keyword" }, { "itextureBuffer", "keyword" }, - { "iimage3D", "keyword2" }, + { "iimage3D", "type" }, { "packUnorm4x8", "keyword" }, { "inout", "keyword" }, { "return", "keyword" }, - { "uimage1DArray", "keyword2" }, + { "uimage1DArray", "type" }, { "min", "keyword" }, - { "samplerCubeArray", "keyword2" }, + { "samplerCubeArray", "type" }, { "texelFetchOffset", "keyword" }, - { "sampler", "keyword2" }, - { "float", "keyword2" }, + { "sampler", "type" }, + { "float", "type" }, { "uintBitsToFloat", "keyword" }, - { "int", "keyword2" }, + { "int", "type" }, { "mediump", "keyword" }, { "subroutine", "keyword" }, { "distance", "keyword" }, { "reflect", "keyword" }, - { "usampler2D", "keyword2" }, + { "usampler2D", "type" }, { "all", "keyword" }, { "intBitsToFloat", "keyword" }, { "out", "keyword" }, - { "double", "keyword2" }, - { "usamplerBuffer", "keyword2" }, + { "double", "type" }, + { "usamplerBuffer", "type" }, { "atomicCounter", "keyword" }, { "if", "keyword" }, { "tan", "keyword" }, @@ -294,45 +294,45 @@ SyntaxDefinition& addGLSL() { { "atan", "keyword" }, { "else", "keyword" }, { "switch", "keyword" }, - { "bool", "keyword2" }, + { "bool", "type" }, { "anyInvocation", "keyword" }, - { "usampler2DRect", "keyword2" }, + { "usampler2DRect", "type" }, { "packSnorm2x16", "keyword" }, { "textureProjOffset", "keyword" }, - { "usamplerCube", "keyword2" }, + { "usamplerCube", "type" }, { "atomicAdd", "keyword" }, { "shared", "keyword" }, { "textureSamples", "keyword" }, - { "iimageBuffer", "keyword2" }, - { "iimage1DArray", "keyword2" }, + { "iimageBuffer", "type" }, + { "iimage1DArray", "type" }, { "inversesqrt", "keyword" }, { "itexture2DArray", "keyword" }, { "barrier", "keyword" }, { "textureCubeArray", "keyword" }, - { "usampler2DMS", "keyword2" }, - { "atomic_uint", "keyword2" }, + { "usampler2DMS", "type" }, + { "atomic_uint", "type" }, { "itextureCubeArray", "keyword" }, { "fract", "keyword" }, { "flat", "keyword" }, - { "samplerCubeShadow", "keyword2" }, - { "sampler1DArrayShadow", "keyword2" }, - { "isampler2DRect", "keyword2" }, + { "samplerCubeShadow", "type" }, + { "sampler1DArrayShadow", "type" }, + { "isampler2DRect", "type" }, { "ldexp", "keyword" }, { "for", "keyword" }, { "normalize", "keyword" }, { "buffer", "keyword" }, - { "sampler1DArray", "keyword2" }, - { "sampler2DRect", "keyword2" }, + { "sampler1DArray", "type" }, + { "sampler2DRect", "type" }, { "void", "keyword" }, { "acosh", "keyword" }, { "sign", "keyword" }, { "packSnorm4x8", "keyword" }, { "case", "keyword" }, { "bitfieldInsert", "keyword" }, - { "isamplerCube", "keyword2" }, + { "isamplerCube", "type" }, { "unpackHalf2x16", "keyword" }, - { "isampler2DArray", "keyword2" }, - { "uimage2D", "keyword2" }, + { "isampler2DArray", "type" }, + { "uimage2D", "type" }, { "unpackSnorm2x16", "keyword" }, { "default", "keyword" }, { "transpose", "keyword" }, @@ -340,18 +340,18 @@ SyntaxDefinition& addGLSL() { { "coherent", "keyword" }, { "exp", "keyword" }, { "utexture1D", "keyword" }, - { "sampler1D", "keyword2" }, + { "sampler1D", "type" }, { "struct", "keyword" }, - { "uint", "keyword2" }, + { "uint", "type" }, { "NULL", "literal" }, { "unpackUnorm2x16", "keyword" }, { "break", "keyword" }, { "textureQueryLevels", "keyword" }, - { "sampler2DShadow", "keyword2" }, + { "sampler2DShadow", "type" }, { "sinh", "keyword" }, - { "isamplerBuffer", "keyword2" }, - { "sampler2D", "keyword2" }, - { "iimage2DMSArray", "keyword2" }, + { "isamplerBuffer", "type" }, + { "sampler2D", "type" }, + { "iimage2DMSArray", "type" }, { "cosh", "keyword" }, { "asinh", "keyword" }, { "pow", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.hpp index b2f851218..16c2e56b4 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/glsl.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addGLSL(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/go.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/go.cpp index b23ab2f64..cb927b26e 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/go.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/go.cpp @@ -26,30 +26,54 @@ SyntaxDefinition& addGo() { }, { - { "elseif", "keyword" }, { "int", "keyword2" }, - { "uint8", "keyword2" }, { "int64", "keyword2" }, - { "go", "keyword" }, { "continue", "keyword" }, - { "float64", "keyword2" }, { "default", "keyword" }, - { "switch", "keyword" }, { "bool", "keyword2" }, - { "map", "keyword2" }, { "int16", "keyword2" }, - { "uintptr", "keyword2" }, { "return", "keyword" }, - { "var", "keyword" }, { "error", "keyword2" }, - { "import", "keyword" }, { "byte", "keyword2" }, - { "defer", "keyword" }, { "int8", "keyword2" }, - { "complex128", "keyword2" }, { "range", "keyword" }, - { "false", "literal" }, { "uint", "keyword2" }, - { "uint64", "keyword2" }, { "for", "keyword" }, - { "const", "keyword" }, { "select", "keyword" }, - { "complex64", "keyword2" }, { "true", "literal" }, - { "else", "keyword" }, { "chan", "keyword" }, - { "func", "keyword" }, { "int32", "keyword2" }, - { "float32", "keyword2" }, { "uint16", "keyword2" }, - { "package", "keyword" }, { "nil", "literal" }, - { "rune", "keyword2" }, { "struct", "keyword" }, - { "break", "keyword" }, { "uint32", "keyword2" }, - { "string", "keyword2" }, { "case", "keyword" }, - { "if", "keyword" }, { "interface", "keyword" }, - { "fallthrough", "keyword" }, { "type", "keyword" }, + { "elseif", "keyword" }, + { "int", "type" }, + { "uint8", "type" }, + { "int64", "type" }, + { "go", "keyword" }, + { "continue", "keyword" }, + { "float64", "type" }, + { "default", "keyword" }, + { "switch", "keyword" }, + { "bool", "type" }, + { "map", "type" }, + { "int16", "type" }, + { "uintptr", "type" }, + { "return", "keyword" }, + { "var", "keyword" }, + { "error", "type" }, + { "import", "keyword" }, + { "byte", "type" }, + { "defer", "keyword" }, + { "int8", "type" }, + { "complex128", "type" }, + { "range", "keyword" }, + { "false", "literal" }, + { "uint", "type" }, + { "uint64", "type" }, + { "for", "keyword" }, + { "const", "keyword" }, + { "select", "keyword" }, + { "complex64", "type" }, + { "true", "literal" }, + { "else", "keyword" }, + { "chan", "keyword" }, + { "func", "keyword" }, + { "int32", "type" }, + { "float32", "type" }, + { "uint16", "type" }, + { "package", "keyword" }, + { "nil", "literal" }, + { "rune", "type" }, + { "struct", "keyword" }, + { "break", "keyword" }, + { "uint32", "type" }, + { "string", "type" }, + { "case", "keyword" }, + { "if", "keyword" }, + { "interface", "keyword" }, + { "fallthrough", "keyword" }, + { "type", "keyword" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/graphql.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/graphql.cpp index b20209e87..acba3159b 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/graphql.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/graphql.cpp @@ -30,7 +30,7 @@ SyntaxDefinition& addGraphQL() { { "true", "literal" }, { "scalar", "keyword" }, { "implements", "keyword" }, - { "extend", "keyword2" }, + { "extend", "type" }, { "enum", "keyword" }, { "schema", "keyword" }, { "mutation", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/groovy.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/groovy.cpp index 7c29bd8a7..b1f349219 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/groovy.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/groovy.cpp @@ -26,7 +26,7 @@ SyntaxDefinition& addGroovy() { { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "[%a_][%w_]*%f[%[]" }, "function" }, - { { "[A-Z]+_?[A-Z]+" }, "keyword2" }, + { { "[A-Z]+_?[A-Z]+" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, { { "[a-zA-Z]+%.+" }, "function" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hare.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hare.cpp index d1b47d416..288176444 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hare.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hare.cpp @@ -23,40 +23,40 @@ SyntaxDefinition& addHare() { }, { - { "void", "keyword2" }, { "valist", "keyword2" }, { "vaend", "keyword" }, - { "vaarg", "keyword" }, { "vastart", "keyword" }, { "use", "keyword" }, - { "i16", "keyword2" }, { "for", "keyword" }, { "abort", "keyword" }, - { "fn", "keyword" }, { "if", "keyword" }, { "fini", "keyword" }, - { "fconst", "keyword2" }, { "i64", "keyword2" }, { "free", "keyword" }, - { "false", "literal" }, { "def", "keyword" }, { "u16", "keyword2" }, - { "f32", "keyword2" }, { "yield", "keyword" }, { "export", "keyword" }, - { "len", "keyword" }, { "delete", "keyword" }, { "align", "keyword" }, - { "true", "literal" }, { "fmt", "literal" }, { "iconst", "keyword2" }, - { "init", "keyword" }, { "break", "keyword" }, { "else", "keyword" }, - { "continue", "keyword" }, { "i32", "keyword2" }, { "bool", "keyword2" }, - { "case", "keyword" }, { "i8", "keyword2" }, { "int", "keyword2" }, - { "str", "keyword2" }, { "is", "keyword" }, { "defer", "keyword" }, - { "f64", "keyword2" }, { "enum", "keyword2" }, { "null", "literal" }, - { "u8", "keyword2" }, { "insert", "keyword" }, { "u64", "keyword2" }, - { "let", "keyword" }, { "return", "keyword" }, { "alloc", "keyword" }, - { "offset", "keyword" }, { "nullable", "keyword2" }, { "rconst", "keyword2" }, - { "uintptr", "keyword2" }, { "rune", "keyword2" }, { "size", "keyword2" }, - { "signed", "literal" }, { "match", "keyword" }, { "static", "keyword" }, - { "switch", "keyword" }, { "test", "keyword" }, { "type", "keyword" }, - { "const", "keyword" }, { "union", "keyword2" }, { "u32", "keyword2" }, - { "struct", "keyword2" }, { "uint", "keyword2" }, { "unsigned", "literal" }, - { "bufio", "literal" }, { "io", "literal" }, { "os", "literal" }, - { "sort", "literal" }, { "strings", "literal" }, { "ascii", "literal" }, - { "bytes", "literal" }, { "crypto", "literal" }, { "dirs", "literal" }, - { "encoding", "literal" }, { "endian", "literal" }, { "errors", "literal" }, - { "fnmatch", "literal" }, { "format", "literal" }, { "fs", "literal" }, - { "getopt", "literal" }, { "glob", "literal" }, { "hare", "literal" }, - { "hash", "literal" }, { "linux", "literal" }, { "log", "literal" }, - { "math", "literal" }, { "mime", "literal" }, { "net", "literal" }, - { "path", "literal" }, { "regex", "literal" }, { "rt", "literal" }, - { "shlex", "literal" }, { "strconv", "literal" }, { "strio", "literal" }, - { "temp", "literal" }, { "test", "literal" }, { "time", "literal" }, - { "types", "literal" }, { "unix", "literal" }, { "uuid", "literal" }, + { "void", "type" }, { "valist", "type" }, { "vaend", "keyword" }, + { "vaarg", "keyword" }, { "vastart", "keyword" }, { "use", "keyword" }, + { "i16", "type" }, { "for", "keyword" }, { "abort", "keyword" }, + { "fn", "keyword" }, { "if", "keyword" }, { "fini", "keyword" }, + { "fconst", "type" }, { "i64", "type" }, { "free", "keyword" }, + { "false", "literal" }, { "def", "keyword" }, { "u16", "type" }, + { "f32", "type" }, { "yield", "keyword" }, { "export", "keyword" }, + { "len", "keyword" }, { "delete", "keyword" }, { "align", "keyword" }, + { "true", "literal" }, { "fmt", "literal" }, { "iconst", "type" }, + { "init", "keyword" }, { "break", "keyword" }, { "else", "keyword" }, + { "continue", "keyword" }, { "i32", "type" }, { "bool", "type" }, + { "case", "keyword" }, { "i8", "type" }, { "int", "type" }, + { "str", "type" }, { "is", "keyword" }, { "defer", "keyword" }, + { "f64", "type" }, { "enum", "type" }, { "null", "literal" }, + { "u8", "type" }, { "insert", "keyword" }, { "u64", "type" }, + { "let", "keyword" }, { "return", "keyword" }, { "alloc", "keyword" }, + { "offset", "keyword" }, { "nullable", "type" }, { "rconst", "type" }, + { "uintptr", "type" }, { "rune", "type" }, { "size", "type" }, + { "signed", "literal" }, { "match", "keyword" }, { "static", "keyword" }, + { "switch", "keyword" }, { "test", "keyword" }, { "type", "keyword" }, + { "const", "keyword" }, { "union", "type" }, { "u32", "type" }, + { "struct", "type" }, { "uint", "type" }, { "unsigned", "literal" }, + { "bufio", "literal" }, { "io", "literal" }, { "os", "literal" }, + { "sort", "literal" }, { "strings", "literal" }, { "ascii", "literal" }, + { "bytes", "literal" }, { "crypto", "literal" }, { "dirs", "literal" }, + { "encoding", "literal" }, { "endian", "literal" }, { "errors", "literal" }, + { "fnmatch", "literal" }, { "format", "literal" }, { "fs", "literal" }, + { "getopt", "literal" }, { "glob", "literal" }, { "hare", "literal" }, + { "hash", "literal" }, { "linux", "literal" }, { "log", "literal" }, + { "math", "literal" }, { "mime", "literal" }, { "net", "literal" }, + { "path", "literal" }, { "regex", "literal" }, { "rt", "literal" }, + { "shlex", "literal" }, { "strconv", "literal" }, { "strio", "literal" }, + { "temp", "literal" }, { "test", "literal" }, { "time", "literal" }, + { "types", "literal" }, { "unix", "literal" }, { "uuid", "literal" }, }, "//", {} diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haxe.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haxe.cpp index a596abf7d..b861b4b2b 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haxe.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/haxe.cpp @@ -11,7 +11,7 @@ SyntaxDefinition& addHaxe() { { { { "#.*" }, "comment" }, { { "%-[%-%w_]*" }, "keyword" }, - { { "(%.)(%u[%w_]*)" }, { "normal", "normal", "keyword2" } }, + { { "(%.)(%u[%w_]*)" }, { "normal", "normal", "type" } }, }, {}, "#" } ) @@ -42,17 +42,16 @@ SyntaxDefinition& addHaxe() { { "Haxe", { "%.hx$" }, { - { { "%~%/", "%/[igmsu]*" }, "keyword2", "HaxeRegularExpressions" }, + { { "%~%/", "%/[igmsu]*" }, "type", "HaxeRegularExpressions" }, { { "%.%.%." }, "operator" }, - { { "(%<)(%u[%w_]*)(%>*)" }, { "normal", "operator", "keyword2", "operator" } }, + { { "(%<)(%u[%w_]*)(%>*)" }, { "normal", "operator", "type", "operator" } }, { { "(%#%s*[%a_]*)(.*\n)" }, { "normal", "keyword", "normal" } }, - { { "(import%s+)(%u[%w]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(import%s+)([%w%.]*%.)(%u[%w]*)" }, - { "normal", "keyword", "normal", "keyword2" } }, + { { "(import%s+)(%u[%w]*)" }, { "normal", "keyword", "type" } }, + { { "(import%s+)([%w%.]*%.)(%u[%w]*)" }, { "normal", "keyword", "normal", "type" } }, { { "(abstract%s+)(%u[%w_]*%s*%()(%s*%u[%w_]*)" }, - { "normal", "keyword2", "normal", "keyword2" } }, + { "normal", "type", "normal", "type" } }, { { "(from%s+)(%u[%w_]*%s+)(to%s+)(%u[%w_]*)" }, - { "normal", "keyword", "keyword2", "keyword", "keyword2" } }, + { "normal", "keyword", "type", "keyword", "type" } }, { { "//.*\n" }, "comment" }, { { "/%*", "%*/" }, "comment" }, { { "\"", "\"", "\\" }, "string" }, @@ -64,26 +63,26 @@ SyntaxDefinition& addHaxe() { { { "[%+%-%.=/%*%^%%<>!~|&]" }, "operator" }, { { "([%a_][%w_]*)(%s*%f[(])" }, { "normal", "function", "normal" } }, { { "[%a_][%w_]*" }, "symbol" }, - { { "(:)(%u[%a_][%w_]*)" }, { "normal", "normal", "keyword2" } }, + { { "(:)(%u[%a_][%w_]*)" }, { "normal", "normal", "type" } }, { { "@:[%a_][%w_]*%f[(]" }, "keyword" }, { { "%$type" }, "keyword" }, }, { - { "using", "keyword2" }, { "true", "literal" }, { "trace", "keyword" }, - { "throw", "keyword" }, { "typedef", "keyword2" }, { "switch", "keyword" }, - { "try", "keyword" }, { "static", "keyword" }, { "set", "keyword" }, - { "return", "keyword" }, { "public", "keyword" }, { "package", "keyword" }, - { "do", "keyword" }, { "default", "keyword" }, { "new", "keyword" }, - { "private", "keyword" }, { "macro", "keyword2" }, { "cast", "keyword" }, - { "class", "keyword" }, { "case", "keyword" }, { "this", "keyword" }, - { "continue", "keyword" }, { "else", "keyword" }, { "extern", "keyword2" }, - { "break", "keyword" }, { "extends", "keyword2" }, { "interface", "keyword" }, - { "abstract", "keyword2" }, { "for", "keyword" }, { "override", "keyword" }, - { "function", "keyword2" }, { "never", "keyword" }, { "get", "keyword" }, - { "final", "keyword" }, { "if", "keyword" }, { "implements", "keyword2" }, - { "var", "keyword2" }, { "catch", "keyword" }, { "import", "keyword" }, - { "false", "literal" }, { "in", "keyword" }, { "while", "keyword" }, - { "inline", "keyword" }, { "enum", "keyword" }, { "null", "literal" }, + { "using", "type" }, { "true", "literal" }, { "trace", "keyword" }, + { "throw", "keyword" }, { "typedef", "type" }, { "switch", "keyword" }, + { "try", "keyword" }, { "static", "keyword" }, { "set", "keyword" }, + { "return", "keyword" }, { "public", "keyword" }, { "package", "keyword" }, + { "do", "keyword" }, { "default", "keyword" }, { "new", "keyword" }, + { "private", "keyword" }, { "macro", "type" }, { "cast", "keyword" }, + { "class", "keyword" }, { "case", "keyword" }, { "this", "keyword" }, + { "continue", "keyword" }, { "else", "keyword" }, { "extern", "type" }, + { "break", "keyword" }, { "extends", "type" }, { "interface", "keyword" }, + { "abstract", "type" }, { "for", "keyword" }, { "override", "keyword" }, + { "function", "type" }, { "never", "keyword" }, { "get", "keyword" }, + { "final", "keyword" }, { "if", "keyword" }, { "implements", "type" }, + { "var", "type" }, { "catch", "keyword" }, { "import", "keyword" }, + { "false", "literal" }, { "in", "keyword" }, { "while", "keyword" }, + { "inline", "keyword" }, { "enum", "keyword" }, { "null", "literal" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.cpp index 5a1132bf2..8608690af 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.cpp @@ -21,36 +21,36 @@ SyntaxDefinition& addHLSL() { { { "-?%d+[%d%.eE]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, - { { "int[1-9]x[1-9]" }, "keyword2" }, - { { "int1[0-6]x[1-9]" }, "keyword2" }, - { { "int[1-9]x1[0-6]" }, "keyword2" }, - { { "int1[0-6]x1[0-6]" }, "keyword2" }, - { { "int[1-4]" }, "keyword2" }, - { { "uint[1-9]x[1-9]" }, "keyword2" }, - { { "uint1[0-6]x[1-9]" }, "keyword2" }, - { { "uint[1-9]x1[0-6]" }, "keyword2" }, - { { "uint1[0-6]x1[0-6]" }, "keyword2" }, - { { "uint[1-4]" }, "keyword2" }, - { { "dword[1-9]x[1-9]" }, "keyword2" }, - { { "dword1[0-6]x[1-9]" }, "keyword2" }, - { { "dword[1-9]x1[0-6]" }, "keyword2" }, - { { "dword1[0-6]x1[0-6]" }, "keyword2" }, - { { "dword[1-4]" }, "keyword2" }, - { { "half[1-9]x[1-9]" }, "keyword2" }, - { { "half1[0-6]x[1-9]" }, "keyword2" }, - { { "half[1-9]x1[0-6]" }, "keyword2" }, - { { "half1[0-6]x1[0-6]" }, "keyword2" }, - { { "half[1-4]" }, "keyword2" }, - { { "float[1-9]x[1-9]" }, "keyword2" }, - { { "float1[0-6]x[1-9]" }, "keyword2" }, - { { "float[1-9]x1[0-6]" }, "keyword2" }, - { { "float1[0-6]x1[0-6]" }, "keyword2" }, - { { "float[1-4]" }, "keyword2" }, - { { "double[1-9]x[1-9]" }, "keyword2" }, - { { "double1[0-6]x[1-9]" }, "keyword2" }, - { { "double[1-9]x1[0-6]" }, "keyword2" }, - { { "double1[0-6]x1[0-6]" }, "keyword2" }, - { { "double[1-4]" }, "keyword2" }, + { { "int[1-9]x[1-9]" }, "type" }, + { { "int1[0-6]x[1-9]" }, "type" }, + { { "int[1-9]x1[0-6]" }, "type" }, + { { "int1[0-6]x1[0-6]" }, "type" }, + { { "int[1-4]" }, "type" }, + { { "uint[1-9]x[1-9]" }, "type" }, + { { "uint1[0-6]x[1-9]" }, "type" }, + { { "uint[1-9]x1[0-6]" }, "type" }, + { { "uint1[0-6]x1[0-6]" }, "type" }, + { { "uint[1-4]" }, "type" }, + { { "dword[1-9]x[1-9]" }, "type" }, + { { "dword1[0-6]x[1-9]" }, "type" }, + { { "dword[1-9]x1[0-6]" }, "type" }, + { { "dword1[0-6]x1[0-6]" }, "type" }, + { { "dword[1-4]" }, "type" }, + { { "half[1-9]x[1-9]" }, "type" }, + { { "half1[0-6]x[1-9]" }, "type" }, + { { "half[1-9]x1[0-6]" }, "type" }, + { { "half1[0-6]x1[0-6]" }, "type" }, + { { "half[1-4]" }, "type" }, + { { "float[1-9]x[1-9]" }, "type" }, + { { "float1[0-6]x[1-9]" }, "type" }, + { { "float[1-9]x1[0-6]" }, "type" }, + { { "float1[0-6]x1[0-6]" }, "type" }, + { { "float[1-4]" }, "type" }, + { { "double[1-9]x[1-9]" }, "type" }, + { { "double1[0-6]x[1-9]" }, "type" }, + { { "double[1-9]x1[0-6]" }, "type" }, + { { "double1[0-6]x1[0-6]" }, "type" }, + { { "double[1-4]" }, "type" }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, }, @@ -58,14 +58,14 @@ SyntaxDefinition& addHLSL() { { "AppendStructuredBuffer", "keyword" }, { "asm", "keyword" }, { "asm_fragment", "keyword" }, - { "BlendState", "keyword2" }, - { "bool", "keyword2" }, + { "BlendState", "type" }, + { "bool", "type" }, { "break", "keyword" }, - { "Buffer", "keyword2" }, - { "ByteAddressBuffer", "keyword2" }, + { "Buffer", "type" }, + { "ByteAddressBuffer", "type" }, { "case", "keyword" }, - { "cbuffer", "keyword2" }, - { "centroid", "keyword2" }, + { "cbuffer", "type" }, + { "centroid", "type" }, { "class", "keyword" }, { "column_major", "keyword" }, { "compile", "keyword" }, @@ -80,102 +80,102 @@ SyntaxDefinition& addHLSL() { { "DepthStencilView", "keyword" }, { "discard", "keyword" }, { "do", "keyword" }, - { "double", "keyword2" }, - { "DomainShader", "keyword2" }, - { "dword", "keyword2" }, + { "double", "type" }, + { "DomainShader", "type" }, + { "dword", "type" }, { "else", "keyword" }, { "export", "keyword" }, { "extern", "keyword" }, { "false", "literal" }, - { "float", "keyword2" }, + { "float", "type" }, { "for", "keyword" }, - { "fxgroup", "keyword2" }, - { "GeometryShader", "keyword2" }, + { "fxgroup", "type" }, + { "GeometryShader", "type" }, { "groupshared", "keyword" }, - { "half", "keyword2" }, - { "HullShader", "keyword2" }, + { "half", "type" }, + { "HullShader", "type" }, { "if", "keyword" }, { "in", "keyword" }, { "inline", "keyword" }, { "inout", "keyword" }, - { "InputPatch", "keyword2" }, - { "int", "keyword2" }, + { "InputPatch", "type" }, + { "int", "type" }, { "interface", "keyword" }, - { "line", "keyword2" }, - { "lineadj", "keyword2" }, + { "line", "type" }, + { "lineadj", "type" }, { "linear", "keyword" }, - { "LineStream", "keyword2" }, - { "matrix", "keyword2" }, - { "min16float", "keyword2" }, - { "min10float", "keyword2" }, - { "min16int", "keyword2" }, - { "min12int", "keyword2" }, - { "min16uint", "keyword2" }, + { "LineStream", "type" }, + { "matrix", "type" }, + { "min16float", "type" }, + { "min10float", "type" }, + { "min16int", "type" }, + { "min12int", "type" }, + { "min16uint", "type" }, { "namespace", "keyword" }, { "nointerpolation", "keyword" }, { "noperspective", "keyword" }, { "NULL", "literal" }, { "out", "keyword" }, - { "OutputPatch", "keyword2" }, + { "OutputPatch", "type" }, { "packoffset", "keyword" }, { "pass", "keyword" }, { "pixelfragment", "keyword" }, - { "PixelShader", "keyword2" }, - { "point", "keyword2" }, - { "PointStream", "keyword2" }, + { "PixelShader", "type" }, + { "point", "type" }, + { "PointStream", "type" }, { "precise", "keyword" }, - { "RasterizerState", "keyword2" }, - { "RenderTargetView", "keyword2" }, + { "RasterizerState", "type" }, + { "RenderTargetView", "type" }, { "return", "keyword" }, { "register", "keyword" }, { "row_major", "keyword" }, - { "RWBuffer", "keyword2" }, - { "RWByteAddressBuffer", "keyword2" }, - { "RWStructuredBuffer", "keyword2" }, - { "RWTexture1D", "keyword2" }, - { "RWTexture1DArray", "keyword2" }, - { "RWTexture2D", "keyword2" }, - { "RWTexture2DArray", "keyword2" }, - { "RWTexture3D", "keyword2" }, + { "RWBuffer", "type" }, + { "RWByteAddressBuffer", "type" }, + { "RWStructuredBuffer", "type" }, + { "RWTexture1D", "type" }, + { "RWTexture1DArray", "type" }, + { "RWTexture2D", "type" }, + { "RWTexture2DArray", "type" }, + { "RWTexture3D", "type" }, { "sample", "keyword" }, - { "sampler", "keyword2" }, - { "SamplerState", "keyword2" }, - { "SamplerComparisonState", "keyword2" }, + { "sampler", "type" }, + { "SamplerState", "type" }, + { "SamplerComparisonState", "type" }, { "shared", "keyword" }, { "snorm", "keyword" }, { "stateblock", "keyword" }, { "stateblock_state", "keyword" }, { "static", "keyword" }, - { "string", "keyword2" }, + { "string", "type" }, { "struct", "keyword" }, { "switch", "keyword" }, - { "StructuredBuffer", "keyword2" }, - { "tbuffer", "keyword2" }, - { "technique", "keyword2" }, - { "technique10", "keyword2" }, - { "technique11", "keyword2" }, - { "texture", "keyword2" }, - { "Texture1D", "keyword2" }, - { "Texture1DArray", "keyword2" }, - { "Texture2D", "keyword2" }, - { "Texture2DArray", "keyword2" }, - { "Texture2DMS", "keyword2" }, - { "Texture2DMSArray", "keyword2" }, - { "Texture3D", "keyword2" }, - { "TextureCube", "keyword2" }, - { "TextureCubeArray", "keyword2" }, + { "StructuredBuffer", "type" }, + { "tbuffer", "type" }, + { "technique", "type" }, + { "technique10", "type" }, + { "technique11", "type" }, + { "texture", "type" }, + { "Texture1D", "type" }, + { "Texture1DArray", "type" }, + { "Texture2D", "type" }, + { "Texture2DArray", "type" }, + { "Texture2DMS", "type" }, + { "Texture2DMSArray", "type" }, + { "Texture3D", "type" }, + { "TextureCube", "type" }, + { "TextureCubeArray", "type" }, { "true", "literal" }, { "typedef", "keyword" }, - { "triangle", "keyword2" }, - { "triangleadj", "keyword2" }, - { "TriangleStream", "keyword2" }, - { "uint", "keyword2" }, + { "triangle", "type" }, + { "triangleadj", "type" }, + { "TriangleStream", "type" }, + { "uint", "type" }, { "uniform", "keyword" }, { "unorm", "keyword" }, { "unsigned", "keyword" }, - { "vector", "keyword2" }, - { "vertexfragment", "keyword2" }, - { "VertexShader", "keyword2" }, + { "vector", "type" }, + { "vertexfragment", "type" }, + { "VertexShader", "type" }, { "void", "keyword" }, { "volatile", "keyword" }, { "while", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.hpp index ab585223b..ea85fba41 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/hlsl.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addHLSL(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.cpp index 3809f327c..0e9fa4b66 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.cpp @@ -17,19 +17,19 @@ SyntaxDefinition& addHtaccessFile() { "?[%w_.~!*:@&+$/?%%#=-]*)%)%]%((https?://[%w_.~!*:@&+$/" "?%%#-]-%w[-.%w]*%.%w%w%w?%w?:?%d*/?[%w_.~!*:@&+$/?%%#=-]*)%)" }, { "keyword", "function", "link", "link" } }, - { { "%f[%w]application/[%w%._+-]+" }, "keyword2" }, - { { "%f[%w]font/[%w%._+-]+" }, "keyword2" }, - { { "%f[%w]image/[%w%._+-]+" }, "keyword2" }, - { { "%f[%w]text/[%w%._+-]+" }, "keyword2" }, - { { "%f[%w]audio/[%w%._+-]+" }, "keyword2" }, - { { "%f[%w]video/[%w%._+-]+" }, "keyword2" }, - { { "%d+%.%d+%.%d+%.%d+" }, "keyword2" }, - { { "%d+%.%d+%.%d+%.%d+/%d+" }, "keyword2" }, - { { "%w+@%w+%.%w+" }, "keyword2" }, + { { "%f[%w]application/[%w%._+-]+" }, "type" }, + { { "%f[%w]font/[%w%._+-]+" }, "type" }, + { { "%f[%w]image/[%w%._+-]+" }, "type" }, + { { "%f[%w]text/[%w%._+-]+" }, "type" }, + { { "%f[%w]audio/[%w%._+-]+" }, "type" }, + { { "%f[%w]video/[%w%._+-]+" }, "type" }, + { { "%d+%.%d+%.%d+%.%d+" }, "type" }, + { { "%d+%.%d+%.%d+%.%d+/%d+" }, "type" }, + { { "%w+@%w+%.%w+" }, "type" }, { { "%f[%S]%b[]" }, "number" }, { { "" }, "literal" }, - { { "[%%$]%d+" }, "keyword2" }, - { { "[%%$]%{[%w_:%-]+%}" }, "keyword2" }, + { { "[%%$]%d+" }, "type" }, + { { "[%%$]%{[%w_:%-]+%}" }, "type" }, { { "A?%d+" }, "number" }, { { "%f[%S][!=+%-]+" }, "operator" }, { { "%f[^%s!]%^%S*" }, "literal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.hpp index c16795133..63a607a08 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/htaccess.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addHtaccessFile(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ispc.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ispc.cpp index 1202c6bf5..a1347dac1 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ispc.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ispc.cpp @@ -17,8 +17,8 @@ SyntaxDefinition& addISPC() { { { "L?\"", "[\"\n]", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, { { "c_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, - { { "(struct)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "keyword2" } }, - { { "(enum)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "keyword2" } }, + { { "(struct)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "type" } }, + { { "(enum)%s+([%a_][%w_]+)" }, { "keyword", "keyword", "type" } }, { { "(cdo|cfor|cif|cwhiledo|else|for|foreach|foreach_active|foreach_tiled|foreach_" "unique|goto|if|switch|while)\\s*(?=\\()" }, { "normal", "keyword", "keyword" }, @@ -75,35 +75,35 @@ SyntaxDefinition& addISPC() { { "typedef", "keyword" }, { "typename", "keyword" }, { "export", "keyword" }, - { "signed", "keyword2" }, - { "unsigned", "keyword2" }, + { "signed", "type" }, + { "unsigned", "type" }, { "soa", "keyword" }, { "__vectorcall", "keyword" }, { "__regcall", "keyword" }, { "__attribute__", "keyword" }, { "volatile", "keyword" }, - { "bool", "keyword2" }, - { "double", "keyword2" }, - { "float", "keyword2" }, - { "float16", "keyword2" }, - { "int", "keyword2" }, - { "uint", "keyword2" }, - { "int8", "keyword2" }, - { "uint8", "keyword2" }, - { "int16", "keyword2" }, - { "uint16", "keyword2" }, - { "int32", "keyword2" }, - { "uint32", "keyword2" }, - { "int64", "keyword2" }, - { "uint64", "keyword2" }, + { "bool", "type" }, + { "double", "type" }, + { "float", "type" }, + { "float16", "type" }, + { "int", "type" }, + { "uint", "type" }, + { "int8", "type" }, + { "uint8", "type" }, + { "int16", "type" }, + { "uint16", "type" }, + { "int32", "type" }, + { "uint32", "type" }, + { "int64", "type" }, + { "uint64", "type" }, { "void", "keyword" }, { "struct", "keyword" }, { "enum", "keyword" }, - { "size_t", "keyword2" }, - { "ptrdiff_t", "keyword2" }, - { "intptr_t", "keyword2" }, - { "uintptr_t", "keyword2" }, + { "size_t", "type" }, + { "ptrdiff_t", "type" }, + { "intptr_t", "type" }, + { "uintptr_t", "type" }, { "true", "literal" }, { "false", "literal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.cpp index 70010bbbf..5873e2338 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.cpp @@ -23,36 +23,36 @@ SyntaxDefinition& addJai() { { "normal", "function", "operator", "keyword" } }, { { "([%a_][%w_]+)(%s+::%s+)%f[(]" }, { "normal", "function", "operator" } }, { { "([%a_][%w_]+)(%s+::%s+)(struct%s*)%f[{]" }, - { "normal", "keyword2", "operator", "keyword" } }, + { "normal", "type", "operator", "keyword" } }, { { "([%a_][%w_]+)(%s+::%s+)(enum%s*)(%w+%s)%f[{]" }, - { "normal", "keyword2", "operator", "keyword", "keyword2" } }, + { "normal", "type", "operator", "keyword", "type" } }, { { "[<>~=+-*/]=" }, "operator" }, { { "[%+%-=/%*%^%%<>!~|&:]" }, "operator" }, { { "%$[%a_][%w_]*" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "[#@][%a_][%w_]*" }, "keyword2" }, - { { "[#@]%b()" }, "keyword2" }, + { { "[#@][%a_][%w_]*" }, "type" }, + { { "[#@]%b()" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "u8", "keyword2" }, { "u16", "keyword2" }, { "u32", "keyword2" }, - { "u64", "keyword2" }, { "s8", "keyword2" }, { "s16", "keyword2" }, - { "s32", "keyword2" }, { "s64", "keyword2" }, { "int", "keyword2" }, - { "float", "keyword2" }, { "float32", "keyword2" }, { "float64", "keyword2" }, - { "Any", "keyword2" }, { "array", "keyword2" }, { "bool", "keyword2" }, - { "enum", "keyword" }, { "null", "keyword2" }, { "pointer", "keyword2" }, - { "procedure", "keyword" }, { "string", "keyword2" }, { "struct", "keyword" }, - { "void", "keyword2" }, { "complex", "keyword2" }, { "const", "keyword" }, - { "union", "keyword" }, { "defer", "keyword" }, { "do", "keyword" }, - { "for", "keyword" }, { "macro", "keyword" }, { "remove", "keyword" }, - { "bit_set", "keyword" }, { "switch", "keyword" }, { "if", "keyword" }, - { "case", "keyword" }, { "foreign", "keyword" }, { "new", "keyword" }, - { "inline", "keyword" }, { "import", "keyword" }, { "false", "literal" }, - { "assert", "keyword2" }, { "return", "keyword" }, { "true", "literal" }, - { "when", "keyword" }, { "using", "keyword" }, { "continue", "keyword" }, - { "in", "keyword" }, { "break", "keyword" }, { "else", "keyword" }, - { "while", "keyword" }, { "count", "keyword" }, { "delete", "keyword" }, + { "u8", "type" }, { "u16", "type" }, { "u32", "type" }, + { "u64", "type" }, { "s8", "type" }, { "s16", "type" }, + { "s32", "type" }, { "s64", "type" }, { "int", "type" }, + { "float", "type" }, { "float32", "type" }, { "float64", "type" }, + { "Any", "type" }, { "array", "type" }, { "bool", "type" }, + { "enum", "keyword" }, { "null", "type" }, { "pointer", "type" }, + { "procedure", "keyword" }, { "string", "type" }, { "struct", "keyword" }, + { "void", "type" }, { "complex", "type" }, { "const", "keyword" }, + { "union", "keyword" }, { "defer", "keyword" }, { "do", "keyword" }, + { "for", "keyword" }, { "macro", "keyword" }, { "remove", "keyword" }, + { "bit_set", "keyword" }, { "switch", "keyword" }, { "if", "keyword" }, + { "case", "keyword" }, { "foreign", "keyword" }, { "new", "keyword" }, + { "inline", "keyword" }, { "import", "keyword" }, { "false", "literal" }, + { "assert", "type" }, { "return", "keyword" }, { "true", "literal" }, + { "when", "keyword" }, { "using", "keyword" }, { "continue", "keyword" }, + { "in", "keyword" }, { "break", "keyword" }, { "else", "keyword" }, + { "while", "keyword" }, { "count", "keyword" }, { "delete", "keyword" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.hpp index 6ca144118..57f20a773 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jai.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addJai(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/janet.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/janet.cpp index 89619225b..8170cee40 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/janet.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/janet.cpp @@ -65,7 +65,7 @@ SyntaxDefinition& addJanet() { std::vector{ "operator", "keyword", "literal" }, "", SyntaxPatternMatchType::RegEx }, - { { "%(?(%:[%a_][%w_]*)" }, { "operator", "keyword3", "keyword3" } }, + { { "%(?(%:[%a_][%w_]*)" }, { "operator", "parameter", "parameter" } }, { { "[';~,|]*\\(([a-zA-Z!$%&*+-./:@^_\"]+/?[a-zA-Z!$%&*+-./:@^_\"]+)" }, std::vector{ "operator", "function", "literal" }, "", @@ -75,7 +75,7 @@ SyntaxDefinition& addJanet() { "", SyntaxPatternMatchType::RegEx }, { { "[a-zA-Z0-9!$%&*+-./:@^_\"]+" }, - "keyword2", + "type", "", SyntaxPatternMatchType::RegEx }, { { "([';~,|]*)@?(\\()" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/java.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/java.cpp index e832adb57..5b5d53d3c 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/java.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/java.cpp @@ -26,10 +26,10 @@ SyntaxDefinition& addJava() { }, { - { "int", "keyword2" }, { "then", "keyword" }, + { "int", "type" }, { "then", "keyword" }, { "new", "keyword" }, { "continue", "keyword" }, - { "default", "keyword" }, { "char", "keyword2" }, - { "long", "keyword2" }, { "short", "keyword2" }, + { "default", "keyword" }, { "char", "type" }, + { "long", "type" }, { "short", "type" }, { "extends", "keyword" }, { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, { "while", "keyword" }, { "null", "literal" }, @@ -40,16 +40,16 @@ SyntaxDefinition& addJava() { { "throws", "keyword" }, { "private", "keyword" }, { "finally", "keyword" }, { "abstract", "keyword" }, { "volatile", "keyword" }, { "switch", "keyword" }, - { "double", "keyword2" }, { "return", "keyword" }, + { "double", "type" }, { "return", "keyword" }, { "import", "keyword" }, { "try", "keyword" }, { "class", "keyword" }, { "void", "keyword" }, - { "byte", "keyword2" }, { "static", "keyword" }, - { "super", "keyword" }, { "boolean", "keyword2" }, + { "byte", "type" }, { "static", "keyword" }, + { "super", "keyword" }, { "boolean", "type" }, { "assert", "keyword" }, { "throw", "keyword" }, { "catch", "keyword" }, { "true", "literal" }, { "implements", "keyword" }, { "instanceof", "keyword" }, { "package", "keyword" }, { "transient", "keyword" }, - { "float", "keyword2" }, { "synchronized", "keyword" }, + { "float", "type" }, { "synchronized", "keyword" }, { "case", "keyword" }, { "interface", "keyword" }, { "protected", "keyword" }, { "do", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jsx.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jsx.cpp index ce8c1ac26..4f7300291 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jsx.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jsx.cpp @@ -18,7 +18,7 @@ SyntaxDefinition& addJSX() { { { "/[%+%-%*%^%!%=%&%|%?%:%;%,%(%[%{%<%>%\\%\"].*%f[/]", "/[igmsuyd\n]?[igmsuyd\n]?[igmsuyd\n]?", "\\" }, "string" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "([%a_-][%w-_]*)(%\?\?)(=)%f[%{%\"]" }, @@ -50,8 +50,8 @@ SyntaxDefinition& addJSX() { { "with", "keyword" }, { "yield", "keyword" }, { "true", "literal" }, { "false", "literal" }, { "null", "literal" }, { "undefined", "literal" }, - { "arguments", "keyword2" }, { "Infinity", "keyword2" }, - { "NaN", "keyword2" }, { "this", "keyword2" }, + { "arguments", "type" }, { "Infinity", "type" }, + { "NaN", "type" }, { "this", "type" }, }, "//" } ) .setLSPName( "javascriptreact" ); diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jule.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jule.cpp index b6a755bcb..7b606b5ff 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jule.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/jule.cpp @@ -23,35 +23,35 @@ SyntaxDefinition& addJule() { { { "-?%d+[%d%.eE]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, - { { "(%w+)::([%a_][%w_]*)%(" }, { "normal", "keyword2", "function" } }, - { { "(%w+)::([%a_][%w_]*)" }, { "normal", "keyword2", "keyword2" } }, - { { "(struct)%s+([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(impl)%s+([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(enum)%s+([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(trait)%s+([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, + { { "(%w+)::([%a_][%w_]*)%(" }, { "normal", "type", "function" } }, + { { "(%w+)::([%a_][%w_]*)" }, { "normal", "type", "type" } }, + { { "(struct)%s+([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(impl)%s+([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(enum)%s+([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(trait)%s+([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "([%a_][%w_]+)%[([%a_][%w_]*)%]%f[(]" }, { "normal", "function", "keyword2" } }, + { { "([%a_][%w_]+)%[([%a_][%w_]*)%]%f[(]" }, { "normal", "function", "type" } }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "int", "keyword2" }, { "str", "keyword2" }, { "impl", "keyword" }, - { "continue", "keyword" }, { "i16", "keyword2" }, { "bool", "keyword2" }, - { "uintptr", "keyword2" }, { "integ", "keyword" }, { "fall", "keyword" }, - { "i8", "keyword2" }, { "u32", "keyword2" }, { "any", "keyword2" }, - { "match", "keyword" }, { "i64", "keyword2" }, { "false", "literal" }, + { "int", "type" }, { "str", "type" }, { "impl", "keyword" }, + { "continue", "keyword" }, { "i16", "type" }, { "bool", "type" }, + { "uintptr", "type" }, { "integ", "keyword" }, { "fall", "keyword" }, + { "i8", "type" }, { "u32", "type" }, { "any", "type" }, + { "match", "keyword" }, { "i64", "type" }, { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, { "const", "keyword" }, - { "u64", "keyword2" }, { "select", "keyword" }, { "unsafe", "keyword" }, - { "else", "keyword" }, { "f64", "keyword2" }, { "enum", "keyword" }, + { "u64", "type" }, { "select", "keyword" }, { "unsafe", "keyword" }, + { "else", "keyword" }, { "f64", "type" }, { "enum", "keyword" }, { "cpp", "keyword" }, { "struct", "keyword" }, { "break", "keyword" }, { "use", "keyword" }, { "if", "keyword" }, { "let", "keyword" }, - { "in", "keyword" }, { "f32", "keyword2" }, { "i32", "keyword2" }, - { "map", "keyword2" }, { "trait", "keyword" }, { "mut", "keyword" }, - { "error", "keyword" }, { "u8", "keyword2" }, { "byte", "keyword2" }, + { "in", "keyword" }, { "f32", "type" }, { "i32", "type" }, + { "map", "type" }, { "trait", "keyword" }, { "mut", "keyword" }, + { "error", "keyword" }, { "u8", "type" }, { "byte", "type" }, { "static", "keyword" }, { "defer", "keyword" }, { "co", "keyword" }, - { "uint", "keyword2" }, { "self", "keyword" }, { "true", "literal" }, - { "chan", "keyword" }, { "nil", "literal" }, { "rune", "keyword2" }, - { "ret", "keyword" }, { "fn", "keyword" }, { "u16", "keyword2" }, + { "uint", "type" }, { "self", "keyword" }, { "true", "literal" }, + { "chan", "keyword" }, { "nil", "literal" }, { "rune", "type" }, + { "ret", "keyword" }, { "fn", "keyword" }, { "u16", "type" }, { "type", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/julia.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/julia.cpp index 08a1bbf5d..95d482f4a 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/julia.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/julia.cpp @@ -38,28 +38,28 @@ SyntaxDefinition& addJulia() { }, { - { "function", "keyword" }, { "import", "keyword" }, { "for", "keyword" }, - { "begin", "keyword" }, { "local", "keyword" }, { "const", "keyword" }, - { "mutable", "keyword2" }, { "using", "keyword" }, { "where", "keyword" }, - { "finally", "keyword" }, { "Float64", "keyword2" }, { "UInt8", "keyword2" }, - { "elseif", "keyword" }, { "Dict", "keyword" }, { "global", "keyword" }, - { "Function", "keyword2" }, { "Ref", "keyword2" }, { "try", "keyword" }, - { "UInt128", "keyword2" }, { "Vector", "keyword2" }, { "module", "keyword" }, - { "Matrix", "keyword2" }, { "nothing", "literal" }, { "struct", "keyword2" }, - { "Number", "keyword2" }, { "let", "keyword" }, { "return", "keyword" }, - { "UInt32", "keyword2" }, { "Int8", "keyword2" }, { "Float16", "keyword2" }, - { "typeof", "keyword" }, { "if", "keyword" }, { "type", "keyword" }, - { "String", "keyword2" }, { "baremodule", "keyword" }, { "Int128", "keyword2" }, - { "Char", "keyword2" }, { "continue", "keyword" }, { "end", "keyword" }, - { "while", "keyword" }, { "quote", "keyword" }, { "Float32", "keyword2" }, - { "true", "literal" }, { "Set", "keyword" }, { "UInt16", "keyword2" }, - { "Union", "keyword" }, { "abstract", "keyword2" }, { "Inf", "literal" }, - { "Int16", "keyword2" }, { "primitive", "keyword2" }, { "Int64", "keyword2" }, - { "missing", "literal" }, { "NaN", "literal" }, { "Bool", "keyword2" }, - { "Int32", "keyword2" }, { "macro", "keyword" }, { "UInt64", "keyword2" }, - { "Int", "keyword2" }, { "catch", "keyword" }, { "do", "keyword" }, - { "export", "keyword" }, { "false", "literal" }, { "Integer", "keyword2" }, - { "else", "keyword" }, { "in", "keyword" }, { "break", "keyword" }, + { "function", "keyword" }, { "import", "keyword" }, { "for", "keyword" }, + { "begin", "keyword" }, { "local", "keyword" }, { "const", "keyword" }, + { "mutable", "type" }, { "using", "keyword" }, { "where", "keyword" }, + { "finally", "keyword" }, { "Float64", "type" }, { "UInt8", "type" }, + { "elseif", "keyword" }, { "Dict", "keyword" }, { "global", "keyword" }, + { "Function", "type" }, { "Ref", "type" }, { "try", "keyword" }, + { "UInt128", "type" }, { "Vector", "type" }, { "module", "keyword" }, + { "Matrix", "type" }, { "nothing", "literal" }, { "struct", "type" }, + { "Number", "type" }, { "let", "keyword" }, { "return", "keyword" }, + { "UInt32", "type" }, { "Int8", "type" }, { "Float16", "type" }, + { "typeof", "keyword" }, { "if", "keyword" }, { "type", "keyword" }, + { "String", "type" }, { "baremodule", "keyword" }, { "Int128", "type" }, + { "Char", "type" }, { "continue", "keyword" }, { "end", "keyword" }, + { "while", "keyword" }, { "quote", "keyword" }, { "Float32", "type" }, + { "true", "literal" }, { "Set", "keyword" }, { "UInt16", "type" }, + { "Union", "keyword" }, { "abstract", "type" }, { "Inf", "literal" }, + { "Int16", "type" }, { "primitive", "type" }, { "Int64", "type" }, + { "missing", "literal" }, { "NaN", "literal" }, { "Bool", "type" }, + { "Int32", "type" }, { "macro", "keyword" }, { "UInt64", "type" }, + { "Int", "type" }, { "catch", "keyword" }, { "do", "keyword" }, + { "export", "keyword" }, { "false", "literal" }, { "Integer", "type" }, + { "else", "keyword" }, { "in", "keyword" }, { "break", "keyword" }, }, "#", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/kotlin.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/kotlin.cpp index 93ac8b2b2..fdf44550e 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/kotlin.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/kotlin.cpp @@ -27,43 +27,79 @@ SyntaxDefinition& addKotlin() { }, { - { "object", "keyword" }, { "case", "keyword" }, - { "sealed", "keyword" }, { "lateinit", "literal" }, - { "override", "keyword" }, { "false", "literal" }, - { "true", "literal" }, { "Double", "keyword2" }, - { "companion", "keyword" }, { "break", "keyword" }, - { "else", "keyword" }, { "Float", "keyword2" }, - { "try", "keyword" }, { "public", "keyword" }, - { "if", "keyword" }, { "String", "keyword2" }, - { "var", "keyword" }, { "import", "keyword" }, - { "synchronized", "keyword" }, { "package", "keyword" }, - { "Long", "keyword2" }, { "protected", "keyword" }, - { "val", "keyword" }, { "Short", "keyword2" }, - { "UByte", "keyword2" }, { "do", "keyword" }, - { "assert", "keyword" }, { "native", "keyword" }, - { "private", "keyword" }, { "UShortArray", "keyword2" }, - { "UInt", "keyword2" }, { "implements", "keyword" }, - { "extends", "keyword" }, { "catch", "keyword" }, - { "interface", "keyword" }, { "UByteArray", "keyword2" }, - { "IntArray", "keyword2" }, { "UIntArray", "keyword2" }, - { "ULong", "keyword2" }, { "null", "literal" }, - { "ShortArray", "keyword2" }, { "ByteArray", "keyword2" }, - { "for", "keyword" }, { "UShort", "keyword2" }, - { "Array", "keyword2" }, { "enum", "keyword" }, - { "elseif", "keyword" }, { "fun", "keyword" }, - { "final", "keyword" }, { "ULongArray", "keyword2" }, - { "then", "keyword" }, { "class", "keyword" }, - { "continue", "keyword" }, { "instanceof", "keyword" }, - { "while", "keyword" }, { "abstract", "keyword" }, - { "super", "keyword" }, { "return", "keyword" }, - { "Byte", "keyword2" }, { "LongArray", "keyword2" }, - { "goto", "keyword" }, { "Boolean", "keyword2" }, - { "throws", "keyword" }, { "throw", "keyword" }, - { "finally", "keyword" }, { "new", "keyword" }, - { "static", "keyword" }, { "switch", "keyword" }, - { "default", "keyword" }, { "transient", "keyword" }, - { "void", "keyword" }, { "volatile", "keyword" }, - { "Int", "keyword2" }, + { "object", "keyword" }, + { "case", "keyword" }, + { "sealed", "keyword" }, + { "lateinit", "literal" }, + { "override", "keyword" }, + { "false", "literal" }, + { "true", "literal" }, + { "Double", "type" }, + { "companion", "keyword" }, + { "break", "keyword" }, + { "else", "keyword" }, + { "Float", "type" }, + { "try", "keyword" }, + { "public", "keyword" }, + { "if", "keyword" }, + { "String", "type" }, + { "var", "keyword" }, + { "import", "keyword" }, + { "synchronized", "keyword" }, + { "package", "keyword" }, + { "Long", "type" }, + { "protected", "keyword" }, + { "val", "keyword" }, + { "Short", "type" }, + { "UByte", "type" }, + { "do", "keyword" }, + { "assert", "keyword" }, + { "native", "keyword" }, + { "private", "keyword" }, + { "UShortArray", "type" }, + { "UInt", "type" }, + { "implements", "keyword" }, + { "extends", "keyword" }, + { "catch", "keyword" }, + { "interface", "keyword" }, + { "UByteArray", "type" }, + { "IntArray", "type" }, + { "UIntArray", "type" }, + { "ULong", "type" }, + { "null", "literal" }, + { "ShortArray", "type" }, + { "ByteArray", "type" }, + { "for", "keyword" }, + { "UShort", "type" }, + { "Array", "type" }, + { "enum", "keyword" }, + { "elseif", "keyword" }, + { "fun", "keyword" }, + { "final", "keyword" }, + { "ULongArray", "type" }, + { "then", "keyword" }, + { "class", "keyword" }, + { "continue", "keyword" }, + { "instanceof", "keyword" }, + { "while", "keyword" }, + { "abstract", "keyword" }, + { "super", "keyword" }, + { "return", "keyword" }, + { "Byte", "type" }, + { "LongArray", "type" }, + { "goto", "keyword" }, + { "Boolean", "type" }, + { "throws", "keyword" }, + { "throw", "keyword" }, + { "finally", "keyword" }, + { "new", "keyword" }, + { "static", "keyword" }, + { "switch", "keyword" }, + { "default", "keyword" }, + { "transient", "keyword" }, + { "void", "keyword" }, + { "volatile", "keyword" }, + { "Int", "type" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/latex.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/latex.cpp index ee626e319..dddb90fcf 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/latex.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/latex.cpp @@ -16,7 +16,7 @@ SyntaxDefinition& addLatex() { { { "%$", "%$" }, "operator" }, { { "\\%[", "\\]" }, "operator" }, { { "{", "}" }, "keyword" }, - { { "\\%w*" }, "keyword2" }, + { { "\\%w*" }, "type" }, }, { diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lbstanza.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lbstanza.cpp index 55c305f2a..6cb86343a 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lbstanza.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lbstanza.cpp @@ -61,7 +61,7 @@ SyntaxDefinition& addLbstanza() { } }, { { "(?x) ^ \\s* (defpackage)", "\\s*$|:|(?=;)" }, - { "literal", "keyword2" }, + { "literal", "type" }, { "operator" }, "", SyntaxPatternMatchType::RegEx, @@ -74,7 +74,7 @@ SyntaxDefinition& addLbstanza() { } }, { { "(?x) ^ \\s* (import) (?= \\s )", "\\s*$|:|(?=;)" }, - { "literal", "keyword2" }, + { "literal", "type" }, { "operator" }, "", SyntaxPatternMatchType::RegEx, @@ -94,7 +94,7 @@ SyntaxDefinition& addLbstanza() { { { "(?x) ^ \\s* (?: (public|protected) \\s+ )? ( def ( struct | type | " "production | syntax ))", "(?x) $ | : | (?= ; ) " }, - { "literal", "keyword", "keyword2" }, + { "literal", "keyword", "type" }, { "operator" }, "", SyntaxPatternMatchType::RegEx, @@ -107,14 +107,14 @@ SyntaxDefinition& addLbstanza() { } }, { { "(?x) \\s* (new)", "\\s*$|:|(?=;)" }, - { "literal", "keyword2" }, + { "literal", "type" }, { "operator" }, "", SyntaxPatternMatchType::RegEx, { { { "[^ `\"'\t0-9~!%^*+-=/.:&|<>\\(\\{\\[][^ " "\t,.:&|<>\\[\\]\\{\\}\\(\\)\\*]*" }, - "keyword2", + "type", "", SyntaxPatternMatchType::RegEx }, @@ -123,7 +123,7 @@ SyntaxDefinition& addLbstanza() { "defn|defmethod|defmulti ) \\*? \\s+ ([^ " "`\"'\t0-9~!%^*+-=/.:&|<>\\(\\{\\[][^ \t,.:&|<>\\[\\]\\{\\}\\(\\)\\*]*) (?= " "\\s | < )" }, - { "literal", "keyword", "keyword", "keyword2", "function" }, + { "literal", "keyword", "keyword", "type", "function" }, {}, "", SyntaxPatternMatchType::RegEx }, @@ -151,7 +151,7 @@ SyntaxDefinition& addLbstanza() { "\\s*", "(?x) (?= , | \\) | \\] | \\} | $ ) | \\s+ (?! -> | \\.\\.\\. | \\| | \\& " ")" }, - { "literal", "keyword2", "keyword", "normal", "operator" }, + { "literal", "type", "keyword", "normal", "operator" }, {}, "", SyntaxPatternMatchType::RegEx, @@ -164,7 +164,7 @@ SyntaxDefinition& addLbstanza() { } }, { { "(?x) \\s* (var|val|defrule) \\s+", "(?x) ( = | (?=\\)) ) (?! > ) " }, - { "literal", "keyword2", "normal" }, + { "literal", "type", "normal" }, { "literal", "operator" }, "", SyntaxPatternMatchType::RegEx, @@ -182,7 +182,7 @@ SyntaxDefinition& addLbstanza() { } }, { { "(?x) \\s* label(?=[ <])", ":" }, - { "keyword2" }, + { "type" }, { "operator" }, "", SyntaxPatternMatchType::RegEx, @@ -271,7 +271,7 @@ SyntaxDefinition& addLbstanza() { { { "(?x) ^(\\s*)(?:(public|protected)\\s+)? " "(lostanza|extern)(?![\\w\\-])(?=.*(?:=|:)$)", "^(?!\\1\\s+|\\n)" }, - { "function", "function", "keyword", "keyword2" }, + { "function", "function", "keyword", "type" }, {}, "", SyntaxPatternMatchType::RegEx, @@ -289,13 +289,13 @@ SyntaxDefinition& addLbstanza() { } }, { { "(lostanza)\\s+(deftype)\\s+(\\S+)\\s+" }, - { "keyword2", "function", "keyword2", "keyword2" }, + { "type", "function", "type", "type" }, {}, "", SyntaxPatternMatchType::RegEx }, { { "(?x)(lostanza)\\s+(?: (val|var)\\s+\\S+\\s*:| (defn)\\s+(\\S+)\\s+\\()", "$" }, - { "normal", "function", "keyword2", "keyword2", "function" }, + { "normal", "function", "type", "type", "function" }, {}, "", SyntaxPatternMatchType::RegEx, @@ -313,7 +313,7 @@ SyntaxDefinition& addLbstanza() { } }, { { "\\s*(extern)\\s+(\\S+)\\s*(:)", "$" }, - { "keyword", "keyword2", "normal", "operator" }, + { "keyword", "type", "normal", "operator" }, {}, "", SyntaxPatternMatchType::RegEx, @@ -358,8 +358,8 @@ SyntaxDefinition& addLbstanza() { "", SyntaxPatternMatchType::RegEx }, { { "(\\\\<)(.+?)(>)", "(<)(\\2)(>)" }, - { "operator", "operator", "keyword2", "operator" }, - { "operator", "operator", "keyword2", "operator" }, + { "operator", "operator", "type", "operator" }, + { "operator", "operator", "type", "operator" }, "", SyntaxPatternMatchType::RegEx }, { { "(?<=\\s|\\()\\[", "\\]" }, @@ -377,7 +377,7 @@ SyntaxDefinition& addLbstanza() { } }, { { "(?x) (?<= \\S : \\s* ) ([^ `\"'\t0-9~!%^*+-=/.:&|<>\\(\\{\\[][^ " "\t,.:&|<>\\[\\]\\{\\}\\(\\)\\*]*)" }, - "keyword2", + "type", "", SyntaxPatternMatchType::RegEx }, { { "(?x) \\s* ([^ `\"'\t0-9~!%^*+-=/.:&|<>\\(\\{\\[][^ " @@ -408,7 +408,7 @@ SyntaxDefinition& addLbstanza() { "", SyntaxPatternMatchType::RegEx }, { { "(ptr|ref)(\\<)", "(?" }, - { "keyword2", "keyword", "operator" }, + { "type", "keyword", "operator" }, { "operator" }, "", SyntaxPatternMatchType::RegEx, @@ -427,7 +427,7 @@ SyntaxDefinition& addLbstanza() { } }, { { "\\baddr!?(?=\\(|\\{)" }, "function", "", SyntaxPatternMatchType::RegEx }, { { "(?\\(\\{\\[][^ \t,.:&|<>\\[\\]\\{\\}\\(\\)\\*]*" }, - "keyword2", + "type", "", SyntaxPatternMatchType::RegEx }, { { "(?x) Void | Equalable | Comparable | Hashable | Lengthable | Seq(?:able)? | " @@ -456,7 +456,7 @@ SyntaxDefinition& addLbstanza() { "(?:String|Gen)?Symbol | Maybe | One | None | Exception | Coroutine | Vector " "| Timer | Liveness(?:Tracker|Marker) | Queue | Table | HashTable | " "(?:Splice|Nested|Plural|Choice)Template" }, - "keyword2", + "type", "", SyntaxPatternMatchType::RegEx }, { { "(?x) (?" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lisp.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lisp.cpp index 2560858a9..1d1481670 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lisp.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lisp.cpp @@ -17,9 +17,9 @@ SyntaxDefinition& addLisp() { { { "#o[0-7]+" }, "number" }, { { "#b[01]+" }, "number" }, { { "-?%d+[%d%.eE]*f?" }, "number" }, - { { "%(%s*([%a_][%w_-]*)%s+([%a_][%w_-]*)" }, { "operator", "symbol", "keyword2" } }, - { { "'([%a_][%w_-]*)" }, { "operator", "keyword2", "symbol" } }, - { { ":([%a_][%w_-]*)" }, { "operator", "keyword3", "symbol" } }, + { { "%(%s*([%a_][%w_-]*)%s+([%a_][%w_-]*)" }, { "operator", "symbol", "type" } }, + { { "'([%a_][%w_-]*)" }, { "operator", "type", "symbol" } }, + { { ":([%a_][%w_-]*)" }, { "operator", "parameter", "symbol" } }, { { "[%<%>%=%*%/%+%-%`%@%%%(%)]" }, "operator" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lobster.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lobster.cpp index ab50d71f6..9589a8ca0 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lobster.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/lobster.cpp @@ -12,9 +12,9 @@ SyntaxDefinition& addLobster() { { { { "//.-\n" }, "comment" }, { { "/%*", "%*/" }, "comment" }, - { { "(struct%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(class%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "[%w_]+%s*%f[{]" }, "keyword2" }, + { { "(struct%s)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(class%s)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "[%w_]+%s*%f[{]" }, "type" }, { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, { { "\"\"\"", "\"\"\"" }, "string" }, @@ -27,28 +27,50 @@ SyntaxDefinition& addLobster() { }, { - { "int", "keyword2" }, { "and", "keyword" }, - { "private", "keyword" }, { "default", "keyword" }, - { "abstract", "keyword" }, { "static_frame", "keyword" }, - { "switch", "keyword" }, { "guard", "keyword" }, - { "pakfile", "keyword" }, { "attribute", "keyword" }, - { "return", "keyword" }, { "var", "keyword" }, - { "import", "keyword" }, { "class", "keyword" }, - { "namespace", "keyword" }, { "void", "keyword2" }, - { "static", "keyword" }, { "any", "keyword2" }, - { "typeof", "keyword" }, { "enum_flags", "keyword" }, - { "super", "keyword" }, { "member", "keyword" }, - { "for", "keyword" }, { "while", "keyword" }, - { "from", "keyword" }, { "member_frame", "keyword" }, - { "def", "keyword" }, { "else", "keyword" }, - { "constructor", "keyword" }, { "enum", "keyword" }, - { "operator", "keyword" }, { "nil", "literal" }, - { "not", "keyword" }, { "float", "keyword2" }, - { "struct", "keyword" }, { "is", "keyword" }, - { "fn", "keyword" }, { "string", "keyword2" }, - { "or", "keyword" }, { "case", "keyword" }, - { "if", "keyword" }, { "resource", "keyword" }, - { "let", "keyword" }, { "program", "keyword" }, + { "int", "type" }, + { "and", "keyword" }, + { "private", "keyword" }, + { "default", "keyword" }, + { "abstract", "keyword" }, + { "static_frame", "keyword" }, + { "switch", "keyword" }, + { "guard", "keyword" }, + { "pakfile", "keyword" }, + { "attribute", "keyword" }, + { "return", "keyword" }, + { "var", "keyword" }, + { "import", "keyword" }, + { "class", "keyword" }, + { "namespace", "keyword" }, + { "void", "type" }, + { "static", "keyword" }, + { "any", "type" }, + { "typeof", "keyword" }, + { "enum_flags", "keyword" }, + { "super", "keyword" }, + { "member", "keyword" }, + { "for", "keyword" }, + { "while", "keyword" }, + { "from", "keyword" }, + { "member_frame", "keyword" }, + { "def", "keyword" }, + { "else", "keyword" }, + { "constructor", "keyword" }, + { "enum", "keyword" }, + { "operator", "keyword" }, + { "nil", "literal" }, + { "not", "keyword" }, + { "float", "type" }, + { "struct", "keyword" }, + { "is", "keyword" }, + { "fn", "keyword" }, + { "string", "type" }, + { "or", "keyword" }, + { "case", "keyword" }, + { "if", "keyword" }, + { "resource", "keyword" }, + { "let", "keyword" }, + { "program", "keyword" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/makefile.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/makefile.cpp index a17ce6918..56cae53b2 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/makefile.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/makefile.cpp @@ -12,10 +12,10 @@ SyntaxDefinition& addMakefile() { { { { "#.*\n" }, "comment" }, { { "[[.]]}" }, "normal" }, - { { "$[@^<%%?+|*]" }, "keyword2" }, + { { "$[@^<%%?+|*]" }, "type" }, { { "$%(", "%)" }, "keyword" }, { { "%f[%w_][%d%.]+%f[^%w_]" }, "number" }, - { { "%..*:" }, "keyword2" }, + { { "%..*:" }, "type" }, { { ".*:=" }, "function" }, { { ".*+=" }, "function" }, { { ".*%s=" }, "function" }, @@ -81,76 +81,76 @@ SyntaxDefinition& addMakefile() { { "shell", "function" }, { "value", "function" }, - { ".DEFAULT_GOAL", "keyword2" }, - { ".FEATURES", "keyword2" }, - { ".INCLUDE_DIRS", "keyword2" }, - { ".LIBPATTERNS", "keyword2" }, - { ".LOADED", "keyword2" }, - { ".RECIPEPREFIX", "keyword2" }, - { ".SHELLFLAGS", "keyword2" }, - { ".SHELLSTATUS", "keyword2" }, - { ".VARIABLES", "keyword2" }, - { "COMSPEC", "keyword2" }, - { "MAKESHELL", "keyword2" }, - { "SHELL", "keyword2" }, - { "GPATH", "keyword2" }, - { "VPATH", "keyword2" }, - { "MAKE", "keyword2" }, - { "MAKECMDGOALS", "keyword2" }, - { "MAKEFILES", "keyword2" }, - { "MAKEFILE_LIST", "keyword2" }, - { "MAKEFLAGS", "keyword2" }, - { "MAKELEVEL", "keyword2" }, - { "MAKEOVERRIDES", "keyword2" }, - { "MAKE_RESTARTS", "keyword2" }, - { "MAKE_TERMERR", "keyword2" }, - { "MAKE_TERMOUT", "keyword2" }, - { "MFLAGS", "keyword2" }, - { "CURDIR", "keyword2" }, - { "OUTPUT_OPTION", "keyword2" }, - { "SUFFIXES", "keyword2" }, - { "AR", "keyword2" }, - { "ARFLAGS", "keyword2" }, - { "AS", "keyword2" }, - { "ASFLAGS", "keyword2" }, - { "CC", "keyword2" }, - { "CFLAGS", "keyword2" }, - { "CO", "keyword2" }, - { "COFLAGS", "keyword2" }, - { "CPP", "keyword2" }, - { "CPPFLAGS", "keyword2" }, - { "CTANGLE", "keyword2" }, - { "CWEAVE", "keyword2" }, - { "CXX", "keyword2" }, - { "CXXFLAGS", "keyword2" }, - { "FC", "keyword2" }, - { "FFLAGS", "keyword2" }, - { "GET", "keyword2" }, - { "GFLAGS", "keyword2" }, - { "LDFLAGS", "keyword2" }, - { "LDLIBS", "keyword2" }, - { "LEX", "keyword2" }, - { "LFLAGS", "keyword2" }, - { "LINT", "keyword2" }, - { "LINTFLAGS", "keyword2" }, - { "M2C", "keyword2" }, - { "MAKEINFO", "keyword2" }, - { "PC", "keyword2" }, - { "PFLAGS", "keyword2" }, - { "RFLAGS", "keyword2" }, - { "RM", "keyword2" }, - { "TANGLE", "keyword2" }, - { "TEX", "keyword2" }, - { "TEXI2DVI", "keyword2" }, - { "WEAVE", "keyword2" }, - { "YACC", "keyword2" }, - { "YFLAGS", "keyword2" }, - { "bindir", "keyword2" }, - { "DESTDIR", "keyword2" }, - { "exec_prefix", "keyword2" }, - { "libexecdir", "keyword2" }, - { "prefix", "keyword2" }, - { "sbindir", "keyword2" }, + { ".DEFAULT_GOAL", "type" }, + { ".FEATURES", "type" }, + { ".INCLUDE_DIRS", "type" }, + { ".LIBPATTERNS", "type" }, + { ".LOADED", "type" }, + { ".RECIPEPREFIX", "type" }, + { ".SHELLFLAGS", "type" }, + { ".SHELLSTATUS", "type" }, + { ".VARIABLES", "type" }, + { "COMSPEC", "type" }, + { "MAKESHELL", "type" }, + { "SHELL", "type" }, + { "GPATH", "type" }, + { "VPATH", "type" }, + { "MAKE", "type" }, + { "MAKECMDGOALS", "type" }, + { "MAKEFILES", "type" }, + { "MAKEFILE_LIST", "type" }, + { "MAKEFLAGS", "type" }, + { "MAKELEVEL", "type" }, + { "MAKEOVERRIDES", "type" }, + { "MAKE_RESTARTS", "type" }, + { "MAKE_TERMERR", "type" }, + { "MAKE_TERMOUT", "type" }, + { "MFLAGS", "type" }, + { "CURDIR", "type" }, + { "OUTPUT_OPTION", "type" }, + { "SUFFIXES", "type" }, + { "AR", "type" }, + { "ARFLAGS", "type" }, + { "AS", "type" }, + { "ASFLAGS", "type" }, + { "CC", "type" }, + { "CFLAGS", "type" }, + { "CO", "type" }, + { "COFLAGS", "type" }, + { "CPP", "type" }, + { "CPPFLAGS", "type" }, + { "CTANGLE", "type" }, + { "CWEAVE", "type" }, + { "CXX", "type" }, + { "CXXFLAGS", "type" }, + { "FC", "type" }, + { "FFLAGS", "type" }, + { "GET", "type" }, + { "GFLAGS", "type" }, + { "LDFLAGS", "type" }, + { "LDLIBS", "type" }, + { "LEX", "type" }, + { "LFLAGS", "type" }, + { "LINT", "type" }, + { "LINTFLAGS", "type" }, + { "M2C", "type" }, + { "MAKEINFO", "type" }, + { "PC", "type" }, + { "PFLAGS", "type" }, + { "RFLAGS", "type" }, + { "RM", "type" }, + { "TANGLE", "type" }, + { "TEX", "type" }, + { "TEXI2DVI", "type" }, + { "WEAVE", "type" }, + { "YACC", "type" }, + { "YFLAGS", "type" }, + { "bindir", "type" }, + { "DESTDIR", "type" }, + { "exec_prefix", "type" }, + { "libexecdir", "type" }, + { "prefix", "type" }, + { "sbindir", "type" }, { "DEFAULT", "literal" }, { "DELETE_ON_ERROR", "literal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp index ac20c5228..9b510c17f 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula2.cpp @@ -83,12 +83,12 @@ SyntaxDefinition& addModula2() { { "ROUND", "function" }, { "SIZE", "function" }, { "TSIZE", "function" }, - { "BITSET", "keyword2" }, - { "BOOLEAN", "keyword2" }, - { "CARDINAL", "keyword2" }, - { "CHAR", "keyword2" }, - { "INTEGER", "keyword2" }, - { "REAL", "keyword2" }, + { "BITSET", "type" }, + { "BOOLEAN", "type" }, + { "CARDINAL", "type" }, + { "CHAR", "type" }, + { "INTEGER", "type" }, + { "REAL", "type" }, { "TRUE", "literal" }, { "FALSE", "literal" }, { "NIL", "literal" }, @@ -99,7 +99,6 @@ SyntaxDefinition& addModula2() { {} } ); - } }}}} // namespace EE::UI::Doc::Language diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp index e7c462672..6f9d51274 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/modula3.cpp @@ -66,12 +66,12 @@ SyntaxDefinition& addModula3() { { "REFANY", "function" }, { "TYPECODE", "function" }, { "DISPOSE", "function" }, { "INC", "function" }, { "LOOPHOLE", "function" }, { "VAL", "function" }, - { "BITSET", "keyword2" }, { "BOOLEAN", "keyword2" }, - { "CARDINAL", "keyword2" }, { "CHAR", "keyword2" }, - { "INTEGER", "keyword2" }, { "REAL", "keyword2" }, - { "FLOAT", "keyword2" }, { "LONGINT", "keyword2" }, - { "LONGREAL", "keyword2" }, { "BOOLEAN", "keyword2" }, - { "WIDECHAR", "keyword2" }, { "TRUE", "literal" }, + { "BITSET", "type" }, { "BOOLEAN", "type" }, + { "CARDINAL", "type" }, { "CHAR", "type" }, + { "INTEGER", "type" }, { "REAL", "type" }, + { "FLOAT", "type" }, { "LONGINT", "type" }, + { "LONGREAL", "type" }, { "BOOLEAN", "type" }, + { "WIDECHAR", "type" }, { "TRUE", "literal" }, { "FALSE", "literal" }, { "NIL", "literal" }, { "NULL", "literal" } diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/moonscript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/moonscript.cpp index 0a9b8cc04..52018d113 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/moonscript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/moonscript.cpp @@ -17,15 +17,15 @@ SyntaxDefinition& addMoonscript() { { { "-?0x%x+" }, "number" }, { { "-?%d+[%d%.eE]*" }, "number" }, { { "-?%.?%d+" }, "number" }, - { { "%.%.%.?" }, "keyword2" }, - { { "[<>~=]=" }, "keyword2" }, - { { "[%+%-=/%*%^%%#<>]" }, "keyword2" }, + { { "%.%.%.?" }, "type" }, + { { "[<>~=]=" }, "type" }, + { { "[%+%-=/%*%^%%#<>]" }, "type" }, { { "[%a_][%w_]*%s*%f[(\"{]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, { { "\\", "[%a_][%w_]*" }, "function" }, { { "%.", "[%a_][%w_]*" }, "function" }, - { { "@", "[%a_][%w_]*" }, "keyword2" }, - { { "!" }, "keyword2" }, + { { "@", "[%a_][%w_]*" }, "type" }, + { { "!" }, "type" }, { { "[%p]" }, "keyword" }, }, @@ -34,11 +34,11 @@ SyntaxDefinition& addMoonscript() { { "and", "keyword" }, { "continue", "keyword" }, { "unless", "keyword" }, { "switch", "keyword" }, { "using", "keyword" }, { "return", "keyword" }, { "import", "keyword" }, { "as", "keyword" }, { "class", "keyword" }, - { "super", "keyword2" }, { "extends", "keyword" }, { "with", "keyword" }, + { "super", "type" }, { "extends", "keyword" }, { "with", "keyword" }, { "false", "literal" }, { "for", "keyword" }, { "while", "keyword" }, - { "from", "keyword" }, { "self", "keyword2" }, { "true", "literal" }, + { "from", "keyword" }, { "self", "type" }, { "true", "literal" }, { "else", "keyword" }, { "nil", "literal" }, { "not", "keyword" }, - { "when", "keyword" }, { "break", "keyword" }, { "#", "keyword2" }, + { "when", "keyword" }, { "break", "keyword" }, { "#", "type" }, { "or", "keyword" }, { "if", "keyword" }, { "export", "keyword" }, { "->", "keyword" }, { "do", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nelua.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nelua.cpp index 1b9a4bf32..949cf40b7 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nelua.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nelua.cpp @@ -32,59 +32,46 @@ SyntaxDefinition& addNelua() { { { "%.?%d+" }, "number" }, { { "%.%.%.?" }, "operator" }, { { "[<>~=]=" }, "operator" }, - { { "_[iunbf][s1368][246i]?[8z]?[e]?" }, "keyword2" }, + { { "_[iunbf][s1368][246i]?[8z]?[e]?" }, "type" }, { { "[%+%-=/%*%^%%#<>]" }, "operator" }, { { "([%a_][%w_]*)(%s*%f[(\"'{])" }, { "function", "function", "normal" } }, - { { "(@)(enum)" }, { "normal", "keyword", "keyword2" } }, - { { "(@)(record)" }, { "normal", "keyword", "keyword2" } }, - { { "(@)(union)" }, { "normal", "keyword", "keyword2" } }, - { { "%((@)(%w+)%)" }, { "normal", "keyword", "keyword2" } }, + { { "(@)(enum)" }, { "normal", "keyword", "type" } }, + { { "(@)(record)" }, { "normal", "keyword", "type" } }, + { { "(@)(union)" }, { "normal", "keyword", "type" } }, + { { "%((@)(%w+)%)" }, { "normal", "keyword", "type" } }, { { "[%a_][%w_]*" }, "symbol" }, { { "::[%a_][%w_]*::" }, "function" }, }, { - { "isize", "keyword2" }, { "break", "keyword" }, - { "else", "keyword" }, { "in", "keyword" }, - { "number", "keyword2" }, { "byte", "keyword2" }, - { "boolean", "keyword2" }, { "culonglong", "keyword2" }, - { "false", "literal" }, { "or", "keyword" }, - { "culong", "keyword2" }, { "clongdouble", "keyword2" }, - { "clonglong", "keyword2" }, { "cshort", "keyword2" }, - { "cemit", "keyword2" }, { "global", "keyword" }, - { "cemitdecl", "keyword2" }, { "nodecl", "keyword2" }, - { "integer", "keyword2" }, { "cuchar", "keyword2" }, - { "cint", "keyword2" }, { "cimport", "keyword2" }, - { "for", "keyword" }, { "cemitdefn", "keyword2" }, - { "defer", "keyword" }, { "codename", "keyword2" }, - { "int8", "keyword2" }, { "goto", "keyword" }, - { "true", "literal" }, { "usize", "keyword2" }, - { "niltype", "keyword2" }, { "uint8", "keyword2" }, - { "inline", "literal" }, { "while", "keyword" }, - { "uint32", "keyword2" }, { "auto", "keyword2" }, - { "then", "keyword" }, { "self", "keyword2" }, - { "void", "keyword2" }, { "function", "keyword" }, - { "string", "keyword2" }, { "float128", "keyword2" }, - { "and", "keyword" }, { "case", "keyword" }, - { "float32", "keyword2" }, { "float64", "keyword2" }, - { "int64", "keyword2" }, { "uint16", "keyword2" }, - { "noinit", "literal" }, { "volatile", "literal" }, - { "int16", "keyword2" }, { "comptime", "literal" }, - { "uint128", "keyword2" }, { "uint64", "keyword2" }, - { "int32", "keyword2" }, { "repeat", "keyword" }, - { "continue", "keyword" }, { "not", "keyword" }, - { "cexport", "keyword2" }, { "cptrdiff", "keyword2" }, - { "nil", "literal" }, { "cstring", "keyword2" }, - { "end", "keyword" }, { "nilptr", "keyword" }, - { "clong", "keyword2" }, { "switch", "keyword" }, - { "cchar", "keyword2" }, { "cuint", "keyword2" }, - { "pointer", "keyword2" }, { "int128", "keyword2" }, - { "return", "keyword" }, { "elseif", "keyword" }, - { "uinteger", "keyword2" }, { "csize", "keyword2" }, - { "if", "keyword" }, { "const", "literal" }, - { "local", "keyword" }, { "cushort", "keyword2" }, - { "do", "keyword" }, { "until", "keyword" }, - { "cschar", "keyword2" }, { "cinclude", "keyword2" }, + { "isize", "type" }, { "break", "keyword" }, { "else", "keyword" }, + { "in", "keyword" }, { "number", "type" }, { "byte", "type" }, + { "boolean", "type" }, { "culonglong", "type" }, { "false", "literal" }, + { "or", "keyword" }, { "culong", "type" }, { "clongdouble", "type" }, + { "clonglong", "type" }, { "cshort", "type" }, { "cemit", "type" }, + { "global", "keyword" }, { "cemitdecl", "type" }, { "nodecl", "type" }, + { "integer", "type" }, { "cuchar", "type" }, { "cint", "type" }, + { "cimport", "type" }, { "for", "keyword" }, { "cemitdefn", "type" }, + { "defer", "keyword" }, { "codename", "type" }, { "int8", "type" }, + { "goto", "keyword" }, { "true", "literal" }, { "usize", "type" }, + { "niltype", "type" }, { "uint8", "type" }, { "inline", "literal" }, + { "while", "keyword" }, { "uint32", "type" }, { "auto", "type" }, + { "then", "keyword" }, { "self", "type" }, { "void", "type" }, + { "function", "keyword" }, { "string", "type" }, { "float128", "type" }, + { "and", "keyword" }, { "case", "keyword" }, { "float32", "type" }, + { "float64", "type" }, { "int64", "type" }, { "uint16", "type" }, + { "noinit", "literal" }, { "volatile", "literal" }, { "int16", "type" }, + { "comptime", "literal" }, { "uint128", "type" }, { "uint64", "type" }, + { "int32", "type" }, { "repeat", "keyword" }, { "continue", "keyword" }, + { "not", "keyword" }, { "cexport", "type" }, { "cptrdiff", "type" }, + { "nil", "literal" }, { "cstring", "type" }, { "end", "keyword" }, + { "nilptr", "keyword" }, { "clong", "type" }, { "switch", "keyword" }, + { "cchar", "type" }, { "cuint", "type" }, { "pointer", "type" }, + { "int128", "type" }, { "return", "keyword" }, { "elseif", "keyword" }, + { "uinteger", "type" }, { "csize", "type" }, { "if", "keyword" }, + { "const", "literal" }, { "local", "keyword" }, { "cushort", "type" }, + { "do", "keyword" }, { "until", "keyword" }, { "cschar", "type" }, + { "cinclude", "type" }, }, "--", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nim.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nim.cpp index 8d33eafaa..42c534882 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nim.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/nim.cpp @@ -52,15 +52,15 @@ SyntaxDefinition& addNim() { }; for ( const auto& keyword : nim_standard_types ) - nim_symbols[keyword] = "keyword2"; + nim_symbols[keyword] = "type"; const std::vector nim_standard_generic_types{ "range", "array", "open[aA]rray", "varargs", "seq", "set", "sink", "lent", "owned", }; for ( const auto& type : nim_standard_generic_types ) { - nim_patterns.push_back( { { type + "%f[%[]" }, "keyword2" } ); - nim_patterns.push_back( { { type + "+%f[%w]" }, "keyword2" } ); + nim_patterns.push_back( { { type + "%f[%[]" }, "type" } ); + nim_patterns.push_back( { { type + "+%f[%w]" }, "type" } ); } const std::vector nim_user_patterns{ @@ -70,7 +70,7 @@ SyntaxDefinition& addNim() { { { "\"\"\"", "\"\"\"[^\"]" }, "string" }, { { "'", "'", "\\" }, "literal" }, { { "[a-zA-Z][a-zA-Z0-9_]*%f[(]" }, "function" }, - { { "[A-Z][a-zA-Z0-9_]*" }, "keyword2" }, + { { "[A-Z][a-zA-Z0-9_]*" }, "type" }, { { "[a-zA-Z][a-zA-Z0-9_]*" }, "symbol" }, { { "%.%f[^.]" }, "normal" }, { { ":%f[ ]" }, "normal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.cpp index 7e85af90c..7282e1788 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.cpp @@ -27,70 +27,38 @@ SyntaxDefinition& addObjeck() { }, { - { "As", "keyword" }, - { "BaseArrayRef", "keyword2" }, - { "Bool", "keyword2" }, - { "BoolArrayRef", "keyword2" }, - { "BoolRef", "keyword2" }, - { "Byte", "keyword2" }, - { "ByteArrayRef", "keyword2" }, - { "ByteRef", "keyword2" }, - { "Char", "keyword2" }, - { "CharArrayRef", "keyword2" }, - { "CharRef", "keyword2" }, - { "Float", "keyword2" }, - { "FloatArrayRef", "keyword2" }, - { "FloatRef", "keyword2" }, - { "Func2Ref", "keyword2" }, - { "Func3Ref", "keyword2" }, - { "Func4Ref", "keyword2" }, - { "FuncRef", "keyword2" }, - { "Int", "keyword2" }, - { "IntArrayRef", "keyword2" }, - { "IntRef", "keyword2" }, - { "New", "keyword" }, - { "Nil", "keyword2" }, - { "Parent", "keyword" }, - { "String", "keyword2" }, - { "StringArrayRef", "keyword2" }, - { "abstract", "keyword" }, - { "alias", "keyword" }, - { "and", "keyword" }, - { "break", "keyword" }, - { "bundle", "keyword" }, - { "class", "keyword" }, - { "consts", "keyword" }, - { "continue", "keyword" }, - { "critical", "keyword" }, - { "do", "keyword" }, - { "each", "keyword" }, - { "else", "keyword" }, - { "enum", "keyword" }, - { "false", "literal" }, - { "for", "keyword" }, - { "from", "keyword" }, - { "function", "keyword" }, - { "if", "keyword" }, - { "implements", "keyword" }, - { "in", "keyword" }, - { "interface", "keyword" }, - { "label", "keyword" }, - { "leaving", "keyword" }, - { "method", "keyword" }, - { "native", "keyword" }, - { "not", "keyword" }, - { "or", "keyword" }, - { "other", "keyword" }, - { "private", "keyword" }, - { "public", "keyword" }, - { "return", "keyword" }, - { "reverse", "keyword" }, - { "select", "keyword" }, - { "static", "keyword" }, - { "true", "literal" }, - { "use", "keyword" }, - { "virtual", "keyword" }, - { "while", "keyword" }, + { "As", "keyword" }, { "BaseArrayRef", "type" }, + { "Bool", "type" }, { "BoolArrayRef", "type" }, + { "BoolRef", "type" }, { "Byte", "type" }, + { "ByteArrayRef", "type" }, { "ByteRef", "type" }, + { "Char", "type" }, { "CharArrayRef", "type" }, + { "CharRef", "type" }, { "Float", "type" }, + { "FloatArrayRef", "type" }, { "FloatRef", "type" }, + { "Func2Ref", "type" }, { "Func3Ref", "type" }, + { "Func4Ref", "type" }, { "FuncRef", "type" }, + { "Int", "type" }, { "IntArrayRef", "type" }, + { "IntRef", "type" }, { "New", "keyword" }, + { "Nil", "type" }, { "Parent", "keyword" }, + { "String", "type" }, { "StringArrayRef", "type" }, + { "abstract", "keyword" }, { "alias", "keyword" }, + { "and", "keyword" }, { "break", "keyword" }, + { "bundle", "keyword" }, { "class", "keyword" }, + { "consts", "keyword" }, { "continue", "keyword" }, + { "critical", "keyword" }, { "do", "keyword" }, + { "each", "keyword" }, { "else", "keyword" }, + { "enum", "keyword" }, { "false", "literal" }, + { "for", "keyword" }, { "from", "keyword" }, + { "function", "keyword" }, { "if", "keyword" }, + { "implements", "keyword" }, { "in", "keyword" }, + { "interface", "keyword" }, { "label", "keyword" }, + { "leaving", "keyword" }, { "method", "keyword" }, + { "native", "keyword" }, { "not", "keyword" }, + { "or", "keyword" }, { "other", "keyword" }, + { "private", "keyword" }, { "public", "keyword" }, + { "return", "keyword" }, { "reverse", "keyword" }, + { "select", "keyword" }, { "static", "keyword" }, + { "true", "literal" }, { "use", "keyword" }, + { "virtual", "keyword" }, { "while", "keyword" }, { "xor", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.hpp index 7a9380242..d1440b0ed 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objeck.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addObjeck(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objective-c.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objective-c.cpp index f772b2715..115c10a26 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objective-c.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/objective-c.cpp @@ -20,23 +20,23 @@ SyntaxDefinition& addObjectiveC() { { { "-?%.?%d+f?" }, "number" }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "@[%a_][%w_]*" }, "keyword2" }, + { { "@[%a_][%w_]*" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "elseif", "keyword" }, { "int", "keyword2" }, { "then", "keyword" }, - { "unsigned", "keyword2" }, { "continue", "keyword" }, { "default", "keyword" }, - { "volatile", "keyword" }, { "switch", "keyword" }, { "char", "keyword2" }, - { "double", "keyword2" }, { "auto", "keyword" }, { "bool", "keyword2" }, - { "return", "keyword" }, { "extern", "keyword" }, { "NULL", "literal" }, - { "long", "keyword2" }, { "void", "keyword" }, { "union", "keyword" }, - { "short", "keyword2" }, { "static", "keyword" }, { "inline", "keyword" }, - { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, - { "while", "keyword" }, { "const", "keyword" }, { "typedef", "keyword" }, - { "true", "literal" }, { "else", "keyword" }, { "enum", "keyword" }, - { "nil", "literal" }, { "float", "keyword2" }, { "struct", "keyword" }, - { "break", "keyword" }, { "case", "keyword" }, { "if", "keyword" }, + { "elseif", "keyword" }, { "int", "type" }, { "then", "keyword" }, + { "unsigned", "type" }, { "continue", "keyword" }, { "default", "keyword" }, + { "volatile", "keyword" }, { "switch", "keyword" }, { "char", "type" }, + { "double", "type" }, { "auto", "keyword" }, { "bool", "type" }, + { "return", "keyword" }, { "extern", "keyword" }, { "NULL", "literal" }, + { "long", "type" }, { "void", "keyword" }, { "union", "keyword" }, + { "short", "type" }, { "static", "keyword" }, { "inline", "keyword" }, + { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, + { "while", "keyword" }, { "const", "keyword" }, { "typedef", "keyword" }, + { "true", "literal" }, { "else", "keyword" }, { "enum", "keyword" }, + { "nil", "literal" }, { "float", "type" }, { "struct", "keyword" }, + { "break", "keyword" }, { "case", "keyword" }, { "if", "keyword" }, { "do", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp index 1b853efb2..712df713a 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp @@ -46,10 +46,10 @@ SyntaxDefinition& addOCaml() { { "struct", "keyword" }, { "to", "keyword" }, { "true", "literal" }, { "try", "keyword" }, { "type", "keyword" }, { "val", "keyword" }, { "virtual", "keyword" }, { "when", "keyword" }, { "while", "keyword" }, - { "with", "keyword" }, { "float", "keyword2" }, { "bool", "keyword2" }, - { "int", "keyword2" }, { "char", "keyword2" }, { "string", "keyword2" }, - { "bytes", "keyword2" }, { "unit", "keyword2" }, { "array", "keyword3" }, - { "list", "keyword3" }, { "option", "keyword3" }, { "result", "keyword3" }, + { "with", "keyword" }, { "float", "type" }, { "bool", "type" }, + { "int", "type" }, { "char", "type" }, { "string", "type" }, + { "bytes", "type" }, { "unit", "type" }, { "array", "parameter" }, + { "list", "parameter" }, { "option", "parameter" }, { "result", "parameter" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/odin.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/odin.cpp index 781133df0..e90e5d12c 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/odin.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/odin.cpp @@ -16,7 +16,7 @@ SyntaxDefinition& addOdin() { { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, { { "`", "`" }, "string" }, - { { "(package)%s+(.-)\n" }, { "normal", "keyword", "keyword2" } }, + { { "(package)%s+(.-)\n" }, { "normal", "keyword", "type" } }, { { "0b[01_]+" }, "number" }, { { "0o[0-7_]+" }, "number" }, { { "0[dz][%d_]+" }, "number" }, @@ -27,142 +27,142 @@ SyntaxDefinition& addOdin() { { { "([%a_][%w_]*)%s+(%:%:)%s+(proc)%f[%(]" }, { "normal", "function", "operator", "function" } }, { { "([%a_][%w_]*)%s+(%:%:)%s+(union)%f[%(]" }, - { "normal", "keyword2", "operator", "keyword" } }, + { "normal", "type", "operator", "keyword" } }, { { "([%a_][%w_]*)%s+(%:%:)%s+(struct)%f[%(]" }, - { "normal", "keyword2", "operator", "keyword" } }, + { "normal", "type", "operator", "keyword" } }, { { "[%+%-=/%*%^%%<>!~|&:%?]" }, "operator" }, { { "%$[%a_][%w_]*" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "[#@][%a_][%w_]*" }, "keyword2" }, - { { "[#@]%b()" }, "keyword2" }, + { { "[#@][%a_][%w_]*" }, "type" }, + { { "[#@]%b()" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "int", "keyword2" }, - { "i32le", "keyword2" }, + { "int", "type" }, + { "i32le", "type" }, { "bit_set", "keyword" }, - { "len", "keyword2" }, + { "len", "type" }, { "not_in", "keyword" }, - { "f16be", "keyword2" }, - { "uintptr", "keyword2" }, - { "offset_of", "keyword2" }, - { "min", "keyword2" }, - { "i64be", "keyword2" }, - { "size_of", "keyword2" }, - { "i64le", "keyword2" }, - { "any", "keyword2" }, - { "i64", "keyword2" }, - { "cap", "keyword2" }, + { "f16be", "type" }, + { "uintptr", "type" }, + { "offset_of", "type" }, + { "min", "type" }, + { "i64be", "type" }, + { "size_of", "type" }, + { "i64le", "type" }, + { "any", "type" }, + { "i64", "type" }, + { "cap", "type" }, { "or_return", "keyword" }, { "for", "keyword" }, - { "u64", "keyword2" }, - { "jmag", "keyword2" }, + { "u64", "type" }, + { "jmag", "type" }, { "context", "keyword" }, - { "f64", "keyword2" }, - { "swizzle", "keyword2" }, + { "f64", "type" }, + { "swizzle", "type" }, { "enum", "keyword" }, - { "u16be", "keyword2" }, + { "u16be", "type" }, { "when", "keyword" }, { "break", "keyword" }, - { "f64be", "keyword2" }, - { "f64le", "keyword2" }, - { "type_info_base", "keyword2" }, - { "cstring", "keyword2" }, - { "u32be", "keyword2" }, - { "b64", "keyword2" }, - { "i32be", "keyword2" }, - { "clamp", "keyword2" }, - { "u16le", "keyword2" }, - { "i16be", "keyword2" }, - { "b16", "keyword2" }, + { "f64be", "type" }, + { "f64le", "type" }, + { "type_info_base", "type" }, + { "cstring", "type" }, + { "u32be", "type" }, + { "b64", "type" }, + { "i32be", "type" }, + { "clamp", "type" }, + { "u16le", "type" }, + { "i16be", "type" }, + { "b16", "type" }, { "dynamic", "keyword" }, { "or_continue", "keyword" }, { "map", "keyword" }, - { "b32", "keyword2" }, - { "transmute", "keyword2" }, - { "byte", "keyword2" }, - { "type_of", "keyword2" }, + { "b32", "type" }, + { "transmute", "type" }, + { "byte", "type" }, + { "type_of", "type" }, { "defer", "keyword" }, - { "quaternion", "keyword2" }, - { "assert", "keyword2" }, + { "quaternion", "type" }, + { "assert", "type" }, { "true", "literal" }, - { "soa_unzip", "keyword2" }, - { "f16le", "keyword2" }, - { "kmag", "keyword2" }, - { "real", "keyword2" }, - { "offset_of_selector", "keyword2" }, - { "f32le", "keyword2" }, + { "soa_unzip", "type" }, + { "f16le", "type" }, + { "kmag", "type" }, + { "real", "type" }, + { "offset_of_selector", "type" }, + { "f32le", "type" }, { "case", "keyword" }, - { "cast", "keyword2" }, + { "cast", "type" }, { "distinct", "keyword" }, { "do", "keyword" }, - { "quaternion128", "keyword2" }, + { "quaternion128", "type" }, { "continue", "keyword" }, { "asm", "keyword" }, - { "i128be", "keyword2" }, - { "i16", "keyword2" }, - { "quaternion256", "keyword2" }, - { "expand_values", "keyword2" }, - { "bool", "keyword2" }, - { "u64le", "keyword2" }, - { "i16le", "keyword2" }, - { "i8", "keyword2" }, - { "u32", "keyword2" }, + { "i128be", "type" }, + { "i16", "type" }, + { "quaternion256", "type" }, + { "expand_values", "type" }, + { "bool", "type" }, + { "u64le", "type" }, + { "i16le", "type" }, + { "i8", "type" }, + { "u32", "type" }, { "or_else", "keyword" }, { "union", "keyword" }, - { "rawptr", "keyword2" }, - { "u128be", "keyword2" }, - { "complex", "keyword2" }, - { "i128le", "keyword2" }, - { "b8", "keyword2" }, - { "conj", "keyword2" }, + { "rawptr", "type" }, + { "u128be", "type" }, + { "complex", "type" }, + { "i128le", "type" }, + { "b8", "type" }, + { "conj", "type" }, { "false", "literal" }, - { "b128", "keyword2" }, - { "type_info_of", "keyword2" }, + { "b128", "type" }, + { "type_info_of", "type" }, { "else", "keyword" }, { "foreign", "keyword" }, - { "u128le", "keyword2" }, - { "typeid_of", "keyword2" }, - { "align_of", "keyword2" }, - { "u64be", "keyword2" }, - { "auto_cast", "keyword2" }, + { "u128le", "type" }, + { "typeid_of", "type" }, + { "align_of", "type" }, + { "u64be", "type" }, + { "auto_cast", "type" }, { "struct", "keyword" }, - { "quaternion64", "keyword2" }, - { "soa_zip", "keyword2" }, - { "string", "keyword2" }, - { "complex32", "keyword2" }, + { "quaternion64", "type" }, + { "soa_zip", "type" }, + { "string", "type" }, + { "complex32", "type" }, { "if", "keyword" }, - { "raw_data", "keyword2" }, + { "raw_data", "type" }, { "in", "keyword" }, - { "f32", "keyword2" }, - { "i32", "keyword2" }, + { "f32", "type" }, + { "i32", "type" }, { "switch", "keyword" }, { "using", "keyword" }, - { "offset_of_by_string", "keyword2" }, - { "typeid", "keyword2" }, - { "offset_of_member", "keyword2" }, + { "offset_of_by_string", "type" }, + { "typeid", "type" }, + { "offset_of_member", "type" }, { "return", "keyword" }, - { "f16", "keyword2" }, - { "u8", "keyword2" }, + { "f16", "type" }, + { "u8", "type" }, { "import", "keyword" }, - { "max", "keyword2" }, - { "imag", "keyword2" }, + { "max", "type" }, + { "imag", "type" }, { "proc", "keyword" }, - { "complex128", "keyword2" }, - { "uint", "keyword2" }, + { "complex128", "type" }, + { "uint", "type" }, { "or_break", "keyword" }, - { "complex64", "keyword2" }, - { "i128", "keyword2" }, - { "abs", "keyword2" }, + { "complex64", "type" }, + { "i128", "type" }, + { "abs", "type" }, { "package", "keyword" }, { "nil", "literal" }, - { "rune", "keyword2" }, - { "u128", "keyword2" }, + { "rune", "type" }, + { "u128", "type" }, { "fallthrough", "keyword" }, - { "f32be", "keyword2" }, - { "u16", "keyword2" }, - { "u32le", "keyword2" }, + { "f32be", "type" }, + { "u16", "type" }, + { "u32le", "type" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/openscad.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/openscad.cpp index 38e3ebe4e..7dd4ce34c 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/openscad.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/openscad.cpp @@ -36,7 +36,7 @@ SyntaxDefinition& addOpenSCAD() { { "min", "keyword" }, { "union", "keyword" }, { "search", "function" }, - { "undef", "keyword2" }, + { "undef", "type" }, { "concat", "function" }, { "ord", "function" }, { "color", "keyword" }, @@ -73,7 +73,7 @@ SyntaxDefinition& addOpenSCAD() { { "minkowski", "keyword" }, { "surface", "keyword" }, { "polygon", "keyword" }, - { "PI", "keyword2" }, + { "PI", "type" }, { "var", "keyword" }, { "import", "keyword" }, { "max", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.cpp index d221854ad..08d0cefbf 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.cpp @@ -28,8 +28,8 @@ SyntaxDefinition& addPascal() { { { "xor", "keyword" }, { "writeonly", "keyword" }, - { "wordbool", "keyword2" }, - { "word", "keyword2" }, + { "wordbool", "type" }, + { "word", "type" }, { "virtual", "keyword" }, { "var", "keyword" }, { "uses", "keyword" }, @@ -65,8 +65,8 @@ SyntaxDefinition& addPascal() { { "except", "keyword" }, { "dynamic", "keyword" }, { "reintroduce", "keyword" }, - { "boolean", "keyword2" }, - { "double", "keyword2" }, + { "boolean", "type" }, + { "double", "type" }, { "unit", "keyword" }, { "dispinterface", "keyword" }, { "assembler", "keyword" }, @@ -75,7 +75,7 @@ SyntaxDefinition& addPascal() { { "dispid", "keyword" }, { "implements", "keyword" }, { "label", "keyword" }, - { "shortint", "keyword2" }, + { "shortint", "type" }, { "automated", "keyword" }, { "class", "keyword" }, { "message", "keyword" }, @@ -91,14 +91,14 @@ SyntaxDefinition& addPascal() { { "string", "keyword" }, { "finally", "keyword" }, { "downto", "keyword" }, - { "integer", "keyword2" }, + { "integer", "type" }, { "absolute", "keyword" }, { "override", "keyword" }, { "near", "keyword" }, { "arctan", "function" }, { "export", "keyword" }, { "abs", "function" }, - { "bytebool", "keyword2" }, + { "bytebool", "type" }, { "out", "keyword" }, { "pascal", "keyword" }, { "read", "keyword" }, @@ -108,20 +108,20 @@ SyntaxDefinition& addPascal() { { "else", "keyword" }, { "in", "keyword" }, { "exports", "keyword" }, - { "char", "keyword2" }, + { "char", "type" }, { "cdecl", "keyword" }, { "function", "keyword" }, { "default", "keyword" }, { "register", "keyword" }, { "eoln", "function" }, - { "comp", "keyword2" }, - { "extended", "keyword2" }, + { "comp", "type" }, + { "extended", "type" }, { "not", "keyword" }, { "const", "keyword" }, { "local", "keyword" }, { "cos", "function" }, { "external", "keyword" }, - { "real", "keyword2" }, + { "real", "type" }, { "inline", "keyword" }, { "interface", "keyword" }, { "is", "keyword" }, @@ -134,12 +134,12 @@ SyntaxDefinition& addPascal() { { "procedure", "keyword" }, { "program", "keyword" }, { "ln", "function" }, - { "byte", "keyword2" }, + { "byte", "type" }, { "do", "keyword" }, { "sin", "function" }, { "resident", "keyword" }, { "safecall", "keyword" }, - { "longint", "keyword2" }, + { "longint", "type" }, { "mod", "keyword" }, { "final", "keyword" }, { "public", "keyword" }, @@ -153,18 +153,18 @@ SyntaxDefinition& addPascal() { { "div", "keyword" }, { "of", "keyword" }, { "false", "literal" }, - { "smallint", "keyword2" }, + { "smallint", "type" }, { "ord", "function" }, { "overload", "keyword" }, - { "longbool", "keyword2" }, + { "longbool", "type" }, { "sealed", "keyword" }, - { "currency", "keyword2" }, + { "currency", "type" }, { "package", "keyword" }, { "packed", "keyword" }, { "repeat", "keyword" }, { "stored", "keyword" }, { "platform", "keyword" }, - { "pointer", "keyword2" }, + { "pointer", "type" }, { "pred", "function" }, { "namespaces", "keyword" }, { "published", "keyword" }, @@ -173,14 +173,14 @@ SyntaxDefinition& addPascal() { { "record", "keyword" }, { "varargs", "keyword" }, { "requires", "keyword" }, - { "cardinal", "keyword2" }, + { "cardinal", "type" }, { "on", "keyword" }, { "round", "function" }, { "self", "literal" }, { "shr", "keyword" }, { "protected", "keyword" }, { "set", "keyword" }, - { "single", "keyword2" }, + { "single", "type" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.hpp index 5f570502e..578fcfa96 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pascal.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addPascal(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.cpp index e4077bd5b..d342f6ca6 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.cpp @@ -16,7 +16,7 @@ SyntaxDefinition& addPerl() { { { "-?%d+[%d%.eE]*" }, "number" }, { { "-?%.?%d+" }, "number" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "[%@%$%*]+[%a_][%w_]*" }, "keyword2" }, + { { "[%@%$%*]+[%a_][%w_]*" }, "type" }, { { "%--[%a_][%w_]*" }, "symbol" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.hpp index 5831d27fe..1269a5c55 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/perl.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addPerl(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/php.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/php.cpp index c297ca951..2d9806f42 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/php.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/php.cpp @@ -5,39 +5,41 @@ namespace EE { namespace UI { namespace Doc { namespace Language { SyntaxDefinition& addPHP() { - auto& sd = SyntaxDefinitionManager::instance() - ->add( { "PHP", - { "%.php$", "%.php3$", "%.php4$", "%.php5$" }, - { - { { "<%s*[sS][cC][rR][iI][pP][tT]%s+[tT][yY][pP][eE]%s*=%s*['\"]%a+/" - "[jJ][aA][vV][aA][sS][cC][rR][iI][pP][tT]['\"]%s*>", - "<%s*/[sS][cC][rR][iI][pP][tT]>" }, - "function", - "JavaScript" }, - { { "<%s*[sS][cC][rR][iI][pP][tT]%s*>", "<%s*/%s*[sS][cC][rR][iI][pP][tT]>" }, - "function", - "JavaScript" }, - { { "<%s*[sS][tT][yY][lL][eE][^>]*>", "<%s*/%s*[sS][tT][yY][lL][eE]%s*>" }, - "function", - "CSS" }, - { { "<%?p?h?p?", "%?>" }, "function", "PHPCore" }, - { { "" }, "comment" }, - { { "%f[^>][^<]", "%f[<]" }, "normal" }, - { { "\"", "\"", "\\" }, "string" }, - { { "'", "'", "\\" }, "string" }, - { { "0x[%da-fA-F]+" }, "number" }, - { { "-?%d+[%d%.]*f?" }, "number" }, - { { "-?%.?%d+f?" }, "number" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, - { { "%f[^<][%a_][%w%_%-]*" }, "function" }, - { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, - { { "[%a_][%w_]*" }, "keyword" }, - { { "[/<>=]" }, "operator" }, - }, - {}, - "", - { "^#!.*[ /]php" } } ) - .setAutoCloseXMLTags( true ); + auto& sd = + SyntaxDefinitionManager::instance() + ->add( + { "PHP", + { "%.php$", "%.php3$", "%.php4$", "%.php5$" }, + { + { { "<%s*[sS][cC][rR][iI][pP][tT]%s+[tT][yY][pP][eE]%s*=%s*['\"]%a+/" + "[jJ][aA][vV][aA][sS][cC][rR][iI][pP][tT]['\"]%s*>", + "<%s*/[sS][cC][rR][iI][pP][tT]>" }, + "function", + "JavaScript" }, + { { "<%s*[sS][cC][rR][iI][pP][tT]%s*>", "<%s*/%s*[sS][cC][rR][iI][pP][tT]>" }, + "function", + "JavaScript" }, + { { "<%s*[sS][tT][yY][lL][eE][^>]*>", "<%s*/%s*[sS][tT][yY][lL][eE]%s*>" }, + "function", + "CSS" }, + { { "<%?p?h?p?", "%?>" }, "function", "PHPCore" }, + { { "" }, "comment" }, + { { "%f[^>][^<]", "%f[<]" }, "normal" }, + { { "\"", "\"", "\\" }, "string" }, + { { "'", "'", "\\" }, "string" }, + { { "0x[%da-fA-F]+" }, "number" }, + { { "-?%d+[%d%.]*f?" }, "number" }, + { { "-?%.?%d+f?" }, "number" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, + { { "%f[^<][%a_][%w%_%-]*" }, "function" }, + { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, + { { "[%a_][%w_]*" }, "keyword" }, + { { "[/<>=]" }, "operator" }, + }, + {}, + "", + { "^#!.*[ /]php" } } ) + .setAutoCloseXMLTags( true ); SyntaxDefinitionManager::instance() ->add( { "PHPCore", @@ -55,50 +57,50 @@ SyntaxDefinition& addPHP() { { { "-?%.?%d+" }, "number" }, { { "[%.%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "%$[%a][%w_]*" }, "keyword2" }, + { { "%$[%a][%w_]*" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, - { { "return", "keyword" }, { "if", "keyword" }, - { "else", "keyword" }, { "elseif", "keyword" }, - { "endif", "keyword" }, { "declare", "keyword" }, - { "enddeclare", "keyword" }, { "switch", "keyword" }, - { "endswitch", "keyword" }, { "as", "keyword" }, - { "do", "keyword" }, { "for", "keyword" }, - { "endfor", "keyword" }, { "foreach", "keyword" }, - { "endforeach", "keyword" }, { "while", "keyword" }, - { "endwhile", "keyword" }, { "switch", "keyword" }, - { "case", "keyword" }, { "continue", "keyword" }, - { "default", "keyword" }, { "break", "keyword" }, - { "exit", "keyword" }, { "goto", "keyword" }, + { { "return", "keyword" }, { "if", "keyword" }, + { "else", "keyword" }, { "elseif", "keyword" }, + { "endif", "keyword" }, { "declare", "keyword" }, + { "enddeclare", "keyword" }, { "switch", "keyword" }, + { "endswitch", "keyword" }, { "as", "keyword" }, + { "do", "keyword" }, { "for", "keyword" }, + { "endfor", "keyword" }, { "foreach", "keyword" }, + { "endforeach", "keyword" }, { "while", "keyword" }, + { "endwhile", "keyword" }, { "switch", "keyword" }, + { "case", "keyword" }, { "continue", "keyword" }, + { "default", "keyword" }, { "break", "keyword" }, + { "exit", "keyword" }, { "goto", "keyword" }, - { "catch", "keyword" }, { "throw", "keyword" }, - { "try", "keyword" }, { "finally", "keyword" }, + { "catch", "keyword" }, { "throw", "keyword" }, + { "try", "keyword" }, { "finally", "keyword" }, - { "class", "keyword" }, { "trait", "keyword" }, - { "interface", "keyword" }, { "public", "keyword" }, - { "static", "keyword" }, { "protected", "keyword" }, - { "private", "keyword" }, { "abstract", "keyword" }, + { "class", "keyword" }, { "trait", "keyword" }, + { "interface", "keyword" }, { "public", "keyword" }, + { "static", "keyword" }, { "protected", "keyword" }, + { "private", "keyword" }, { "abstract", "keyword" }, { "final", "keyword" }, - { "function", "keyword2" }, { "global", "keyword2" }, - { "var", "keyword2" }, { "const", "keyword2" }, - { "bool", "keyword2" }, { "boolean", "keyword2" }, - { "int", "keyword2" }, { "integer", "keyword2" }, - { "real", "keyword2" }, { "double", "keyword2" }, - { "float", "keyword2" }, { "string", "keyword2" }, - { "array", "keyword2" }, { "object", "keyword2" }, - { "callable", "keyword2" }, { "iterable", "keyword2" }, + { "function", "type" }, { "global", "type" }, + { "var", "type" }, { "const", "type" }, + { "bool", "type" }, { "boolean", "type" }, + { "int", "type" }, { "integer", "type" }, + { "real", "type" }, { "double", "type" }, + { "float", "type" }, { "string", "type" }, + { "array", "type" }, { "object", "type" }, + { "callable", "type" }, { "iterable", "type" }, - { "namespace", "keyword2" }, { "extends", "keyword2" }, - { "implements", "keyword2" }, { "instanceof", "keyword2" }, - { "require", "keyword2" }, { "require_once", "keyword2" }, - { "include", "keyword2" }, { "include_once", "keyword2" }, - { "use", "keyword2" }, { "new", "keyword2" }, - { "clone", "keyword2" }, + { "namespace", "type" }, { "extends", "type" }, + { "implements", "type" }, { "instanceof", "type" }, + { "require", "type" }, { "require_once", "type" }, + { "include", "type" }, { "include_once", "type" }, + { "use", "type" }, { "new", "type" }, + { "clone", "type" }, - { "true", "literal" }, { "false", "literal" }, - { "NULL", "literal" }, { "parent", "literal" }, - { "self", "literal" }, { "echo", "function" } }, + { "true", "literal" }, { "false", "literal" }, + { "NULL", "literal" }, { "parent", "literal" }, + { "self", "literal" }, { "echo", "function" } }, "//", {}, "php" } ) diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.cpp index 108ba661d..671bfce57 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.cpp @@ -29,13 +29,13 @@ SyntaxDefinition& addPICO8() { }, { - { "true", "literal" }, { "self", "keyword2" }, { "return", "keyword" }, - { "repeat", "keyword" }, { "or", "keyword" }, { "and", "keyword" }, - { "break", "keyword" }, { "else", "keyword" }, { "until", "keyword" }, - { "do", "keyword" }, { "in", "keyword" }, { "while", "keyword" }, - { "end", "keyword" }, { "nil", "literal" }, { "elseif", "keyword" }, - { "false", "literal" }, { "not", "keyword" }, { "local", "keyword" }, - { "for", "keyword" }, { "then", "keyword" }, { "function", "keyword" }, + { "true", "literal" }, { "self", "type" }, { "return", "keyword" }, + { "repeat", "keyword" }, { "or", "keyword" }, { "and", "keyword" }, + { "break", "keyword" }, { "else", "keyword" }, { "until", "keyword" }, + { "do", "keyword" }, { "in", "keyword" }, { "while", "keyword" }, + { "end", "keyword" }, { "nil", "literal" }, { "elseif", "keyword" }, + { "false", "literal" }, { "not", "keyword" }, { "local", "keyword" }, + { "for", "keyword" }, { "then", "keyword" }, { "function", "keyword" }, { "goto", "keyword" }, { "if", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.hpp index 246606a1c..b2ba019f3 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pico-8.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addPICO8(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.cpp index 36d6b937d..4921fc8dd 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.cpp @@ -30,83 +30,83 @@ SyntaxDefinition& addPony() { { { "then", "keyword" }, { "new", "keyword" }, - { "continue", "keyword2" }, + { "continue", "type" }, { "ifdef", "keyword" }, - { "&", "keyword2" }, + { "&", "type" }, { "val", "keyword" }, { "I32", "keyword" }, - { "this", "keyword2" }, + { "this", "type" }, { "Pointer", "keyword" }, - { "consume", "keyword2" }, + { "consume", "type" }, { "Array", "keyword" }, { "String", "keyword" }, { "F64", "keyword" }, - { "xor", "keyword2" }, + { "xor", "type" }, { "end", "keyword" }, - { "addressof", "keyword2" }, + { "addressof", "type" }, { "U128", "keyword" }, { "object", "keyword" }, { "match", "keyword" }, { "with", "keyword" }, - { "false", "keyword2" }, + { "false", "type" }, { "for", "keyword" }, { "while", "keyword" }, { "iso", "keyword" }, { "Stringable", "keyword" }, { "Iterator", "keyword" }, { "else", "keyword" }, - { "recover", "keyword2" }, + { "recover", "type" }, { "compile_intrinsic", "keyword" }, - { "digestof", "keyword2" }, + { "digestof", "type" }, { "actor", "keyword" }, { "U32", "keyword" }, { "primitive", "keyword" }, { "iftype", "keyword" }, { "struct", "keyword" }, - { "break", "keyword2" }, + { "break", "type" }, { "is", "keyword" }, { "use", "keyword" }, - { "or", "keyword2" }, + { "or", "type" }, { "until", "keyword" }, { "if", "keyword" }, { "let", "keyword" }, - { "isnt", "keyword2" }, + { "isnt", "type" }, { "Any", "keyword" }, { "elseif", "keyword" }, { "in", "keyword" }, { "USize", "keyword" }, - { "#alias", "keyword2" }, + { "#alias", "type" }, { "Env", "keyword" }, - { "and", "keyword2" }, + { "and", "type" }, { "trn", "keyword" }, { "tag", "keyword" }, { "box", "keyword" }, - { "None", "keyword2" }, + { "None", "type" }, { "trait", "keyword" }, { "return", "keyword" }, { "var", "keyword" }, { "U8", "keyword" }, - { "error", "keyword2" }, + { "error", "type" }, { "try", "keyword" }, - { "as", "keyword2" }, + { "as", "type" }, { "class", "keyword" }, { "ILong", "keyword" }, { "I8", "keyword" }, { "repeat", "keyword" }, { "U16", "keyword" }, - { "#send", "keyword2" }, - { "#any", "keyword2" }, - { "#share", "keyword2" }, + { "#send", "type" }, + { "#any", "type" }, + { "#share", "type" }, { "I128", "keyword" }, - { "#read", "keyword2" }, + { "#read", "type" }, { "F32", "keyword" }, { "compile_error", "keyword" }, { "embed", "keyword" }, - { "where", "keyword2" }, - { "true", "keyword2" }, - { "not", "keyword2" }, + { "where", "type" }, + { "true", "type" }, + { "not", "type" }, { "Bool", "keyword" }, - { "|", "keyword2" }, + { "|", "type" }, { "I64", "keyword" }, { "U64", "keyword" }, { "ULong", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.hpp index 56a704e4b..1dc0c8f16 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/pony.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addPony(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.cpp index 331133703..ceebc8de5 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.cpp @@ -37,18 +37,18 @@ SyntaxDefinition& addPostgreSQL() { { "union", "keyword" }, { "unbounded", "keyword" }, { "type", "keyword" }, - { "tsvector", "keyword2" }, + { "tsvector", "type" }, { "trigger", "keyword" }, { "timezone", "keyword" }, - { "timez", "keyword2" }, - { "timestampz", "keyword2" }, - { "time", "keyword2" }, + { "timez", "type" }, + { "timestampz", "type" }, + { "time", "type" }, { "sql", "keyword" }, { "some", "keyword" }, - { "smallint", "keyword2" }, + { "smallint", "type" }, { "true", "literal" }, { "setof", "keyword" }, - { "serial4", "keyword2" }, + { "serial4", "type" }, { "sequence", "keyword" }, { "select", "keyword" }, { "row", "keyword" }, @@ -56,9 +56,9 @@ SyntaxDefinition& addPostgreSQL() { { "returning", "keyword" }, { "procedure", "keyword" }, { "preceding", "keyword" }, - { "polygon", "keyword2" }, - { "point", "keyword2" }, - { "pg_lsn", "keyword2" }, + { "polygon", "type" }, + { "point", "type" }, + { "pg_lsn", "type" }, { "owned", "keyword" }, { "outer", "keyword" }, { "order", "keyword" }, @@ -66,88 +66,88 @@ SyntaxDefinition& addPostgreSQL() { { "operator", "keyword" }, { "only", "keyword" }, { "offset", "keyword" }, - { "numrange", "keyword2" }, - { "numeric", "keyword2" }, + { "numrange", "type" }, + { "numeric", "type" }, { "null", "keyword" }, { "notnull", "keyword" }, { "notice", "keyword" }, { "not", "keyword" }, { "natural", "keyword" }, - { "money", "keyword2" }, - { "lseg", "keyword2" }, + { "money", "type" }, + { "lseg", "type" }, { "loop", "keyword" }, { "localtime", "literal" }, { "nulls", "keyword" }, { "like", "keyword" }, { "lateral", "keyword" }, { "key", "keyword" }, - { "jsonb", "keyword2" }, + { "jsonb", "type" }, { "join", "keyword" }, - { "smallserial", "keyword2" }, + { "smallserial", "type" }, { "into", "keyword" }, - { "interval", "keyword2" }, + { "interval", "type" }, { "intersect", "keyword" }, - { "int8range", "keyword2" }, - { "int8", "keyword2" }, - { "int4", "keyword2" }, - { "int2", "keyword2" }, + { "int8range", "type" }, + { "int8", "type" }, + { "int4", "type" }, + { "int2", "type" }, { "table", "keyword" }, { "insert", "keyword" }, { "inner", "keyword" }, { "index", "keyword" }, - { "INT4", "keyword2" }, + { "INT4", "type" }, { "EXCEPT", "keyword" }, - { "txid_snapshot", "keyword2" }, + { "txid_snapshot", "type" }, { "set", "keyword" }, - { "PRECISION", "keyword2" }, + { "PRECISION", "type" }, { "EXISTS", "keyword" }, - { "TSRANGE", "keyword2" }, + { "TSRANGE", "type" }, { "ORDINALITY", "keyword" }, - { "NUMERIC", "keyword2" }, + { "NUMERIC", "type" }, { "LATERAL", "keyword" }, { "FUNCTION", "keyword" }, { "NULL", "keyword" }, { "NOT", "keyword" }, - { "NUMRANGE", "keyword2" }, + { "NUMRANGE", "type" }, { "WHERE", "keyword" }, { "NOTNULL", "keyword" }, { "case", "keyword" }, - { "MACADDR", "keyword2" }, - { "INTEGER", "keyword2" }, + { "MACADDR", "type" }, + { "INTEGER", "type" }, { "NATURAL", "keyword" }, - { "LSEG", "keyword2" }, + { "LSEG", "type" }, { "LOOP", "keyword" }, { "xmlserialize", "keyword" }, - { "JSON", "keyword2" }, + { "JSON", "type" }, { "LOCALTIME", "literal" }, { "LIKE", "keyword" }, { "GROUP", "keyword" }, - { "json", "keyword2" }, + { "json", "type" }, { "LAST", "keyword" }, - { "BIGSERIAL", "keyword2" }, + { "BIGSERIAL", "type" }, { "OR", "keyword" }, { "SETOF", "keyword" }, - { "JSONB", "keyword2" }, - { "PATH", "keyword2" }, + { "JSONB", "type" }, + { "PATH", "type" }, { "ISNULL", "keyword" }, { "option", "keyword" }, { "TO", "keyword" }, { "EXCLUDE", "keyword" }, - { "INT8", "keyword2" }, - { "CIRCLE", "keyword2" }, - { "INT2", "keyword2" }, + { "INT8", "type" }, + { "CIRCLE", "type" }, + { "INT2", "type" }, { "partition", "keyword" }, { "INSTEAD", "keyword" }, - { "INET", "keyword2" }, + { "INET", "type" }, { "IN", "keyword" }, { "ordinality", "keyword" }, { "TIMEZONE", "keyword" }, { "INNER", "keyword" }, - { "bigserial", "keyword2" }, + { "bigserial", "type" }, { "FOREIGN", "keyword" }, { "UNKNOWN", "keyword" }, - { "CHAR", "keyword2" }, - { "BOOL", "keyword2" }, + { "CHAR", "type" }, + { "BOOL", "type" }, { "EXECUTE", "keyword" }, { "AT", "keyword" }, { "CURRENT_DATE", "literal" }, @@ -156,100 +156,100 @@ SyntaxDefinition& addPostgreSQL() { { "FALSE", "literal" }, { "ROW", "keyword" }, { "CASE", "keyword" }, - { "INTERVAL", "keyword2" }, - { "boolean", "keyword2" }, + { "INTERVAL", "type" }, + { "boolean", "type" }, { "each", "keyword" }, { "CHECK", "keyword" }, { "EXTENSION", "keyword" }, { "RIGHT", "keyword" }, - { "CHARACTER", "keyword2" }, + { "CHARACTER", "type" }, { "FOLLOWING", "keyword" }, { "INTERSECT", "keyword" }, { "DOCUMENT", "keyword" }, { "ASC", "keyword" }, - { "varchar", "keyword2" }, + { "varchar", "type" }, { "END", "keyword" }, { "NULLS", "keyword" }, { "when", "keyword" }, - { "CIDR", "keyword2" }, - { "POINT", "keyword2" }, - { "BIT", "keyword2" }, + { "CIDR", "type" }, + { "POINT", "type" }, + { "BIT", "type" }, { "ORDER", "keyword" }, { "LANGUAGE", "keyword" }, - { "FLOAT8", "keyword2" }, - { "timestamp", "keyword2" }, - { "inet", "keyword2" }, - { "FLOAT4", "keyword2" }, - { "line", "keyword2" }, + { "FLOAT8", "type" }, + { "timestamp", "type" }, + { "inet", "type" }, + { "FLOAT4", "type" }, + { "line", "type" }, { "PARTITION", "keyword" }, { "AND", "keyword" }, { "domain", "keyword" }, { "FOR", "keyword" }, { "BEFORE", "keyword" }, - { "SERIAL4", "keyword2" }, - { "varbit", "keyword2" }, + { "SERIAL4", "type" }, + { "varbit", "type" }, { "SELECT", "keyword" }, { "NOTICE", "keyword" }, { "BEGIN", "keyword" }, - { "PG_LSN", "keyword2" }, + { "PG_LSN", "type" }, { "end", "keyword" }, { "INSERT", "keyword" }, - { "int", "keyword2" }, + { "int", "type" }, { "RETURNING", "keyword" }, - { "SERIAL", "keyword2" }, - { "TIMEZ", "keyword2" }, + { "SERIAL", "type" }, + { "TIMEZ", "type" }, { "KEY", "keyword" }, - { "DOUBLE", "keyword2" }, + { "DOUBLE", "type" }, { "references", "keyword" }, - { "BOX", "keyword2" }, - { "MONEY", "keyword2" }, + { "BOX", "type" }, + { "MONEY", "type" }, { "ZONE", "keyword" }, { "THEN", "keyword" }, { "ARRAY", "keyword" }, { "ANY", "keyword" }, { "JOIN", "keyword" }, - { "precision", "keyword2" }, + { "precision", "type" }, { "ALTER", "keyword" }, { "CROSS", "keyword" }, { "OPTION", "keyword" }, - { "uuid", "keyword2" }, + { "uuid", "type" }, { "then", "keyword" }, { "SET", "keyword" }, { "AS", "keyword" }, { "to", "keyword" }, - { "TEXT", "keyword2" }, - { "serial2", "keyword2" }, - { "TSTZRANGE", "keyword2" }, + { "TEXT", "type" }, + { "serial2", "type" }, + { "TSTZRANGE", "type" }, { "ONLY", "keyword" }, { "limit", "keyword" }, - { "TIMESTAMP", "keyword2" }, + { "TIMESTAMP", "type" }, { "RECURSIVE", "keyword" }, - { "bit", "keyword2" }, - { "LINE", "keyword2" }, + { "bit", "type" }, + { "LINE", "type" }, { "FIRST", "keyword" }, { "OUTER", "keyword" }, { "CREATE", "keyword" }, - { "DATE", "keyword2" }, + { "DATE", "type" }, { "TRIGGER", "keyword" }, { "asc", "keyword" }, - { "serial", "keyword2" }, - { "BYTEA", "keyword2" }, + { "serial", "type" }, + { "BYTEA", "type" }, { "localtimestamp", "literal" }, - { "character", "keyword2" }, + { "character", "type" }, { "EVENT", "keyword" }, { "INDEX", "keyword" }, - { "DATERANGE", "keyword2" }, + { "DATERANGE", "type" }, { "recursive", "keyword" }, { "on", "keyword" }, - { "VARBIT", "keyword2" }, + { "VARBIT", "type" }, { "CONTENT", "keyword" }, { "rows", "keyword" }, { "WITH", "keyword" }, { "INTO", "keyword" }, { "DECLARE", "keyword" }, { "ROWS", "keyword" }, - { "real", "keyword2" }, - { "int4range", "keyword2" }, + { "real", "type" }, + { "int4range", "type" }, { "TRUE", "literal" }, { "ALL", "keyword" }, { "extension", "keyword" }, @@ -259,16 +259,16 @@ SyntaxDefinition& addPostgreSQL() { { "XMLSERIALIZE", "keyword" }, { "left", "keyword" }, { "PRECEDING", "keyword" }, - { "BIGINT", "keyword2" }, + { "BIGINT", "type" }, { "CURRENT_TIME", "literal" }, { "exists", "keyword" }, { "BETWEEN", "keyword" }, { "DESC", "keyword" }, - { "TIME", "keyword2" }, + { "TIME", "type" }, { "FULL", "keyword" }, - { "INT4RANGE", "keyword2" }, + { "INT4RANGE", "type" }, { "DOMAIN", "keyword" }, - { "SMALLINT", "keyword2" }, + { "SMALLINT", "type" }, { "TABLE", "keyword" }, { "OPERATOR", "keyword" }, { "ELSE", "keyword" }, @@ -283,46 +283,46 @@ SyntaxDefinition& addPostgreSQL() { { "DROP", "keyword" }, { "following", "keyword" }, { "RAISE", "keyword" }, - { "REAL", "keyword2" }, + { "REAL", "type" }, { "REFERENCES", "keyword" }, { "RETURNS", "keyword" }, - { "xml", "keyword2" }, + { "xml", "type" }, { "last", "keyword" }, { "SEQUENCE", "keyword" }, { "OWNED", "keyword" }, { "UNIQUE", "keyword" }, - { "text", "keyword2" }, + { "text", "type" }, { "LIMIT", "keyword" }, { "constraint", "keyword" }, { "CONSTRAINT", "keyword" }, - { "double", "keyword2" }, - { "SERIAL2", "keyword2" }, - { "INT8RANGE", "keyword2" }, - { "SERIAL8", "keyword2" }, - { "SMALLSERIAL", "keyword2" }, + { "double", "type" }, + { "SERIAL2", "type" }, + { "INT8RANGE", "type" }, + { "SERIAL8", "type" }, + { "SMALLSERIAL", "type" }, { "SQL", "keyword" }, - { "TIMESTAMPZ", "keyword2" }, + { "TIMESTAMPZ", "type" }, { "for", "keyword" }, - { "TSQUERY", "keyword2" }, - { "TSVECTOR", "keyword2" }, - { "TXID_SNAPSHOT", "keyword2" }, + { "TSQUERY", "type" }, + { "TSVECTOR", "type" }, + { "TXID_SNAPSHOT", "type" }, { "instead", "keyword" }, { "TYPE", "keyword" }, { "language", "keyword" }, { "distinct", "keyword" }, - { "circle", "keyword2" }, + { "circle", "type" }, { "collation", "keyword" }, { "UNION", "keyword" }, { "UNNEST", "keyword" }, - { "tsrange", "keyword2" }, + { "tsrange", "type" }, { "else", "keyword" }, { "UPDATE", "keyword" }, { "USING", "keyword" }, { "LOCALTIMESTAMP", "literal" }, { "VALUES", "keyword" }, { "SOME", "keyword" }, - { "VARCHAR", "keyword2" }, - { "serial8", "keyword2" }, + { "VARCHAR", "type" }, + { "serial8", "type" }, { "VARIADIC", "keyword" }, { "VIEW", "keyword" }, { "DISTINCT", "keyword" }, @@ -330,69 +330,69 @@ SyntaxDefinition& addPostgreSQL() { { "WHEN", "keyword" }, { "WITHOUT", "keyword" }, { "primary", "keyword" }, - { "XML", "keyword2" }, - { "daterange", "keyword2" }, + { "XML", "type" }, + { "daterange", "type" }, { "all", "keyword" }, - { "DECIMAL", "keyword2" }, + { "DECIMAL", "type" }, { "any", "keyword" }, - { "integer", "keyword2" }, + { "integer", "type" }, { "array", "keyword" }, { "OFFSET", "keyword" }, { "as", "keyword" }, { "first", "keyword" }, - { "UUID", "keyword2" }, + { "UUID", "type" }, { "at", "keyword" }, { "EACH", "keyword" }, { "enum", "keyword" }, { "before", "keyword" }, { "begin", "keyword" }, - { "decimal", "keyword2" }, + { "decimal", "type" }, { "between", "keyword" }, - { "bigint", "keyword2" }, - { "INT", "keyword2" }, - { "bool", "keyword2" }, + { "bigint", "type" }, + { "INT", "type" }, + { "bool", "type" }, { "by", "keyword" }, - { "BOOLEAN", "keyword2" }, - { "bytea", "keyword2" }, - { "char", "keyword2" }, - { "float8", "keyword2" }, + { "BOOLEAN", "type" }, + { "bytea", "type" }, + { "char", "type" }, + { "float8", "type" }, { "check", "keyword" }, - { "cidr", "keyword2" }, + { "cidr", "type" }, { "ON", "keyword" }, { "content", "keyword" }, { "right", "keyword" }, { "and", "keyword" }, { "FROM", "keyword" }, { "create", "keyword" }, - { "box", "keyword2" }, + { "box", "type" }, { "cross", "keyword" }, - { "tstzrange", "keyword2" }, + { "tstzrange", "type" }, { "current_date", "literal" }, - { "tsquery", "keyword2" }, + { "tsquery", "type" }, { "current_time", "literal" }, { "current_timestamp", "literal" }, { "isnull", "keyword" }, - { "date", "keyword2" }, + { "date", "type" }, { "default", "keyword" }, { "function", "keyword" }, { "delete", "keyword" }, - { "float4", "keyword2" }, + { "float4", "type" }, { "desc", "keyword" }, { "drop", "keyword" }, { "full", "keyword" }, - { "path", "keyword2" }, + { "path", "type" }, { "CURRENT_TIMESTAMP", "literal" }, { "event", "keyword" }, { "except", "keyword" }, { "exclude", "keyword" }, { "raise", "keyword" }, - { "macaddr", "keyword2" }, + { "macaddr", "type" }, { "alter", "keyword" }, { "execute", "keyword" }, { "false", "literal" }, { "HAVING", "keyword" }, { "from", "keyword" }, - { "POLYGON", "keyword2" }, + { "POLYGON", "type" }, { "group", "keyword" }, { "having", "keyword" }, { "XMLPARSE", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.hpp index 1beaba244..e7e150c1e 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/postgresql.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addPostgreSQL(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/powershell.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/powershell.cpp index 60949cc6a..03bb4b6ee 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/powershell.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/powershell.cpp @@ -19,8 +19,8 @@ SyntaxDefinition& addPowerShell() { { { "%f[%S]%-[%w%-%_]+" }, "function" }, { { "[%u][%a]+[%-][%u][%a]+" }, "function" }, { { "${.*}" }, "symbol" }, - { { "$[%a_@*][%w_]*" }, "keyword2" }, - { { "$[%$][%a]+" }, "keyword2" }, + { { "$[%a_@*][%w_]*" }, "type" }, + { { "$[%$][%a]+" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/racket.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/racket.cpp index d4b2f881b..99a4a7f6d 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/racket.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/racket.cpp @@ -69,7 +69,7 @@ SyntaxDefinition& addRacket() { SyntaxPatternMatchType::RegEx, { { { "(?<=\\[)\\s*([^\\s\\{\\}\\(\\)\\[\\]#\\|,\"'´\\\\;]+)" }, - { "normal", "keyword3" }, + { "normal", "parameter" }, {}, "", SyntaxPatternMatchType::RegEx }, @@ -837,7 +837,7 @@ SyntaxDefinition& addRacket() { { { "(?<=struct)\\s*([^\\s\\{\\}\\(\\)\\[\\]#\\|,\"'´\\\\;]+\\s+)?([^\\s\\{" "\\}\\(\\)\\[\\]#\\|,\"'´\\\\;]+)\\s*(\\()", "\\)" }, - { "normal", "normal", "keyword2", "operator" }, + { "normal", "normal", "type", "operator" }, { "operator" }, "", SyntaxPatternMatchType::RegEx, @@ -1305,7 +1305,7 @@ SyntaxDefinition& addRacket() { "", SyntaxPatternMatchType::RegEx }, { { "[^\\s\\{\\}\\(\\)\\[\\]#\\|,\"'´\\\\;]+" }, - "keyword3", + "parameter", "", SyntaxPatternMatchType::RegEx }, { { "include", "#keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.cpp index 2caa9f1b1..3157c64e3 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.cpp @@ -18,13 +18,13 @@ SyntaxDefinition& addRave() { { { "-?%d+_%d" }, "number" }, { { "-?%d+[%d%.eE]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, - { { "(namespace)%s+([%a_][%w_]*)" }, { "keyword", "keyword", "keyword2" } }, + { { "(namespace)%s+([%a_][%w_]*)" }, { "keyword", "keyword", "type" } }, { { "%(%s*inline%s*%)" }, "keyword" }, { { "%(%s*inline%,%s*nochecks%s*%)" }, "keyword" }, { { "%(%s*nochecks%s*%)" }, "keyword" }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "std%:%:[%w_]*" }, "keyword2" }, + { { "std%:%:[%w_]*" }, "type" }, { { "@[%a_][%w_]*" }, "symbol" }, { { "[%a_][%w_]*" }, "symbol" }, }, @@ -49,34 +49,34 @@ SyntaxDefinition& addRave() { { "return", "keyword" }, { "defer", "keyword" }, { "fdefer", "keyword" }, - { "const", "keyword2" }, - { "alias", "keyword2" }, - { "void", "keyword2" }, - { "bool", "keyword2" }, - { "char", "keyword2" }, - { "uchar", "keyword2" }, - { "short", "keyword2" }, - { "ushort", "keyword2" }, - { "int", "keyword2" }, - { "uint", "keyword2" }, - { "long", "keyword2" }, - { "ulong", "keyword2" }, - { "cent", "keyword2" }, - { "ucent", "keyword2" }, - { "float", "keyword2" }, - { "double", "keyword2" }, - { "auto", "keyword2" }, - { "half", "keyword2" }, - { "bhalf", "keyword2" }, - { "real", "keyword2" }, - { "short8", "keyword2" }, - { "int4", "keyword2" }, - { "int8", "keyword2" }, - { "float2", "keyword2" }, - { "float4", "keyword2" }, - { "float8", "keyword2" }, - { "double2", "keyword2" }, - { "double4", "keyword2" }, + { "const", "type" }, + { "alias", "type" }, + { "void", "type" }, + { "bool", "type" }, + { "char", "type" }, + { "uchar", "type" }, + { "short", "type" }, + { "ushort", "type" }, + { "int", "type" }, + { "uint", "type" }, + { "long", "type" }, + { "ulong", "type" }, + { "cent", "type" }, + { "ucent", "type" }, + { "float", "type" }, + { "double", "type" }, + { "auto", "type" }, + { "half", "type" }, + { "bhalf", "type" }, + { "real", "type" }, + { "short8", "type" }, + { "int4", "type" }, + { "int8", "type" }, + { "float2", "type" }, + { "float4", "type" }, + { "float8", "type" }, + { "double2", "type" }, + { "double4", "type" }, { "true", "literal" }, { "false", "literal" }, { "struct", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.hpp index 70af25c69..7919b68fe 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rave.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addRave(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rescript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rescript.cpp index 061a76763..fadca00a8 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rescript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rescript.cpp @@ -15,7 +15,7 @@ SyntaxDefinition& addRescript() { { { "\\?\"", "\"", "\\" }, "string" }, { { "\\?`", "`", "\\" }, "string" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "([%a_-][%w-_]*)(%\?\?)(=)%f[%{%\"]" }, @@ -24,23 +24,23 @@ SyntaxDefinition& addRescript() { { { "js_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, { { "#[%a_][%w_]*" }, "literal" }, { { "%l[%w_]*%f[(]" }, "function" }, - { { "%u[%w_]*" }, "keyword2" }, + { { "%u[%w_]*" }, "type" }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, - { { "'[%a_][%w_]*" }, "keyword3" }, - { { "@%l[%w_]*" }, "keyword3" }, + { { "'[%a_][%w_]*" }, "parameter" }, + { { "@%l[%w_]*" }, "parameter" }, { { "[%l_][%w_%.]*" }, "symbol" }, }, { - { "int", "keyword2" }, { "in", "keyword" }, { "external", "keyword" }, + { "int", "type" }, { "in", "keyword" }, { "external", "keyword" }, { "and", "keyword" }, { "include", "keyword" }, { "switch", "keyword" }, - { "bool", "keyword2" }, { "try", "keyword" }, { "as", "keyword" }, + { "bool", "type" }, { "try", "keyword" }, { "as", "keyword" }, { "exception", "keyword" }, { "lazy", "keyword" }, { "of", "keyword" }, { "rec", "keyword" }, { "with", "keyword" }, { "module", "keyword" }, - { "false", "literal" }, { "for", "keyword" }, { "array", "keyword2" }, + { "false", "literal" }, { "for", "keyword" }, { "array", "type" }, { "while", "keyword" }, { "assert", "keyword" }, { "true", "literal" }, - { "else", "keyword" }, { "option", "keyword2" }, { "when", "keyword" }, - { "downto", "keyword" }, { "string", "keyword2" }, { "if", "keyword" }, + { "else", "keyword" }, { "option", "type" }, { "when", "keyword" }, + { "downto", "keyword" }, { "string", "type" }, { "if", "keyword" }, { "constraint", "keyword" }, { "let", "keyword" }, { "mutable", "keyword" }, { "open", "keyword" }, { "type", "keyword" }, { "to", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ring.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ring.cpp index 3a5a3cf2b..51fad7b67 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ring.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ring.cpp @@ -32,36 +32,36 @@ SyntaxDefinition& addRing() { }, { - { "int", "keyword2" }, + { "int", "type" }, { "BREAK", "keyword" }, { "new", "keyword" }, { "IF", "keyword" }, - { "Override", "keyword2" }, + { "Override", "type" }, { "End", "keyword" }, { "endfor", "keyword" }, { "Catch", "keyword" }, { "loop", "keyword" }, { "OTHER", "keyword" }, { "CASE", "keyword" }, - { "long", "keyword2" }, + { "long", "type" }, { "foreach", "keyword" }, { "LOAD", "keyword" }, - { "String", "keyword2" }, + { "String", "type" }, { "give", "keyword" }, { "STEP", "keyword" }, { "Give", "keyword" }, { "FALSE", "literal" }, { "end", "keyword" }, { "Loadsyntax", "keyword" }, - { "short", "keyword2" }, + { "short", "type" }, { "while", "keyword" }, { "bye", "keyword" }, { "endclass", "keyword" }, { "FOREACH", "keyword" }, - { "VOID", "keyword2" }, - { "OBJECT", "keyword2" }, + { "VOID", "type" }, + { "OBJECT", "type" }, { "break", "keyword" }, - { "Object", "keyword2" }, + { "Object", "type" }, { "ENDCLASS", "keyword" }, { "BUT", "keyword" }, { "IMPORT", "keyword" }, @@ -70,20 +70,20 @@ SyntaxDefinition& addRing() { { "Enablehashcomments", "keyword" }, { "False", "literal" }, { "WHILE", "keyword" }, - { "abstract", "keyword2" }, + { "abstract", "type" }, { "ELSEIF", "keyword" }, { "CATCH", "keyword" }, - { "Int", "keyword2" }, + { "Int", "type" }, { "Nl", "keyword" }, - { "BOOLEAN", "keyword2" }, - { "SIGNED", "keyword2" }, + { "BOOLEAN", "type" }, + { "SIGNED", "type" }, { "Break", "keyword" }, { "class", "keyword" }, - { "void", "keyword2" }, - { "DOUBLE", "keyword2" }, - { "byte", "keyword2" }, + { "void", "type" }, + { "DOUBLE", "type" }, + { "byte", "type" }, { "Changeringkeyword", "keyword" }, - { "boolean", "keyword2" }, + { "boolean", "type" }, { "Step", "keyword" }, { "ENDWHILE", "keyword" }, { "DO", "keyword" }, @@ -91,22 +91,22 @@ SyntaxDefinition& addRing() { { "AGAIN", "keyword" }, { "other", "keyword" }, { "Return", "keyword" }, - { "float", "keyword2" }, + { "float", "type" }, { "see", "function" }, { "loadsyntax", "keyword" }, { "do", "keyword" }, { "to", "keyword" }, - { "Abstract", "keyword2" }, + { "Abstract", "type" }, { "default", "keyword" }, { "but", "keyword" }, - { "char", "keyword2" }, - { "BYTE", "keyword2" }, + { "char", "type" }, + { "BYTE", "type" }, { "Call", "keyword" }, { "Next", "keyword" }, { "get", "keyword" }, { "call", "keyword" }, { "from", "keyword" }, - { "Static", "keyword2" }, + { "Static", "type" }, { "else", "keyword" }, { "next", "keyword" }, { "For", "keyword" }, @@ -115,40 +115,40 @@ SyntaxDefinition& addRing() { { "FUNC", "keyword" }, { "SEE", "function" }, { "ENDFUNCTION", "keyword" }, - { "string", "keyword2" }, + { "string", "type" }, { "Endfor", "keyword" }, { "DEFAULT", "keyword" }, - { "Number", "keyword2" }, - { "Char", "keyword2" }, + { "Number", "type" }, + { "Char", "type" }, { "elseif", "keyword" }, { "in", "keyword" }, - { "NUMBER", "keyword2" }, - { "Float", "keyword2" }, + { "NUMBER", "type" }, + { "Float", "type" }, { "private", "keyword" }, - { "signed", "keyword2" }, + { "signed", "type" }, { "DEF", "keyword" }, { "switch", "keyword" }, - { "OVERRIDE", "keyword2" }, + { "OVERRIDE", "type" }, { "Get", "keyword" }, { "LOADSYNTAX", "keyword" }, { "Exit", "keyword" }, { "import", "keyword" }, { "try", "keyword" }, - { "Unsigned", "keyword2" }, + { "Unsigned", "type" }, { "See", "function" }, { "In", "keyword" }, - { "Short", "keyword2" }, + { "Short", "type" }, { "endtry", "keyword" }, - { "LIST", "keyword2" }, - { "FLOAT", "keyword2" }, + { "LIST", "type" }, + { "FLOAT", "type" }, { "DISABLEHASHCOMMENTS", "keyword" }, - { "list", "keyword2" }, + { "list", "type" }, { "Try", "keyword" }, { "catch", "keyword" }, - { "LONG", "keyword2" }, + { "LONG", "type" }, { "Endpackage", "keyword" }, { "EXIT", "keyword" }, - { "SHORT", "keyword2" }, + { "SHORT", "type" }, { "done", "keyword" }, { "Done", "keyword" }, { "again", "keyword" }, @@ -156,7 +156,7 @@ SyntaxDefinition& addRing() { { "nl", "keyword" }, { "CLASS", "keyword" }, { "Disablehashcomments", "keyword" }, - { "Long", "keyword2" }, + { "Long", "type" }, { "ENDSWITCH", "keyword" }, { "TRY", "keyword" }, { "Do", "keyword" }, @@ -171,15 +171,15 @@ SyntaxDefinition& addRing() { { "PRINT", "function" }, { "CHANGERINGKEYWORD", "keyword" }, { "func", "keyword" }, - { "INT", "keyword2" }, + { "INT", "type" }, { "NEXT", "keyword" }, { "disablehashcomments", "keyword" }, { "If", "keyword" }, - { "CHAR", "keyword2" }, + { "CHAR", "type" }, { "Bye", "keyword" }, { "enablehashcomments", "keyword" }, { "endfunc", "keyword" }, - { "STRING", "keyword2" }, + { "STRING", "type" }, { "exit", "keyword" }, { "Endswitch", "keyword" }, { "ENDTRY", "keyword" }, @@ -189,28 +189,28 @@ SyntaxDefinition& addRing() { { "ENDPACKAGE", "keyword" }, { "Else", "keyword" }, { "END", "keyword" }, - { "Byte", "keyword2" }, + { "Byte", "type" }, { "Elseif", "keyword" }, { "Default", "keyword" }, { "Changeringoperator", "keyword" }, - { "static", "keyword2" }, + { "static", "type" }, { "Endfunc", "keyword" }, { "CONTINUE", "keyword" }, { "off", "keyword" }, { "def", "keyword" }, { "true", "literal" }, - { "Void", "keyword2" }, + { "Void", "type" }, { "endfunction", "keyword" }, - { "Signed", "keyword2" }, + { "Signed", "type" }, { "ENDFUNC", "keyword" }, - { "PROTECTED", "keyword2" }, + { "PROTECTED", "type" }, { "Endtry", "keyword" }, { "Class", "keyword" }, { "case", "keyword" }, - { "protected", "keyword2" }, + { "protected", "type" }, { "ON", "keyword" }, { "Switch", "keyword" }, - { "STATIC", "keyword2" }, + { "STATIC", "type" }, { "Func", "keyword" }, { "PACKAGE", "keyword" }, { "continue", "keyword" }, @@ -225,9 +225,9 @@ SyntaxDefinition& addRing() { { "SWITCH", "keyword" }, { "load", "keyword" }, { "Endclass", "keyword" }, - { "object", "keyword2" }, + { "object", "type" }, { "false", "literal" }, - { "Public", "keyword2" }, + { "Public", "type" }, { "GIVE", "keyword" }, { "ok", "keyword" }, { "ENDFOR", "keyword" }, @@ -235,7 +235,7 @@ SyntaxDefinition& addRing() { { "endwhile", "keyword" }, { "print", "function" }, { "GET", "keyword" }, - { "List", "keyword2" }, + { "List", "type" }, { "TRUE", "literal" }, { "NL", "keyword" }, { "Import", "keyword" }, @@ -244,38 +244,38 @@ SyntaxDefinition& addRing() { { "ELSE", "keyword" }, { "NEW", "keyword" }, { "step", "keyword" }, - { "public", "keyword2" }, - { "unsigned", "keyword2" }, + { "public", "type" }, + { "unsigned", "type" }, { "New", "keyword" }, - { "number", "keyword2" }, + { "number", "type" }, { "Case", "keyword" }, { "changeringoperator", "keyword" }, { "put", "function" }, { "PRIVATE", "keyword" }, - { "double", "keyword2" }, + { "double", "type" }, { "Load", "keyword" }, - { "PUBLIC", "keyword2" }, + { "PUBLIC", "type" }, { "return", "keyword" }, { "NULL", "literal" }, { "But", "keyword" }, { "PUT", "function" }, - { "Double", "keyword2" }, + { "Double", "type" }, { "Ok", "keyword" }, { "Null", "literal" }, { "endpackage", "keyword" }, { "From", "keyword" }, - { "ABSTRACT", "keyword2" }, + { "ABSTRACT", "type" }, { "ENABLEHASHCOMMENTS", "keyword" }, { "FOR", "keyword" }, - { "Boolean", "keyword2" }, + { "Boolean", "type" }, { "OK", "keyword" }, { "package", "keyword" }, - { "override", "keyword2" }, - { "Protected", "keyword2" }, + { "override", "type" }, + { "Protected", "type" }, { "To", "keyword" }, { "Again", "keyword" }, { "Def", "keyword" }, - { "UNSIGNED", "keyword2" }, + { "UNSIGNED", "type" }, { "Endfunction", "keyword" }, { "endswitch", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ruby.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ruby.cpp index 6ec634892..3becc89bf 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ruby.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ruby.cpp @@ -18,10 +18,10 @@ SyntaxDefinition& addRuby() { { { "-?%.?%d+f?" }, "number" }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "@?@[%a_][%w_]*" }, "keyword2" }, + { { "@?@[%a_][%w_]*" }, "type" }, { { "::[%w_]*" }, "symbol" }, - { { ":[%w_]*" }, "keyword2" }, - { { "[%a_][%w_]*:[^:]" }, "keyword2" }, + { { ":[%w_]*" }, "type" }, + { { "[%a_][%w_]*:[^:]" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.cpp index 2752bd709..5ef59e198 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.cpp @@ -15,7 +15,7 @@ SyntaxDefinition& addRust() { { { "r#\"", "\"#", "\\" }, "string" }, { { "\"", "\"", "\\" }, "string" }, { { "'.'" }, "string" }, - { { "'[%a_][%a%d_]*" }, "keyword2" }, + { { "'[%a_][%a%d_]*" }, "type" }, { { "0[oO_][0-7]+" }, "number" }, { { "-?0x[%x_]+" }, "number" }, { { "-?%d+_%d" }, "number" }, @@ -28,26 +28,26 @@ SyntaxDefinition& addRust() { }, { - { "while", "keyword" }, { "for", "keyword" }, { "u16", "keyword2" }, - { "i16", "keyword2" }, { "usize", "keyword2" }, { "continue", "keyword" }, - { "char", "keyword2" }, { "i64", "keyword2" }, { "extern", "keyword" }, - { "fn", "keyword" }, { "if", "keyword" }, { "u8", "keyword2" }, - { "f32", "keyword2" }, { "await", "keyword" }, { "let", "keyword" }, - { "return", "keyword" }, { "Self", "keyword" }, { "Result", "literal" }, - { "false", "literal" }, { "dyn", "keyword" }, { "pub", "keyword" }, - { "i128", "keyword2" }, { "as", "keyword" }, { "Some", "literal" }, - { "enum", "keyword" }, { "f64", "keyword2" }, { "None", "literal" }, - { "async", "keyword" }, { "mut", "keyword" }, { "i32", "keyword2" }, - { "move", "keyword" }, { "f128", "keyword2" }, { "crate", "keyword" }, - { "i8", "keyword2" }, { "str", "keyword2" }, { "impl", "keyword" }, - { "in", "keyword" }, { "break", "keyword" }, { "else", "keyword" }, - { "isize", "keyword2" }, { "String", "keyword2" }, { "type", "keyword" }, - { "loop", "keyword" }, { "static", "keyword" }, { "match", "keyword" }, - { "Option", "literal" }, { "bool", "keyword2" }, { "mod", "keyword" }, - { "ref", "keyword" }, { "super", "keyword" }, { "self", "keyword" }, - { "trait", "keyword" }, { "struct", "keyword" }, { "true", "literal" }, - { "const", "keyword" }, { "u32", "keyword2" }, { "u64", "keyword2" }, - { "use", "keyword" }, { "unsafe", "keyword" }, { "where", "keyword" }, + { "while", "keyword" }, { "for", "keyword" }, { "u16", "type" }, + { "i16", "type" }, { "usize", "type" }, { "continue", "keyword" }, + { "char", "type" }, { "i64", "type" }, { "extern", "keyword" }, + { "fn", "keyword" }, { "if", "keyword" }, { "u8", "type" }, + { "f32", "type" }, { "await", "keyword" }, { "let", "keyword" }, + { "return", "keyword" }, { "Self", "keyword" }, { "Result", "literal" }, + { "false", "literal" }, { "dyn", "keyword" }, { "pub", "keyword" }, + { "i128", "type" }, { "as", "keyword" }, { "Some", "literal" }, + { "enum", "keyword" }, { "f64", "type" }, { "None", "literal" }, + { "async", "keyword" }, { "mut", "keyword" }, { "i32", "type" }, + { "move", "keyword" }, { "f128", "type" }, { "crate", "keyword" }, + { "i8", "type" }, { "str", "type" }, { "impl", "keyword" }, + { "in", "keyword" }, { "break", "keyword" }, { "else", "keyword" }, + { "isize", "type" }, { "String", "type" }, { "type", "keyword" }, + { "loop", "keyword" }, { "static", "keyword" }, { "match", "keyword" }, + { "Option", "literal" }, { "bool", "type" }, { "mod", "keyword" }, + { "ref", "keyword" }, { "super", "keyword" }, { "self", "keyword" }, + { "trait", "keyword" }, { "struct", "keyword" }, { "true", "literal" }, + { "const", "keyword" }, { "u32", "type" }, { "u64", "type" }, + { "use", "keyword" }, { "unsafe", "keyword" }, { "where", "keyword" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.hpp index 1af48a602..1bbddc881 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/rust.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addRust(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.cpp index e20450bb8..26079c8a8 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.cpp @@ -15,21 +15,21 @@ SyntaxDefinition& addSass() { { { "'", "'", "\\" }, "string" }, { { "$%w+" }, "keyword" }, { { "@%w+" }, "literal" }, - { { "&" }, "keyword2" }, + { { "&" }, "type" }, { { "[:%/%*%-]" }, "operator" }, - { { "[%a][%w-]*%s*%f[:]" }, "keyword2" }, + { { "[%a][%w-]*%s*%f[:]" }, "type" }, { { "-?%d+[%d%.]*p[xt]" }, "number" }, { { "-?%d+[%d%.]*deg" }, "number" }, { { "-?%d+[%d%.]*[s%%]" }, "number" }, { { "-?%d+[%d%.]*" }, "number" }, { { "#%x%x?%x?%x?%x?%x?%x?%x?" }, "string" }, - { { "#[%a%_%-][%w%_%-]*" }, "keyword2" }, - { { "%-%-%a[%w%-%_]*" }, "keyword2" }, + { { "#[%a%_%-][%w%_%-]*" }, "type" }, + { { "%-%-%a[%w%-%_]*" }, "type" }, { { "-?%d+[%d%.]*p[xt]" }, "number" }, { { "-?%d+[%d%.]*deg" }, "number" }, { { "-?%d+[%d%.]*" }, "number" }, - { { "@[%a][%w%_%-]*" }, "keyword2" }, - { { "%.[%a%_%-][%w%_%-]*" }, "keyword2" }, + { { "@[%a][%w%_%-]*" }, "type" }, + { { "%.[%a%_%-][%w%_%-]*" }, "type" }, { { "(:)(hover)" }, { "normal", "operator", "literal" } }, { { "(:)(focus%-within)" }, { "normal", "operator", "literal" } }, { { "(:)(focus)" }, { "normal", "operator", "literal" } }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.hpp index c21acd107..903047a7c 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sass.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addSass(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/scala.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/scala.cpp index a41148b3e..1fc3c5330 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/scala.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/scala.cpp @@ -24,24 +24,24 @@ SyntaxDefinition& addScala() { }, { - { "Nothing", "literal" }, { "AnyRef", "literal" }, { "new", "keyword" }, - { "val", "keyword" }, { "this", "keyword2" }, { "Array", "keyword2" }, - { "String", "keyword2" }, { "Long", "keyword2" }, { "extends", "keyword" }, - { "object", "keyword" }, { "match", "keyword" }, { "with", "keyword" }, - { "false", "literal" }, { "for", "keyword" }, { "forSome", "keyword" }, - { "while", "keyword" }, { "else", "keyword" }, { "final", "keyword" }, - { "List", "keyword2" }, { "if", "keyword" }, { "println", "keyword" }, - { "Any", "literal" }, { "Char", "keyword2" }, { "Float", "keyword2" }, - { "private", "keyword2" }, { "finally", "keyword" }, { "abstract", "keyword" }, - { "Int", "keyword2" }, { "trait", "keyword" }, { "return", "keyword" }, - { "var", "keyword" }, { "import", "keyword" }, { "class", "keyword" }, - { "Byte", "keyword2" }, { "lazy", "keyword" }, { "yield", "keyword" }, - { "Double", "keyword2" }, { "super", "keyword2" }, { "Null", "literal" }, - { "Short", "keyword2" }, { "throw", "keyword" }, { "def", "keyword" }, - { "Try", "keyword" }, { "Unit", "literal" }, { "catch", "keyword" }, - { "true", "literal" }, { "Boolean", "keyword2" }, { "package", "keyword" }, - { "override", "keyword" }, { "sealed", "keyword2" }, { "case", "keyword" }, - { "protected", "keyword2" }, { "do", "keyword" }, { "implicit", "keyword" }, + { "Nothing", "literal" }, { "AnyRef", "literal" }, { "new", "keyword" }, + { "val", "keyword" }, { "this", "type" }, { "Array", "type" }, + { "String", "type" }, { "Long", "type" }, { "extends", "keyword" }, + { "object", "keyword" }, { "match", "keyword" }, { "with", "keyword" }, + { "false", "literal" }, { "for", "keyword" }, { "forSome", "keyword" }, + { "while", "keyword" }, { "else", "keyword" }, { "final", "keyword" }, + { "List", "type" }, { "if", "keyword" }, { "println", "keyword" }, + { "Any", "literal" }, { "Char", "type" }, { "Float", "type" }, + { "private", "type" }, { "finally", "keyword" }, { "abstract", "keyword" }, + { "Int", "type" }, { "trait", "keyword" }, { "return", "keyword" }, + { "var", "keyword" }, { "import", "keyword" }, { "class", "keyword" }, + { "Byte", "type" }, { "lazy", "keyword" }, { "yield", "keyword" }, + { "Double", "type" }, { "super", "type" }, { "Null", "literal" }, + { "Short", "type" }, { "throw", "keyword" }, { "def", "keyword" }, + { "Try", "keyword" }, { "Unit", "literal" }, { "catch", "keyword" }, + { "true", "literal" }, { "Boolean", "type" }, { "package", "keyword" }, + { "override", "keyword" }, { "sealed", "type" }, { "case", "keyword" }, + { "protected", "type" }, { "do", "keyword" }, { "implicit", "keyword" }, { "type", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/shellscript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/shellscript.cpp index eabef440a..c566a8e69 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/shellscript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/shellscript.cpp @@ -12,7 +12,7 @@ SyntaxDefinition& addShellScript() { { "%.sh$", "%.bash$", "^%.bashrc$", "^%.bash_profile$", "^%.profile$", "%.zsh$", "%.fish$", "^PKGBUILD$", "%.winlib$" }, { - { { "$[%a_@*#][%w_]*" }, "keyword2" }, + { { "$[%a_@*#][%w_]*" }, "type" }, { { "#.*\n" }, "comment" }, { { "<<%-?%s*EOF", "EOF" }, "string" }, { { "\"", "\"", "\\" }, "string" }, @@ -24,9 +24,9 @@ SyntaxDefinition& addShellScript() { { { "%f[%S][%+%-][%w%-_]+%f[=]" }, "function" }, { { "(%s%-%a[%w_%-]*%s+)(%d[%d%.]+)" }, { "normal", "function", "number" } }, { { "(%s%-%a[%w_%-]*%s+)(%a[%a%-_:=]+)" }, { "normal", "function", "symbol" } }, - { { "[_%a][%w_]+%f[%+=]" }, "keyword2" }, - { { "${.-}" }, "keyword2" }, - { { "$[%d$%a_@*][%w_]*" }, "keyword2" }, + { { "[_%a][%w_]+%f[%+=]" }, "type" }, + { { "${.-}" }, "type" }, + { { "$[%d$%a_@*][%w_]*" }, "type" }, { { "[%a_%-][%w_%-]*[%s]*%f[(]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.cpp index 3a7948c1b..ac82d470f 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.cpp @@ -5,338 +5,185 @@ namespace EE { namespace UI { namespace Doc { namespace Language { SyntaxDefinition& addSmallBASIC() { - return SyntaxDefinitionManager::instance()->add( + return SyntaxDefinitionManager::instance() + ->add( - { "SmallBASIC", - { "%.bas$" }, - { - { { "'.*" }, "comment" }, - { { "REM%s.*" }, "comment" }, - { { "\"", "\"" }, "string" }, - { { "-?&H%x+" }, "number" }, - { { "-?%d+[%d%.eE]*" }, "number" }, - { { "-?%.?%d+f?" }, "number" }, - { { "[=><%+%-%*%^&:%.,_%(%)]" }, "operator" }, - { { "[%a_][%w_]*" }, "symbol" }, + { "SmallBASIC", + { "%.bas$" }, + { + { { "'.*" }, "comment" }, + { { "REM%s.*" }, "comment" }, + { { "\"", "\"" }, "string" }, + { { "-?&H%x+" }, "number" }, + { { "-?%d+[%d%.eE]*" }, "number" }, + { { "-?%.?%d+f?" }, "number" }, + { { "[=><%+%-%*%^&:%.,_%(%)]" }, "operator" }, + { { "[%a_][%w_]*" }, "symbol" }, - }, - { + }, + { - { "abs", "keyword" }, - { "absmax", "keyword" }, - { "absmin", "keyword" }, - { "access", "keyword" }, - { "acos", "keyword" }, - { "acosh", "keyword" }, - { "acot", "keyword" }, - { "acoth", "keyword" }, - { "acsc", "keyword" }, - { "acsch", "keyword" }, - { "and", "keyword" }, - { "append", "keyword" }, - { "arc", "keyword" }, - { "array", "keyword" }, - { "as", "keyword" }, - { "asc", "keyword" }, - { "asec", "keyword" }, - { "asech", "keyword" }, - { "asin", "keyword" }, - { "asinh", "keyword" }, - { "at", "keyword" }, - { "atan", "keyword" }, - { "atan2", "keyword" }, - { "atanh", "keyword" }, - { "atn", "keyword" }, - { "band", "keyword" }, - { "bcs", "keyword" }, - { "beep", "keyword" }, - { "bg", "keyword" }, - { "bgetc", "keyword" }, - { "bin", "keyword" }, - { "bload", "keyword" }, - { "bor", "keyword" }, - { "bputc", "keyword" }, - { "bsave", "keyword" }, - { "byref", "keyword" }, - { "call", "keyword" }, - { "case", "keyword" }, - { "cat", "keyword" }, - { "catch", "keyword" }, - { "cbs", "keyword" }, - { "cdbl", "keyword" }, - { "ceil", "keyword" }, - { "chain", "keyword" }, - { "chart", "keyword" }, - { "chdir", "keyword" }, - { "chmod", "keyword" }, - { "chop", "keyword" }, - { "chr", "keyword" }, - { "cint", "keyword" }, - { "circle", "keyword" }, - { "close", "keyword" }, - { "cls", "keyword" }, - { "color", "keyword" }, - { "command", "keyword" }, - { "const", "keyword" }, - { "copy", "keyword" }, - { "cos", "keyword" }, - { "cosh", "keyword" }, - { "cot", "keyword" }, - { "coth", "keyword" }, - { "creal", "keyword" }, - { "csc", "keyword" }, - { "csch", "keyword" }, - { "cwd", "keyword" }, - { "data", "keyword" }, - { "date", "keyword" }, - { "datedmy", "keyword" }, - { "datefmt", "keyword" }, - { "declare", "keyword" }, - { "def", "keyword" }, - { "definekey", "keyword" }, - { "deg", "keyword" }, - { "delay", "keyword" }, - { "delete", "keyword" }, - { "deriv", "keyword" }, - { "determ", "keyword" }, - { "diffeqn", "keyword" }, - { "dim", "keyword" }, - { "dirwalk", "keyword" }, - { "disclose", "keyword" }, - { "do", "keyword" }, - { "draw", "keyword" }, - { "drawpoly", "keyword" }, - { "elif", "keyword" }, - { "else", "keyword" }, - { "elseif", "keyword" }, - { "empty", "keyword" }, - { "enclose", "keyword" }, - { "end", "keyword" }, - { "try", "keyword" }, - { "endif", "keyword" }, - { "env", "keyword" }, - { "eof", "keyword" }, - { "eqv", "keyword" }, - { "erase", "keyword" }, - { "exec", "keyword" }, - { "exist", "keyword" }, - { "exit", "keyword" }, - { "exp", "keyword" }, - { "export", "keyword" }, - { "exprseq", "keyword" }, - { "false", "keyword" }, - { "fi", "keyword" }, - { "files", "keyword" }, - { "fix", "keyword" }, - { "floor", "keyword" }, - { "for", "keyword" }, - { "form", "keyword" }, - { "format", "keyword" }, - { "frac", "keyword" }, - { "fre", "keyword" }, - { "freefile", "keyword" }, - { "func", "keyword" }, - { "gosub", "keyword" }, - { "goto", "keyword" }, - { "hex", "keyword" }, - { "home", "keyword" }, - { "if", "keyword" }, - { "iff", "keyword" }, - { "image", "keyword" }, - { "imp", "keyword" }, - { "import", "keyword" }, - { "in", "keyword" }, - { "include", "keyword" }, - { "inkey", "keyword" }, - { "input", "keyword" }, - { "insert", "keyword" }, - { "instr", "keyword" }, - { "int", "keyword" }, - { "intersect", "keyword" }, - { "inverse", "keyword" }, - { "isarray", "keyword" }, - { "isdir", "keyword" }, - { "isfile", "keyword" }, - { "islink", "keyword" }, - { "ismap", "keyword" }, - { "isnumber", "keyword" }, - { "isstring", "keyword" }, - { "join", "keyword" }, - { "julian", "keyword" }, - { "kill", "keyword" }, - { "label", "keyword" }, - { "lbound", "keyword" }, - { "lcase", "keyword" }, - { "left", "keyword" }, - { "leftof", "keyword" }, - { "leftoflast", "keyword" }, - { "len", "keyword" }, - { "let", "keyword" }, - { "like", "keyword" }, - { "line", "keyword" }, - { "lineinput", "keyword" }, - { "lineqn", "keyword" }, - { "linput", "keyword" }, - { "local", "keyword" }, - { "locate", "keyword" }, - { "lock", "keyword" }, - { "lof", "keyword" }, - { "log", "keyword" }, - { "log10", "keyword" }, - { "logprint", "keyword" }, - { "lower", "keyword" }, - { "lshift", "keyword" }, - { "ltrim", "keyword" }, - { "m3apply", "keyword" }, - { "m3ident", "keyword" }, - { "m3rotate", "keyword" }, - { "m3scale", "keyword" }, - { "m3trans", "keyword" }, - { "max", "keyword" }, - { "maxint", "keyword" }, - { "mdl", "keyword" }, - { "mid", "keyword" }, - { "min", "keyword" }, - { "mkdir", "keyword" }, - { "mod", "keyword" }, - { "nand", "keyword" }, - { "next", "keyword" }, - { "nil", "keyword" }, - { "nor", "keyword" }, - { "nosound", "keyword" }, - { "not", "keyword" }, - { "oct", "keyword" }, - { "on", "keyword" }, - { "open", "keyword" }, - { "option", "keyword" }, - { "or", "keyword" }, - { "paint", "keyword" }, - { "pause", "keyword" }, - { "pen", "keyword" }, - { "pen", "keyword" }, - { "pi", "keyword" }, - { "play", "keyword" }, - { "plot", "keyword" }, - { "point", "keyword" }, - { "polyarea", "keyword" }, - { "polycent", "keyword" }, - { "polyext", "keyword" }, - { "pow", "keyword" }, - { "print", "keyword" }, - { "progline", "keyword" }, - { "pset", "keyword" }, - { "ptdistln", "keyword" }, - { "ptdistseg", "keyword" }, - { "ptsign", "keyword" }, - { "rad", "keyword" }, - { "randomize", "keyword" }, - { "read", "keyword" }, - { "rect", "keyword" }, - { "redim", "keyword" }, - { "rename", "keyword" }, - { "repeat", "keyword" }, - { "replace", "keyword" }, - { "restore", "keyword" }, - { "return", "keyword" }, - { "rgb", "keyword" }, - { "rgbf", "keyword" }, - { "right", "keyword" }, - { "rightof", "keyword" }, - { "rightoflast", "keyword" }, - { "rinstr", "keyword" }, - { "rmdir", "keyword" }, - { "rnd", "keyword" }, - { "root", "keyword" }, - { "round", "keyword" }, - { "rshift", "keyword" }, - { "rtrim", "keyword" }, - { "run", "keyword" }, - { "sbver", "keyword" }, - { "search", "keyword" }, - { "sec", "keyword" }, - { "sech", "keyword" }, - { "seek", "keyword" }, - { "seek", "keyword" }, - { "segcos", "keyword" }, - { "seglen", "keyword" }, - { "segsin", "keyword" }, - { "select", "keyword" }, - { "self", "keyword" }, - { "seq", "keyword" }, - { "sgn", "keyword" }, - { "showpage", "keyword" }, - { "sin", "keyword" }, - { "sinh", "keyword" }, - { "sinput", "keyword" }, - { "sort", "keyword" }, - { "sound", "keyword" }, - { "space", "keyword" }, - { "spc", "keyword" }, - { "split", "keyword" }, - { "sprint", "keyword" }, - { "sqr", "keyword" }, - { "squeeze", "keyword" }, - { "statmean", "keyword" }, - { "statmeandev", "keyword" }, - { "statspreadp", "keyword" }, - { "statspreads", "keyword" }, - { "step", "keyword" }, - { "stkdump", "keyword" }, - { "stop", "keyword" }, - { "str", "keyword" }, - { "string", "keyword" }, - { "sub", "keyword" }, - { "sum", "keyword" }, - { "sumsq", "keyword" }, - { "swap", "keyword" }, - { "tab", "keyword" }, - { "tan", "keyword" }, - { "tanh", "keyword" }, - { "textheight", "keyword" }, - { "textwidth", "keyword" }, - { "then", "keyword" }, - { "throw", "keyword" }, - { "ticks", "keyword" }, - { "time", "keyword" }, - { "timehms", "keyword" }, - { "timer", "keyword" }, - { "timestamp", "keyword" }, - { "tload", "keyword" }, - { "to", "keyword" }, - { "translate", "keyword" }, - { "trim", "keyword" }, - { "troff", "keyword" }, - { "tron", "keyword" }, - { "true", "keyword" }, - { "try", "keyword" }, - { "tsave", "keyword" }, - { "txth", "keyword" }, - { "txtw", "keyword" }, - { "ubound", "keyword" }, - { "ucase", "keyword" }, - { "unit", "keyword" }, - { "until", "keyword" }, - { "upper", "keyword" }, - { "use", "keyword" }, - { "usg", "keyword" }, - { "using", "keyword" }, - { "val", "keyword" }, - { "view", "keyword" }, - { "weekday", "keyword" }, - { "wend", "keyword" }, - { "while", "keyword" }, - { "window", "keyword" }, - { "write", "keyword" }, - { "xmax", "keyword" }, - { "xnor", "keyword" }, - { "xor", "keyword" }, - { "xpos", "keyword" }, - { "ymax", "keyword" }, - { "ypos", "keyword" } }, - "'", - {} + { "abs", "keyword" }, { "absmax", "keyword" }, + { "absmin", "keyword" }, { "access", "keyword" }, + { "acos", "keyword" }, { "acosh", "keyword" }, + { "acot", "keyword" }, { "acoth", "keyword" }, + { "acsc", "keyword" }, { "acsch", "keyword" }, + { "and", "keyword" }, { "append", "keyword" }, + { "arc", "keyword" }, { "array", "keyword" }, + { "as", "keyword" }, { "asc", "keyword" }, + { "asec", "keyword" }, { "asech", "keyword" }, + { "asin", "keyword" }, { "asinh", "keyword" }, + { "at", "keyword" }, { "atan", "keyword" }, + { "atan2", "keyword" }, { "atanh", "keyword" }, + { "atn", "keyword" }, { "band", "keyword" }, + { "bcs", "keyword" }, { "beep", "keyword" }, + { "bg", "keyword" }, { "bgetc", "keyword" }, + { "bin", "keyword" }, { "bload", "keyword" }, + { "bor", "keyword" }, { "bputc", "keyword" }, + { "bsave", "keyword" }, { "byref", "keyword" }, + { "call", "keyword" }, { "case", "keyword" }, + { "cat", "keyword" }, { "catch", "keyword" }, + { "cbs", "keyword" }, { "cdbl", "keyword" }, + { "ceil", "keyword" }, { "chain", "keyword" }, + { "chart", "keyword" }, { "chdir", "keyword" }, + { "chmod", "keyword" }, { "chop", "keyword" }, + { "chr", "keyword" }, { "cint", "keyword" }, + { "circle", "keyword" }, { "close", "keyword" }, + { "cls", "keyword" }, { "color", "keyword" }, + { "command", "keyword" }, { "const", "keyword" }, + { "copy", "keyword" }, { "cos", "keyword" }, + { "cosh", "keyword" }, { "cot", "keyword" }, + { "coth", "keyword" }, { "creal", "keyword" }, + { "csc", "keyword" }, { "csch", "keyword" }, + { "cwd", "keyword" }, { "data", "keyword" }, + { "date", "keyword" }, { "datedmy", "keyword" }, + { "datefmt", "keyword" }, { "declare", "keyword" }, + { "def", "keyword" }, { "definekey", "keyword" }, + { "deg", "keyword" }, { "delay", "keyword" }, + { "delete", "keyword" }, { "deriv", "keyword" }, + { "determ", "keyword" }, { "diffeqn", "keyword" }, + { "dim", "keyword" }, { "dirwalk", "keyword" }, + { "disclose", "keyword" }, { "do", "keyword" }, + { "draw", "keyword" }, { "drawpoly", "keyword" }, + { "elif", "keyword" }, { "else", "keyword" }, + { "elseif", "keyword" }, { "empty", "keyword" }, + { "enclose", "keyword" }, { "end", "keyword" }, + { "try", "keyword" }, { "endif", "keyword" }, + { "env", "keyword" }, { "eof", "keyword" }, + { "eqv", "keyword" }, { "erase", "keyword" }, + { "exec", "keyword" }, { "exist", "keyword" }, + { "exit", "keyword" }, { "exp", "keyword" }, + { "export", "keyword" }, { "exprseq", "keyword" }, + { "false", "keyword" }, { "fi", "keyword" }, + { "files", "keyword" }, { "fix", "keyword" }, + { "floor", "keyword" }, { "for", "keyword" }, + { "form", "keyword" }, { "format", "keyword" }, + { "frac", "keyword" }, { "fre", "keyword" }, + { "freefile", "keyword" }, { "func", "keyword" }, + { "gosub", "keyword" }, { "goto", "keyword" }, + { "hex", "keyword" }, { "home", "keyword" }, + { "if", "keyword" }, { "iff", "keyword" }, + { "image", "keyword" }, { "imp", "keyword" }, + { "import", "keyword" }, { "in", "keyword" }, + { "include", "keyword" }, { "inkey", "keyword" }, + { "input", "keyword" }, { "insert", "keyword" }, + { "instr", "keyword" }, { "int", "keyword" }, + { "intersect", "keyword" }, { "inverse", "keyword" }, + { "isarray", "keyword" }, { "isdir", "keyword" }, + { "isfile", "keyword" }, { "islink", "keyword" }, + { "ismap", "keyword" }, { "isnumber", "keyword" }, + { "isstring", "keyword" }, { "join", "keyword" }, + { "julian", "keyword" }, { "kill", "keyword" }, + { "label", "keyword" }, { "lbound", "keyword" }, + { "lcase", "keyword" }, { "left", "keyword" }, + { "leftof", "keyword" }, { "leftoflast", "keyword" }, + { "len", "keyword" }, { "let", "keyword" }, + { "like", "keyword" }, { "line", "keyword" }, + { "lineinput", "keyword" }, { "lineqn", "keyword" }, + { "linput", "keyword" }, { "local", "keyword" }, + { "locate", "keyword" }, { "lock", "keyword" }, + { "lof", "keyword" }, { "log", "keyword" }, + { "log10", "keyword" }, { "logprint", "keyword" }, + { "lower", "keyword" }, { "lshift", "keyword" }, + { "ltrim", "keyword" }, { "m3apply", "keyword" }, + { "m3ident", "keyword" }, { "m3rotate", "keyword" }, + { "m3scale", "keyword" }, { "m3trans", "keyword" }, + { "max", "keyword" }, { "maxint", "keyword" }, + { "mdl", "keyword" }, { "mid", "keyword" }, + { "min", "keyword" }, { "mkdir", "keyword" }, + { "mod", "keyword" }, { "nand", "keyword" }, + { "next", "keyword" }, { "nil", "keyword" }, + { "nor", "keyword" }, { "nosound", "keyword" }, + { "not", "keyword" }, { "oct", "keyword" }, + { "on", "keyword" }, { "open", "keyword" }, + { "option", "keyword" }, { "or", "keyword" }, + { "paint", "keyword" }, { "pause", "keyword" }, + { "pen", "keyword" }, { "pen", "keyword" }, + { "pi", "keyword" }, { "play", "keyword" }, + { "plot", "keyword" }, { "point", "keyword" }, + { "polyarea", "keyword" }, { "polycent", "keyword" }, + { "polyext", "keyword" }, { "pow", "keyword" }, + { "print", "keyword" }, { "progline", "keyword" }, + { "pset", "keyword" }, { "ptdistln", "keyword" }, + { "ptdistseg", "keyword" }, { "ptsign", "keyword" }, + { "rad", "keyword" }, { "randomize", "keyword" }, + { "read", "keyword" }, { "rect", "keyword" }, + { "redim", "keyword" }, { "rename", "keyword" }, + { "repeat", "keyword" }, { "replace", "keyword" }, + { "restore", "keyword" }, { "return", "keyword" }, + { "rgb", "keyword" }, { "rgbf", "keyword" }, + { "right", "keyword" }, { "rightof", "keyword" }, + { "rightoflast", "keyword" }, { "rinstr", "keyword" }, + { "rmdir", "keyword" }, { "rnd", "keyword" }, + { "root", "keyword" }, { "round", "keyword" }, + { "rshift", "keyword" }, { "rtrim", "keyword" }, + { "run", "keyword" }, { "sbver", "keyword" }, + { "search", "keyword" }, { "sec", "keyword" }, + { "sech", "keyword" }, { "seek", "keyword" }, + { "seek", "keyword" }, { "segcos", "keyword" }, + { "seglen", "keyword" }, { "segsin", "keyword" }, + { "select", "keyword" }, { "self", "keyword" }, + { "seq", "keyword" }, { "sgn", "keyword" }, + { "showpage", "keyword" }, { "sin", "keyword" }, + { "sinh", "keyword" }, { "sinput", "keyword" }, + { "sort", "keyword" }, { "sound", "keyword" }, + { "space", "keyword" }, { "spc", "keyword" }, + { "split", "keyword" }, { "sprint", "keyword" }, + { "sqr", "keyword" }, { "squeeze", "keyword" }, + { "statmean", "keyword" }, { "statmeandev", "keyword" }, + { "statspreadp", "keyword" }, { "statspreads", "keyword" }, + { "step", "keyword" }, { "stkdump", "keyword" }, + { "stop", "keyword" }, { "str", "keyword" }, + { "string", "keyword" }, { "sub", "keyword" }, + { "sum", "keyword" }, { "sumsq", "keyword" }, + { "swap", "keyword" }, { "tab", "keyword" }, + { "tan", "keyword" }, { "tanh", "keyword" }, + { "textheight", "keyword" }, { "textwidth", "keyword" }, + { "then", "keyword" }, { "throw", "keyword" }, + { "ticks", "keyword" }, { "time", "keyword" }, + { "timehms", "keyword" }, { "timer", "keyword" }, + { "timestamp", "keyword" }, { "tload", "keyword" }, + { "to", "keyword" }, { "translate", "keyword" }, + { "trim", "keyword" }, { "troff", "keyword" }, + { "tron", "keyword" }, { "true", "keyword" }, + { "try", "keyword" }, { "tsave", "keyword" }, + { "txth", "keyword" }, { "txtw", "keyword" }, + { "ubound", "keyword" }, { "ucase", "keyword" }, + { "unit", "keyword" }, { "until", "keyword" }, + { "upper", "keyword" }, { "use", "keyword" }, + { "usg", "keyword" }, { "using", "keyword" }, + { "val", "keyword" }, { "view", "keyword" }, + { "weekday", "keyword" }, { "wend", "keyword" }, + { "while", "keyword" }, { "window", "keyword" }, + { "write", "keyword" }, { "xmax", "keyword" }, + { "xnor", "keyword" }, { "xor", "keyword" }, + { "xpos", "keyword" }, { "ymax", "keyword" }, + { "ypos", "keyword" } }, + "'", + {} - } ).setCaseInsensitive( true ); + } ) + .setCaseInsensitive( true ); } }}}} // namespace EE::UI::Doc::Language diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.hpp index 066b92793..22a8c9dee 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/smallbasic.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addSmallBASIC(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.cpp index 2303c4bee..db9b26a01 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.cpp @@ -23,124 +23,65 @@ SyntaxDefinition& addSolidity() { }, { - { "interface", "keyword" }, - { "bytes3", "keyword2" }, - { "blockhash", "keyword2" }, - { "uint64", "keyword2" }, - { "ecrecover", "keyword2" }, - { "new", "keyword" }, - { "ripemd160", "keyword2" }, - { "sha3", "keyword2" }, - { "byte", "keyword2" }, - { "bytes32", "keyword2" }, - { "suicide", "keyword2" }, - { "virtual", "keyword2" }, - { "revert", "keyword2" }, - { "bytes30", "keyword2" }, - { "msg", "keyword2" }, - { "bytes15", "keyword2" }, - { "enum", "keyword" }, - { "payable", "keyword2" }, - { "assembly", "keyword" }, - { "super", "keyword2" }, - { "library", "keyword" }, - { "private", "keyword2" }, - { "is", "keyword" }, - { "now", "keyword2" }, - { "throw", "keyword" }, - { "bytes18", "keyword2" }, - { "contract", "keyword" }, - { "view", "keyword2" }, - { "bytes14", "keyword2" }, - { "let", "keyword" }, - { "external", "keyword2" }, - { "return", "keyword" }, - { "mulmod", "keyword2" }, - { "modifier", "keyword" }, - { "bytes12", "keyword2" }, - { "uint256", "keyword2" }, - { "assert", "keyword2" }, - { "tx", "keyword2" }, - { "require", "keyword" }, - { "bytes8", "keyword2" }, - { "uint32", "keyword2" }, - { "returns", "keyword" }, - { "do", "keyword" }, - { "sha256", "keyword2" }, - { "while", "keyword" }, - { "bytes23", "keyword2" }, - { "function", "keyword" }, - { "memory", "keyword2" }, - { "event", "keyword" }, - { "else", "keyword" }, - { "break", "keyword" }, - { "for", "keyword" }, - { "address", "keyword2" }, - { "bytes4", "keyword2" }, - { "abstract", "keyword" }, - { "gasleft", "keyword2" }, - { "keccak256", "keyword2" }, - { "bytes25", "keyword2" }, - { "bytes28", "keyword2" }, - { "this", "keyword2" }, - { "bytes10", "keyword2" }, - { "protected", "keyword" }, - { "uint8", "keyword2" }, - { "delete", "keyword" }, - { "indexed", "keyword2" }, - { "bytes11", "keyword2" }, - { "bytes17", "keyword2" }, - { "bytes21", "keyword2" }, - { "bytes5", "keyword2" }, - { "bytes26", "keyword2" }, - { "bytes16", "keyword2" }, - { "string", "keyword2" }, - { "bytes31", "keyword2" }, - { "emit", "keyword" }, - { "int32", "keyword2" }, - { "bytes19", "keyword2" }, - { "bytes27", "keyword2" }, - { "int16", "keyword2" }, - { "int8", "keyword2" }, - { "bytes13", "keyword2" }, - { "bytes22", "keyword2" }, - { "hash", "keyword2" }, - { "bytes7", "keyword2" }, - { "pragma", "keyword2" }, - { "int128", "keyword2" }, - { "bytes29", "keyword2" }, - { "int256", "keyword2" }, - { "bytes", "keyword2" }, - { "int64", "keyword2" }, - { "uint16", "keyword2" }, - { "int", "keyword2" }, - { "uint", "keyword2" }, - { "bytes24", "keyword2" }, - { "struct", "keyword" }, - { "uint128", "keyword2" }, - { "bytes2", "keyword2" }, - { "bytes6", "keyword2" }, - { "bytes1", "keyword2" }, - { "override", "keyword2" }, - { "constructor", "keyword" }, - { "using", "keyword" }, - { "nonpayable", "keyword2" }, - { "mapping", "keyword2" }, - { "inherited", "keyword2" }, - { "bytes9", "keyword2" }, - { "pure", "keyword2" }, - { "selfdestruct", "keyword2" }, - { "immutable", "keyword2" }, - { "constant", "keyword2" }, - { "bytes20", "keyword2" }, - { "addmod", "keyword2" }, - { "internal", "keyword2" }, - { "bool", "keyword2" }, - { "public", "keyword2" }, - { "block", "keyword2" }, - { "storage", "keyword2" }, - { "calldata", "keyword2" }, - { "if", "keyword" }, + { "interface", "keyword" }, { "bytes3", "type" }, + { "blockhash", "type" }, { "uint64", "type" }, + { "ecrecover", "type" }, { "new", "keyword" }, + { "ripemd160", "type" }, { "sha3", "type" }, + { "byte", "type" }, { "bytes32", "type" }, + { "suicide", "type" }, { "virtual", "type" }, + { "revert", "type" }, { "bytes30", "type" }, + { "msg", "type" }, { "bytes15", "type" }, + { "enum", "keyword" }, { "payable", "type" }, + { "assembly", "keyword" }, { "super", "type" }, + { "library", "keyword" }, { "private", "type" }, + { "is", "keyword" }, { "now", "type" }, + { "throw", "keyword" }, { "bytes18", "type" }, + { "contract", "keyword" }, { "view", "type" }, + { "bytes14", "type" }, { "let", "keyword" }, + { "external", "type" }, { "return", "keyword" }, + { "mulmod", "type" }, { "modifier", "keyword" }, + { "bytes12", "type" }, { "uint256", "type" }, + { "assert", "type" }, { "tx", "type" }, + { "require", "keyword" }, { "bytes8", "type" }, + { "uint32", "type" }, { "returns", "keyword" }, + { "do", "keyword" }, { "sha256", "type" }, + { "while", "keyword" }, { "bytes23", "type" }, + { "function", "keyword" }, { "memory", "type" }, + { "event", "keyword" }, { "else", "keyword" }, + { "break", "keyword" }, { "for", "keyword" }, + { "address", "type" }, { "bytes4", "type" }, + { "abstract", "keyword" }, { "gasleft", "type" }, + { "keccak256", "type" }, { "bytes25", "type" }, + { "bytes28", "type" }, { "this", "type" }, + { "bytes10", "type" }, { "protected", "keyword" }, + { "uint8", "type" }, { "delete", "keyword" }, + { "indexed", "type" }, { "bytes11", "type" }, + { "bytes17", "type" }, { "bytes21", "type" }, + { "bytes5", "type" }, { "bytes26", "type" }, + { "bytes16", "type" }, { "string", "type" }, + { "bytes31", "type" }, { "emit", "keyword" }, + { "int32", "type" }, { "bytes19", "type" }, + { "bytes27", "type" }, { "int16", "type" }, + { "int8", "type" }, { "bytes13", "type" }, + { "bytes22", "type" }, { "hash", "type" }, + { "bytes7", "type" }, { "pragma", "type" }, + { "int128", "type" }, { "bytes29", "type" }, + { "int256", "type" }, { "bytes", "type" }, + { "int64", "type" }, { "uint16", "type" }, + { "int", "type" }, { "uint", "type" }, + { "bytes24", "type" }, { "struct", "keyword" }, + { "uint128", "type" }, { "bytes2", "type" }, + { "bytes6", "type" }, { "bytes1", "type" }, + { "override", "type" }, { "constructor", "keyword" }, + { "using", "keyword" }, { "nonpayable", "type" }, + { "mapping", "type" }, { "inherited", "type" }, + { "bytes9", "type" }, { "pure", "type" }, + { "selfdestruct", "type" }, { "immutable", "type" }, + { "constant", "type" }, { "bytes20", "type" }, + { "addmod", "type" }, { "internal", "type" }, + { "bool", "type" }, { "public", "type" }, + { "block", "type" }, { "storage", "type" }, + { "calldata", "type" }, { "if", "keyword" }, { "continue", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.hpp index c846942be..d8a3cdba3 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/solidity.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addSolidity(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.cpp index 6d5a95ad2..54bc88099 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.cpp @@ -21,25 +21,25 @@ SyntaxDefinition& addSQL() { }, { - { "SERIAL8", "keyword2" }, - { "INT8RANGE", "keyword2" }, - { "INT8", "keyword2" }, - { "bigint", "keyword2" }, - { "VARBIT", "keyword2" }, + { "SERIAL8", "type" }, + { "INT8RANGE", "type" }, + { "INT8", "type" }, + { "bigint", "type" }, + { "VARBIT", "type" }, { "recursive", "keyword" }, { "on", "keyword" }, { "foreign", "keyword" }, { "ENUM", "keyword" }, { "VARIADIC", "keyword" }, - { "serial8", "keyword2" }, + { "serial8", "type" }, { "DOMAIN", "keyword" }, - { "INT4RANGE", "keyword2" }, + { "INT4RANGE", "type" }, { "OPERATOR", "keyword" }, { "EVENT", "keyword" }, { "INDEX", "keyword" }, - { "DATERANGE", "keyword2" }, + { "DATERANGE", "type" }, { "event", "keyword" }, - { "path", "keyword2" }, + { "path", "type" }, { "CURRENT_TIMESTAMP", "literal" }, { "RAISE", "keyword" }, { "LOOP", "keyword" }, @@ -50,7 +50,7 @@ SyntaxDefinition& addSQL() { { "execute", "keyword" }, { "raise", "keyword" }, { "alter", "keyword" }, - { "macaddr", "keyword2" }, + { "macaddr", "type" }, { "ROW", "keyword" }, { "CASE", "keyword" }, { "FALSE", "literal" }, @@ -61,11 +61,11 @@ SyntaxDefinition& addSQL() { { "for", "keyword" }, { "collation", "keyword" }, { "UNION", "keyword" }, - { "circle", "keyword2" }, + { "circle", "type" }, { "some", "keyword" }, { "PRECEDING", "keyword" }, { "left", "keyword" }, - { "varbit", "keyword2" }, + { "varbit", "type" }, { "SELECT", "keyword" }, { "EACH", "keyword" }, { "enum", "keyword" }, @@ -80,21 +80,21 @@ SyntaxDefinition& addSQL() { { "ALSO", "keyword" }, { "DISTINCT", "keyword" }, { "END", "keyword" }, - { "varchar", "keyword2" }, + { "varchar", "type" }, { "when", "keyword" }, - { "CIDR", "keyword2" }, + { "CIDR", "type" }, { "notice", "keyword" }, { "then", "keyword" }, { "SET", "keyword" }, - { "uuid", "keyword2" }, + { "uuid", "type" }, { "FOREIGN", "keyword" }, { "UNKNOWN", "keyword" }, { "unknown", "keyword" }, - { "int8", "keyword2" }, + { "int8", "type" }, { "NOTNULL", "keyword" }, { "notnull", "keyword" }, { "isnull", "keyword" }, - { "date", "keyword2" }, + { "date", "type" }, { "DECLARE", "keyword" }, { "INTO", "keyword" }, { "ROWS", "keyword" }, @@ -117,47 +117,47 @@ SyntaxDefinition& addSQL() { { "option", "keyword" }, { "else", "keyword" }, { "UPDATE", "keyword" }, - { "tsrange", "keyword2" }, + { "tsrange", "type" }, { "xmlparse", "keyword" }, { "without", "keyword" }, { "zone", "keyword" }, { "sequence", "keyword" }, { "ALTER", "keyword" }, - { "precision", "keyword2" }, + { "precision", "type" }, { "INSTEAD", "keyword" }, { "partition", "keyword" }, { "THEN", "keyword" }, { "ZONE", "keyword" }, - { "MONEY", "keyword2" }, + { "MONEY", "type" }, { "instead", "keyword" }, { "TYPE", "keyword" }, { "also", "keyword" }, { "set", "keyword" }, { "EXISTS", "keyword" }, - { "PRECISION", "keyword2" }, - { "txid_snapshot", "keyword2" }, + { "PRECISION", "type" }, + { "txid_snapshot", "type" }, { "returning", "keyword" }, { "ARRAY", "keyword" }, { "any", "keyword" }, - { "DECIMAL", "keyword2" }, - { "bigserial", "keyword2" }, + { "DECIMAL", "type" }, + { "bigserial", "type" }, { "INNER", "keyword" }, { "drop", "keyword" }, { "full", "keyword" }, { "FULL", "keyword" }, { "NATURAL", "keyword" }, - { "MACADDR", "keyword2" }, - { "INTEGER", "keyword2" }, + { "MACADDR", "type" }, + { "INTEGER", "type" }, { "inner", "keyword" }, { "RIGHT", "keyword" }, { "CHECK", "keyword" }, - { "jsonb", "keyword2" }, + { "jsonb", "type" }, { "EXTENSION", "keyword" }, { "AND", "keyword" }, { "SETOF", "keyword" }, { "PARTITION", "keyword" }, - { "line", "keyword2" }, - { "SERIAL4", "keyword2" }, + { "line", "type" }, + { "SERIAL4", "type" }, { "AS", "keyword" }, { "LIKE", "keyword" }, { "GROUP", "keyword" }, @@ -165,11 +165,11 @@ SyntaxDefinition& addSQL() { { "RETURNS", "keyword" }, { "sql", "keyword" }, { "LATERAL", "keyword" }, - { "NUMERIC", "keyword2" }, - { "int4", "keyword2" }, + { "NUMERIC", "type" }, + { "int4", "type" }, { "FUNCTION", "keyword" }, { "references", "keyword" }, - { "BOX", "keyword2" }, + { "BOX", "type" }, { "intersect", "keyword" }, { "CURRENT_DATE", "literal" }, { "AT", "keyword" }, @@ -177,145 +177,145 @@ SyntaxDefinition& addSQL() { { "current_timestamp", "literal" }, { "NULLS", "keyword" }, { "first", "keyword" }, - { "BOOLEAN", "keyword2" }, - { "bytea", "keyword2" }, - { "BOOL", "keyword2" }, - { "BIGSERIAL", "keyword2" }, - { "json", "keyword2" }, + { "BOOLEAN", "type" }, + { "bytea", "type" }, + { "BOOL", "type" }, + { "BIGSERIAL", "type" }, + { "json", "type" }, { "LAST", "keyword" }, { "localtimestamp", "literal" }, - { "character", "keyword2" }, + { "character", "type" }, { "LEFT", "keyword" }, - { "BYTEA", "keyword2" }, - { "serial", "keyword2" }, - { "time", "keyword2" }, + { "BYTEA", "type" }, + { "serial", "type" }, + { "time", "type" }, { "operator", "keyword" }, - { "CHARACTER", "keyword2" }, - { "char", "keyword2" }, - { "float8", "keyword2" }, - { "CHAR", "keyword2" }, + { "CHARACTER", "type" }, + { "char", "type" }, + { "float8", "type" }, + { "CHAR", "type" }, { "EXCEPT", "keyword" }, - { "INT4", "keyword2" }, + { "INT4", "type" }, { "view", "keyword" }, - { "TSRANGE", "keyword2" }, - { "CIRCLE", "keyword2" }, - { "INT2", "keyword2" }, - { "daterange", "keyword2" }, - { "TIMEZ", "keyword2" }, - { "SERIAL", "keyword2" }, + { "TSRANGE", "type" }, + { "CIRCLE", "type" }, + { "INT2", "type" }, + { "daterange", "type" }, + { "TIMEZ", "type" }, + { "SERIAL", "type" }, { "INSERT", "keyword" }, - { "timestampz", "keyword2" }, - { "TSQUERY", "keyword2" }, - { "point", "keyword2" }, - { "pg_lsn", "keyword2" }, + { "timestampz", "type" }, + { "TSQUERY", "type" }, + { "point", "type" }, + { "pg_lsn", "type" }, { "unnest", "keyword" }, { "begin", "keyword" }, - { "decimal", "keyword2" }, + { "decimal", "type" }, { "LOCALTIME", "literal" }, - { "TIME", "keyword2" }, + { "TIME", "type" }, { "UNNEST", "keyword" }, - { "tsquery", "keyword2" }, + { "tsquery", "type" }, { "current_time", "literal" }, { "xmlserialize", "keyword" }, - { "JSON", "keyword2" }, + { "JSON", "type" }, { "returns", "keyword" }, - { "TSVECTOR", "keyword2" }, - { "TXID_SNAPSHOT", "keyword2" }, - { "lseg", "keyword2" }, - { "int8range", "keyword2" }, + { "TSVECTOR", "type" }, + { "TXID_SNAPSHOT", "type" }, + { "lseg", "type" }, + { "int8range", "type" }, { "localtime", "literal" }, { "index", "keyword" }, - { "serial4", "keyword2" }, + { "serial4", "type" }, { "check", "keyword" }, - { "INET", "keyword2" }, - { "smallserial", "keyword2" }, + { "INET", "type" }, + { "smallserial", "type" }, { "into", "keyword" }, { "PRIMARY", "keyword" }, { "UNBOUNDED", "keyword" }, { "or", "keyword" }, { "FOLLOWING", "keyword" }, { "INTERSECT", "keyword" }, - { "SERIAL2", "keyword2" }, + { "SERIAL2", "type" }, { "false", "literal" }, - { "smallint", "keyword2" }, + { "smallint", "type" }, { "union", "keyword" }, - { "TIMESTAMPZ", "keyword2" }, - { "float4", "keyword2" }, + { "TIMESTAMPZ", "type" }, + { "float4", "type" }, { "desc", "keyword" }, - { "tstzrange", "keyword2" }, + { "tstzrange", "type" }, { "current_date", "literal" }, { "KEY", "keyword" }, - { "DOUBLE", "keyword2" }, - { "PG_LSN", "keyword2" }, - { "DATE", "keyword2" }, + { "DOUBLE", "type" }, + { "PG_LSN", "type" }, + { "DATE", "type" }, { "TRIGGER", "keyword" }, { "asc", "keyword" }, - { "numrange", "keyword2" }, + { "numrange", "type" }, { "RECURSIVE", "keyword" }, - { "bit", "keyword2" }, + { "bit", "type" }, { "SQL", "keyword" }, - { "SMALLINT", "keyword2" }, + { "SMALLINT", "type" }, { "TABLE", "keyword" }, - { "tsvector", "keyword2" }, + { "tsvector", "type" }, { "language", "keyword" }, { "distinct", "keyword" }, - { "LSEG", "keyword2" }, - { "int2", "keyword2" }, + { "LSEG", "type" }, + { "int2", "type" }, { "as", "keyword" }, { "OFFSET", "keyword" }, - { "REAL", "keyword2" }, - { "JSONB", "keyword2" }, + { "REAL", "type" }, + { "JSONB", "type" }, { "TRUE", "literal" }, - { "int4range", "keyword2" }, - { "real", "keyword2" }, - { "cidr", "keyword2" }, - { "polygon", "keyword2" }, + { "int4range", "type" }, + { "real", "type" }, + { "cidr", "type" }, + { "polygon", "type" }, { "null", "keyword" }, { "CONTENT", "keyword" }, { "rows", "keyword" }, { "WITH", "keyword" }, { "LANGUAGE", "keyword" }, - { "POINT", "keyword2" }, - { "BIT", "keyword2" }, + { "POINT", "type" }, + { "BIT", "type" }, { "ORDER", "keyword" }, - { "numeric", "keyword2" }, + { "numeric", "type" }, { "unbounded", "keyword" }, - { "SMALLSERIAL", "keyword2" }, - { "timez", "keyword2" }, - { "money", "keyword2" }, + { "SMALLSERIAL", "type" }, + { "timez", "type" }, + { "money", "type" }, { "lateral", "keyword" }, - { "LINE", "keyword2" }, + { "LINE", "type" }, { "FIRST", "keyword" }, { "join", "keyword" }, - { "bool", "keyword2" }, - { "INT", "keyword2" }, - { "inet", "keyword2" }, - { "timestamp", "keyword2" }, - { "FLOAT4", "keyword2" }, - { "FLOAT8", "keyword2" }, + { "bool", "type" }, + { "INT", "type" }, + { "inet", "type" }, + { "timestamp", "type" }, + { "FLOAT4", "type" }, + { "FLOAT8", "type" }, { "all", "keyword" }, { "RETURNING", "keyword" }, - { "int", "keyword2" }, - { "box", "keyword2" }, + { "int", "type" }, + { "box", "type" }, { "cross", "keyword" }, { "IN", "keyword" }, { "ordinality", "keyword" }, { "TIMEZONE", "keyword" }, - { "INTERVAL", "keyword2" }, + { "INTERVAL", "type" }, { "each", "keyword" }, - { "boolean", "keyword2" }, - { "TSTZRANGE", "keyword2" }, - { "serial2", "keyword2" }, + { "boolean", "type" }, + { "TSTZRANGE", "type" }, + { "serial2", "type" }, { "ONLY", "keyword" }, { "JOIN", "keyword" }, { "default", "keyword" }, { "function", "keyword" }, { "NOT", "keyword" }, - { "NUMRANGE", "keyword2" }, + { "NUMRANGE", "type" }, { "WHERE", "keyword" }, { "SOME", "keyword" }, - { "VARCHAR", "keyword2" }, - { "XML", "keyword2" }, + { "VARCHAR", "type" }, + { "XML", "type" }, { "primary", "keyword" }, { "delete", "keyword" }, { "variadic", "keyword" }, @@ -325,7 +325,7 @@ SyntaxDefinition& addSQL() { { "XMLSERIALIZE", "keyword" }, { "OR", "keyword" }, { "natural", "keyword" }, - { "interval", "keyword2" }, + { "interval", "type" }, { "using", "keyword" }, { "before", "keyword" }, { "except", "keyword" }, @@ -334,10 +334,10 @@ SyntaxDefinition& addSQL() { { "exclude", "keyword" }, { "timezone", "keyword" }, { "CONSTRAINT", "keyword" }, - { "double", "keyword2" }, + { "double", "type" }, { "OWNED", "keyword" }, { "UNIQUE", "keyword" }, - { "text", "keyword2" }, + { "text", "type" }, { "LIMIT", "keyword" }, { "constraint", "keyword" }, { "NULL", "keyword" }, @@ -345,11 +345,11 @@ SyntaxDefinition& addSQL() { { "select", "keyword" }, { "REFERENCES", "keyword" }, { "only", "keyword" }, - { "TEXT", "keyword2" }, + { "TEXT", "type" }, { "to", "keyword" }, { "like", "keyword" }, { "nulls", "keyword" }, - { "UUID", "keyword2" }, + { "UUID", "type" }, { "at", "keyword" }, { "HAVING", "keyword" }, { "ADD", "keyword" }, @@ -371,20 +371,20 @@ SyntaxDefinition& addSQL() { { "COLLATION", "keyword" }, { "order", "keyword" }, { "outer", "keyword" }, - { "xml", "keyword2" }, + { "xml", "type" }, { "SEQUENCE", "keyword" }, { "last", "keyword" }, { "BY", "keyword" }, { "where", "keyword" }, { "WITHOUT", "keyword" }, { "procedure", "keyword" }, - { "POLYGON", "keyword2" }, + { "POLYGON", "type" }, { "group", "keyword" }, { "LOCALTIMESTAMP", "literal" }, { "VALUES", "keyword" }, { "CROSS", "keyword" }, { "OPTION", "keyword" }, - { "PATH", "keyword2" }, + { "PATH", "type" }, { "ISNULL", "keyword" }, { "with", "keyword" }, { "by", "keyword" }, @@ -392,11 +392,11 @@ SyntaxDefinition& addSQL() { { "having", "keyword" }, { "domain", "keyword" }, { "offset", "keyword" }, - { "TIMESTAMP", "keyword2" }, + { "TIMESTAMP", "type" }, { "limit", "keyword" }, - { "BIGINT", "keyword2" }, + { "BIGINT", "type" }, { "CURRENT_TIME", "literal" }, - { "integer", "keyword2" }, + { "integer", "type" }, { "array", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.hpp index 022ad873e..c1f546896 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/sql.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addSQL(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/squirrel.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/squirrel.cpp index 40b5af35d..f10c95095 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/squirrel.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/squirrel.cpp @@ -19,23 +19,23 @@ SyntaxDefinition& addSquirrel() { { { "common_number_parser_o" }, "number", "", SyntaxPatternMatchType::Parser }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "(class%s+)([%a_][%w_]*%s+)(extends%s+)([%a_][%w_]*)" }, - { "keyword", "keyword", "keyword2", "keyword", "keyword2" } }, - { { "(class%s+)([%a_][%w_]*)" }, { "keyword", "keyword", "keyword2" } }, - { { "(enum%s+)([%a_][%w_]*)" }, { "keyword", "keyword", "keyword2" } }, + { "keyword", "keyword", "type", "keyword", "type" } }, + { { "(class%s+)([%a_][%w_]*)" }, { "keyword", "keyword", "type" } }, + { { "(enum%s+)([%a_][%w_]*)" }, { "keyword", "keyword", "type" } }, { { "(function%s+)([%a_][%w_]*)(%:%:)([%a_][%w_]*)%f[(]" }, - { "keyword", "keyword", "keyword2", "operator", "function" } }, + { "keyword", "keyword", "type", "operator", "function" } }, { { "[%a_][%w_]*%f[(]" }, "function" }, { { "_[A-Z]%w*" }, "keyword" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "vargc", "keyword2" }, { "in", "keyword" }, { "resume", "keyword" }, + { "vargc", "type" }, { "in", "keyword" }, { "resume", "keyword" }, { "continue", "keyword" }, { "default", "keyword" }, { "switch", "keyword" }, { "this", "keyword" }, { "delete", "keyword" }, { "return", "keyword" }, { "try", "keyword" }, { "foreach", "keyword" }, { "class", "keyword" }, { "yield", "keyword" }, { "typeof", "keyword" }, { "extends", "keyword" }, - { "false", "literal" }, { "vargv", "keyword2" }, { "for", "keyword" }, + { "false", "literal" }, { "vargv", "type" }, { "for", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, { "delegate", "keyword" }, { "null", "literal" }, { "function", "keyword" }, { "throw", "keyword" }, { "catch", "keyword" }, { "true", "literal" }, { "else", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/svelte.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/svelte.cpp index 9101b61d7..e76218a64 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/svelte.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/svelte.cpp @@ -33,27 +33,27 @@ SyntaxDefinition& addSvelte() { { { "{@html[^}]*}" }, "keyword", "", SyntaxPatternMatchType::RegEx }, { { "{@debug[^}]*}" }, "keyword", "", SyntaxPatternMatchType::RegEx }, { { "{(:else|:then|:catch)}" }, - std::vector{ "keyword", "keyword2" }, + std::vector{ "keyword", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "{(/if|/each|/await|/key)}" }, - std::vector{ "keyword", "keyword2" }, + std::vector{ "keyword", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "{(#if|#each|#await|#key)", "}", "\\" }, - std::vector{ "keyword", "keyword2", "normal" }, + std::vector{ "keyword", "type", "normal" }, "JavaScript", SyntaxPatternMatchType::RegEx }, { { "{", "}", "\\" }, "keyword", "JavaScript" }, { { "([%a_][%w_-]*)(:)([%a_][%w_-]*)(=)" }, - { "keyword", "keyword2", "normal", "keyword", "operator" } }, + { "keyword", "type", "normal", "keyword", "operator" } }, { { "([%a_][%w_-]*)(=)" }, { "keyword", "keyword", "operator" } }, { { "0x[%da-fA-F]+" }, "number" }, { { "-?%d+[%d%.]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, { { "%f[^<][%a_][%w%_%-]*(:)([%w_-]+)" }, { "function", "normal", "keyword" } }, { { "%f[^<]/[%a_][%w%_%-]*(:)([%w_-]+)" }, { "function", "normal", "keyword" } }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "[/<>=]" }, "operator" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.cpp index f67ed45d6..e7e16ee46 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.cpp @@ -23,40 +23,40 @@ SyntaxDefinition& addSwift() { }, { - { "encodeBitsAsWords", "keyword2" }, + { "encodeBitsAsWords", "type" }, { "postfix", "keyword" }, { "open", "keyword" }, - { "debugPrintln", "keyword2" }, - { "debugPrint", "keyword2" }, + { "debugPrintln", "type" }, + { "debugPrint", "type" }, { "convenience", "keyword" }, - { "count", "keyword2" }, - { "contains", "keyword2" }, + { "count", "type" }, + { "contains", "type" }, { "#imageLiteral", "keyword" }, - { "enumerate", "keyword2" }, - { "c", "keyword2" }, - { "bridgeToObjectiveCUnconditional", "keyword2" }, + { "enumerate", "type" }, + { "c", "type" }, + { "bridgeToObjectiveCUnconditional", "type" }, { "try?", "keyword" }, - { "assertionFailure", "keyword2" }, - { "withUnsafePointers", "keyword2" }, - { "Void", "keyword2" }, - { "assert", "keyword2" }, + { "assertionFailure", "type" }, + { "withUnsafePointers", "type" }, + { "Void", "type" }, + { "assert", "type" }, { "in", "keyword" }, - { "anyGenerator", "keyword2" }, - { "fatalError", "keyword2" }, - { "alignofValue", "keyword2" }, - { "bridgeToObjectiveC", "keyword2" }, - { "alignof", "keyword2" }, + { "anyGenerator", "type" }, + { "fatalError", "type" }, + { "alignofValue", "type" }, + { "bridgeToObjectiveC", "type" }, + { "alignof", "type" }, { "willSet", "keyword" }, { "where", "keyword" }, { "weak", "keyword" }, { "typealias", "keyword" }, - { "isBridgedToObjectiveC", "keyword2" }, - { "isUniquelyReferenced", "keyword2" }, - { "underestimateCount", "keyword2" }, + { "isBridgedToObjectiveC", "type" }, + { "isUniquelyReferenced", "type" }, + { "underestimateCount", "type" }, { "try!", "keyword" }, { "as!", "keyword" }, { "none", "keyword" }, - { "maxElement", "keyword2" }, + { "maxElement", "type" }, { "throws", "keyword" }, { "associatedtype", "keyword" }, { "throw", "keyword" }, @@ -65,8 +65,8 @@ SyntaxDefinition& addSwift() { { "super", "keyword" }, { "struct", "keyword" }, { "static", "keyword" }, - { "unsafeReflect", "keyword2" }, - { "dropLast", "keyword2" }, + { "unsafeReflect", "type" }, + { "dropLast", "type" }, { "Self", "keyword" }, { "fallthrough", "keyword" }, { "unowned", "keyword" }, @@ -75,7 +75,7 @@ SyntaxDefinition& addSwift() { { "required", "keyword" }, { "nonmutating", "keyword" }, { "try", "keyword" }, - { "withExtendedLifetime", "keyword2" }, + { "withExtendedLifetime", "type" }, { "public", "keyword" }, { "final", "keyword" }, { "Protocol", "keyword" }, @@ -83,123 +83,123 @@ SyntaxDefinition& addSwift() { { "operator", "keyword" }, { "let", "keyword" }, { "extension", "keyword" }, - { "posix", "keyword2" }, + { "posix", "type" }, { "precedence", "keyword" }, { "case", "keyword" }, { "left", "keyword" }, - { "filter", "keyword2" }, - { "min", "keyword2" }, - { "countElements", "keyword2" }, - { "unsafeBitCast", "keyword2" }, + { "filter", "type" }, + { "min", "type" }, + { "countElements", "type" }, + { "unsafeBitCast", "type" }, { "do", "keyword" }, - { "max", "keyword2" }, + { "max", "type" }, { "dynamicType", "keyword" }, - { "reverse", "keyword2" }, + { "reverse", "type" }, { "while", "keyword" }, { "init", "keyword" }, { "func", "keyword" }, - { "abs", "keyword2" }, - { "sizeof", "keyword2" }, + { "abs", "type" }, + { "sizeof", "type" }, { "true", "keyword" }, { "default", "keyword" }, { "dynamic", "keyword" }, { "var", "keyword" }, { "#sourceLocation", "keyword" }, - { "indices", "keyword2" }, - { "isUniquelyReferencedNonObjC", "keyword2" }, - { "getBridgedObjectiveCType", "keyword2" }, - { "precondition", "keyword2" }, - { "getVaList", "keyword2" }, + { "indices", "type" }, + { "isUniquelyReferencedNonObjC", "type" }, + { "getBridgedObjectiveCType", "type" }, + { "precondition", "type" }, + { "getVaList", "type" }, { "get", "keyword" }, - { "Double", "keyword2" }, - { "join", "keyword2" }, - { "startsWith", "keyword2" }, - { "Bool", "keyword2" }, + { "Double", "type" }, + { "join", "type" }, + { "startsWith", "type" }, + { "Bool", "type" }, { "associativity", "keyword" }, { "self", "keyword" }, { "prefix", "keyword" }, - { "sort", "keyword2" }, - { "lexicographicalCompare", "keyword2" }, - { "insertionSort", "keyword2" }, + { "sort", "type" }, + { "lexicographicalCompare", "type" }, + { "insertionSort", "type" }, { "__LINE__", "keyword" }, - { "Array", "keyword2" }, - { "stride", "keyword2" }, - { "unsafeDowncast", "keyword2" }, - { "strideof", "keyword2" }, + { "Array", "type" }, + { "stride", "type" }, + { "unsafeDowncast", "type" }, + { "strideof", "type" }, { "continue", "keyword" }, - { "sizeofValue", "keyword2" }, - { "swap", "keyword2" }, - { "withUnsafeMutablePointer", "keyword2" }, + { "sizeofValue", "type" }, + { "swap", "type" }, + { "withUnsafeMutablePointer", "type" }, { "Type", "keyword" }, - { "find", "keyword2" }, - { "zip", "keyword2" }, - { "preconditionFailure", "keyword2" }, + { "find", "type" }, + { "zip", "type" }, + { "preconditionFailure", "type" }, { "enum", "keyword" }, - { "withObjectAtPlusZero", "keyword2" }, - { "strideofValue", "keyword2" }, - { "transcode", "keyword2" }, - { "withUnsafePointerToObject", "keyword2" }, - { "overlaps", "keyword2" }, - { "split", "keyword2" }, - { "withUnsafePointer", "keyword2" }, + { "withObjectAtPlusZero", "type" }, + { "strideofValue", "type" }, + { "transcode", "type" }, + { "withUnsafePointerToObject", "type" }, + { "overlaps", "type" }, + { "split", "type" }, + { "withUnsafePointer", "type" }, { "internal", "keyword" }, - { "reinterpretCast", "keyword2" }, - { "reduce", "keyword2" }, - { "toString", "keyword2" }, - { "readLine", "keyword2" }, + { "reinterpretCast", "type" }, + { "reduce", "type" }, + { "toString", "type" }, + { "readLine", "type" }, { "as", "keyword" }, { "deinit", "keyword" }, { "break", "keyword" }, { "optional", "keyword" }, - { "withVaList", "keyword2" }, - { "quickSort", "keyword2" }, - { "unsafeAddressOf", "keyword2" }, + { "withVaList", "type" }, + { "quickSort", "type" }, + { "unsafeAddressOf", "type" }, { "fileprivate", "keyword" }, - { "bridgeFromObjectiveCUnconditional", "keyword2" }, + { "bridgeFromObjectiveCUnconditional", "type" }, { "if", "keyword" }, - { "isBridgedVerbatimToObjectiveC", "keyword2" }, - { "String", "keyword2" }, - { "print", "keyword2" }, - { "roundUpToAlignment", "keyword2" }, + { "isBridgedVerbatimToObjectiveC", "type" }, + { "String", "type" }, + { "print", "type" }, + { "roundUpToAlignment", "type" }, { "catch", "keyword" }, - { "equal", "keyword2" }, - { "Optional", "keyword2" }, - { "map", "keyword2" }, - { "println", "keyword2" }, + { "equal", "type" }, + { "Optional", "type" }, + { "map", "type" }, + { "println", "type" }, { "as?", "keyword" }, { "didSet", "keyword" }, { "defer", "keyword" }, { "inout", "keyword" }, { "is", "keyword" }, - { "Int", "keyword2" }, - { "minElement", "keyword2" }, + { "Int", "type" }, + { "minElement", "type" }, { "private", "keyword" }, - { "countLeadingZeros", "keyword2" }, - { "bridgeFromObjectiveC", "keyword2" }, + { "countLeadingZeros", "type" }, + { "bridgeFromObjectiveC", "type" }, { "nil", "keyword" }, { "rethrows", "keyword" }, - { "withUnsafeMutablePointers", "keyword2" }, - { "compactMap", "keyword2" }, - { "unsafeUnwrap", "keyword2" }, + { "withUnsafeMutablePointers", "type" }, + { "compactMap", "type" }, + { "unsafeUnwrap", "type" }, { "#if", "keyword" }, { "#column", "keyword" }, { "protocol", "keyword" }, { "#file", "keyword" }, { "indirect", "keyword" }, - { "numericCast", "keyword2" }, + { "numericCast", "type" }, { "#elseif", "keyword" }, { "infix", "keyword" }, { "override", "keyword" }, { "#else", "keyword" }, - { "dropFirst", "keyword2" }, + { "dropFirst", "type" }, { "subscript", "keyword" }, { "#line", "keyword" }, { "for", "keyword" }, { "import", "keyword" }, { "false", "keyword" }, { "#fileLiteral", "keyword" }, - { "advance", "keyword2" }, - { "partition", "keyword2" }, + { "advance", "type" }, + { "partition", "type" }, { "__FUNCTION__", "keyword" }, { "#endif", "keyword" }, { "repeat", "keyword" }, @@ -208,16 +208,16 @@ SyntaxDefinition& addSwift() { { "mutating", "keyword" }, { "#colorLiteral", "keyword" }, { "class", "keyword" }, - { "dump", "keyword2" }, + { "dump", "type" }, { "#function", "keyword" }, { "__COLUMN__", "keyword" }, { "set", "keyword" }, { "Any", "keyword" }, { "return", "keyword" }, - { "distance", "keyword2" }, - { "reflect", "keyword2" }, + { "distance", "type" }, + { "reflect", "type" }, { "else", "keyword" }, - { "Float", "keyword2" }, + { "Float", "type" }, { "_", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.hpp index e4a16285c..553be95c0 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/swift.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addSwift(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/tcl.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/tcl.cpp index 03c56affd..661fb61b9 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/tcl.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/tcl.cpp @@ -24,15 +24,15 @@ SyntaxDefinition& addTcl() { }, { { "elseif", "keyword" }, { "lsearch", "keyword" }, { "lreverse", "keyword" }, - { "continue", "keyword" }, { "lset", "keyword" }, { "finally", "keyword2" }, - { "on", "keyword2" }, { "dict", "keyword" }, { "set", "keyword" }, + { "continue", "keyword" }, { "lset", "keyword" }, { "finally", "type" }, + { "on", "type" }, { "dict", "keyword" }, { "set", "keyword" }, { "lappend", "keyword" }, { "lrepeat", "keyword" }, { "return", "keyword" }, - { "error", "keyword2" }, { "rename", "keyword" }, { "split", "join" }, - { "try", "keyword2" }, { "foreach", "keyword" }, { "concat", "keyword" }, + { "error", "type" }, { "rename", "keyword" }, { "split", "join" }, + { "try", "type" }, { "foreach", "keyword" }, { "concat", "keyword" }, { "incr", "keyword" }, { "unset", "keyword" }, { "proc", "keyword" }, { "lindex", "keyword" }, { "for", "keyword" }, { "array", "keyword" }, { "while", "keyword" }, { "eval", "keyword" }, { "gets", "keyword" }, - { "list", "keyword" }, { "throw", "keyword2" }, { "else", "keyword" }, + { "list", "keyword" }, { "throw", "type" }, { "else", "keyword" }, { "package", "keyword" }, { "linsert", "keyword" }, { "lassign", "keyword" }, { "source", "keyword" }, { "break", "keyword" }, { "puts", "keyword" }, { "lreplace", "keyword" }, { "upvar", "keyword" }, { "case", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/teal.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/teal.cpp index 27f2b930e..d10aa621c 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/teal.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/teal.cpp @@ -18,7 +18,7 @@ SyntaxDefinition& addTeal() { { { "-?0x%x+" }, "number" }, { { "-?%d+[%d%.eE]*" }, "number" }, { { "-?%.?%d+" }, "number" }, - { { "<%a+>" }, "keyword2" }, + { { "<%a+>" }, "type" }, { { "%.%.%.?" }, "operator" }, { { "[<>~=]=" }, "operator" }, { { "[%+%-=/%*%^%%#<>]" }, "operator" }, @@ -28,16 +28,16 @@ SyntaxDefinition& addTeal() { }, { - { "true", "literal" }, { "if", "keyword" }, { "any", "keyword2" }, - { "boolean", "keyword2" }, { "while", "keyword" }, { "end", "keyword" }, - { "else", "keyword" }, { "number", "keyword2" }, { "break", "keyword" }, - { "not", "keyword" }, { "local", "keyword" }, { "elseif", "keyword" }, - { "then", "keyword" }, { "return", "keyword" }, { "do", "keyword" }, - { "until", "keyword" }, { "function", "keyword" }, { "string", "keyword2" }, - { "global", "keyword" }, { "false", "literal" }, { "repeat", "keyword" }, - { "in", "keyword" }, { "and", "keyword" }, { "for", "keyword" }, - { "or", "keyword" }, { "goto", "keyword" }, { "record", "keyword" }, - { "nil", "literal" }, { "enum", "keyword" }, { "thread", "keyword2" }, + { "true", "literal" }, { "if", "keyword" }, { "any", "type" }, + { "boolean", "type" }, { "while", "keyword" }, { "end", "keyword" }, + { "else", "keyword" }, { "number", "type" }, { "break", "keyword" }, + { "not", "keyword" }, { "local", "keyword" }, { "elseif", "keyword" }, + { "then", "keyword" }, { "return", "keyword" }, { "do", "keyword" }, + { "until", "keyword" }, { "function", "keyword" }, { "string", "type" }, + { "global", "keyword" }, { "false", "literal" }, { "repeat", "keyword" }, + { "in", "keyword" }, { "and", "keyword" }, { "for", "keyword" }, + { "or", "keyword" }, { "goto", "keyword" }, { "record", "keyword" }, + { "nil", "literal" }, { "enum", "keyword" }, { "thread", "type" }, }, "--", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typescript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typescript.cpp index fad7ac3c0..f1e5f529b 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typescript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typescript.cpp @@ -21,8 +21,8 @@ SyntaxDefinition& addTypeScript() { "string" }, { { "js_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, - { { "(interface%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(type%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, + { { "(interface%s)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(type%s)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, { { "(if|for|while|switch|catch|with|typeof|delete|void|super|await|function)\\s*(?=" "\\()" }, { "normal", "keyword", "keyword" }, @@ -35,8 +35,8 @@ SyntaxDefinition& addTypeScript() { { { "new", "keyword" }, { "continue", "keyword" }, { "default", "keyword" }, { "set", "keyword" }, - { "this", "keyword2" }, { "namespace", "keyword" }, - { "any", "keyword2" }, { "of", "keyword" }, + { "this", "type" }, { "namespace", "keyword" }, + { "any", "type" }, { "of", "keyword" }, { "typeof", "keyword" }, { "extends", "keyword" }, { "with", "keyword" }, { "undefined", "literal" }, { "false", "literal" }, { "for", "keyword" }, @@ -46,28 +46,28 @@ SyntaxDefinition& addTypeScript() { { "else", "keyword" }, { "constructor", "function" }, { "enum", "keyword" }, { "async", "keyword" }, { "break", "keyword" }, { "declare", "keyword" }, - { "arguments", "keyword2" }, { "string", "keyword2" }, + { "arguments", "type" }, { "string", "type" }, { "if", "keyword" }, { "await", "keyword" }, { "let", "keyword" }, { "in", "keyword" }, { "public", "keyword" }, { "debugger", "keyword" }, { "private", "keyword" }, { "finally", "keyword" }, - { "abstract", "keyword" }, { "number", "keyword2" }, + { "abstract", "keyword" }, { "number", "type" }, { "switch", "keyword" }, { "delete", "keyword" }, { "return", "keyword" }, { "var", "keyword" }, { "import", "keyword" }, { "try", "keyword" }, { "as", "keyword" }, { "class", "keyword" }, - { "void", "keyword" }, { "unknown", "keyword2" }, + { "void", "keyword" }, { "unknown", "type" }, { "yield", "keyword" }, { "static", "keyword" }, { "super", "keyword" }, { "module", "keyword" }, - { "boolean", "keyword2" }, { "throw", "keyword" }, + { "boolean", "type" }, { "throw", "keyword" }, { "catch", "keyword" }, { "true", "literal" }, - { "implements", "keyword" }, { "symbol", "keyword2" }, + { "implements", "keyword" }, { "symbol", "type" }, { "instanceof", "keyword" }, { "package", "keyword" }, - { "require", "keyword" }, { "Infinity", "keyword2" }, + { "require", "keyword" }, { "Infinity", "type" }, { "readonly", "keyword" }, { "case", "keyword" }, { "export", "keyword" }, { "interface", "keyword" }, { "protected", "keyword" }, { "do", "keyword" }, - { "type", "keyword2" }, { "is", "keyword" }, + { "type", "type" }, { "is", "keyword" }, }, "//", @@ -90,15 +90,15 @@ SyntaxDefinition& addTypeScript() { { { "/[%+%-%*%^%!%=%&%|%?%:%;%,%(%[%{%<%>%\\%\"].*%f[/]", "/[igmsuyd\n]?[igmsuyd\n]?[igmsuyd\n]?", "\\" }, "string" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "([%a_-][%w-_]*)(%\?\?)(=)%f[%{%\"]" }, { "normal", "keyword", "normal", "operator" } }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "js_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, - { { "(interface%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(type%s)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, + { { "(interface%s)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(type%s)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, { { "[%a_][%w_$]*%f[(]" }, "function" }, { { "[%a_][%w_]*" }, "symbol" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typst.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typst.cpp index 4e352df6b..f9cd2c4d6 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typst.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/typst.cpp @@ -30,7 +30,7 @@ SyntaxDefinition& addTypst() { { "arguments", { { { "\\b[[:alpha:]_][[:alnum:]_-]*(?=:)" }, - "keyword3", + "parameter", "", SyntaxPatternMatchType::RegEx }, { { "include", "#code" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/u.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/u.cpp index 47447f16a..18cda4ae6 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/u.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/u.cpp @@ -10,147 +10,149 @@ SyntaxDefinition& addU() { { "Ü", { "%.u$", "%.uh$" }, { - { { "//.-\n" }, "comment" }, // Single-line comments. - { { "/%*", "%*/" }, "comment" }, // Multi-line comments. + { { "//.-\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. + { { "'", "'", "\\" }, "string" }, // Char literals. + { { "cpp_number_parser" }, + "number", + "", + SyntaxPatternMatchType::Parser }, // Numbers. TODO - support Ü-specific formats. { { "[%+%-=/%*%^%%<>!~|&$:.@?]" }, "operator" }, // Various operators. - { { "[%a_][%w_]*" }, "symbol" }, // Regular identifiers. + { { "[%a_][%w_]*" }, "symbol" }, // Regular identifiers. }, - { - // Keywords. - { "fn", "keyword" }, - { "op", "keyword" }, - { "var", "keyword" }, - { "auto", "keyword" }, - { "return", "keyword" }, - { "yield", "keyword" }, - { "label", "keyword" }, - { "while", "keyword" }, - { "loop", "keyword" }, - { "break", "keyword" }, - { "continue", "keyword" }, - { "if", "keyword" }, - { "static_if", "keyword" }, - { "enable_if", "keyword" }, - { "if_coro_advance", "keyword" }, - { "else", "keyword" }, - { "move", "keyword" }, - { "take", "keyword" }, - { "byval", "keyword" }, - { "tup", "keyword" }, - { "struct", "keyword" }, - { "class", "keyword" }, - { "final", "keyword" }, - { "polymorph", "keyword" }, - { "interface", "keyword" }, - { "abstract", "keyword" }, - { "non_sync", "keyword" }, - { "ordered", "keyword" }, - { "nodiscard", "keyword" }, - { "nomangle", "keyword" }, - { "call_conv", "keyword" }, - { "virtual", "keyword" }, - { "override", "keyword" }, - { "pure", "keyword" }, - { "generator", "keyword" }, - { "async", "keyword" }, - { "await", "keyword" }, - { "namespace", "keyword" }, - { "public", "keyword" }, - { "private", "keyword" }, - { "protected", "keyword" }, - { "true", "literal" }, - { "false", "literal" }, - { "mut", "keyword" }, - { "imut", "keyword" }, - { "constexpr", "keyword" }, - { "const", "keyword" }, - { "zero_init", "keyword" }, - { "this", "keyword" }, - { "base", "keyword" }, - { "constructor", "keyword" }, - { "destructor", "keyword" }, - { "conversion_constructor", "keyword" }, - { "static_assert", "keyword" }, - { "halt", "keyword" }, - { "safe", "keyword" }, - { "type", "keyword" }, - { "typeinfo", "keyword" }, - { "same_type", "keyword" }, - { "typeof", "keyword" }, - { "template", "keyword" }, - { "enum", "keyword" }, - { "cast_ref", "keyword" }, - { "cast_imut", "keyword" }, - { "alloca", "keyword" }, - { "as", "keyword" }, - { "is", "keyword" }, - { "import", "keyword" }, - { "export", "keyword" }, - { "embed", "keyword" }, - { "default", "keyword" }, - { "delete", "keyword" }, - { "for", "keyword" }, - { "with", "keyword" }, - { "do", "keyword" }, - { "switch", "keyword" }, - { "case", "keyword" }, - { "typename", "keyword" }, - { "lambda", "keyword" }, - { "static", "keyword" }, - { "package", "keyword" }, - { "module", "keyword" }, - { "mixin", "keyword" }, - { "thread_local", "keyword" }, - { "unsafe", "keyword" }, - { "cast_ref_unsafe", "keyword" }, - { "cast_mut", "keyword" }, - { "uninitialized", "keyword" }, - // Built-in type keywords. - { "void", "keyword2" }, - { "bool", "keyword2" }, - { "i8", "keyword2" }, - { "u8", "keyword2" }, - { "i16", "keyword2" }, - { "u16", "keyword2" }, - { "i32", "keyword2" }, - { "u32", "keyword2" }, - { "i64", "keyword2" }, - { "u64", "keyword2" }, - { "i128", "keyword2" }, - { "u128", "keyword2" }, - { "i256", "keyword2" }, - { "u256", "keyword2" }, - { "i512", "keyword2" }, - { "u512", "keyword2" }, - { "i1024", "keyword2" }, - { "u1024", "keyword2" }, - { "i2048", "keyword2" }, - { "u2048", "keyword2" }, - { "i4096", "keyword2" }, - { "u4096", "keyword2" }, - { "f16", "keyword2" }, - { "f32", "keyword2" }, - { "f80", "keyword2" }, - { "f64", "keyword2" }, - { "f128", "keyword2" }, - { "char8", "keyword2" }, - { "char16", "keyword2" }, - { "char32", "keyword2" }, - { "byte8", "keyword2" }, - { "byte16", "keyword2" }, - { "byte32", "keyword2" }, - { "byte64", "keyword2" }, - { "byte128", "keyword2" }, - { "byte256", "keyword2" }, - { "byte512", "keyword2" }, - { "byte1024", "keyword2" }, - { "byte2048", "keyword2" }, - { "byte4096", "keyword2" }, - { "size_type", "keyword2" }, - { "ssize_type", "keyword2" } }, + { // Keywords. + { "fn", "keyword" }, + { "op", "keyword" }, + { "var", "keyword" }, + { "auto", "keyword" }, + { "return", "keyword" }, + { "yield", "keyword" }, + { "label", "keyword" }, + { "while", "keyword" }, + { "loop", "keyword" }, + { "break", "keyword" }, + { "continue", "keyword" }, + { "if", "keyword" }, + { "static_if", "keyword" }, + { "enable_if", "keyword" }, + { "if_coro_advance", "keyword" }, + { "else", "keyword" }, + { "move", "keyword" }, + { "take", "keyword" }, + { "byval", "keyword" }, + { "tup", "keyword" }, + { "struct", "keyword" }, + { "class", "keyword" }, + { "final", "keyword" }, + { "polymorph", "keyword" }, + { "interface", "keyword" }, + { "abstract", "keyword" }, + { "non_sync", "keyword" }, + { "ordered", "keyword" }, + { "nodiscard", "keyword" }, + { "nomangle", "keyword" }, + { "call_conv", "keyword" }, + { "virtual", "keyword" }, + { "override", "keyword" }, + { "pure", "keyword" }, + { "generator", "keyword" }, + { "async", "keyword" }, + { "await", "keyword" }, + { "namespace", "keyword" }, + { "public", "keyword" }, + { "private", "keyword" }, + { "protected", "keyword" }, + { "true", "literal" }, + { "false", "literal" }, + { "mut", "keyword" }, + { "imut", "keyword" }, + { "constexpr", "keyword" }, + { "const", "keyword" }, + { "zero_init", "keyword" }, + { "this", "keyword" }, + { "base", "keyword" }, + { "constructor", "keyword" }, + { "destructor", "keyword" }, + { "conversion_constructor", "keyword" }, + { "static_assert", "keyword" }, + { "halt", "keyword" }, + { "safe", "keyword" }, + { "type", "keyword" }, + { "typeinfo", "keyword" }, + { "same_type", "keyword" }, + { "typeof", "keyword" }, + { "template", "keyword" }, + { "enum", "keyword" }, + { "cast_ref", "keyword" }, + { "cast_imut", "keyword" }, + { "alloca", "keyword" }, + { "as", "keyword" }, + { "is", "keyword" }, + { "import", "keyword" }, + { "export", "keyword" }, + { "embed", "keyword" }, + { "default", "keyword" }, + { "delete", "keyword" }, + { "for", "keyword" }, + { "with", "keyword" }, + { "do", "keyword" }, + { "switch", "keyword" }, + { "case", "keyword" }, + { "typename", "keyword" }, + { "lambda", "keyword" }, + { "static", "keyword" }, + { "package", "keyword" }, + { "module", "keyword" }, + { "mixin", "keyword" }, + { "thread_local", "keyword" }, + { "unsafe", "keyword" }, + { "cast_ref_unsafe", "keyword" }, + { "cast_mut", "keyword" }, + { "uninitialized", "keyword" }, + // Built-in type keywords. + { "void", "type" }, + { "bool", "type" }, + { "i8", "type" }, + { "u8", "type" }, + { "i16", "type" }, + { "u16", "type" }, + { "i32", "type" }, + { "u32", "type" }, + { "i64", "type" }, + { "u64", "type" }, + { "i128", "type" }, + { "u128", "type" }, + { "i256", "type" }, + { "u256", "type" }, + { "i512", "type" }, + { "u512", "type" }, + { "i1024", "type" }, + { "u1024", "type" }, + { "i2048", "type" }, + { "u2048", "type" }, + { "i4096", "type" }, + { "u4096", "type" }, + { "f16", "type" }, + { "f32", "type" }, + { "f80", "type" }, + { "f64", "type" }, + { "f128", "type" }, + { "char8", "type" }, + { "char16", "type" }, + { "char32", "type" }, + { "byte8", "type" }, + { "byte16", "type" }, + { "byte32", "type" }, + { "byte64", "type" }, + { "byte128", "type" }, + { "byte256", "type" }, + { "byte512", "type" }, + { "byte1024", "type" }, + { "byte2048", "type" }, + { "byte4096", "type" }, + { "size_type", "type" }, + { "ssize_type", "type" } }, "//", {}, "ü" } ); diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v.cpp index d0248eb0a..f5650c4ef 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v.cpp @@ -5,62 +5,73 @@ namespace EE { namespace UI { namespace Doc { namespace Language { SyntaxDefinition& addV() { - auto& sd = SyntaxDefinitionManager::instance()->add( + return SyntaxDefinitionManager::instance() + ->add( { "V", + { "%.v$", "%.vsh$" }, + { - { "V", - { "%.v$", "%.vsh$" }, - { - { { "//.-\n" }, "comment" }, - { { "/%*", "%*/" }, "comment" }, - { { "\"", "\"", "\\" }, "string" }, - { { "'", "'", "\\" }, "string" }, - { { "`", "`", "\\" }, "string" }, - { { "r'", "'" }, "string" }, - { { "r\"", "\"" }, "string" }, - { { "0x[%da-fA-F_]+" }, "number" }, - { { "0b[01_]+" }, "number" }, - { { "00[01234567_]+" }, "number" }, - { { "-?%.?%d+" }, "number" }, - { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "[%+%-%*%/%%%~%&%|%^%!%=]" }, "operator" }, - { { "%:%=" }, "operator" }, - { { "%.%.%.?" }, "operator" }, - { { "[%a_][%w_]*" }, "symbol" }, - { { "%$%s?[%a_][%w_]*" }, "keyword2" }, - { { "%@%s?[%a_][%w_]*" }, "keyword2" }, + { { "//.-\n" }, "comment" }, + { { "/%*", "%*/" }, "comment" }, + { { "\"", "\"", "\\" }, "string" }, + { { "'", "'", "\\" }, "string" }, + { { "`", "`", "\\" }, "string" }, + { { "r'", "'" }, "string" }, + { { "r\"", "\"" }, "string" }, + { { "0x[%da-fA-F_]+" }, "number" }, + { { "0b[01_]+" }, "number" }, + { { "00[01234567_]+" }, "number" }, + { { "-?%.?%d+" }, "number" }, + { { "[%a_][%w_]*%f[(]" }, "function" }, + { { "[%+%-%*%/%%%~%&%|%^%!%=]" }, "operator" }, + { { "%:%=" }, "operator" }, + { { "%.%.%.?" }, "operator" }, + { { "[%a_][%w_]*" }, "symbol" }, + { { "%$%s?[%a_][%w_]*" }, "type" }, + { { "%@%s?[%a_][%w_]*" }, "type" }, - }, - { - { "thread", "keyword2" }, { "struct", "keyword" }, { "string", "keyword2" }, - { "go", "keyword" }, { "i128", "keyword2" }, { "bool", "keyword2" }, - { "import", "keyword" }, { "as", "keyword" }, { "goto", "keyword" }, - { "union", "keyword" }, { "u32", "keyword2" }, { "const", "keyword" }, - { "f32", "keyword2" }, { "u16", "keyword2" }, { "unsafe", "keyword" }, - { "voidptr", "keyword2" }, { "i64", "keyword2" }, { "typeof", "keyword" }, - { "if", "keyword" }, { "fn", "keyword" }, { "continue", "keyword" }, - { "char", "keyword2" }, { "atomic", "keyword" }, { "isreftype", "keyword" }, - { "u64", "keyword2" }, { "true", "literal" }, { "u128", "keyword2" }, - { "u8", "keyword2" }, { "chan", "keyword2" }, { "assert", "keyword" }, - { "i16", "keyword2" }, { "byte", "keyword2" }, { "type", "keyword" }, - { "__offsetof", "keyword" }, { "for", "keyword" }, { "i8", "keyword2" }, - { "int", "keyword2" }, { "is", "keyword" }, { "defer", "keyword" }, - { "interface", "keyword" }, { "false", "literal" }, { "or", "keyword" }, - { "pub", "keyword" }, { "lock", "keyword" }, { "map", "keyword2" }, - { "module", "keyword" }, { "rune", "keyword2" }, { "shared", "keyword" }, - { "mut", "keyword" }, { "match", "keyword" }, { "static", "keyword" }, - { "asm", "keyword" }, { "none", "literal" }, { "return", "keyword" }, - { "in", "keyword" }, { "else", "keyword" }, { "break", "keyword" }, - { "rlock", "keyword" }, { "select", "keyword" }, { "enum", "keyword" }, - { "f64", "keyword2" }, { "sizeof", "keyword" }, + }, + { + { "thread", "type" }, { "struct", "keyword" }, + { "string", "type" }, { "go", "keyword" }, + { "i128", "type" }, { "bool", "type" }, + { "import", "keyword" }, { "as", "keyword" }, + { "goto", "keyword" }, { "union", "keyword" }, + { "u32", "type" }, { "const", "keyword" }, + { "f32", "type" }, { "u16", "type" }, + { "unsafe", "keyword" }, { "voidptr", "type" }, + { "i64", "type" }, { "typeof", "keyword" }, + { "if", "keyword" }, { "fn", "keyword" }, + { "continue", "keyword" }, { "char", "type" }, + { "atomic", "keyword" }, { "isreftype", "keyword" }, + { "u64", "type" }, { "true", "literal" }, + { "u128", "type" }, { "u8", "type" }, + { "chan", "type" }, { "assert", "keyword" }, + { "i16", "type" }, { "byte", "type" }, + { "type", "keyword" }, { "__offsetof", "keyword" }, + { "for", "keyword" }, { "i8", "type" }, + { "int", "type" }, { "is", "keyword" }, + { "defer", "keyword" }, { "interface", "keyword" }, + { "false", "literal" }, { "or", "keyword" }, + { "pub", "keyword" }, { "lock", "keyword" }, + { "map", "type" }, { "module", "keyword" }, + { "rune", "type" }, { "shared", "keyword" }, + { "mut", "keyword" }, { "match", "keyword" }, + { "static", "keyword" }, { "asm", "keyword" }, + { "none", "literal" }, { "return", "keyword" }, + { "in", "keyword" }, { "else", "keyword" }, + { "break", "keyword" }, { "rlock", "keyword" }, + { "select", "keyword" }, { "enum", "keyword" }, + { "f64", "type" }, { "sizeof", "keyword" }, - }, - "//", - {} + }, - } ).setExtensionPriority( true ); + "//", + {} - sd.setFoldRangeType( FoldRangeType::Braces ).setFoldBraces( { { '{', '}' } } ); - return sd; + } ) + .setExtensionPriority( true ) + .setFoldRangeType( FoldRangeType::Braces ) + .setFoldBraces( { { '{', '}' } } ); } }}}} // namespace EE::UI::Doc::Language diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v1.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v1.cpp index 27bb20c40..86a6183b9 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v1.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/v1.cpp @@ -5,39 +5,41 @@ namespace EE { namespace UI { namespace Doc { namespace Language { SyntaxDefinition& addV1() { - auto& v1 = SyntaxDefinitionManager::instance() - ->add( { "V1", - { "%.v1$" }, - { - { { "<%s*[sS][cC][rR][iI][pP][tT]%s+[tT][yY][pP][eE]%s*=%s*['\"]%a+/" - "[jJ][aA][vV][aA][sS][cC][rR][iI][pP][tT]['\"]%s*>", - "<%s*/[sS][cC][rR][iI][pP][tT]>" }, - "function", - "JavaScript" }, - { { "<%s*[sS][cC][rR][iI][pP][tT]%s*>", "<%s*/%s*[sS][cC][rR][iI][pP][tT]>" }, - "function", - "JavaScript" }, - { { "<%s*[sS][tT][yY][lL][eE][^>]*>", "<%s*/%s*[sS][tT][yY][lL][eE]%s*>" }, - "function", - "CSS" }, - { { "<%?v?1?", "%?>" }, "function", "V1Core" }, - { { "" }, "comment" }, - { { "%f[^>][^<]", "%f[<]" }, "normal" }, - { { "\"", "\"", "\\" }, "string" }, - { { "'", "'", "\\" }, "string" }, - { { "0x[%da-fA-F]+" }, "number" }, - { { "-?%d+[%d%.]*f?" }, "number" }, - { { "-?%.?%d+f?" }, "number" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, - { { "%f[^<][%a_][%w%_%-]*" }, "function" }, - { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, - { { "[%a_][%w_]*" }, "keyword" }, - { { "[/<>=]" }, "operator" }, - }, - {}, - "", - { "^#!.*[ /]v1" } } ) - .setAutoCloseXMLTags( true ); + auto& v1 = + SyntaxDefinitionManager::instance() + ->add( + { "V1", + { "%.v1$" }, + { + { { "<%s*[sS][cC][rR][iI][pP][tT]%s+[tT][yY][pP][eE]%s*=%s*['\"]%a+/" + "[jJ][aA][vV][aA][sS][cC][rR][iI][pP][tT]['\"]%s*>", + "<%s*/[sS][cC][rR][iI][pP][tT]>" }, + "function", + "JavaScript" }, + { { "<%s*[sS][cC][rR][iI][pP][tT]%s*>", "<%s*/%s*[sS][cC][rR][iI][pP][tT]>" }, + "function", + "JavaScript" }, + { { "<%s*[sS][tT][yY][lL][eE][^>]*>", "<%s*/%s*[sS][tT][yY][lL][eE]%s*>" }, + "function", + "CSS" }, + { { "<%?v?1?", "%?>" }, "function", "V1Core" }, + { { "" }, "comment" }, + { { "%f[^>][^<]", "%f[<]" }, "normal" }, + { { "\"", "\"", "\\" }, "string" }, + { { "'", "'", "\\" }, "string" }, + { { "0x[%da-fA-F]+" }, "number" }, + { { "-?%d+[%d%.]*f?" }, "number" }, + { { "-?%.?%d+f?" }, "number" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, + { { "%f[^<][%a_][%w%_%-]*" }, "function" }, + { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, + { { "[%a_][%w_]*" }, "keyword" }, + { { "[/<>=]" }, "operator" }, + }, + {}, + "", + { "^#!.*[ /]v1" } } ) + .setAutoCloseXMLTags( true ); auto& sd = SyntaxDefinitionManager::instance() ->add( { "V1Core", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp index 78a25965a..086980ff2 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vala.cpp @@ -19,11 +19,11 @@ SyntaxDefinition& addVala() { { { "-?0x%x+" }, "number" }, { { "-?%.?%d+[uUlLfFdDmM]?" }, "number" }, { { "(class|interface|struct)\\s+([A-Za-z]\\w*)" }, - { "keyword", "keyword", "keyword2" }, + { "keyword", "keyword", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "(class|interface|struct)\\s+([A-Za-z]\\w*)\\s*:\\s*([A-Za-z]\\w*)" }, - { "keyword", "keyword", "keyword2", "keyword2" }, + { "keyword", "keyword", "type", "type" }, "", SyntaxPatternMatchType::RegEx }, { { "-?%d+[%d%.eE]*f?" }, "number" }, @@ -63,17 +63,17 @@ SyntaxDefinition& addVala() { { "null", "keyword" }, { "true", "keyword" }, { "false", "keyword" }, - { "bool", "keyword2" }, { "char", "keyword2" }, { "double", "keyword2" }, - { "float", "keyword2" }, { "int", "keyword2" }, { "int8", "keyword2" }, - { "int16", "keyword2" }, { "int32", "keyword2" }, { "int64", "keyword2" }, - { "long", "keyword2" }, { "short", "keyword2" }, + { "bool", "type" }, { "char", "type" }, { "double", "type" }, + { "float", "type" }, { "int", "type" }, { "int8", "type" }, + { "int16", "type" }, { "int32", "type" }, { "int64", "type" }, + { "long", "type" }, { "short", "type" }, - { "size_t", "keyword2" }, { "ssize_t", "keyword2" }, { "string", "keyword2" }, - { "uchar", "keyword2" }, { "uint", "keyword2" }, { "uint8", "keyword2" }, - { "uint16", "keyword2" }, { "uint32", "keyword2" }, { "uint64", "keyword2" }, - { "ulong", "keyword2" }, { "IOError", "keyword2" }, { "Object", "keyword2" }, + { "size_t", "type" }, { "ssize_t", "type" }, { "string", "type" }, + { "uchar", "type" }, { "uint", "type" }, { "uint8", "type" }, + { "uint16", "type" }, { "uint32", "type" }, { "uint64", "type" }, + { "ulong", "type" }, { "IOError", "type" }, { "Object", "type" }, - { "unichar", "keyword2" }, { "ushort", "keyword2" }, { "Error", "keyword2" }, + { "unichar", "type" }, { "ushort", "type" }, { "Error", "type" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.cpp index 4ae2f2f45..426d4b98b 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.cpp @@ -25,29 +25,29 @@ SyntaxDefinition& addVisualBasic() { { { "then", "keyword" }, { "new", "keyword" }, { "continue", "keyword" }, { "on", "keyword" }, { "default", "keyword" }, { "begin", "keyword" }, - { "char", "keyword2" }, { "set", "keyword" }, { "wend", "keyword" }, + { "char", "type" }, { "set", "keyword" }, { "wend", "keyword" }, { "byref", "keyword" }, { "loop", "keyword" }, { "attribute", "keyword" }, - { "long", "keyword2" }, { "execute", "keyword" }, { "xor", "keyword" }, - { "end", "keyword" }, { "short", "keyword2" }, { "date", "keyword2" }, - { "object", "keyword2" }, { "variant", "keyword2" }, { "sub", "keyword" }, + { "long", "type" }, { "execute", "keyword" }, { "xor", "keyword" }, + { "end", "keyword" }, { "short", "type" }, { "date", "type" }, + { "object", "type" }, { "variant", "type" }, { "sub", "keyword" }, { "with", "keyword" }, { "false", "keyword" }, { "for", "keyword" }, { "goto", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, { "get", "keyword" }, { "lib", "keyword" }, { "call", "keyword" }, { "null", "keyword" }, { "select", "keyword" }, { "function", "keyword" }, { "else", "keyword" }, { "next", "keyword" }, { "option", "keyword" }, { "enum", "keyword" }, { "is", "keyword" }, { "declare", "keyword" }, - { "decimal", "keyword2" }, { "string", "keyword2" }, { "or", "keyword" }, + { "decimal", "type" }, { "string", "type" }, { "or", "keyword" }, { "until", "keyword" }, { "if", "keyword" }, { "nothing", "keyword" }, { "let", "keyword" }, { "property", "keyword" }, { "step", "keyword" }, { "dim", "keyword" }, { "elseif", "keyword" }, { "in", "keyword" }, - { "single", "keyword2" }, { "exit", "keyword" }, { "public", "keyword" }, + { "single", "type" }, { "exit", "keyword" }, { "public", "keyword" }, { "and", "keyword" }, { "private", "keyword" }, { "each", "keyword" }, { "redim", "keyword" }, { "preserve", "keyword" }, { "byval", "keyword" }, - { "double", "keyword2" }, { "return", "keyword" }, { "error", "keyword" }, - { "as", "keyword" }, { "class", "keyword" }, { "byte", "keyword2" }, - { "module", "keyword" }, { "randomize", "keyword" }, { "boolean", "keyword2" }, + { "double", "type" }, { "return", "keyword" }, { "error", "keyword" }, + { "as", "keyword" }, { "class", "keyword" }, { "byte", "type" }, + { "module", "keyword" }, { "randomize", "keyword" }, { "boolean", "type" }, { "explicit", "keyword" }, { "true", "keyword" }, { "not", "keyword" }, - { "integer", "keyword2" }, { "case", "keyword" }, { "mod", "keyword" }, + { "integer", "type" }, { "case", "keyword" }, { "mod", "keyword" }, { "do", "keyword" }, { "empty", "keyword" }, { "type", "keyword" }, { "to", "keyword" }, }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.hpp index f9ce6137d..e128e621a 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vb.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addVisualBasic(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vue.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vue.cpp index 3d8fbe0a6..6f90a2cd1 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vue.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/vue.cpp @@ -18,7 +18,7 @@ SyntaxDefinition& addVue() { { { "0x[%da-fA-F]+" }, "number" }, { { "-?%d+[%d%.]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "[%a_][%w_]*" }, "keyword" }, @@ -51,7 +51,7 @@ SyntaxDefinition& addVue() { { { "0x[%da-fA-F]+" }, "number" }, { { "-?%d+[%d%.]*f?" }, "number" }, { { "-?%.?%d+f?" }, "number" }, - { { "%f[^<]![%a_][%w%_%-]*" }, "keyword2" }, + { { "%f[^<]![%a_][%w%_%-]*" }, "type" }, { { "%f[^<][%a_][%w%_%-]*" }, "function" }, { { "%f[^<]/[%a_][%w%_%-]*" }, "function" }, { { "[%a_][%w_]*" }, "keyword" }, @@ -60,7 +60,6 @@ SyntaxDefinition& addVue() { {}, "", {} } ); - } }}}} // namespace EE::UI::Doc::Language diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/wren.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/wren.cpp index 9cc56cd42..56e11f7c4 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/wren.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/wren.cpp @@ -26,7 +26,7 @@ SyntaxDefinition& addWren() { { "false", "literal" }, { "in", "keyword" }, { "for", "keyword" }, { "while", "keyword" }, { "null", "literal" }, { "true", "literal" }, { "else", "keyword" }, { "construct", "keyword" }, { "foreign", "keyword" }, - { "this", "keyword2" }, { "return", "keyword" }, { "var", "keyword" }, + { "this", "type" }, { "return", "keyword" }, { "var", "keyword" }, { "import", "keyword" }, { "break", "keyword" }, { "class", "keyword" }, { "is", "keyword" }, { "if", "keyword" }, { "static", "keyword" }, { "super", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.cpp index f8dceb645..ed25f8152 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.cpp @@ -26,7 +26,7 @@ SyntaxDefinition& addX86Assembly() { }, { - { "zword", "keyword2" }, + { "zword", "type" }, { "zmm6", "literal" }, { "zmm28", "literal" }, { "zmm26", "literal" }, @@ -77,11 +77,11 @@ SyntaxDefinition& addX86Assembly() { { "xbegin", "keyword" }, { "xadd", "keyword" }, { "xabort", "keyword" }, - { "wrt", "keyword2" }, + { "wrt", "type" }, { "wrshr", "keyword" }, { "wrmsr", "keyword" }, { "wrfsbase", "keyword" }, - { "word", "keyword2" }, + { "word", "type" }, { "wait", "keyword" }, { "zmm13", "literal" }, { "vxorpd", "keyword" }, @@ -156,7 +156,7 @@ SyntaxDefinition& addX86Assembly() { { "vprorvq", "keyword" }, { "vprorvd", "keyword" }, { "vprord", "keyword" }, - { "yword", "keyword2" }, + { "yword", "type" }, { "vprolvq", "keyword" }, { "vprolvd", "keyword" }, { "ymm7", "literal" }, @@ -715,9 +715,9 @@ SyntaxDefinition& addX86Assembly() { { "vmovdqa", "keyword" }, { "vaddps", "keyword" }, { "vaddpd", "keyword" }, - { "use64", "keyword2" }, - { "use32", "keyword2" }, - { "use16", "keyword2" }, + { "use64", "type" }, + { "use32", "type" }, + { "use16", "type" }, { "vpabsd", "keyword" }, { "unpcklps", "keyword" }, { "vphaddbd", "keyword" }, @@ -746,12 +746,12 @@ SyntaxDefinition& addX86Assembly() { { "vpermt2ps", "keyword" }, { "jge", "keyword" }, { "vinserti32x8", "keyword" }, - { "dt", "keyword2" }, + { "dt", "type" }, { "cmovng", "keyword" }, { "setge", "keyword" }, { "t1mskc", "keyword" }, { "kaddb", "keyword" }, - { "USE64", "keyword2" }, + { "USE64", "type" }, { "sahf", "keyword" }, { "setbe", "keyword" }, { "vpmacsdqh", "keyword" }, @@ -765,25 +765,25 @@ SyntaxDefinition& addX86Assembly() { { "pshuflw", "keyword" }, { "ip", "literal" }, { "zmm7", "literal" }, - { "dq", "keyword2" }, + { "dq", "type" }, { "vfmadd321sd", "keyword" }, { "cmpnltpd", "keyword" }, { "invlpg", "keyword" }, { "cmovz", "keyword" }, { "int3", "keyword" }, { "ymm25", "literal" }, - { "dz", "keyword2" }, + { "dz", "type" }, { "int03", "keyword" }, { "hint_nop37", "keyword" }, { "insertq", "keyword" }, { "ud1", "keyword" }, { "vpcmpgtq", "keyword" }, { "vpalignr", "keyword" }, - { "incbin", "keyword2" }, + { "incbin", "type" }, { "jmpe", "keyword" }, { "vpcmpq", "keyword" }, - { "istruc", "keyword2" }, - { "dd", "keyword2" }, + { "istruc", "type" }, + { "dd", "type" }, { "vinserti64x4", "keyword" }, { "vcmpordpd", "keyword" }, { "bndmov", "keyword" }, @@ -828,8 +828,8 @@ SyntaxDefinition& addX86Assembly() { { "hint_nop52", "keyword" }, { "fxrstor", "keyword" }, { "cmovnz", "keyword" }, - { "common", "keyword2" }, - { "strict", "keyword2" }, + { "common", "type" }, + { "strict", "type" }, { "vpcmpistrm", "keyword" }, { "jc", "keyword" }, { "hint_nop40", "keyword" }, @@ -859,7 +859,7 @@ SyntaxDefinition& addX86Assembly() { { "mm3", "literal" }, { "vpsllvq", "keyword" }, { "vcmpfalse_osss", "keyword" }, - { "endstruc", "keyword2" }, + { "endstruc", "type" }, { "invlpga", "keyword" }, { "hint_nop24", "keyword" }, { "vpclmullqlqdq", "keyword" }, @@ -882,7 +882,7 @@ SyntaxDefinition& addX86Assembly() { { "vsubps", "keyword" }, { "hsubpd", "keyword" }, { "psrlq", "keyword" }, - { "section", "keyword2" }, + { "section", "type" }, { "xrstor", "keyword" }, { "fyl2xp1", "keyword" }, { "cvtsd2ss", "keyword" }, @@ -900,7 +900,7 @@ SyntaxDefinition& addX86Assembly() { { "fsub", "keyword" }, { "vpshad", "keyword" }, { "vfnmsub312ss", "keyword" }, - { "dword", "keyword2" }, + { "dword", "type" }, { "movups", "keyword" }, { "vroundsd", "keyword" }, { "fstsw", "keyword" }, @@ -918,7 +918,7 @@ SyntaxDefinition& addX86Assembly() { { "kxnord", "keyword" }, { "vcmplt_oqps", "keyword" }, { "vandnps", "keyword" }, - { "__BITS__", "keyword2" }, + { "__BITS__", "type" }, { "fldln2", "keyword" }, { "fldl2t", "keyword" }, { "fldenv", "keyword" }, @@ -939,7 +939,7 @@ SyntaxDefinition& addX86Assembly() { { "fiadd", "keyword" }, { "vpmaddwd", "keyword" }, { "ffree", "keyword" }, - { "__NASM_MINOR__", "keyword2" }, + { "__NASM_MINOR__", "type" }, { "jnbe", "keyword" }, { "vextracti64x4", "keyword" }, { "pfadd", "keyword" }, @@ -975,7 +975,7 @@ SyntaxDefinition& addX86Assembly() { { "hint_nop25", "keyword" }, { "punpcklbw", "keyword" }, { "faddp", "keyword" }, - { "__LINE__", "keyword2" }, + { "__LINE__", "type" }, { "popfd", "keyword" }, { "vpcomuw", "keyword" }, { "vbroadcasti128", "keyword" }, @@ -994,7 +994,7 @@ SyntaxDefinition& addX86Assembly() { { "adc", "keyword" }, { "st5", "literal" }, { "vextractf128", "keyword" }, - { "equ", "keyword2" }, + { "equ", "type" }, { "vpbroadcastd", "keyword" }, { "vminss", "keyword" }, { "hint_nop54", "keyword" }, @@ -1018,7 +1018,7 @@ SyntaxDefinition& addX86Assembly() { { "vcmple_oqss", "keyword" }, { "hint_nop15", "keyword" }, { "ecx", "literal" }, - { "dy", "keyword2" }, + { "dy", "type" }, { "vbroadcastd", "keyword" }, { "movdq2q", "keyword" }, { "vcmplt_oqpd", "keyword" }, @@ -1034,7 +1034,7 @@ SyntaxDefinition& addX86Assembly() { { "vpmaxsq", "keyword" }, { "hint_nop36", "keyword" }, { "blendpd", "keyword" }, - { "dw", "keyword2" }, + { "dw", "type" }, { "maxpd", "keyword" }, { "xmm31", "literal" }, { "vblendmpd", "keyword" }, @@ -1067,7 +1067,7 @@ SyntaxDefinition& addX86Assembly() { { "vpshufd", "keyword" }, { "fbld", "keyword" }, { "bzhi", "keyword" }, - { "ptr", "keyword2" }, + { "ptr", "type" }, { "fdisi", "keyword" }, { "cmplepd", "keyword" }, { "vpshld", "keyword" }, @@ -1078,7 +1078,7 @@ SyntaxDefinition& addX86Assembly() { { "fndisi", "keyword" }, { "cmpnless", "keyword" }, { "vpabsb", "keyword" }, - { "ABSOLUTE", "keyword2" }, + { "ABSOLUTE", "type" }, { "rsdc", "keyword" }, { "addsubps", "keyword" }, { "popa", "keyword" }, @@ -1123,7 +1123,7 @@ SyntaxDefinition& addX86Assembly() { { "bswap", "keyword" }, { "vfmaddsub231pd", "keyword" }, { "feni", "keyword" }, - { "alignb", "keyword2" }, + { "alignb", "type" }, { "vptest", "keyword" }, { "vcmpneq_uqps", "keyword" }, { "phsubw", "keyword" }, @@ -1144,9 +1144,9 @@ SyntaxDefinition& addX86Assembly() { { "ktestw", "keyword" }, { "sets", "keyword" }, { "vpord", "keyword" }, - { "SEGMENT", "keyword2" }, + { "SEGMENT", "type" }, { "fcomp", "keyword" }, - { "absolute", "keyword2" }, + { "absolute", "type" }, { "jnp", "keyword" }, { "fdiv", "keyword" }, { "vcmpnge_uspd", "keyword" }, @@ -1194,17 +1194,17 @@ SyntaxDefinition& addX86Assembly() { { "hint_nop56", "keyword" }, { "vpshlb", "keyword" }, { "sar", "keyword" }, - { "__NASM_MAJOR__", "keyword2" }, + { "__NASM_MAJOR__", "type" }, { "pfcmpeq", "keyword" }, { "cvttpd2dq", "keyword" }, { "vaddsd", "keyword" }, - { "SECTION", "keyword2" }, + { "SECTION", "type" }, { "hint_nop0", "keyword" }, { "finit", "keyword" }, { "setc", "keyword" }, { "vrsqrt28ss", "keyword" }, { "st1", "literal" }, - { "__NASM_SUBMINOR__", "keyword2" }, + { "__NASM_SUBMINOR__", "type" }, { "salc", "keyword" }, { "hint_nop55", "keyword" }, { "hint_nop61", "keyword" }, @@ -1226,13 +1226,13 @@ SyntaxDefinition& addX86Assembly() { { "insd", "keyword" }, { "hint_nop44", "keyword" }, { "setns", "keyword" }, - { "..plt", "keyword2" }, + { "..plt", "type" }, { "fstenv", "keyword" }, { "pmovsxbw", "keyword" }, { "dr2", "literal" }, { "bndcn", "keyword" }, { "kandd", "keyword" }, - { "resq", "keyword2" }, + { "resq", "type" }, { "fclex", "keyword" }, { "cvtsi2sd", "keyword" }, { "punpcklwd", "keyword" }, @@ -1245,7 +1245,7 @@ SyntaxDefinition& addX86Assembly() { { "vcmppd", "keyword" }, { "pshufhw", "keyword" }, { "sub", "keyword" }, - { "SEG", "keyword2" }, + { "SEG", "type" }, { "vcmptrue_ussd", "keyword" }, { "cmovp", "keyword" }, { "cmpltpd", "keyword" }, @@ -1255,7 +1255,7 @@ SyntaxDefinition& addX86Assembly() { { "fsin", "keyword" }, { "hint_nop21", "keyword" }, { "vcmpgt_oqps", "keyword" }, - { "__NASM_VER__", "keyword2" }, + { "__NASM_VER__", "type" }, { "dpps", "keyword" }, { "sarx", "keyword" }, { "cmovna", "keyword" }, @@ -1278,7 +1278,7 @@ SyntaxDefinition& addX86Assembly() { { "jae", "keyword" }, { "fnclex", "keyword" }, { "setnp", "keyword" }, - { "USE16", "keyword2" }, + { "USE16", "type" }, { "kortestq", "keyword" }, { "fcmovb", "keyword" }, { "blcmsk", "keyword" }, @@ -1290,14 +1290,14 @@ SyntaxDefinition& addX86Assembly() { { "vfnmsub231pd", "keyword" }, { "blsmsk", "keyword" }, { "pcmpeqb", "keyword" }, - { "__NASM_VERSION_ID__", "keyword2" }, + { "__NASM_VERSION_ID__", "type" }, { "movsldup", "keyword" }, { "xmm3", "literal" }, { "vblendmps", "keyword" }, { "cmovg", "keyword" }, { "vphaddudq", "keyword" }, { "invpcid", "keyword" }, - { "IEND", "keyword2" }, + { "IEND", "type" }, { "vdivss", "keyword" }, { "vcmpngtsd", "keyword" }, { "vcmpeqpd", "keyword" }, @@ -1306,14 +1306,14 @@ SyntaxDefinition& addX86Assembly() { { "fldlg2", "keyword" }, { "vfnmsub231ss", "keyword" }, { "setno", "keyword" }, - { "EXTERN", "keyword2" }, + { "EXTERN", "type" }, { "vfmadd321ps", "keyword" }, { "call", "keyword" }, { "ebp", "literal" }, { "lwpval", "keyword" }, { "jpo", "keyword" }, - { "STRICT", "keyword2" }, - { "at", "keyword2" }, + { "STRICT", "type" }, + { "at", "type" }, { "vcmpgt_ospd", "keyword" }, { "pfsub", "keyword" }, { "vzeroall", "keyword" }, @@ -1360,7 +1360,7 @@ SyntaxDefinition& addX86Assembly() { { "cmpordpd", "keyword" }, { "paddusb", "keyword" }, { "adox", "keyword" }, - { "GLOBAL", "keyword2" }, + { "GLOBAL", "type" }, { "prefetcht1", "keyword" }, { "fmul", "keyword" }, { "ud2b", "keyword" }, @@ -1371,7 +1371,7 @@ SyntaxDefinition& addX86Assembly() { { "vpminuw", "keyword" }, { "vinsertf32x8", "keyword" }, { "rsi", "literal" }, - { "ORG", "keyword2" }, + { "ORG", "type" }, { "vminpd", "keyword" }, { "setb", "keyword" }, { "pcmpistri", "keyword" }, @@ -1390,13 +1390,13 @@ SyntaxDefinition& addX86Assembly() { { "vrsqrt14sd", "keyword" }, { "dx", "literal" }, { "sal", "keyword" }, - { "iend", "keyword2" }, + { "iend", "type" }, { "fistp", "keyword" }, { "rdpmc", "keyword" }, { "repnz", "keyword" }, { "vpsignb", "keyword" }, { "vfmsubadd312pd", "keyword" }, - { "align", "keyword2" }, + { "align", "type" }, { "blsic", "keyword" }, { "vfnmadd231ss", "keyword" }, { "fld1", "keyword" }, @@ -1413,7 +1413,7 @@ SyntaxDefinition& addX86Assembly() { { "rdshr", "keyword" }, { "rep", "keyword" }, { "vcmpfalse_oqps", "keyword" }, - { "tword", "keyword2" }, + { "tword", "type" }, { "blci", "keyword" }, { "vpminub", "keyword" }, { "cmove", "keyword" }, @@ -1450,9 +1450,9 @@ SyntaxDefinition& addX86Assembly() { { "vcmpnge_uqpd", "keyword" }, { "hint_nop32", "keyword" }, { "vcmpge_oqps", "keyword" }, - { "do", "keyword2" }, + { "do", "type" }, { "pextrb", "keyword" }, - { "default", "keyword2" }, + { "default", "type" }, { "esi", "literal" }, { "cvtps2dq", "keyword" }, { "vfmsub213ss", "keyword" }, @@ -1466,7 +1466,7 @@ SyntaxDefinition& addX86Assembly() { { "hint_nop7", "keyword" }, { "pcmpistrm", "keyword" }, { "vpternlogq", "keyword" }, - { "resb", "keyword2" }, + { "resb", "type" }, { "bp", "literal" }, { "vfmsubadd231ps", "keyword" }, { "edx", "literal" }, @@ -1488,8 +1488,8 @@ SyntaxDefinition& addX86Assembly() { { "hint_nop9", "keyword" }, { "cmpneqsd", "keyword" }, { "cmpleps", "keyword" }, - { "DEFAULT", "keyword2" }, - { "global", "keyword2" }, + { "DEFAULT", "type" }, + { "global", "type" }, { "vpmovm2w", "keyword" }, { "vcmptruess", "keyword" }, { "pmovzxbw", "keyword" }, @@ -1554,7 +1554,7 @@ SyntaxDefinition& addX86Assembly() { { "fucomp", "keyword" }, { "vptestmb", "keyword" }, { "vmfunc", "keyword" }, - { "..got", "keyword2" }, + { "..got", "type" }, { "xmm7", "literal" }, { "vpcmpuq", "keyword" }, { "movntpd", "keyword" }, @@ -1571,7 +1571,7 @@ SyntaxDefinition& addX86Assembly() { { "fdecstp", "keyword" }, { "je", "keyword" }, { "fs", "literal" }, - { "USE32", "keyword2" }, + { "USE32", "type" }, { "cmovle", "keyword" }, { "jng", "keyword" }, { "hint_nop59", "keyword" }, @@ -1617,10 +1617,10 @@ SyntaxDefinition& addX86Assembly() { { "adcx", "keyword" }, { "daa", "keyword" }, { "vfnmaddpd", "keyword" }, - { "byte", "keyword2" }, + { "byte", "type" }, { "knotq", "keyword" }, { "vprotq", "keyword" }, - { "db", "keyword2" }, + { "db", "type" }, { "di", "literal" }, { "pdep", "keyword" }, { "dil", "literal" }, @@ -1633,10 +1633,10 @@ SyntaxDefinition& addX86Assembly() { { "andn", "keyword" }, { "vpcomub", "keyword" }, { "invvpid", "keyword" }, - { "bits", "keyword2" }, + { "bits", "type" }, { "dmint", "keyword" }, { "r9", "literal" }, - { "resd", "keyword2" }, + { "resd", "type" }, { "vscatterqps", "keyword" }, { "vfmadd123ss", "keyword" }, { "kandnw", "keyword" }, @@ -1718,11 +1718,11 @@ SyntaxDefinition& addX86Assembly() { { "kxord", "keyword" }, { "kxorw", "keyword" }, { "lahf", "keyword" }, - { "oword", "keyword2" }, + { "oword", "type" }, { "mm7", "literal" }, { "lar", "keyword" }, { "lddqu", "keyword" }, - { "qword", "keyword2" }, + { "qword", "type" }, { "ldmxcsr", "keyword" }, { "lea", "keyword" }, { "xmm5", "literal" }, @@ -1780,7 +1780,7 @@ SyntaxDefinition& addX86Assembly() { { "mm5", "literal" }, { "monitor", "keyword" }, { "movaps", "keyword" }, - { "ALIGNB", "keyword2" }, + { "ALIGNB", "type" }, { "movbe", "keyword" }, { "movd", "keyword" }, { "zmm1", "literal" }, @@ -1806,7 +1806,7 @@ SyntaxDefinition& addX86Assembly() { { "movntsd", "keyword" }, { "cvtpi2pd", "keyword" }, { "outsw", "keyword" }, - { "BITS", "keyword2" }, + { "BITS", "type" }, { "setnae", "keyword" }, { "kxnorq", "keyword" }, { "movntss", "keyword" }, @@ -1827,7 +1827,7 @@ SyntaxDefinition& addX86Assembly() { { "vphaddubw", "keyword" }, { "vgatherdpd", "keyword" }, { "mulpd", "keyword" }, - { "COMMON", "keyword2" }, + { "COMMON", "type" }, { "mulps", "keyword" }, { "vmovsd", "keyword" }, { "kshiftld", "keyword" }, @@ -1852,16 +1852,16 @@ SyntaxDefinition& addX86Assembly() { { "stc", "keyword" }, { "or", "keyword" }, { "vmovupd", "keyword" }, - { "org", "keyword2" }, + { "org", "type" }, { "orpd", "keyword" }, { "pshufb", "keyword" }, { "vcmplesd", "keyword" }, { "orps", "keyword" }, { "out", "keyword" }, - { "__SECT__", "keyword2" }, + { "__SECT__", "type" }, { "outs", "keyword" }, { "cmovnae", "keyword" }, - { "struc", "keyword2" }, + { "struc", "type" }, { "pabsd", "keyword" }, { "pabsw", "keyword" }, { "popfw", "keyword" }, @@ -1870,7 +1870,7 @@ SyntaxDefinition& addX86Assembly() { { "vmovdqu32", "keyword" }, { "packusdw", "keyword" }, { "sbb", "keyword" }, - { "seg", "keyword2" }, + { "seg", "type" }, { "cmpsw", "keyword" }, { "paddd", "keyword" }, { "popad", "keyword" }, @@ -1897,7 +1897,7 @@ SyntaxDefinition& addX86Assembly() { { "vcmpngtpd", "keyword" }, { "fidiv", "keyword" }, { "pclmullqlqdq", "keyword" }, - { "AT", "keyword2" }, + { "AT", "type" }, { "pclmulqdq", "keyword" }, { "vpsubd", "keyword" }, { "pcmpeqd", "keyword" }, @@ -2003,7 +2003,7 @@ SyntaxDefinition& addX86Assembly() { { "subsd", "keyword" }, { "psignd", "keyword" }, { "vscalefss", "keyword" }, - { "reso", "keyword2" }, + { "reso", "type" }, { "setne", "keyword" }, { "st", "literal" }, { "vcmpfalse_ospd", "keyword" }, @@ -2036,7 +2036,7 @@ SyntaxDefinition& addX86Assembly() { { "pusha", "keyword" }, { "rdpkru", "keyword" }, { "iretw", "keyword" }, - { "..sym", "keyword2" }, + { "..sym", "type" }, { "setnb", "keyword" }, { "vrsqrt14ss", "keyword" }, { "vcmpgtpd", "keyword" }, @@ -2049,7 +2049,7 @@ SyntaxDefinition& addX86Assembly() { { "pushfd", "keyword" }, { "vfmadd312sd", "keyword" }, { "pushfq", "keyword" }, - { "times", "keyword2" }, + { "times", "type" }, { "pushfw", "keyword" }, { "jnz", "keyword" }, { "r10", "literal" }, @@ -2095,13 +2095,13 @@ SyntaxDefinition& addX86Assembly() { { "repe", "keyword" }, { "vextractf32x8", "keyword" }, { "repz", "keyword" }, - { "rest", "keyword2" }, + { "rest", "type" }, { "hint_nop19", "keyword" }, { "setna", "keyword" }, - { "resw", "keyword2" }, + { "resw", "type" }, { "frndint", "keyword" }, - { "resy", "keyword2" }, - { "resz", "keyword2" }, + { "resy", "type" }, + { "resz", "type" }, { "vpmovb2m", "keyword" }, { "movsb", "keyword" }, { "packuswb", "keyword" }, @@ -2127,11 +2127,11 @@ SyntaxDefinition& addX86Assembly() { { "scasq", "keyword" }, { "vshuff64x2", "keyword" }, { "kandw", "keyword" }, - { "___NASM_PATCHLEVEL__", "keyword2" }, + { "___NASM_PATCHLEVEL__", "type" }, { "scasw", "keyword" }, { "svldt", "keyword" }, { "setl", "keyword" }, - { "segment", "keyword2" }, + { "segment", "type" }, { "seta", "keyword" }, { "setae", "keyword" }, { "jl", "keyword" }, @@ -2139,7 +2139,7 @@ SyntaxDefinition& addX86Assembly() { { "vcvtsi2sd", "keyword" }, { "sgdt", "keyword" }, { "setnbe", "keyword" }, - { "extern", "keyword2" }, + { "extern", "type" }, { "setnc", "keyword" }, { "clwb", "keyword" }, { "setnl", "keyword" }, @@ -2151,7 +2151,7 @@ SyntaxDefinition& addX86Assembly() { { "setpo", "keyword" }, { "shld", "keyword" }, { "zmm8", "literal" }, - { "short", "keyword2" }, + { "short", "type" }, { "int", "keyword" }, { "shr", "keyword" }, { "rbp", "literal" }, @@ -2173,8 +2173,8 @@ SyntaxDefinition& addX86Assembly() { { "aam", "keyword" }, { "kandnb", "keyword" }, { "sp", "literal" }, - { "__FILE__", "keyword2" }, - { "ALIGN", "keyword2" }, + { "__FILE__", "type" }, + { "ALIGN", "type" }, { "movsq", "keyword" }, { "phaddsw", "keyword" }, { "spl", "literal" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.hpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.hpp index c22572bfb..5094cc207 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.hpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/x86assembly.hpp @@ -7,6 +7,6 @@ namespace EE { namespace UI { namespace Doc { namespace Language { extern SyntaxDefinition& addX86Assembly(); -}}}} +}}}} // namespace EE::UI::Doc::Language #endif diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/xtend.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/xtend.cpp index bb0f25b8c..f6a2ce775 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/xtend.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/xtend.cpp @@ -26,78 +26,42 @@ SyntaxDefinition& addXtend() { }, { - { "abstract", "keyword" }, - { "annotation", "keyword" }, - { "as", "keyword" }, - { "case", "keyword" }, - { "catch", "keyword" }, - { "class", "keyword" }, - { "create", "keyword" }, - { "def", "keyword" }, - { "default", "keyword" }, - { "dispatch", "keyword" }, - { "do", "keyword" }, - { "else", "keyword" }, - { "enum", "keyword" }, - { "extends", "keyword" }, - { "extension", "keyword" }, - { "final", "keyword" }, - { "finally", "keyword" }, - { "for", "keyword" }, - { "if", "keyword" }, - { "implements", "keyword" }, - { "import", "keyword" }, - { "interface", "keyword" }, - { "instanceof", "keyword" }, - { "it", "keyword" }, - { "new", "keyword" }, - { "override", "keyword" }, - { "package", "keyword" }, - { "private", "keyword" }, - { "protected", "keyword" }, - { "public", "keyword" }, - { "return", "keyword" }, - { "self", "keyword" }, - { "static", "keyword" }, - { "super", "keyword" }, - { "switch", "keyword" }, - { "synchronized", "keyword" }, - { "this", "keyword" }, - { "throw", "keyword" }, - { "throws", "keyword" }, - { "try", "keyword" }, - { "typeof", "keyword" }, - { "val", "keyword" }, - { "var", "keyword" }, - { "while", "keyword" }, - { "AFTER", "keyword" }, - { "BEFORE", "keyword" }, - { "ENDFOR", "keyword" }, - { "ENDIF", "keyword" }, - { "FOR", "keyword" }, - { "IF", "keyword" }, - { "SEPARATOR", "keyword" }, - { "boolean", "keyword2" }, - { "byte", "keyword2" }, - { "char", "keyword2" }, - { "double", "keyword2" }, - { "float", "keyword2" }, - { "int", "keyword2" }, - { "long", "keyword2" }, - { "short", "keyword2" }, - { "void", "keyword2" }, - { "Boolean", "keyword2" }, - { "Byte", "keyword2" }, - { "Character", "keyword2" }, - { "Double", "keyword2" }, - { "Float", "keyword2" }, - { "Integer", "keyword2" }, - { "Long", "keyword2" }, - { "Short", "keyword2" }, - { "String", "keyword2" }, - { "true", "literal" }, - { "false", "literal" }, - { "null", "literal" }, + { "abstract", "keyword" }, { "annotation", "keyword" }, + { "as", "keyword" }, { "case", "keyword" }, + { "catch", "keyword" }, { "class", "keyword" }, + { "create", "keyword" }, { "def", "keyword" }, + { "default", "keyword" }, { "dispatch", "keyword" }, + { "do", "keyword" }, { "else", "keyword" }, + { "enum", "keyword" }, { "extends", "keyword" }, + { "extension", "keyword" }, { "final", "keyword" }, + { "finally", "keyword" }, { "for", "keyword" }, + { "if", "keyword" }, { "implements", "keyword" }, + { "import", "keyword" }, { "interface", "keyword" }, + { "instanceof", "keyword" }, { "it", "keyword" }, + { "new", "keyword" }, { "override", "keyword" }, + { "package", "keyword" }, { "private", "keyword" }, + { "protected", "keyword" }, { "public", "keyword" }, + { "return", "keyword" }, { "self", "keyword" }, + { "static", "keyword" }, { "super", "keyword" }, + { "switch", "keyword" }, { "synchronized", "keyword" }, + { "this", "keyword" }, { "throw", "keyword" }, + { "throws", "keyword" }, { "try", "keyword" }, + { "typeof", "keyword" }, { "val", "keyword" }, + { "var", "keyword" }, { "while", "keyword" }, + { "AFTER", "keyword" }, { "BEFORE", "keyword" }, + { "ENDFOR", "keyword" }, { "ENDIF", "keyword" }, + { "FOR", "keyword" }, { "IF", "keyword" }, + { "SEPARATOR", "keyword" }, { "boolean", "type" }, + { "byte", "type" }, { "char", "type" }, + { "double", "type" }, { "float", "type" }, + { "int", "type" }, { "long", "type" }, + { "short", "type" }, { "void", "type" }, + { "Boolean", "type" }, { "Byte", "type" }, + { "Character", "type" }, { "Double", "type" }, + { "Float", "type" }, { "Integer", "type" }, + { "Long", "type" }, { "Short", "type" }, + { "String", "type" }, { "true", "literal" }, + { "false", "literal" }, { "null", "literal" }, }, "//", {} diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yaml.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yaml.cpp index b7614effd..95e1a0d44 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yaml.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yaml.cpp @@ -21,7 +21,7 @@ SyntaxDefinition& addYAML() { { { "https?://[%w_.~!*:@&+$/?%%#-]-%w[-.%w]*%.%w%w%w?%w?:?%d*/?[%w_.~!*:@&+$/" "?%%#=-]*" }, "link" }, - { { "([%s]%*)([%w%d_]+)" }, { "keyword", "keyword", "keyword2" } }, + { { "([%s]%*)([%w%d_]+)" }, { "keyword", "keyword", "type" } }, { { "(%*)([%w%d_]+)" }, { "keyword", "keyword", "literal" } }, { { "([%[%{])(%s*[%w%d]+%g+%s*)(:%s)" }, { "keyword", "operator", "operator", "keyword" } }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yuescript.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yuescript.cpp index f8a9fcbe9..37ac98cf9 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yuescript.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/yuescript.cpp @@ -32,11 +32,11 @@ SyntaxDefinition& addYueScript() { { { "%-%-%[%[", "%]%]" }, "comment" }, { { "%-%-.*\n" }, "comment" }, { { "#!.*\n" }, "comment" }, - { { "%u[%w_]*" }, "keyword2" }, + { { "%u[%w_]*" }, "type" }, { { "(<)(%s*close)" }, { "normal", "operator", "normal" } }, { { "close" }, "keyword" }, - { { "(macro%s+)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, - { { "(class%s+)([%a_][%w_]*)" }, { "normal", "keyword", "keyword2" } }, + { { "(macro%s+)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, + { { "(class%s+)([%a_][%w_]*)" }, { "normal", "keyword", "type" } }, { { "([%a_][%w_]*)(%s*%f[%(@\"'{#])" }, { "normal", "function", "normal" } }, { { "([a-zA-Z_][\\w_]*)(\\s+(?:try|default|do|export|switch|and|while|unless|global|" "catch|until|goto|in|or|when|with|extends|for|from|then|as|return|macro|const|" @@ -65,7 +65,7 @@ SyntaxDefinition& addYueScript() { SyntaxPatternMatchType::RegEx }, { { "([%a_][%w_]*)(%??%s*!=)" }, { "normal", "normal", "operator" } }, { { "([%a_][%w_]*)(%??%s*!)" }, { "normal", "function", "operator" } }, - { { "(::)([%a_][%w_]*)(::)" }, { "normal", "operator", "keyword2", "operator" } }, + { { "(::)([%a_][%w_]*)(::)" }, { "normal", "operator", "type", "operator" } }, { { "(::)([%a_][%w_]*)" }, { "normal", "operator", "function" } }, { { "(\\)([%a_][%w_]*)" }, { "normal", "operator", "function" } }, { { "\\-?0x[\\da-fA-F](?:_?[\\da-fA-F])*(?:\\.[\\da-fA-F](?:_?[\\da-fA-F])*)?" }, @@ -81,8 +81,8 @@ SyntaxDefinition& addYueScript() { "number", "", SyntaxPatternMatchType::RegEx }, - { { "@@?[%w_]*" }, "keyword2" }, - { { "$[%w_]+" }, "keyword2" }, + { { "@@?[%w_]*" }, "type" }, + { { "$[%w_]+" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, { { "\"", "\"", "\\" }, "string", "YueScriptStringInterpolation" }, { { "'", "'", "\\" }, "string" }, @@ -97,10 +97,10 @@ SyntaxDefinition& addYueScript() { { "default", "keyword" }, { "unless", "keyword" }, { "switch", "keyword" }, { "using", "keyword" }, { "return", "keyword" }, { "import", "keyword" }, { "try", "keyword" }, { "as", "keyword" }, { "class", "keyword" }, - { "repeat", "keyword" }, { "super", "keyword2" }, { "extends", "keyword" }, + { "repeat", "keyword" }, { "super", "type" }, { "extends", "keyword" }, { "with", "keyword" }, { "false", "literal" }, { "for", "keyword" }, { "goto", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, - { "from", "keyword" }, { "self", "keyword2" }, { "catch", "keyword" }, + { "from", "keyword" }, { "self", "type" }, { "catch", "keyword" }, { "true", "literal" }, { "else", "keyword" }, { "global", "keyword" }, { "nil", "literal" }, { "not", "keyword" }, { "when", "keyword" }, { "local", "keyword" }, { "break", "keyword" }, { "or", "keyword" }, diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zephir.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zephir.cpp index d4e600aca..9945d6d8d 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zephir.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zephir.cpp @@ -21,57 +21,42 @@ SyntaxDefinition& addZephir() { { { "common_number_parser" }, "number", "", SyntaxPatternMatchType::Parser }, { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "%$[%a][%w_]*" }, "keyword3" }, + { { "%$[%a][%w_]*" }, "parameter" }, { { "[%a_][%w_]*" }, "symbol" }, }, { - { "internal", "keyword" }, { "int", "keyword2" }, - { "new", "keyword" }, { "continue", "keyword" }, - { "default", "keyword" }, { "isset", "keyword" }, - { "char", "keyword2" }, { "likely", "keyword" }, - { "_REQUEST", "keyword2" }, { "bool", "keyword2" }, - { "this", "keyword" }, { "loop", "keyword" }, - { "iterator", "keyword2" }, { "long", "keyword2" }, - { "Array", "keyword2" }, { "namespace", "keyword" }, - { "short", "keyword2" }, { "typeof", "keyword" }, - { "unset", "keyword" }, { "PHP_VERSION", "keyword2" }, - { "extends", "keyword" }, { "match", "keyword" }, - { "range", "keyword2" }, { "with", "keyword" }, - { "undefined", "literal" }, { "false", "literal" }, - { "for", "keyword" }, { "goto", "keyword" }, - { "while", "keyword" }, { "const", "keyword" }, - { "null", "literal" }, { "function", "keyword" }, - { "else", "keyword" }, { "final", "keyword" }, - { "enum", "keyword" }, { "_COOKIE", "keyword2" }, - { "break", "keyword" }, { "use", "keyword" }, - { "string", "keyword" }, { "if", "keyword" }, - { "let", "keyword" }, { "in", "keyword" }, - { "native", "keyword" }, { "public", "keyword" }, - { "unsigned", "keyword2" }, { "throws", "keyword" }, - { "private", "keyword" }, { "finally", "keyword" }, - { "abstract", "keyword" }, { "volatile", "keyword" }, - { "switch", "keyword" }, { "double", "keyword2" }, - { "_SERVER", "keyword2" }, { "delete", "keyword" }, - { "unlikely", "keyword" }, { "ulong", "keyword2" }, - { "return", "keyword" }, { "var", "keyword" }, - { "import", "keyword" }, { "uchar", "keyword2" }, - { "try", "keyword" }, { "class", "keyword" }, - { "void", "keyword" }, { "static", "keyword" }, - { "inline", "keyword" }, { "echo", "keyword" }, - { "reverse", "keyword" }, { "boolean", "keyword2" }, - { "_POST", "keyword2" }, { "throw", "keyword" }, - { "self", "keyword2" }, { "catch", "keyword" }, - { "true", "literal" }, { "implements", "keyword" }, - { "stdClass", "keyword2" }, { "Boolean", "keyword2" }, - { "instanceof", "keyword" }, { "_SESSION", "keyword2" }, - { "require", "keyword" }, { "transient", "keyword" }, - { "Date", "keyword2" }, { "float", "keyword2" }, - { "PHP_EOL", "keyword2" }, { "fetch", "keyword" }, - { "case", "keyword" }, { "_GET", "keyword2" }, - { "export", "keyword" }, { "interface", "keyword" }, - { "protected", "keyword" }, { "do", "keyword" }, - { "window", "keyword2" }, { "empty", "keyword" }, + { "internal", "keyword" }, { "int", "type" }, { "new", "keyword" }, + { "continue", "keyword" }, { "default", "keyword" }, { "isset", "keyword" }, + { "char", "type" }, { "likely", "keyword" }, { "_REQUEST", "type" }, + { "bool", "type" }, { "this", "keyword" }, { "loop", "keyword" }, + { "iterator", "type" }, { "long", "type" }, { "Array", "type" }, + { "namespace", "keyword" }, { "short", "type" }, { "typeof", "keyword" }, + { "unset", "keyword" }, { "PHP_VERSION", "type" }, { "extends", "keyword" }, + { "match", "keyword" }, { "range", "type" }, { "with", "keyword" }, + { "undefined", "literal" }, { "false", "literal" }, { "for", "keyword" }, + { "goto", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, + { "null", "literal" }, { "function", "keyword" }, { "else", "keyword" }, + { "final", "keyword" }, { "enum", "keyword" }, { "_COOKIE", "type" }, + { "break", "keyword" }, { "use", "keyword" }, { "string", "keyword" }, + { "if", "keyword" }, { "let", "keyword" }, { "in", "keyword" }, + { "native", "keyword" }, { "public", "keyword" }, { "unsigned", "type" }, + { "throws", "keyword" }, { "private", "keyword" }, { "finally", "keyword" }, + { "abstract", "keyword" }, { "volatile", "keyword" }, { "switch", "keyword" }, + { "double", "type" }, { "_SERVER", "type" }, { "delete", "keyword" }, + { "unlikely", "keyword" }, { "ulong", "type" }, { "return", "keyword" }, + { "var", "keyword" }, { "import", "keyword" }, { "uchar", "type" }, + { "try", "keyword" }, { "class", "keyword" }, { "void", "keyword" }, + { "static", "keyword" }, { "inline", "keyword" }, { "echo", "keyword" }, + { "reverse", "keyword" }, { "boolean", "type" }, { "_POST", "type" }, + { "throw", "keyword" }, { "self", "type" }, { "catch", "keyword" }, + { "true", "literal" }, { "implements", "keyword" }, { "stdClass", "type" }, + { "Boolean", "type" }, { "instanceof", "keyword" }, { "_SESSION", "type" }, + { "require", "keyword" }, { "transient", "keyword" }, { "Date", "type" }, + { "float", "type" }, { "PHP_EOL", "type" }, { "fetch", "keyword" }, + { "case", "keyword" }, { "_GET", "type" }, { "export", "keyword" }, + { "interface", "keyword" }, { "protected", "keyword" }, { "do", "keyword" }, + { "window", "type" }, { "empty", "keyword" }, }, "//", diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zig.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zig.cpp index 5109378aa..e7ec510da 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zig.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/zig.cpp @@ -14,7 +14,7 @@ SyntaxDefinition& addZig() { { { "\\\\.-\n" }, "string" }, { { "\"", "\"", "\\" }, "string" }, { { "'", "'", "\\" }, "string" }, - { { "[iu][%d_]+" }, "keyword2" }, + { { "[iu][%d_]+" }, "type" }, { { "0b[01_]+" }, "number" }, { { "0o[0-7_]+" }, "number" }, { { "0x[%x_]+" }, "number" }, @@ -29,27 +29,27 @@ SyntaxDefinition& addZig() { { { "%d[%d_]*" }, "number" }, { { "[%+%-=/%*%^%%<>!~|&%.%?]" }, "operator" }, { { "([%a_][%w_]*)(%s*%()" }, { "function", "function", "normal" } }, - { { "[A-Z][%w_]*" }, "keyword2" }, + { { "[A-Z][%w_]*" }, "type" }, { { "[%a_][%w_]*" }, "symbol" }, { { "(@)([%a_][%w_]*)" }, { "operator", "operator", "function" } }, }, { - { "f64", "keyword2" }, + { "f64", "type" }, { "enum", "keyword" }, { "noalias", "keyword" }, - { "c_void", "keyword2" }, + { "c_void", "type" }, { "allowzero", "keyword" }, { "opaque", "keyword" }, - { "c_uint", "keyword2" }, + { "c_uint", "type" }, { "and", "keyword" }, - { "f16", "keyword2" }, - { "c_ulong", "keyword2" }, + { "f16", "type" }, + { "c_ulong", "type" }, { "nakedcc", "keyword" }, { "error", "keyword" }, { "callconv", "keyword" }, { "test", "keyword" }, - { "f32", "keyword2" }, + { "f32", "type" }, { "const", "keyword" }, { "union", "keyword" }, { "nosuspend", "keyword" }, @@ -62,7 +62,7 @@ SyntaxDefinition& addZig() { { "undefined", "literal" }, { "true", "literal" }, { "usingnamespace", "keyword" }, - { "void", "keyword2" }, + { "void", "type" }, { "volatile", "keyword" }, { "linksection", "keyword" }, { "threadlocal", "keyword" }, @@ -71,25 +71,25 @@ SyntaxDefinition& addZig() { { "comptime", "keyword" }, { "null", "literal" }, { "try", "keyword" }, - { "bool", "keyword2" }, - { "comptime_int", "keyword2" }, + { "bool", "type" }, + { "comptime_int", "type" }, { "continue", "keyword" }, - { "anyerror", "keyword2" }, - { "type", "keyword2" }, - { "c_longdouble", "keyword2" }, + { "anyerror", "type" }, + { "type", "type" }, + { "c_longdouble", "type" }, { "resume", "keyword" }, - { "noreturn", "keyword2" }, - { "c_ulonglong", "keyword2" }, - { "c_long", "keyword2" }, - { "c_int", "keyword2" }, - { "c_longlong", "keyword2" }, - { "c_ushort", "keyword2" }, - { "c_short", "keyword2" }, + { "noreturn", "type" }, + { "c_ulonglong", "type" }, + { "c_long", "type" }, + { "c_int", "type" }, + { "c_longlong", "type" }, + { "c_ushort", "type" }, + { "c_short", "type" }, { "noasync", "keyword" }, { "defer", "keyword" }, - { "f128", "keyword2" }, + { "f128", "type" }, { "else", "keyword" }, - { "isize", "keyword2" }, + { "isize", "type" }, { "break", "keyword" }, { "export", "keyword" }, { "packed", "keyword" }, @@ -99,13 +99,13 @@ SyntaxDefinition& addZig() { { "anyframe", "keyword" }, { "switch", "keyword" }, { "orelse", "keyword" }, - { "usize", "keyword2" }, + { "usize", "type" }, { "unreachable", "keyword" }, { "asm", "keyword" }, { "for", "keyword" }, { "while", "keyword" }, { "inline", "keyword" }, - { "comptime_float", "keyword2" }, + { "comptime_float", "type" }, { "var", "keyword" }, { "catch", "keyword" }, { "or", "keyword" }, diff --git a/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp b/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp index 9d5648e35..0dd64975d 100644 --- a/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp +++ b/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp @@ -13,8 +13,6 @@ #include "sdk/ipc.hpp" -#include - using namespace EE; using namespace EE::System; using namespace EE::UI; diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp index bdc66c699..a1d78d1f6 100644 --- a/src/tools/ecode/plugins/git/gitplugin.cpp +++ b/src/tools/ecode/plugins/git/gitplugin.cpp @@ -395,12 +395,12 @@ void GitPlugin::updateStatusBarSync() { auto insertedColor( getVarColor( "--theme-success" ) ); auto deletedColor( getVarColor( "--theme-error" ) ); patterns.emplace_back( - SyntaxPattern( { ".*%((%+%d+)%s/%s(%-%d+)%)" }, { "normal", "keyword", "keyword2" } ) ); + SyntaxPattern( { ".*%((%+%d+)%s/%s(%-%d+)%)" }, { "normal", "keyword", "type" } ) ); SyntaxDefinition syntaxDef( "custom_build", {}, std::move( patterns ) ); SyntaxColorScheme scheme( "status_bar_git", { { "normal"_sst, { fontColor } }, { "keyword"_sst, { insertedColor } }, - { "keyword2"_sst, { deletedColor } } }, + { "type"_sst, { deletedColor } } }, {} ); mStatusCustomTokenizer = { std::move( syntaxDef ), std::move( scheme ) }; } diff --git a/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp b/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp index 75f14d59a..978239c3a 100644 --- a/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp +++ b/src/tools/ecode/plugins/lsp/lspdocumentclient.cpp @@ -239,22 +239,22 @@ static SyntaxStyleType semanticTokenTypeToSyntaxType( const std::string& type ) case SemanticTokenTypes::Interface: case SemanticTokenTypes::Struct: case SemanticTokenTypes::TypeParameter: - return "keyword2"_sst; + return "type"_sst; case SemanticTokenTypes::Parameter: - return "keyword3"_sst; + return "parameter"_sst; case SemanticTokenTypes::Variable: return "symbol"_sst; case SemanticTokenTypes::Property: return "symbol"_sst; case SemanticTokenTypes::EnumMember: case SemanticTokenTypes::Event: - return "keyword2"_sst; + return "type"_sst; case SemanticTokenTypes::Function: case SemanticTokenTypes::Method: case SemanticTokenTypes::Member: return "function"_sst; case SemanticTokenTypes::Macro: - return "keyword2"_sst; + return "type"_sst; case SemanticTokenTypes::Keyword: case SemanticTokenTypes::Modifier: return "keyword"_sst;