Commits November 2024

commits@lists.geany.org

1 participants
67 discussions

[geany/geany-themes] 0a4119: Regenerate index.json
by Enrico Tröger 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 09 Nov 2024 09:04:43 UTC Commit: 0a41197ae047d6e53102b32f7c62b2ec068339f3 https://github.com/geany/geany-themes/commit/0a41197ae047d6e53102b32f7c62b2… Log Message: ----------- Regenerate index.json Modified Paths: -------------- index/index.json index/index.json.md5 Modified: index/index.json 37 lines changed, 28 insertions(+), 9 deletions(-) =================================================================== No diff available, check online Modified: index/index.json.md5 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -c6128fbe512aa7a90936e3b70472d0fc index.json +a9d9e72ef9c64e2da276e34ab251992f index.json -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] abfe93: mkindex.py: Allow leading delimiter in compat version list
by Enrico Tröger 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 09 Nov 2024 09:04:20 UTC Commit: abfe933746c132e44ec4f6ebc9ee02bc5a65726f https://github.com/geany/geany-themes/commit/abfe933746c132e44ec4f6ebc9ee02… Log Message: ----------- mkindex.py: Allow leading delimiter in compat version list Modified Paths: -------------- scripts/mkindex.py Modified: scripts/mkindex.py 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -91,6 +91,9 @@ def create_index(themes_dir, screenshot_dir='screenshots'): compat = get_option(cp, 'theme_info', 'compat', '0.0.0') versions = [] for ver in compat.split(';'): + if not ver: + continue + ver = [int(v) for v in ver.split('.')] + [0]*3 ver = '.'.join([ str(v) for v in ver[0:3] ]) versions.append(ver) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] bdf402: Add Kurayami color scheme (#75)
by harpo 09 Nov '24

09 Nov '24

Branch: refs/heads/master Author: harpo <thomas.herrle(a)pm.me> Committer: GitHub <noreply(a)github.com> Date: Sat, 09 Nov 2024 08:58:33 UTC Commit: bdf4020b8ac0c1939b9ec7592d68c25d5c59ee85 https://github.com/geany/geany-themes/commit/bdf4020b8ac0c1939b9ec7592d68c2… Log Message: ----------- Add Kurayami color scheme (#75) * Add Kurayami color scheme Modified Paths: -------------- AUTHORS colorschemes/kurayami.conf screenshots/kurayami.png Modified: AUTHORS 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -97,6 +97,10 @@ kugel.conf ---------- *Thomas Martitz <thomas.martitz(at)student.htw-berlin(dot)de> +kurayami.conf +------------- + * Thomas Herrle <therrle(at)gmail(dot)com + matcha.conf ----------- *Axel Amores <dkzenzuri(at)gmail(dot)com> Modified: colorschemes/kurayami.conf 129 lines changed, 129 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,129 @@ +# Kurayami Theme for Geany +# Derived from Kevin M's Kurayami kitty theme (github.com/kevinm6) +# Original license: MIT +# Upstream: https://github.com/kevinm6/kitty-themes/blob/master/themes/kurayami.conf +# Ported to Geany by Thomas Herrle + +[theme_info] +name=Kurayami +description=A dark theme emphasizing readability with muted colors +version=1 +author=Kevin M (Kitty theme) - Ported to Geany +url=https://github.com/kevinm6/kitty-themes/blob/master/themes/kurayami.conf +compat=1.22;1.23;1.23.1;1.24 + +[named_colors] +# Basic colors +fg=#cccccc +bg=#1c1c1c +selection_fg=#cccccc +selection_bg=#264f78 + +# Base colors +black=#2c2c2c +bright_black=#626262 +red=#bf616a +bright_red=#b2201f +green=#00af87 +bright_green=#36F57A +yellow=#cecb00 +bright_yellow=#fffd00 +blue=#158C8A +bright_blue=#1a8fff +purple=#B48EAD +bright_purple=#cb1ed1 +cyan=#1a8fff +bright_cyan=#14ffff +white=#dcdcdc +bright_white=#ffffff + +# Additional UI colors +cursor=#ffffff +cursor_bg=#3c3c3c +tab_active_fg=#DCDCDC +tab_active_bg=#015A60 +tab_inactive_fg=#808080 +tab_inactive_bg=#3c3c3c +url_color=#0087bd + +[named_styles] +default=fg;bg;false;false +error=bright_red;bg;false;true + +# Editor styles +selection=selection_fg;selection_bg;false;true +current_line=;black;true +brace_good=bright_blue;black;true +brace_bad=bright_red;black;true +margin_line_number=bright_black;black +margin_folding=bright_black;black +fold_symbol_highlight=white +indent_guide=bright_black +caret=cursor;;false +marker_line=yellow;black +marker_search=black;blue +marker_mark=green;black +call_tips=bright_black;black;false;false +white_space=bright_black;;true + +# Programming languages +comment=bright_black +comment_doc=comment +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment,bold +comment_doc_keyword_error=comment,italic + +number=purple +number_1=number +number_2=number_1 + +type=green +class=type +function=type +parameter=cyan + +keyword=blue +keyword_1=keyword +keyword_2=cyan +keyword_3=keyword_1 +keyword_4=keyword_2 + +identifier=default +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 + +string=red +string_1=string +string_2=string_1 +string_3=default +string_4=default +string_eol=string_1,italic +character=string_1 +backticks=string_2 +here_doc=string_2 + +scalar=string_2 +label=default,bold +preprocessor=green +regex=number_1 +operator=default +decorator=string_1,bold +other=default +extra=keyword + +# Markup languages +tag=keyword +tag_unknown=tag,bold +tag_end=tag,bold +attribute=type +attribute_unknown=attribute,bold +value=number +entity=number + +# Diff +line_added=bright_green +line_removed=bright_red +line_changed=bright_blue Modified: screenshots/kurayami.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2900a4: Merge pull request #3974 from techee/zig
by Jiří Techet 08 Nov '24

08 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 08 Nov 2024 15:25:57 UTC Commit: 2900a447e7ef288cb37247b663d42970b0b50f30 https://github.com/geany/geany/commit/2900a447e7ef288cb37247b663d42970b0b50… Log Message: ----------- Merge pull request #3974 from techee/zig Add Zig support Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.zig data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/include/SciLexer.h scintilla/lexilla/lexers/LexZig.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/document.c src/editor.c src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -84,7 +84,8 @@ filetypes_dist = \ filedefs/filetypes.vhdl \ filedefs/filetypes.xml \ filedefs/filetypes.yaml \ - filedefs/filetypes.zephir + filedefs/filetypes.zephir \ + filedefs/filetypes.zig # generated filetypes filetypes_nodist = \ Modified: data/filedefs/filetypes.zig 74 lines changed, 74 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,74 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +comment_line=comment_line +comment_line_doc=comment_doc +comment_line_top=comment_doc +number=number_1 +operator=operator +character=character +string=string_1 +multistring=string_1 +escapechar=string_1 +identifier=identifier_1 +function=function +builtin_function=keyword_2 +kw_primary=keyword_1 +kw_secondary=keyword_2 +kw_tertiary=keyword_2 +kw_type=class +identifer_string=preprocessor + +[keywords] +# all items must be in one line +primary=addrspace align allowzero and anyframe anytype asm async await break callconv catch comptime const continue defer else enum errdefer error export extern fn for if inline linksection noalias noinline nosuspend opaque or orelse packed pub resume return struct suspend switch test threadlocal try union unreachable usingnamespace var volatile while true false null undefined +secondary=i8 u8 i16 u16 i32 u32 i64 u64 i128 u128 isize usize c_char c_short c_ushort c_int c_uint c_long c_ulong c_longlong c_ulonglong c_longdouble f16 f32 f64 f80 f128 bool anyopaque void noreturn type anyerror comptime_int comptime_float + +[lexer_properties] + +[settings] +# default extension used when saving files +extension=zig + +# MIME type +mime_type=text/x-zig + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comment char, like # in this file +comment_single=// +# multiline comments +#comment_open= +#comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d +# #command_example(); +# setting to false would generate this +# # command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=0 + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +FT_00_LB=_Build +FT_00_CM=zig build-exe %f +FT_00_WD= +FT_02_LB=Te_st +FT_02_CM=zig test %f +FT_02_WD= +EX_00_LB=_Run +EX_00_CM=zig run %f +EX_00_WD= Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -84,6 +84,7 @@ VHDL=*.vhd;*.vhdl; XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;*.mml;*.mathml; YAML=*.yaml;*.yml; Zephir=*.zep; +Zig=*.zig; None=*; # Note: restarting is required after editing groups Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -293,6 +293,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexVHDL.cxx', 'scintilla/lexilla/lexers/LexVisualProlog.cxx', 'scintilla/lexilla/lexers/LexYAML.cxx', + 'scintilla/lexilla/lexers/LexZig.cxx', 'scintilla/lexilla/lexlib/Accessor.cxx', 'scintilla/lexilla/lexlib/Accessor.h', 'scintilla/lexilla/lexlib/CatalogueModules.h', Modified: scintilla/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,8 @@ lexilla/lexers/LexTxt2tags.cxx \ lexilla/lexers/LexVHDL.cxx \ lexilla/lexers/LexVerilog.cxx \ lexilla/lexers/LexVisualProlog.cxx \ -lexilla/lexers/LexYAML.cxx +lexilla/lexers/LexYAML.cxx \ +lexilla/lexers/LexZig.cxx LEXLIB_SRCS = \ lexilla/include/Lexilla.h \ Modified: scintilla/lexilla/include/SciLexer.h 92 lines changed, 92 insertions(+), 0 deletions(-) =================================================================== @@ -148,6 +148,10 @@ #define SCLEX_JULIA 133 #define SCLEX_ASCIIDOC 134 #define SCLEX_GDSCRIPT 135 +#define SCLEX_TOML 136 +#define SCLEX_TROFF 137 +#define SCLEX_DART 138 +#define SCLEX_ZIG 139 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -2058,6 +2062,94 @@ #define SCE_GD_WORD2 14 #define SCE_GD_ANNOTATION 15 #define SCE_GD_NODEPATH 16 +#define SCE_TOML_DEFAULT 0 +#define SCE_TOML_COMMENT 1 +#define SCE_TOML_IDENTIFIER 2 +#define SCE_TOML_KEYWORD 3 +#define SCE_TOML_NUMBER 4 +#define SCE_TOML_TABLE 5 +#define SCE_TOML_KEY 6 +#define SCE_TOML_ERROR 7 +#define SCE_TOML_OPERATOR 8 +#define SCE_TOML_STRING_SQ 9 +#define SCE_TOML_STRING_DQ 10 +#define SCE_TOML_TRIPLE_STRING_SQ 11 +#define SCE_TOML_TRIPLE_STRING_DQ 12 +#define SCE_TOML_ESCAPECHAR 13 +#define SCE_TOML_DATETIME 14 +#define SCE_TROFF_DEFAULT 0 +#define SCE_TROFF_REQUEST 1 +#define SCE_TROFF_COMMAND 2 +#define SCE_TROFF_NUMBER 3 +#define SCE_TROFF_OPERATOR 4 +#define SCE_TROFF_STRING 5 +#define SCE_TROFF_COMMENT 6 +#define SCE_TROFF_IGNORE 7 +#define SCE_TROFF_ESCAPE_STRING 8 +#define SCE_TROFF_ESCAPE_MACRO 9 +#define SCE_TROFF_ESCAPE_FONT 10 +#define SCE_TROFF_ESCAPE_NUMBER 11 +#define SCE_TROFF_ESCAPE_COLOUR 12 +#define SCE_TROFF_ESCAPE_GLYPH 13 +#define SCE_TROFF_ESCAPE_ENV 14 +#define SCE_TROFF_ESCAPE_SUPPRESSION 15 +#define SCE_TROFF_ESCAPE_SIZE 16 +#define SCE_TROFF_ESCAPE_TRANSPARENT 17 +#define SCE_TROFF_ESCAPE_ISVALID 18 +#define SCE_TROFF_ESCAPE_DRAW 19 +#define SCE_TROFF_ESCAPE_MOVE 20 +#define SCE_TROFF_ESCAPE_HEIGHT 21 +#define SCE_TROFF_ESCAPE_OVERSTRIKE 22 +#define SCE_TROFF_ESCAPE_SLANT 23 +#define SCE_TROFF_ESCAPE_WIDTH 24 +#define SCE_TROFF_ESCAPE_VSPACING 25 +#define SCE_TROFF_ESCAPE_DEVICE 26 +#define SCE_TROFF_ESCAPE_NOMOVE 27 +#define SCE_DART_DEFAULT 0 +#define SCE_DART_COMMENTLINE 1 +#define SCE_DART_COMMENTLINEDOC 2 +#define SCE_DART_COMMENTBLOCK 3 +#define SCE_DART_COMMENTBLOCKDOC 4 +#define SCE_DART_STRING_SQ 5 +#define SCE_DART_STRING_DQ 6 +#define SCE_DART_TRIPLE_STRING_SQ 7 +#define SCE_DART_TRIPLE_STRING_DQ 8 +#define SCE_DART_RAWSTRING_SQ 9 +#define SCE_DART_RAWSTRING_DQ 10 +#define SCE_DART_TRIPLE_RAWSTRING_SQ 11 +#define SCE_DART_TRIPLE_RAWSTRING_DQ 12 +#define SCE_DART_ESCAPECHAR 13 +#define SCE_DART_IDENTIFIER 14 +#define SCE_DART_IDENTIFIER_STRING 15 +#define SCE_DART_OPERATOR 16 +#define SCE_DART_OPERATOR_STRING 17 +#define SCE_DART_SYMBOL_IDENTIFIER 18 +#define SCE_DART_SYMBOL_OPERATOR 19 +#define SCE_DART_NUMBER 20 +#define SCE_DART_KEY 21 +#define SCE_DART_METADATA 22 +#define SCE_DART_KW_PRIMARY 23 +#define SCE_DART_KW_SECONDARY 24 +#define SCE_DART_KW_TERTIARY 25 +#define SCE_DART_KW_TYPE 26 +#define SCE_ZIG_DEFAULT 0 +#define SCE_ZIG_COMMENTLINE 1 +#define SCE_ZIG_COMMENTLINEDOC 2 +#define SCE_ZIG_COMMENTLINETOP 3 +#define SCE_ZIG_NUMBER 4 +#define SCE_ZIG_OPERATOR 5 +#define SCE_ZIG_CHARACTER 6 +#define SCE_ZIG_STRING 7 +#define SCE_ZIG_MULTISTRING 8 +#define SCE_ZIG_ESCAPECHAR 9 +#define SCE_ZIG_IDENTIFIER 10 +#define SCE_ZIG_FUNCTION 11 +#define SCE_ZIG_BUILTIN_FUNCTION 12 +#define SCE_ZIG_KW_PRIMARY 13 +#define SCE_ZIG_KW_SECONDARY 14 +#define SCE_ZIG_KW_TERTIARY 15 +#define SCE_ZIG_KW_TYPE 16 +#define SCE_ZIG_IDENTIFIER_STRING 17 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif Modified: scintilla/lexilla/lexers/LexZig.cxx 463 lines changed, 463 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,463 @@ +// Scintilla source code edit control +/** @file LexZig.cxx + ** Lexer for Zig language. + **/ +// Based on Zufu Liu's Notepad4 Zig lexer +// Modified for Scintilla by Jiri Techet, 2024 +// The License.txt file describes the conditions under which this software may be distributed. + +#include <cassert> +#include <cstring> + +#include <string> +#include <string_view> +#include <vector> +#include <map> +#include <algorithm> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" +#include "OptionSet.h" +#include "DefaultLexer.h" + +using namespace Scintilla; +using namespace Lexilla; + +namespace { +// Use an unnamed namespace to protect the functions and classes from name conflicts + +constexpr bool IsAGraphic(int ch) noexcept { + // excludes C0 control characters and whitespace + return ch > 32 && ch < 127; +} + +constexpr bool IsIdentifierStart(int ch) noexcept { + return IsUpperOrLowerCase(ch) || ch == '_'; +} + +constexpr bool IsIdentifierStartEx(int ch) noexcept { + return IsIdentifierStart(ch) || ch >= 0x80; +} + +constexpr bool IsNumberStart(int ch, int chNext) noexcept { + return IsADigit(ch) || (ch == '.' && IsADigit(chNext)); +} + +constexpr bool IsIdentifierChar(int ch) noexcept { + return IsAlphaNumeric(ch) || ch == '_'; +} + +constexpr bool IsNumberContinue(int chPrev, int ch, int chNext) noexcept { + return ((ch == '+' || ch == '-') && (chPrev == 'e' || chPrev == 'E')) + || (ch == '.' && chNext != '.'); +} + +constexpr bool IsDecimalNumber(int chPrev, int ch, int chNext) noexcept { + return IsIdentifierChar(ch) || IsNumberContinue(chPrev, ch, chNext); +} + +constexpr bool IsIdentifierCharEx(int ch) noexcept { + return IsIdentifierChar(ch) || ch >= 0x80; +} + +// https://ziglang.org/documentation/master/#Escape-Sequences +struct EscapeSequence { + int outerState = SCE_ZIG_DEFAULT; + int digitsLeft = 0; + bool brace = false; + + // highlight any character as escape sequence. + void resetEscapeState(int state, int chNext) noexcept { + outerState = state; + digitsLeft = 1; + brace = false; + if (chNext == 'x') { + digitsLeft = 3; + } else if (chNext == 'u') { + digitsLeft = 5; + } + } + void resetEscapeState(int state) noexcept { + outerState = state; + digitsLeft = 1; + brace = false; + } + bool atEscapeEnd(int ch) noexcept { + --digitsLeft; + return digitsLeft <= 0 || !IsAHeXDigit(ch); + } +}; + +enum { + ZigLineStateMaskLineComment = 1, // line comment + ZigLineStateMaskMultilineString = 1 << 1, // multiline string +}; + +struct FoldLineState { + int lineComment; + int multilineString; + constexpr explicit FoldLineState(int lineState) noexcept: + lineComment(lineState & ZigLineStateMaskLineComment), + multilineString((lineState >> 1) & 1) { + } +}; + +enum class KeywordType { + None = SCE_ZIG_DEFAULT, + Function = SCE_ZIG_FUNCTION, +}; + +enum { + KeywordIndex_Primary = 0, + KeywordIndex_Secondary = 1, + KeywordIndex_Tertiary = 2, + KeywordIndex_Type = 3, +}; + +// Options used for LexerZig +struct OptionsZig { + bool fold = false; +}; + +const char *const zigWordListDesc[] = { + "Primary keywords", + "Secondary keywords", + "Tertiary keywords", + "Global type definitions", + nullptr +}; + +struct OptionSetZig : public OptionSet<OptionsZig> { + OptionSetZig() { + DefineProperty("fold", &OptionsZig::fold); + + DefineWordListSets(zigWordListDesc); + } +}; + +LexicalClass lexicalClasses[] = { + // Lexer ZIG SCLEX_ZIG SCE_ZIG_: + 0, "SCE_ZIG_DEFAULT", "default", "White space", + 1, "SCE_ZIG_COMMENTLINE", "comment line", "Comment: //", + 2, "SCE_ZIG_COMMENTLINEDOC", "comment line documentation", "Comment: ///", + 3, "SCE_ZIG_COMMENTLINETOP", "comment line documentation", "Comment: //!", + 4, "SCE_ZIG_NUMBER", "literal numeric", "Number", + 5, "SCE_ZIG_OPERATOR", "operator", "Operator", + 6, "SCE_ZIG_CHARACTER", "literal string character", "Single quoted string", + 7, "SCE_ZIG_STRING", "literal string", "Double quoted string", + 8, "SCE_ZIG_MULTISTRING", "literal string multiline", "Multiline string introduced by two backslashes", + 9, "SCE_ZIG_ESCAPECHAR", "literal string escapesequence", "Escape sequence", + 10, "SCE_ZIG_IDENTIFIER", "identifier", "Identifier", + 11, "SCE_ZIG_FUNCTION", "identifier", "Function definition", + 12, "SCE_ZIG_BUILTIN_FUNCTION", "identifier", "Builtin function", + 13, "SCE_ZIG_KW_PRIMARY", "keyword", "Primary keywords", + 14, "SCE_ZIG_KW_SECONDARY", "identifier", "Secondary keywords", + 15, "SCE_ZIG_KW_TERTIARY", "identifier", "Tertiary keywords", + 16, "SCE_ZIG_KW_TYPE", "identifier", "Global types", + 17, "SCE_ZIG_IDENTIFIER_STRING", "identifier", "Identifier using @\"\" syntax", +}; + +class LexerZig : public DefaultLexer { + WordList keywordsPrimary; + WordList keywordsSecondary; + WordList keywordsTertiary; + WordList keywordsTypes; + OptionsZig options; + OptionSetZig osZig; +public: + LexerZig(const char *languageName_, int language_) : + DefaultLexer(languageName_, language_, lexicalClasses, std::size(lexicalClasses)) { + } + // Deleted so LexerZig objects can not be copied. + LexerZig(const LexerZig &) = delete; + LexerZig(LexerZig &&) = delete; + void operator=(const LexerZig &) = delete; + void operator=(LexerZig &&) = delete; + ~LexerZig() override = default; + + void SCI_METHOD Release() override { + delete this; + } + int SCI_METHOD Version() const override { + return lvRelease5; + } + const char *SCI_METHOD PropertyNames() override { + return osZig.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) override { + return osZig.PropertyType(name); + } + const char *SCI_METHOD DescribeProperty(const char *name) override { + return osZig.DescribeProperty(name); + } + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + const char *SCI_METHOD PropertyGet(const char *key) override { + return osZig.PropertyGet(key); + } + const char *SCI_METHOD DescribeWordListSets() override { + return osZig.DescribeWordListSets(); + } + Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override; + + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + + void *SCI_METHOD PrivateCall(int, void *) override { + return nullptr; + } + + void BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle); + Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int &chPrevNonWhite, int &stylePrevNonWhite); + + static ILexer5 *LexerFactoryZig() { + return new LexerZig("zig", SCLEX_ZIG); + } +}; + +Sci_Position SCI_METHOD LexerZig::PropertySet(const char *key, const char *val) { + if (osZig.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +Sci_Position SCI_METHOD LexerZig::WordListSet(int n, const char *wl) { + WordList *wordListN = nullptr; + switch (n) { + case 0: + wordListN = &keywordsPrimary; + break; + case 1: + wordListN = &keywordsSecondary; + break; + case 2: + wordListN = &keywordsTertiary; + break; + case 3: + wordListN = &keywordsTypes; + break; + default: + break; + } + Sci_Position firstModification = -1; + if (wordListN && wordListN->Set(wl)) { + firstModification = 0; + } + return firstModification; +} + +void LexerZig::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + Accessor styler(pAccess, nullptr); + + KeywordType kwType = KeywordType::None; + int visibleChars = 0; + int lineState = 0; + EscapeSequence escSeq; + + StyleContext sc(startPos, lengthDoc, initStyle, styler); + + while (sc.More()) { + switch (sc.state) { + case SCE_ZIG_OPERATOR: + sc.SetState(SCE_ZIG_DEFAULT); + break; + + case SCE_ZIG_NUMBER: + if (!IsDecimalNumber(sc.chPrev, sc.ch, sc.chNext)) { + sc.SetState(SCE_ZIG_DEFAULT); + } + break; + + case SCE_ZIG_IDENTIFIER: + case SCE_ZIG_BUILTIN_FUNCTION: + if (!IsIdentifierCharEx(sc.ch)) { + if (sc.state == SCE_ZIG_IDENTIFIER) { + char s[64]; + sc.GetCurrent(s, sizeof(s)); + if (kwType != KeywordType::None) { + sc.ChangeState(static_cast<int>(kwType)); + } else if (keywordsPrimary.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_PRIMARY); + kwType = KeywordType::None; + if (strcmp(s, "fn") == 0) { + kwType = KeywordType::Function; + } + } else if (keywordsSecondary.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_SECONDARY); + } else if (keywordsTertiary.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_TERTIARY); + } else if (keywordsTypes.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_TYPE); + } + } + if (sc.state != SCE_ZIG_KW_PRIMARY) { + kwType = KeywordType::None; + } + sc.SetState(SCE_ZIG_DEFAULT); + } + break; + + case SCE_ZIG_CHARACTER: + case SCE_ZIG_STRING: + case SCE_ZIG_MULTISTRING: + case SCE_ZIG_IDENTIFIER_STRING: + if (sc.atLineStart) { + sc.SetState(SCE_ZIG_DEFAULT); + } else if (sc.ch == '\\' && sc.state != SCE_ZIG_MULTISTRING) { + escSeq.resetEscapeState(sc.state, sc.chNext); + sc.SetState(SCE_ZIG_ESCAPECHAR); + sc.Forward(); + if (sc.Match('u', '{')) { + escSeq.brace = true; + escSeq.digitsLeft = 9; + sc.Forward(); + } + } else if ((sc.ch == '\'' && sc.state == SCE_ZIG_CHARACTER) || + (sc.ch == '\"' && (sc.state == SCE_ZIG_STRING || sc.state == SCE_ZIG_IDENTIFIER_STRING))) { + sc.ForwardSetState(SCE_ZIG_DEFAULT); + } + break; + + case SCE_ZIG_ESCAPECHAR: + if (escSeq.atEscapeEnd(sc.ch)) { + if (escSeq.brace && sc.ch == '}') { + sc.Forward(); + } + sc.SetState(escSeq.outerState); + continue; + } + break; + + case SCE_ZIG_COMMENTLINE: + case SCE_ZIG_COMMENTLINEDOC: + case SCE_ZIG_COMMENTLINETOP: + if (sc.atLineStart) { + sc.SetState(SCE_ZIG_DEFAULT); + } + break; + } + + if (sc.state == SCE_ZIG_DEFAULT) { + if (sc.Match('/', '/')) { + if (visibleChars == 0) { + lineState = ZigLineStateMaskLineComment; + } + sc.SetState(SCE_ZIG_COMMENTLINE); + sc.Forward(2); + if (sc.ch == '!') { + sc.ChangeState(SCE_ZIG_COMMENTLINETOP); + } else if (sc.ch == '/' && sc.chNext != '/') { + sc.ChangeState(SCE_ZIG_COMMENTLINEDOC); + } + } else if (sc.Match('\\', '\\')) { + lineState = ZigLineStateMaskMultilineString; + sc.SetState(SCE_ZIG_MULTISTRING); + } else if (sc.ch == '\"') { + sc.SetState(SCE_ZIG_STRING); + } else if (sc.ch == '\'') { + sc.SetState(SCE_ZIG_CHARACTER); + } else if (IsNumberStart(sc.ch, sc.chNext)) { + sc.SetState(SCE_ZIG_NUMBER); + } else if ((sc.ch == '@' && IsIdentifierStartEx(sc.chNext)) || IsIdentifierStartEx(sc.ch)) { + sc.SetState((sc.ch == '@') ? SCE_ZIG_BUILTIN_FUNCTION : SCE_ZIG_IDENTIFIER); + } else if (sc.ch == '@' && sc.chNext == '"') { + sc.SetState(SCE_ZIG_IDENTIFIER_STRING); + sc.Forward(); + } else if (IsAGraphic(sc.ch)) { + sc.SetState(SCE_ZIG_OPERATOR); + } + } + + if (visibleChars == 0 && !isspacechar(sc.ch)) { + visibleChars++; + } + if (sc.atLineEnd) { + styler.SetLineState(sc.currentLine, lineState); + lineState = 0; + kwType = KeywordType::None; + visibleChars = 0; + } + sc.Forward(); + } + + sc.Complete(); +} + +void LexerZig::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + if (!options.fold) + return; + + Accessor styler(pAccess, nullptr); + const Sci_PositionU endPos = startPos + lengthDoc; + Sci_Position lineCurrent = styler.GetLine(startPos); + while (lineCurrent > 0) { + lineCurrent--; + startPos = styler.LineStart(lineCurrent); + initStyle = (startPos > 0) ? styler.StyleIndexAt(startPos) : 0; + if (!AnyOf(initStyle, SCE_ZIG_MULTISTRING, + SCE_ZIG_COMMENTLINE, SCE_ZIG_COMMENTLINEDOC, SCE_ZIG_COMMENTLINETOP)) { + break; + } + } + FoldLineState foldPrev(0); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) { + levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16; + foldPrev = FoldLineState(styler.GetLineState(lineCurrent - 1)); + } + + int levelNext = levelCurrent; + FoldLineState foldCurrent(styler.GetLineState(lineCurrent)); + Sci_PositionU lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + + while (startPos < endPos) { + initStyle = styler.StyleIndexAt(startPos); + + if (initStyle == SCE_ZIG_OPERATOR) { + const char ch = styler[startPos]; + if (ch == '{' || ch == '[' || ch == '(') { + levelNext++; + } else if (ch == '}' || ch == ']' || ch == ')') { + levelNext--; + } + } + + ++startPos; + if (startPos == lineStartNext) { + const FoldLineState foldNext(styler.GetLineState(lineCurrent + 1)); + levelNext = std::max(levelNext, SC_FOLDLEVELBASE); + if (foldCurrent.lineComment) { + levelNext += foldNext.lineComment - foldPrev.lineComment; + } else if (foldCurrent.multilineString) { + levelNext += foldNext.multilineString - foldPrev.multilineString; + } + + const int levelUse = levelCurrent; + int lev = levelUse | (levelNext << 16); + if (levelUse < levelNext) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + styler.SetLevel(lineCurrent, lev); + + lineCurrent++; + lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + levelCurrent = levelNext; + foldPrev = foldCurrent; + foldCurrent = foldNext; + } + } +} + +} // unnamed namespace end + +extern const LexerModule lmZig(SCLEX_ZIG, LexerZig::LexerFactoryZig, "zig", zigWordListDesc); Modified: scintilla/lexilla/src/Lexilla.cxx 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -160,6 +160,7 @@ extern LexerModule lmVisualProlog; extern LexerModule lmX12; extern LexerModule lmXML; extern LexerModule lmYAML; +extern LexerModule lmZig; //--Autogenerated -- end of automatically generated section @@ -224,6 +225,7 @@ static void AddGeanyLexers() &lmVisualProlog, &lmXML, &lmYAML, + &lmZig, }); } @@ -372,6 +374,7 @@ void AddEachLexer() { &lmX12, &lmXML, &lmYAML, + &lmZig, //--Autogenerated -- end of automatically generated section }); Modified: scintilla/scintilla_changes.patch 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,7 @@ diff --git scintilla/lexilla/src/Lexilla.cxx scintilla/lexilla/src/Lexilla.cxx index cd4b23617..af4a73db4 100644 --- scintilla/lexilla/src/Lexilla.cxx +++ scintilla/lexilla/src/Lexilla.cxx -@@ -167,8 +167,72 @@ +@@ -167,8 +167,73 @@ CatalogueModules catalogueLexilla; @@ -123,6 +123,7 @@ index cd4b23617..af4a73db4 100644 + &lmVisualProlog, + &lmXML, + &lmYAML, ++ &lmZig, + }); +} + Modified: src/document.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2722,6 +2722,7 @@ void document_highlight_tags(GeanyDocument *doc) case GEANY_FILETYPES_VALA: case GEANY_FILETYPES_RUST: case GEANY_FILETYPES_GO: + case GEANY_FILETYPES_ZIG: { /* index of the keyword set in the Scintilla lexer, for Modified: src/editor.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1330,6 +1330,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) case SCLEX_R: case SCLEX_RAKU: case SCLEX_RUST: + case SCLEX_ZIG: return TRUE; default: return FALSE; @@ -5146,6 +5147,7 @@ void editor_set_indentation_guides(GeanyEditor *editor) case SCLEX_D: case SCLEX_OCTAVE: case SCLEX_RUST: + case SCLEX_ZIG: mode = SC_IV_LOOKBOTH; break; Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -193,6 +193,7 @@ static void init_builtin_filetypes(void) FT_INIT( CIL, NONE, "CIL", NULL, SOURCE_FILE, COMPILED ); FT_INIT( PROLOG, NONE, "Prolog", NULL, SOURCE_FILE, COMPILED ); FT_INIT( NIM, NONE, "Nim", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( ZIG, NONE, "Zig", NULL, SOURCE_FILE, COMPILED ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -113,6 +113,7 @@ typedef enum GEANY_FILETYPES_CIL, GEANY_FILETYPES_PROLOG, GEANY_FILETYPES_NIM, + GEANY_FILETYPES_ZIG, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -1059,6 +1059,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(XML); init_styleset_case(YAML); init_styleset_case(ZEPHIR); + init_styleset_case(ZIG); default: if (ft->lexer_filetype) geany_debug("Filetype %s has a recursive lexer_filetype %s set!", @@ -1155,6 +1156,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(XML); styleset_case(YAML); styleset_case(ZEPHIR); + styleset_case(ZIG); case GEANY_FILETYPES_NONE: default: styleset_default(sci, ft->id); @@ -1685,6 +1687,12 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_NIM_TRIPLE || style == SCE_NIM_TRIPLEDOUBLE || style == SCE_NIM_STRINGEOL); + + case SCLEX_ZIG: + return (style == SCE_ZIG_STRING || + style == SCE_ZIG_MULTISTRING || + style == SCE_ZIG_CHARACTER || + style == SCE_ZIG_ESCAPECHAR); } return FALSE; } @@ -1937,6 +1945,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_NIM_COMMENTDOC || style == SCE_NIM_COMMENTLINE || style == SCE_NIM_COMMENTLINEDOC); + + case SCLEX_ZIG: + return (style == SCE_ZIG_COMMENTLINE || + style == SCE_ZIG_COMMENTLINEDOC || + style == SCE_ZIG_COMMENTLINETOP); } return FALSE; } Modified: src/highlightingmappings.h 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -1886,6 +1886,39 @@ static const HLKeyword highlighting_keywords_YAML[] = #define highlighting_properties_YAML EMPTY_PROPERTIES +/* ZIG */ +#define highlighting_lexer_ZIG SCLEX_ZIG +static const HLStyle highlighting_styles_ZIG[] = +{ + { SCE_ZIG_DEFAULT, "default", FALSE }, + { SCE_ZIG_COMMENTLINE, "comment_line", FALSE }, + { SCE_ZIG_COMMENTLINEDOC, "comment_line_doc", FALSE }, + { SCE_ZIG_COMMENTLINETOP, "comment_line_top", FALSE }, + { SCE_ZIG_NUMBER, "number", FALSE }, + { SCE_ZIG_OPERATOR, "operator", FALSE }, + { SCE_ZIG_CHARACTER, "character", FALSE }, + { SCE_ZIG_STRING, "string", FALSE }, + { SCE_ZIG_MULTISTRING, "multistring", FALSE }, + { SCE_ZIG_ESCAPECHAR, "escapechar", FALSE }, + { SCE_ZIG_IDENTIFIER, "identifier", FALSE }, + { SCE_ZIG_FUNCTION, "function", FALSE }, + { SCE_ZIG_BUILTIN_FUNCTION, "builtin_function", FALSE }, + { SCE_ZIG_KW_PRIMARY, "kw_primary", FALSE }, + { SCE_ZIG_KW_SECONDARY, "kw_secondary", FALSE }, + { SCE_ZIG_KW_TERTIARY, "kw_tertiary", FALSE }, + { SCE_ZIG_KW_TYPE, "kw_type", FALSE }, + { SCE_ZIG_IDENTIFIER_STRING, "identifer_string", FALSE } +}; +static const HLKeyword highlighting_keywords_ZIG[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, + { 2, "tertiary", FALSE }, + { 3, "types", FALSE } +}; +#define highlighting_properties_ZIG EMPTY_PROPERTIES + + /* Zephir */ #define highlighting_lexer_ZEPHIR SCLEX_PHPSCRIPT #define highlighting_styles_ZEPHIR highlighting_styles_PHP -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 274f56: Add Zig support
by Jiří Techet 08 Nov '24

08 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 08 Nov 2024 15:12:04 UTC Commit: 274f560628f4db504cf6b917b1b7652a18e9710a https://github.com/geany/geany/commit/274f560628f4db504cf6b917b1b7652a18e97… Log Message: ----------- Add Zig support Fixes #3724. Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.zig data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/include/SciLexer.h scintilla/lexilla/lexers/LexZig.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/document.c src/editor.c src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -84,7 +84,8 @@ filetypes_dist = \ filedefs/filetypes.vhdl \ filedefs/filetypes.xml \ filedefs/filetypes.yaml \ - filedefs/filetypes.zephir + filedefs/filetypes.zephir \ + filedefs/filetypes.zig # generated filetypes filetypes_nodist = \ Modified: data/filedefs/filetypes.zig 74 lines changed, 74 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,74 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +comment_line=comment_line +comment_line_doc=comment_doc +comment_line_top=comment_doc +number=number_1 +operator=operator +character=character +string=string_1 +multistring=string_1 +escapechar=string_1 +identifier=identifier_1 +function=function +builtin_function=keyword_2 +kw_primary=keyword_1 +kw_secondary=keyword_2 +kw_tertiary=keyword_2 +kw_type=class +identifer_string=preprocessor + +[keywords] +# all items must be in one line +primary=addrspace align allowzero and anyframe anytype asm async await break callconv catch comptime const continue defer else enum errdefer error export extern fn for if inline linksection noalias noinline nosuspend opaque or orelse packed pub resume return struct suspend switch test threadlocal try union unreachable usingnamespace var volatile while true false null undefined +secondary=i8 u8 i16 u16 i32 u32 i64 u64 i128 u128 isize usize c_char c_short c_ushort c_int c_uint c_long c_ulong c_longlong c_ulonglong c_longdouble f16 f32 f64 f80 f128 bool anyopaque void noreturn type anyerror comptime_int comptime_float + +[lexer_properties] + +[settings] +# default extension used when saving files +extension=zig + +# MIME type +mime_type=text/x-zig + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comment char, like # in this file +comment_single=// +# multiline comments +#comment_open= +#comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d +# #command_example(); +# setting to false would generate this +# # command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=0 + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +FT_00_LB=_Build +FT_00_CM=zig build-exe %f +FT_00_WD= +FT_02_LB=Te_st +FT_02_CM=zig test %f +FT_02_WD= +EX_00_LB=_Run +EX_00_CM=zig run %f +EX_00_WD= Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -84,6 +84,7 @@ VHDL=*.vhd;*.vhdl; XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;*.mml;*.mathml; YAML=*.yaml;*.yml; Zephir=*.zep; +Zig=*.zig; None=*; # Note: restarting is required after editing groups Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -293,6 +293,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexVHDL.cxx', 'scintilla/lexilla/lexers/LexVisualProlog.cxx', 'scintilla/lexilla/lexers/LexYAML.cxx', + 'scintilla/lexilla/lexers/LexZig.cxx', 'scintilla/lexilla/lexlib/Accessor.cxx', 'scintilla/lexilla/lexlib/Accessor.h', 'scintilla/lexilla/lexlib/CatalogueModules.h', Modified: scintilla/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,8 @@ lexilla/lexers/LexTxt2tags.cxx \ lexilla/lexers/LexVHDL.cxx \ lexilla/lexers/LexVerilog.cxx \ lexilla/lexers/LexVisualProlog.cxx \ -lexilla/lexers/LexYAML.cxx +lexilla/lexers/LexYAML.cxx \ +lexilla/lexers/LexZig.cxx LEXLIB_SRCS = \ lexilla/include/Lexilla.h \ Modified: scintilla/lexilla/include/SciLexer.h 92 lines changed, 92 insertions(+), 0 deletions(-) =================================================================== @@ -148,6 +148,10 @@ #define SCLEX_JULIA 133 #define SCLEX_ASCIIDOC 134 #define SCLEX_GDSCRIPT 135 +#define SCLEX_TOML 136 +#define SCLEX_TROFF 137 +#define SCLEX_DART 138 +#define SCLEX_ZIG 139 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -2058,6 +2062,94 @@ #define SCE_GD_WORD2 14 #define SCE_GD_ANNOTATION 15 #define SCE_GD_NODEPATH 16 +#define SCE_TOML_DEFAULT 0 +#define SCE_TOML_COMMENT 1 +#define SCE_TOML_IDENTIFIER 2 +#define SCE_TOML_KEYWORD 3 +#define SCE_TOML_NUMBER 4 +#define SCE_TOML_TABLE 5 +#define SCE_TOML_KEY 6 +#define SCE_TOML_ERROR 7 +#define SCE_TOML_OPERATOR 8 +#define SCE_TOML_STRING_SQ 9 +#define SCE_TOML_STRING_DQ 10 +#define SCE_TOML_TRIPLE_STRING_SQ 11 +#define SCE_TOML_TRIPLE_STRING_DQ 12 +#define SCE_TOML_ESCAPECHAR 13 +#define SCE_TOML_DATETIME 14 +#define SCE_TROFF_DEFAULT 0 +#define SCE_TROFF_REQUEST 1 +#define SCE_TROFF_COMMAND 2 +#define SCE_TROFF_NUMBER 3 +#define SCE_TROFF_OPERATOR 4 +#define SCE_TROFF_STRING 5 +#define SCE_TROFF_COMMENT 6 +#define SCE_TROFF_IGNORE 7 +#define SCE_TROFF_ESCAPE_STRING 8 +#define SCE_TROFF_ESCAPE_MACRO 9 +#define SCE_TROFF_ESCAPE_FONT 10 +#define SCE_TROFF_ESCAPE_NUMBER 11 +#define SCE_TROFF_ESCAPE_COLOUR 12 +#define SCE_TROFF_ESCAPE_GLYPH 13 +#define SCE_TROFF_ESCAPE_ENV 14 +#define SCE_TROFF_ESCAPE_SUPPRESSION 15 +#define SCE_TROFF_ESCAPE_SIZE 16 +#define SCE_TROFF_ESCAPE_TRANSPARENT 17 +#define SCE_TROFF_ESCAPE_ISVALID 18 +#define SCE_TROFF_ESCAPE_DRAW 19 +#define SCE_TROFF_ESCAPE_MOVE 20 +#define SCE_TROFF_ESCAPE_HEIGHT 21 +#define SCE_TROFF_ESCAPE_OVERSTRIKE 22 +#define SCE_TROFF_ESCAPE_SLANT 23 +#define SCE_TROFF_ESCAPE_WIDTH 24 +#define SCE_TROFF_ESCAPE_VSPACING 25 +#define SCE_TROFF_ESCAPE_DEVICE 26 +#define SCE_TROFF_ESCAPE_NOMOVE 27 +#define SCE_DART_DEFAULT 0 +#define SCE_DART_COMMENTLINE 1 +#define SCE_DART_COMMENTLINEDOC 2 +#define SCE_DART_COMMENTBLOCK 3 +#define SCE_DART_COMMENTBLOCKDOC 4 +#define SCE_DART_STRING_SQ 5 +#define SCE_DART_STRING_DQ 6 +#define SCE_DART_TRIPLE_STRING_SQ 7 +#define SCE_DART_TRIPLE_STRING_DQ 8 +#define SCE_DART_RAWSTRING_SQ 9 +#define SCE_DART_RAWSTRING_DQ 10 +#define SCE_DART_TRIPLE_RAWSTRING_SQ 11 +#define SCE_DART_TRIPLE_RAWSTRING_DQ 12 +#define SCE_DART_ESCAPECHAR 13 +#define SCE_DART_IDENTIFIER 14 +#define SCE_DART_IDENTIFIER_STRING 15 +#define SCE_DART_OPERATOR 16 +#define SCE_DART_OPERATOR_STRING 17 +#define SCE_DART_SYMBOL_IDENTIFIER 18 +#define SCE_DART_SYMBOL_OPERATOR 19 +#define SCE_DART_NUMBER 20 +#define SCE_DART_KEY 21 +#define SCE_DART_METADATA 22 +#define SCE_DART_KW_PRIMARY 23 +#define SCE_DART_KW_SECONDARY 24 +#define SCE_DART_KW_TERTIARY 25 +#define SCE_DART_KW_TYPE 26 +#define SCE_ZIG_DEFAULT 0 +#define SCE_ZIG_COMMENTLINE 1 +#define SCE_ZIG_COMMENTLINEDOC 2 +#define SCE_ZIG_COMMENTLINETOP 3 +#define SCE_ZIG_NUMBER 4 +#define SCE_ZIG_OPERATOR 5 +#define SCE_ZIG_CHARACTER 6 +#define SCE_ZIG_STRING 7 +#define SCE_ZIG_MULTISTRING 8 +#define SCE_ZIG_ESCAPECHAR 9 +#define SCE_ZIG_IDENTIFIER 10 +#define SCE_ZIG_FUNCTION 11 +#define SCE_ZIG_BUILTIN_FUNCTION 12 +#define SCE_ZIG_KW_PRIMARY 13 +#define SCE_ZIG_KW_SECONDARY 14 +#define SCE_ZIG_KW_TERTIARY 15 +#define SCE_ZIG_KW_TYPE 16 +#define SCE_ZIG_IDENTIFIER_STRING 17 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif Modified: scintilla/lexilla/lexers/LexZig.cxx 463 lines changed, 463 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,463 @@ +// Scintilla source code edit control +/** @file LexZig.cxx + ** Lexer for Zig language. + **/ +// Based on Zufu Liu's Notepad4 Zig lexer +// Modified for Scintilla by Jiri Techet, 2024 +// The License.txt file describes the conditions under which this software may be distributed. + +#include <cassert> +#include <cstring> + +#include <string> +#include <string_view> +#include <vector> +#include <map> +#include <algorithm> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" +#include "OptionSet.h" +#include "DefaultLexer.h" + +using namespace Scintilla; +using namespace Lexilla; + +namespace { +// Use an unnamed namespace to protect the functions and classes from name conflicts + +constexpr bool IsAGraphic(int ch) noexcept { + // excludes C0 control characters and whitespace + return ch > 32 && ch < 127; +} + +constexpr bool IsIdentifierStart(int ch) noexcept { + return IsUpperOrLowerCase(ch) || ch == '_'; +} + +constexpr bool IsIdentifierStartEx(int ch) noexcept { + return IsIdentifierStart(ch) || ch >= 0x80; +} + +constexpr bool IsNumberStart(int ch, int chNext) noexcept { + return IsADigit(ch) || (ch == '.' && IsADigit(chNext)); +} + +constexpr bool IsIdentifierChar(int ch) noexcept { + return IsAlphaNumeric(ch) || ch == '_'; +} + +constexpr bool IsNumberContinue(int chPrev, int ch, int chNext) noexcept { + return ((ch == '+' || ch == '-') && (chPrev == 'e' || chPrev == 'E')) + || (ch == '.' && chNext != '.'); +} + +constexpr bool IsDecimalNumber(int chPrev, int ch, int chNext) noexcept { + return IsIdentifierChar(ch) || IsNumberContinue(chPrev, ch, chNext); +} + +constexpr bool IsIdentifierCharEx(int ch) noexcept { + return IsIdentifierChar(ch) || ch >= 0x80; +} + +// https://ziglang.org/documentation/master/#Escape-Sequences +struct EscapeSequence { + int outerState = SCE_ZIG_DEFAULT; + int digitsLeft = 0; + bool brace = false; + + // highlight any character as escape sequence. + void resetEscapeState(int state, int chNext) noexcept { + outerState = state; + digitsLeft = 1; + brace = false; + if (chNext == 'x') { + digitsLeft = 3; + } else if (chNext == 'u') { + digitsLeft = 5; + } + } + void resetEscapeState(int state) noexcept { + outerState = state; + digitsLeft = 1; + brace = false; + } + bool atEscapeEnd(int ch) noexcept { + --digitsLeft; + return digitsLeft <= 0 || !IsAHeXDigit(ch); + } +}; + +enum { + ZigLineStateMaskLineComment = 1, // line comment + ZigLineStateMaskMultilineString = 1 << 1, // multiline string +}; + +struct FoldLineState { + int lineComment; + int multilineString; + constexpr explicit FoldLineState(int lineState) noexcept: + lineComment(lineState & ZigLineStateMaskLineComment), + multilineString((lineState >> 1) & 1) { + } +}; + +enum class KeywordType { + None = SCE_ZIG_DEFAULT, + Function = SCE_ZIG_FUNCTION, +}; + +enum { + KeywordIndex_Primary = 0, + KeywordIndex_Secondary = 1, + KeywordIndex_Tertiary = 2, + KeywordIndex_Type = 3, +}; + +// Options used for LexerZig +struct OptionsZig { + bool fold = false; +}; + +const char *const zigWordListDesc[] = { + "Primary keywords", + "Secondary keywords", + "Tertiary keywords", + "Global type definitions", + nullptr +}; + +struct OptionSetZig : public OptionSet<OptionsZig> { + OptionSetZig() { + DefineProperty("fold", &OptionsZig::fold); + + DefineWordListSets(zigWordListDesc); + } +}; + +LexicalClass lexicalClasses[] = { + // Lexer ZIG SCLEX_ZIG SCE_ZIG_: + 0, "SCE_ZIG_DEFAULT", "default", "White space", + 1, "SCE_ZIG_COMMENTLINE", "comment line", "Comment: //", + 2, "SCE_ZIG_COMMENTLINEDOC", "comment line documentation", "Comment: ///", + 3, "SCE_ZIG_COMMENTLINETOP", "comment line documentation", "Comment: //!", + 4, "SCE_ZIG_NUMBER", "literal numeric", "Number", + 5, "SCE_ZIG_OPERATOR", "operator", "Operator", + 6, "SCE_ZIG_CHARACTER", "literal string character", "Single quoted string", + 7, "SCE_ZIG_STRING", "literal string", "Double quoted string", + 8, "SCE_ZIG_MULTISTRING", "literal string multiline", "Multiline string introduced by two backslashes", + 9, "SCE_ZIG_ESCAPECHAR", "literal string escapesequence", "Escape sequence", + 10, "SCE_ZIG_IDENTIFIER", "identifier", "Identifier", + 11, "SCE_ZIG_FUNCTION", "identifier", "Function definition", + 12, "SCE_ZIG_BUILTIN_FUNCTION", "identifier", "Builtin function", + 13, "SCE_ZIG_KW_PRIMARY", "keyword", "Primary keywords", + 14, "SCE_ZIG_KW_SECONDARY", "identifier", "Secondary keywords", + 15, "SCE_ZIG_KW_TERTIARY", "identifier", "Tertiary keywords", + 16, "SCE_ZIG_KW_TYPE", "identifier", "Global types", + 17, "SCE_ZIG_IDENTIFIER_STRING", "identifier", "Identifier using @\"\" syntax", +}; + +class LexerZig : public DefaultLexer { + WordList keywordsPrimary; + WordList keywordsSecondary; + WordList keywordsTertiary; + WordList keywordsTypes; + OptionsZig options; + OptionSetZig osZig; +public: + LexerZig(const char *languageName_, int language_) : + DefaultLexer(languageName_, language_, lexicalClasses, std::size(lexicalClasses)) { + } + // Deleted so LexerZig objects can not be copied. + LexerZig(const LexerZig &) = delete; + LexerZig(LexerZig &&) = delete; + void operator=(const LexerZig &) = delete; + void operator=(LexerZig &&) = delete; + ~LexerZig() override = default; + + void SCI_METHOD Release() override { + delete this; + } + int SCI_METHOD Version() const override { + return lvRelease5; + } + const char *SCI_METHOD PropertyNames() override { + return osZig.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) override { + return osZig.PropertyType(name); + } + const char *SCI_METHOD DescribeProperty(const char *name) override { + return osZig.DescribeProperty(name); + } + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + const char *SCI_METHOD PropertyGet(const char *key) override { + return osZig.PropertyGet(key); + } + const char *SCI_METHOD DescribeWordListSets() override { + return osZig.DescribeWordListSets(); + } + Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override; + + void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override; + + void *SCI_METHOD PrivateCall(int, void *) override { + return nullptr; + } + + void BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle); + Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int &chPrevNonWhite, int &stylePrevNonWhite); + + static ILexer5 *LexerFactoryZig() { + return new LexerZig("zig", SCLEX_ZIG); + } +}; + +Sci_Position SCI_METHOD LexerZig::PropertySet(const char *key, const char *val) { + if (osZig.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +Sci_Position SCI_METHOD LexerZig::WordListSet(int n, const char *wl) { + WordList *wordListN = nullptr; + switch (n) { + case 0: + wordListN = &keywordsPrimary; + break; + case 1: + wordListN = &keywordsSecondary; + break; + case 2: + wordListN = &keywordsTertiary; + break; + case 3: + wordListN = &keywordsTypes; + break; + default: + break; + } + Sci_Position firstModification = -1; + if (wordListN && wordListN->Set(wl)) { + firstModification = 0; + } + return firstModification; +} + +void LexerZig::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + Accessor styler(pAccess, nullptr); + + KeywordType kwType = KeywordType::None; + int visibleChars = 0; + int lineState = 0; + EscapeSequence escSeq; + + StyleContext sc(startPos, lengthDoc, initStyle, styler); + + while (sc.More()) { + switch (sc.state) { + case SCE_ZIG_OPERATOR: + sc.SetState(SCE_ZIG_DEFAULT); + break; + + case SCE_ZIG_NUMBER: + if (!IsDecimalNumber(sc.chPrev, sc.ch, sc.chNext)) { + sc.SetState(SCE_ZIG_DEFAULT); + } + break; + + case SCE_ZIG_IDENTIFIER: + case SCE_ZIG_BUILTIN_FUNCTION: + if (!IsIdentifierCharEx(sc.ch)) { + if (sc.state == SCE_ZIG_IDENTIFIER) { + char s[64]; + sc.GetCurrent(s, sizeof(s)); + if (kwType != KeywordType::None) { + sc.ChangeState(static_cast<int>(kwType)); + } else if (keywordsPrimary.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_PRIMARY); + kwType = KeywordType::None; + if (strcmp(s, "fn") == 0) { + kwType = KeywordType::Function; + } + } else if (keywordsSecondary.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_SECONDARY); + } else if (keywordsTertiary.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_TERTIARY); + } else if (keywordsTypes.InList(s)) { + sc.ChangeState(SCE_ZIG_KW_TYPE); + } + } + if (sc.state != SCE_ZIG_KW_PRIMARY) { + kwType = KeywordType::None; + } + sc.SetState(SCE_ZIG_DEFAULT); + } + break; + + case SCE_ZIG_CHARACTER: + case SCE_ZIG_STRING: + case SCE_ZIG_MULTISTRING: + case SCE_ZIG_IDENTIFIER_STRING: + if (sc.atLineStart) { + sc.SetState(SCE_ZIG_DEFAULT); + } else if (sc.ch == '\\' && sc.state != SCE_ZIG_MULTISTRING) { + escSeq.resetEscapeState(sc.state, sc.chNext); + sc.SetState(SCE_ZIG_ESCAPECHAR); + sc.Forward(); + if (sc.Match('u', '{')) { + escSeq.brace = true; + escSeq.digitsLeft = 9; + sc.Forward(); + } + } else if ((sc.ch == '\'' && sc.state == SCE_ZIG_CHARACTER) || + (sc.ch == '\"' && (sc.state == SCE_ZIG_STRING || sc.state == SCE_ZIG_IDENTIFIER_STRING))) { + sc.ForwardSetState(SCE_ZIG_DEFAULT); + } + break; + + case SCE_ZIG_ESCAPECHAR: + if (escSeq.atEscapeEnd(sc.ch)) { + if (escSeq.brace && sc.ch == '}') { + sc.Forward(); + } + sc.SetState(escSeq.outerState); + continue; + } + break; + + case SCE_ZIG_COMMENTLINE: + case SCE_ZIG_COMMENTLINEDOC: + case SCE_ZIG_COMMENTLINETOP: + if (sc.atLineStart) { + sc.SetState(SCE_ZIG_DEFAULT); + } + break; + } + + if (sc.state == SCE_ZIG_DEFAULT) { + if (sc.Match('/', '/')) { + if (visibleChars == 0) { + lineState = ZigLineStateMaskLineComment; + } + sc.SetState(SCE_ZIG_COMMENTLINE); + sc.Forward(2); + if (sc.ch == '!') { + sc.ChangeState(SCE_ZIG_COMMENTLINETOP); + } else if (sc.ch == '/' && sc.chNext != '/') { + sc.ChangeState(SCE_ZIG_COMMENTLINEDOC); + } + } else if (sc.Match('\\', '\\')) { + lineState = ZigLineStateMaskMultilineString; + sc.SetState(SCE_ZIG_MULTISTRING); + } else if (sc.ch == '\"') { + sc.SetState(SCE_ZIG_STRING); + } else if (sc.ch == '\'') { + sc.SetState(SCE_ZIG_CHARACTER); + } else if (IsNumberStart(sc.ch, sc.chNext)) { + sc.SetState(SCE_ZIG_NUMBER); + } else if ((sc.ch == '@' && IsIdentifierStartEx(sc.chNext)) || IsIdentifierStartEx(sc.ch)) { + sc.SetState((sc.ch == '@') ? SCE_ZIG_BUILTIN_FUNCTION : SCE_ZIG_IDENTIFIER); + } else if (sc.ch == '@' && sc.chNext == '"') { + sc.SetState(SCE_ZIG_IDENTIFIER_STRING); + sc.Forward(); + } else if (IsAGraphic(sc.ch)) { + sc.SetState(SCE_ZIG_OPERATOR); + } + } + + if (visibleChars == 0 && !isspacechar(sc.ch)) { + visibleChars++; + } + if (sc.atLineEnd) { + styler.SetLineState(sc.currentLine, lineState); + lineState = 0; + kwType = KeywordType::None; + visibleChars = 0; + } + sc.Forward(); + } + + sc.Complete(); +} + +void LexerZig::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) { + if (!options.fold) + return; + + Accessor styler(pAccess, nullptr); + const Sci_PositionU endPos = startPos + lengthDoc; + Sci_Position lineCurrent = styler.GetLine(startPos); + while (lineCurrent > 0) { + lineCurrent--; + startPos = styler.LineStart(lineCurrent); + initStyle = (startPos > 0) ? styler.StyleIndexAt(startPos) : 0; + if (!AnyOf(initStyle, SCE_ZIG_MULTISTRING, + SCE_ZIG_COMMENTLINE, SCE_ZIG_COMMENTLINEDOC, SCE_ZIG_COMMENTLINETOP)) { + break; + } + } + FoldLineState foldPrev(0); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) { + levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16; + foldPrev = FoldLineState(styler.GetLineState(lineCurrent - 1)); + } + + int levelNext = levelCurrent; + FoldLineState foldCurrent(styler.GetLineState(lineCurrent)); + Sci_PositionU lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + + while (startPos < endPos) { + initStyle = styler.StyleIndexAt(startPos); + + if (initStyle == SCE_ZIG_OPERATOR) { + const char ch = styler[startPos]; + if (ch == '{' || ch == '[' || ch == '(') { + levelNext++; + } else if (ch == '}' || ch == ']' || ch == ')') { + levelNext--; + } + } + + ++startPos; + if (startPos == lineStartNext) { + const FoldLineState foldNext(styler.GetLineState(lineCurrent + 1)); + levelNext = std::max(levelNext, SC_FOLDLEVELBASE); + if (foldCurrent.lineComment) { + levelNext += foldNext.lineComment - foldPrev.lineComment; + } else if (foldCurrent.multilineString) { + levelNext += foldNext.multilineString - foldPrev.multilineString; + } + + const int levelUse = levelCurrent; + int lev = levelUse | (levelNext << 16); + if (levelUse < levelNext) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + styler.SetLevel(lineCurrent, lev); + + lineCurrent++; + lineStartNext = styler.LineStart(lineCurrent + 1); + lineStartNext = std::min(lineStartNext, endPos); + levelCurrent = levelNext; + foldPrev = foldCurrent; + foldCurrent = foldNext; + } + } +} + +} // unnamed namespace end + +extern const LexerModule lmZig(SCLEX_ZIG, LexerZig::LexerFactoryZig, "zig", zigWordListDesc); Modified: scintilla/lexilla/src/Lexilla.cxx 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -160,6 +160,7 @@ extern LexerModule lmVisualProlog; extern LexerModule lmX12; extern LexerModule lmXML; extern LexerModule lmYAML; +extern LexerModule lmZig; //--Autogenerated -- end of automatically generated section @@ -224,6 +225,7 @@ static void AddGeanyLexers() &lmVisualProlog, &lmXML, &lmYAML, + &lmZig, }); } @@ -372,6 +374,7 @@ void AddEachLexer() { &lmX12, &lmXML, &lmYAML, + &lmZig, //--Autogenerated -- end of automatically generated section }); Modified: scintilla/scintilla_changes.patch 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,7 @@ diff --git scintilla/lexilla/src/Lexilla.cxx scintilla/lexilla/src/Lexilla.cxx index cd4b23617..af4a73db4 100644 --- scintilla/lexilla/src/Lexilla.cxx +++ scintilla/lexilla/src/Lexilla.cxx -@@ -167,8 +167,72 @@ +@@ -167,8 +167,73 @@ CatalogueModules catalogueLexilla; @@ -123,6 +123,7 @@ index cd4b23617..af4a73db4 100644 + &lmVisualProlog, + &lmXML, + &lmYAML, ++ &lmZig, + }); +} + Modified: src/document.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2722,6 +2722,7 @@ void document_highlight_tags(GeanyDocument *doc) case GEANY_FILETYPES_VALA: case GEANY_FILETYPES_RUST: case GEANY_FILETYPES_GO: + case GEANY_FILETYPES_ZIG: { /* index of the keyword set in the Scintilla lexer, for Modified: src/editor.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1330,6 +1330,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) case SCLEX_R: case SCLEX_RAKU: case SCLEX_RUST: + case SCLEX_ZIG: return TRUE; default: return FALSE; @@ -5146,6 +5147,7 @@ void editor_set_indentation_guides(GeanyEditor *editor) case SCLEX_D: case SCLEX_OCTAVE: case SCLEX_RUST: + case SCLEX_ZIG: mode = SC_IV_LOOKBOTH; break; Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -193,6 +193,7 @@ static void init_builtin_filetypes(void) FT_INIT( CIL, NONE, "CIL", NULL, SOURCE_FILE, COMPILED ); FT_INIT( PROLOG, NONE, "Prolog", NULL, SOURCE_FILE, COMPILED ); FT_INIT( NIM, NONE, "Nim", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( ZIG, NONE, "Zig", NULL, SOURCE_FILE, COMPILED ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -113,6 +113,7 @@ typedef enum GEANY_FILETYPES_CIL, GEANY_FILETYPES_PROLOG, GEANY_FILETYPES_NIM, + GEANY_FILETYPES_ZIG, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -1059,6 +1059,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(XML); init_styleset_case(YAML); init_styleset_case(ZEPHIR); + init_styleset_case(ZIG); default: if (ft->lexer_filetype) geany_debug("Filetype %s has a recursive lexer_filetype %s set!", @@ -1155,6 +1156,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(XML); styleset_case(YAML); styleset_case(ZEPHIR); + styleset_case(ZIG); case GEANY_FILETYPES_NONE: default: styleset_default(sci, ft->id); @@ -1685,6 +1687,12 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_NIM_TRIPLE || style == SCE_NIM_TRIPLEDOUBLE || style == SCE_NIM_STRINGEOL); + + case SCLEX_ZIG: + return (style == SCE_ZIG_STRING || + style == SCE_ZIG_MULTISTRING || + style == SCE_ZIG_CHARACTER || + style == SCE_ZIG_ESCAPECHAR); } return FALSE; } @@ -1937,6 +1945,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_NIM_COMMENTDOC || style == SCE_NIM_COMMENTLINE || style == SCE_NIM_COMMENTLINEDOC); + + case SCLEX_ZIG: + return (style == SCE_ZIG_COMMENTLINE || + style == SCE_ZIG_COMMENTLINEDOC || + style == SCE_ZIG_COMMENTLINETOP); } return FALSE; } Modified: src/highlightingmappings.h 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -1886,6 +1886,39 @@ static const HLKeyword highlighting_keywords_YAML[] = #define highlighting_properties_YAML EMPTY_PROPERTIES +/* ZIG */ +#define highlighting_lexer_ZIG SCLEX_ZIG +static const HLStyle highlighting_styles_ZIG[] = +{ + { SCE_ZIG_DEFAULT, "default", FALSE }, + { SCE_ZIG_COMMENTLINE, "comment_line", FALSE }, + { SCE_ZIG_COMMENTLINEDOC, "comment_line_doc", FALSE }, + { SCE_ZIG_COMMENTLINETOP, "comment_line_top", FALSE }, + { SCE_ZIG_NUMBER, "number", FALSE }, + { SCE_ZIG_OPERATOR, "operator", FALSE }, + { SCE_ZIG_CHARACTER, "character", FALSE }, + { SCE_ZIG_STRING, "string", FALSE }, + { SCE_ZIG_MULTISTRING, "multistring", FALSE }, + { SCE_ZIG_ESCAPECHAR, "escapechar", FALSE }, + { SCE_ZIG_IDENTIFIER, "identifier", FALSE }, + { SCE_ZIG_FUNCTION, "function", FALSE }, + { SCE_ZIG_BUILTIN_FUNCTION, "builtin_function", FALSE }, + { SCE_ZIG_KW_PRIMARY, "kw_primary", FALSE }, + { SCE_ZIG_KW_SECONDARY, "kw_secondary", FALSE }, + { SCE_ZIG_KW_TERTIARY, "kw_tertiary", FALSE }, + { SCE_ZIG_KW_TYPE, "kw_type", FALSE }, + { SCE_ZIG_IDENTIFIER_STRING, "identifer_string", FALSE } +}; +static const HLKeyword highlighting_keywords_ZIG[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, + { 2, "tertiary", FALSE }, + { 3, "types", FALSE } +}; +#define highlighting_properties_ZIG EMPTY_PROPERTIES + + /* Zephir */ #define highlighting_lexer_ZEPHIR SCLEX_PHPSCRIPT #define highlighting_styles_ZEPHIR highlighting_styles_PHP -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e1a5e9: Fix README: highlight code as such using ``code``
by Javier Mora 04 Nov '24

04 Nov '24

Branch: refs/heads/master Author: Javier Mora <cousteaulecommandant(a)gmail.com> Committer: Javier Mora <cousteaulecommandant(a)gmail.com> Date: Fri, 01 Nov 2024 23:44:10 UTC Commit: e1a5e9848ba014cc411f6aeb2f790e036613d2c6 https://github.com/geany/geany/commit/e1a5e9848ba014cc411f6aeb2f790e036613d… Log Message: ----------- Fix README: highlight code as such using ``code`` Code snippets in README(.rst) should use ``double backticks`` rather than `single backticks`. Otherwise it's hard to tell apart code from text in the README render (especially when it says "`code 1` or `code 2`"). Modified Paths: -------------- README Modified: README 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -91,26 +91,26 @@ N.B. Meson support is still incomplete and a work-in-progress. Meson requires to chose a separate build directory. Either create one, or let meson do it: -`meson build` or `mkdir build; cd build; meson ..` +``meson build`` or ``mkdir build; cd build; meson ..`` Either command will configure the build system. The system is probed in many ways and system-dependant build files are created. This includes location of dependencies and compiler and linker flags required for them. -To build Geany, follow with a `meson compile -C build` +To build Geany, follow with a ``meson compile -C build`` -To install Geany, follow the build with a `sudo meson install -C build`. +To install Geany, follow the build with a ``sudo meson install -C build``. -By default, meson will install Geany to `/usr/local`. A different +By default, meson will install Geany to ``/usr/local``. A different prefix can be selected at the initial command or via reconfiguration: -`meson --prefix /opt build` or `meson configure --prefix /opt build` +``meson --prefix /opt build`` or ``meson configure --prefix /opt build`` Geany has some selectable features that may reduce the required build and runtime dependencies. See meson_optionts.txt for a full list. -To turn a feature off, use `-D<feature>=false` when configuring the build, -for example: `meson configure -Dvte=false build` +To turn a feature off, use ``-D<feature>=false`` when configuring the build, +for example: ``meson configure -Dvte=false build`` Using Autotools +++++++++++++++ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c5d68e: Merge pull request #4029 from cousteaulecommandant/fix-readme-rst
by Jiří Techet 04 Nov '24

04 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Mon, 04 Nov 2024 15:13:53 UTC Commit: c5d68efa7edb4c37af00283e0c684aa7365a61d0 https://github.com/geany/geany/commit/c5d68efa7edb4c37af00283e0c684aa7365a6… Log Message: ----------- Merge pull request #4029 from cousteaulecommandant/fix-readme-rst Fix README: highlight code as such using ``code`` Modified Paths: -------------- README Modified: README 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -91,26 +91,26 @@ N.B. Meson support is still incomplete and a work-in-progress. Meson requires to chose a separate build directory. Either create one, or let meson do it: -`meson build` or `mkdir build; cd build; meson ..` +``meson build`` or ``mkdir build; cd build; meson ..`` Either command will configure the build system. The system is probed in many ways and system-dependant build files are created. This includes location of dependencies and compiler and linker flags required for them. -To build Geany, follow with a `meson compile -C build` +To build Geany, follow with a ``meson compile -C build`` -To install Geany, follow the build with a `sudo meson install -C build`. +To install Geany, follow the build with a ``sudo meson install -C build``. -By default, meson will install Geany to `/usr/local`. A different +By default, meson will install Geany to ``/usr/local``. A different prefix can be selected at the initial command or via reconfiguration: -`meson --prefix /opt build` or `meson configure --prefix /opt build` +``meson --prefix /opt build`` or ``meson configure --prefix /opt build`` Geany has some selectable features that may reduce the required build and runtime dependencies. See meson_optionts.txt for a full list. -To turn a feature off, use `-D<feature>=false` when configuring the build, -for example: `meson configure -Dvte=false build` +To turn a feature off, use ``-D<feature>=false`` when configuring the build, +for example: ``meson configure -Dvte=false build`` Using Autotools +++++++++++++++ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3122fb: Merge pull request #4013 from techee/optlib
by Jiří Techet 03 Nov '24

03 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 03 Nov 2024 17:22:51 UTC Commit: 3122fb1dbcc1906df32a89f0a9d19253fa44288f https://github.com/geany/geany/commit/3122fb1dbcc1906df32a89f0a9d19253fa442… Log Message: ----------- Merge pull request #4013 from techee/optlib Use Forth and Meson optlib-based ctags parsers Modified Paths: -------------- ctags/Makefile.am ctags/optlib/forth.c ctags/optlib/meson.c data/filedefs/filetypes.Meson.conf meson.build scripts/update-ctags.py src/filetypes.c src/symbols.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_parsers.h Modified: ctags/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,8 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libctags.la parsers = \ + optlib/forth.c \ + optlib/meson.c \ parsers/cxx/cxx.c \ parsers/cxx/cxx_debug.c \ parsers/cxx/cxx_debug.h \ Modified: ctags/optlib/forth.c 76 lines changed, 76 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,76 @@ +/* + * Generated by ./misc/optlib2c from optlib/forth.ctags, Don't edit this manually. + */ +#include "general.h" +#include "parse.h" +#include "routines.h" +#include "field.h" +#include "xtag.h" +#include "selectors.h" + + +static void initializeForthParser (const langType language CTAGS_ATTR_UNUSED) +{ +} + +extern parserDefinition* ForthParser (void) +{ + static const char *const extensions [] = { + "fth", + "forth", + "fs", + "4th", + "f", + NULL + }; + + static const char *const aliases [] = { + NULL + }; + + static const char *const patterns [] = { + NULL + }; + + static kindDefinition ForthKindTable [] = { + { + true, 'w', "word", "words", + }, + { + true, 'v', "variable", "variables", + }, + { + true, 'c', "constant", "constants", + }, + }; + static tagRegexTable ForthTagRegexTable [] = { + {"^[[:space:]]*\\\\.*", "", + "", "{exclusive}", NULL, false}, + {"^:[[:space:]]+([^[:space:]]+)", "\\1", + "w", "{exclusive}", NULL, false}, + {"^variable[[:space:]]+([^[:space:]]+)", "\\1", + "v", "{exclusive}{icase}", NULL, false}, + {"^[[:alnum:]]+[[:space:]]+constant[[:space:]]+([^[:space:]]+)", "\\1", + "c", "{exclusive}{icase}", NULL, false}, + }; + + static selectLanguage selectors[] = { selectFortranOrForthByForthMarker, NULL }; + + parserDefinition* const def = parserNew ("Forth"); + + def->versionCurrent= 0; + def->versionAge = 0; + def->enabled = true; + def->extensions = extensions; + def->patterns = patterns; + def->aliases = aliases; + def->selectLanguage= selectors; + def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; + def->kindTable = ForthKindTable; + def->kindCount = ARRAY_SIZE(ForthKindTable); + def->tagRegexTable = ForthTagRegexTable; + def->tagRegexCount = ARRAY_SIZE(ForthTagRegexTable); + def->initialize = initializeForthParser; + + return def; +} Modified: ctags/optlib/meson.c 261 lines changed, 261 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,261 @@ +/* + * Generated by ./misc/optlib2c from optlib/meson.ctags, Don't edit this manually. + */ +#include "general.h" +#include "parse.h" +#include "routines.h" +#include "field.h" +#include "xtag.h" + + +static void initializeMesonParser (const langType language) +{ + + addLanguageRegexTable (language, "main"); + addLanguageRegexTable (language, "mline_string"); + addLanguageRegexTable (language, "string"); + addLanguageRegexTable (language, "comment"); + addLanguageRegexTable (language, "skipPair"); + addLanguageRegexTable (language, "common"); + addLanguageRegexTable (language, "skipToArgEnd"); + + addLanguageTagMultiTableRegex (language, "main", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^project[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "P", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^subdir[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "S", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^test[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "t", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^([a-zA-Z_][a-zA-Z_0-9]*)[ \t\n]*=([^=]|$)", + "\\1", "V", "{_advanceTo=2start}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "mline_string", + "^'''", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "mline_string", + "^[^']+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "mline_string", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^[^\\\\']+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^\\\\.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^'", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "comment", + "^[^\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "comment", + "^\n", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^[])}]", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^[])}]", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^.", + "", "", "", NULL); +} + +extern parserDefinition* MesonParser (void) +{ + static const char *const extensions [] = { + NULL + }; + + static const char *const aliases [] = { + NULL + }; + + static const char *const patterns [] = { + "meson.build", + NULL + }; + + static roleDefinition MesonModuleRoleTable [] = { + { true, "imported", "imported" }, + }; + static kindDefinition MesonKindTable [] = { + { + true, 'P', "project", "projects", + }, + { + true, 'V', "variable", "variables", + }, + { + true, 'S', "subdir", "subdirs", + }, + { + true, 'B', "build", "build targets", + }, + { + true, 'c', "custom", "custom targets", + }, + { + true, 't', "test", "tests", + }, + { + true, 'b', "benchmark", "benchmark targets", + }, + { + true, 'r', "run", "run targets", + }, + { + true, 'm', "module", "modules", + ATTACH_ROLES(MesonModuleRoleTable), + }, + }; + + parserDefinition* const def = parserNew ("Meson"); + + def->versionCurrent= 0; + def->versionAge = 0; + def->enabled = true; + def->extensions = extensions; + def->patterns = patterns; + def->aliases = aliases; + def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; + def->kindTable = MesonKindTable; + def->kindCount = ARRAY_SIZE(MesonKindTable); + def->initialize = initializeMesonParser; + + return def; +} Modified: data/filedefs/filetypes.Meson.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -8,6 +8,7 @@ identifiers=add_global_arguments add_global_link_arguments add_languages add_pro [settings] lexer_filetype=Python +tag_parser=Meson extension=build comment_single=# mime_type=text/x-meson Modified: meson.build 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -596,6 +596,8 @@ ctags = static_library('ctags', 'ctags/main/xtag.c', 'ctags/main/xtag.h', 'ctags/main/xtag_p.h', + 'ctags/optlib/forth.c', + 'ctags/optlib/meson.c', 'ctags/parsers/abaqus.c', 'ctags/parsers/abc.c', 'ctags/parsers/ada.c', Modified: scripts/update-ctags.py 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -29,6 +29,13 @@ for f in cxx_parser_src_files: shutil.copy(f, dstdir + '/parsers/cxx') +os.chdir(dstdir + '/optlib') +optlib_parser_dst_files = glob.glob('*.c') +os.chdir(srcdir + '/optlib') +print('Copying optlib parsers... ({} files)'.format(len(optlib_parser_dst_files))) +for f in optlib_parser_dst_files: + shutil.copy(f, dstdir + '/optlib') + print('Copying dsl files...') for f in ['dsl/es.c', 'dsl/es.h', 'dsl/optscript.c', 'dsl/optscript.h']: shutil.copy(srcdir + '/' + f, dstdir + '/' + f) Modified: src/filetypes.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -177,7 +177,7 @@ static void init_builtin_filetypes(void) FT_INIT( CMAKE, NONE, "CMake", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( NSIS, NSIS, "NSIS", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( ADA, ADA, "Ada", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( FORTH, NONE, "Forth", NULL, SOURCE_FILE, SCRIPT ); + FT_INIT( FORTH, FORTH, "Forth", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( ASCIIDOC, ASCIIDOC, "Asciidoc", NULL, SOURCE_FILE, MARKUP ); FT_INIT( ABAQUS, ABAQUS, "Abaqus", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( BATCH, BATCH, "Batch", NULL, SCRIPT, SCRIPT ); Modified: src/symbols.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1599,7 +1599,8 @@ static GPtrArray *filter_tags(GPtrArray *tags, TMTag *current_tag, gboolean defi GPtrArray *filtered_tags = g_ptr_array_new(); guint i; - symbols_get_current_function(doc, &current_scope); + if (symbols_get_current_function(doc, &current_scope) == -1) + current_scope = NULL; /* current_scope == "unknown" when not found */ foreach_ptr_array(tmtag, i, tags) { Modified: src/tagmanager/tm_parser.c 36 lines changed, 36 insertions(+), 0 deletions(-) =================================================================== @@ -1169,6 +1169,40 @@ static TMParserMapGroup group_LDSCRIPT[] = { {"unused", TM_ICON_NONE, tm_tag_undef_t}, }; +static TMParserMapEntry map_FORTH[] = { + {'w', tm_tag_function_t}, // word + {'v', tm_tag_variable_t}, // variable + {'c', tm_tag_macro_t}, // constant +}; +static TMParserMapGroup group_FORTH[] = { + {N_("Words"), TM_ICON_METHOD, tm_tag_function_t}, + {N_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {N_("Constants"), TM_ICON_MACRO, tm_tag_macro_t}, +}; + +static TMParserMapEntry map_MESON[] = { + {'P', tm_tag_namespace_t}, // project + {'V', tm_tag_local_var_t}, // variable + {'S', tm_tag_macro_t}, // subdir + {'B', tm_tag_other_t}, // build + {'c', tm_tag_enumerator_t}, // custom + {'t', tm_tag_field_t}, // test + {'b', tm_tag_function_t}, // benchmark + {'r', tm_tag_member_t}, // run + {'m', tm_tag_package_t}, // module +}; +static TMParserMapGroup group_MESON[] = { + {N_("Projects"), TM_ICON_CLASS, tm_tag_namespace_t}, + {N_("Modules"), TM_ICON_NAMESPACE, tm_tag_package_t}, + {N_("Variables"), TM_ICON_NONE, tm_tag_local_var_t}, + {N_("Subdirs"), TM_ICON_OTHER, tm_tag_macro_t}, + {N_("Build Targets"), TM_ICON_METHOD, tm_tag_other_t}, + {N_("Custom Targets"), TM_ICON_METHOD, tm_tag_enumerator_t}, + {N_("Benchmark Targets"), TM_ICON_METHOD, tm_tag_function_t}, + {N_("Run Targets"), TM_ICON_METHOD, tm_tag_member_t}, + {N_("Tests"), TM_ICON_NONE, tm_tag_field_t}, +}; + typedef struct { TMParserMapEntry *entries; @@ -1244,6 +1278,8 @@ static TMParserMap parser_map[] = { MAP_ENTRY(RAKU), MAP_ENTRY(OCAML), MAP_ENTRY(LDSCRIPT), + MAP_ENTRY(FORTH), + MAP_ENTRY(MESON), }; /* make sure the parser map is consistent and complete */ G_STATIC_ASSERT(G_N_ELEMENTS(parser_map) == TM_PARSER_COUNT); Modified: src/tagmanager/tm_parser.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -142,6 +142,8 @@ enum TM_PARSER_RAKU, TM_PARSER_OCAML, TM_PARSER_LDSCRIPT, + TM_PARSER_FORTH, + TM_PARSER_MESON, TM_PARSER_COUNT }; Modified: src/tagmanager/tm_parsers.h 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -76,6 +76,8 @@ AutoItParser, \ Perl6Parser, \ OcamlParser, \ - LdScriptParser + LdScriptParser, \ + ForthParser, \ + MesonParser #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fd70da: Fix current_scope value passed to tm_workspace_is_autocomplete_tag()
by Jiří Techet 03 Nov '24

03 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 03 Nov 2024 16:54:00 UTC Commit: fd70da00d9ae846b63d533f6d7d63dc3d96e0a5c https://github.com/geany/geany/commit/fd70da00d9ae846b63d533f6d7d63dc3d96e0… Log Message: ----------- Fix current_scope value passed to tm_workspace_is_autocomplete_tag() When the parser doesn't provide scope, symbols_get_current_function() returns "unknown" in its tagname argument. We have to set it to NULL in this case so tm_workspace_is_autocomplete_tag() works correctly. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1599,7 +1599,8 @@ static GPtrArray *filter_tags(GPtrArray *tags, TMTag *current_tag, gboolean defi GPtrArray *filtered_tags = g_ptr_array_new(); guint i; - symbols_get_current_function(doc, &current_scope); + if (symbols_get_current_function(doc, &current_scope) == -1) + current_scope = NULL; /* current_scope == "unknown" when not found */ foreach_ptr_array(tmtag, i, tags) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] dcd2f3: Use Forth and Meson optlib-based ctags parsers
by Jiří Techet 03 Nov '24

03 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 03 Nov 2024 16:53:52 UTC Commit: dcd2f3e6201c5a51252bedb005df3f3c5b285bf8 https://github.com/geany/geany/commit/dcd2f3e6201c5a51252bedb005df3f3c5b285… Log Message: ----------- Use Forth and Meson optlib-based ctags parsers This patch also updates update-ctags.py to update parsers in the optlib directory. Modified Paths: -------------- ctags/Makefile.am ctags/optlib/forth.c ctags/optlib/meson.c data/filedefs/filetypes.Meson.conf meson.build scripts/update-ctags.py src/filetypes.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_parsers.h Modified: ctags/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,8 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libctags.la parsers = \ + optlib/forth.c \ + optlib/meson.c \ parsers/cxx/cxx.c \ parsers/cxx/cxx_debug.c \ parsers/cxx/cxx_debug.h \ Modified: ctags/optlib/forth.c 76 lines changed, 76 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,76 @@ +/* + * Generated by ./misc/optlib2c from optlib/forth.ctags, Don't edit this manually. + */ +#include "general.h" +#include "parse.h" +#include "routines.h" +#include "field.h" +#include "xtag.h" +#include "selectors.h" + + +static void initializeForthParser (const langType language CTAGS_ATTR_UNUSED) +{ +} + +extern parserDefinition* ForthParser (void) +{ + static const char *const extensions [] = { + "fth", + "forth", + "fs", + "4th", + "f", + NULL + }; + + static const char *const aliases [] = { + NULL + }; + + static const char *const patterns [] = { + NULL + }; + + static kindDefinition ForthKindTable [] = { + { + true, 'w', "word", "words", + }, + { + true, 'v', "variable", "variables", + }, + { + true, 'c', "constant", "constants", + }, + }; + static tagRegexTable ForthTagRegexTable [] = { + {"^[[:space:]]*\\\\.*", "", + "", "{exclusive}", NULL, false}, + {"^:[[:space:]]+([^[:space:]]+)", "\\1", + "w", "{exclusive}", NULL, false}, + {"^variable[[:space:]]+([^[:space:]]+)", "\\1", + "v", "{exclusive}{icase}", NULL, false}, + {"^[[:alnum:]]+[[:space:]]+constant[[:space:]]+([^[:space:]]+)", "\\1", + "c", "{exclusive}{icase}", NULL, false}, + }; + + static selectLanguage selectors[] = { selectFortranOrForthByForthMarker, NULL }; + + parserDefinition* const def = parserNew ("Forth"); + + def->versionCurrent= 0; + def->versionAge = 0; + def->enabled = true; + def->extensions = extensions; + def->patterns = patterns; + def->aliases = aliases; + def->selectLanguage= selectors; + def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; + def->kindTable = ForthKindTable; + def->kindCount = ARRAY_SIZE(ForthKindTable); + def->tagRegexTable = ForthTagRegexTable; + def->tagRegexCount = ARRAY_SIZE(ForthTagRegexTable); + def->initialize = initializeForthParser; + + return def; +} Modified: ctags/optlib/meson.c 261 lines changed, 261 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,261 @@ +/* + * Generated by ./misc/optlib2c from optlib/meson.ctags, Don't edit this manually. + */ +#include "general.h" +#include "parse.h" +#include "routines.h" +#include "field.h" +#include "xtag.h" + + +static void initializeMesonParser (const langType language) +{ + + addLanguageRegexTable (language, "main"); + addLanguageRegexTable (language, "mline_string"); + addLanguageRegexTable (language, "string"); + addLanguageRegexTable (language, "comment"); + addLanguageRegexTable (language, "skipPair"); + addLanguageRegexTable (language, "common"); + addLanguageRegexTable (language, "skipToArgEnd"); + + addLanguageTagMultiTableRegex (language, "main", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^project[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "P", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^subdir[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "S", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^test[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "t", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^([a-zA-Z_][a-zA-Z_0-9]*)[ \t\n]*=([^=]|$)", + "\\1", "V", "{_advanceTo=2start}", NULL); + addLanguageTagMultiTableRegex (language, "main", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "mline_string", + "^'''", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "mline_string", + "^[^']+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "mline_string", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^[^\\\\']+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^\\\\.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^'", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "string", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "comment", + "^[^\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "comment", + "^\n", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^[])}]", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "skipPair", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "common", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^[ \t\n]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^#", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^'''", + "", "", "{tenter=mline_string}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^'", + "", "", "{tenter=string}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^[[({]", + "", "", "{tenter=skipPair}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^(jar|executable|shared_module|(both_|shared_|static_)?library)[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\3", "B", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^custom_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "c", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^(alias|run)_target[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\2", "r", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^benchmark[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "b", "{tenter=skipToArgEnd}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^import[ \t\n]*\\([ \t\n]*'([^']*[^\\\\])'[ \t\n]*", + "\\1", "m", "{tenter=skipToArgEnd}{_role=imported}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^[])}]", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "skipToArgEnd", + "^.", + "", "", "", NULL); +} + +extern parserDefinition* MesonParser (void) +{ + static const char *const extensions [] = { + NULL + }; + + static const char *const aliases [] = { + NULL + }; + + static const char *const patterns [] = { + "meson.build", + NULL + }; + + static roleDefinition MesonModuleRoleTable [] = { + { true, "imported", "imported" }, + }; + static kindDefinition MesonKindTable [] = { + { + true, 'P', "project", "projects", + }, + { + true, 'V', "variable", "variables", + }, + { + true, 'S', "subdir", "subdirs", + }, + { + true, 'B', "build", "build targets", + }, + { + true, 'c', "custom", "custom targets", + }, + { + true, 't', "test", "tests", + }, + { + true, 'b', "benchmark", "benchmark targets", + }, + { + true, 'r', "run", "run targets", + }, + { + true, 'm', "module", "modules", + ATTACH_ROLES(MesonModuleRoleTable), + }, + }; + + parserDefinition* const def = parserNew ("Meson"); + + def->versionCurrent= 0; + def->versionAge = 0; + def->enabled = true; + def->extensions = extensions; + def->patterns = patterns; + def->aliases = aliases; + def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; + def->kindTable = MesonKindTable; + def->kindCount = ARRAY_SIZE(MesonKindTable); + def->initialize = initializeMesonParser; + + return def; +} Modified: data/filedefs/filetypes.Meson.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -8,6 +8,7 @@ identifiers=add_global_arguments add_global_link_arguments add_languages add_pro [settings] lexer_filetype=Python +tag_parser=Meson extension=build comment_single=# mime_type=text/x-meson Modified: meson.build 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -596,6 +596,8 @@ ctags = static_library('ctags', 'ctags/main/xtag.c', 'ctags/main/xtag.h', 'ctags/main/xtag_p.h', + 'ctags/optlib/forth.c', + 'ctags/optlib/meson.c', 'ctags/parsers/abaqus.c', 'ctags/parsers/abc.c', 'ctags/parsers/ada.c', Modified: scripts/update-ctags.py 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -29,6 +29,13 @@ for f in cxx_parser_src_files: shutil.copy(f, dstdir + '/parsers/cxx') +os.chdir(dstdir + '/optlib') +optlib_parser_dst_files = glob.glob('*.c') +os.chdir(srcdir + '/optlib') +print('Copying optlib parsers... ({} files)'.format(len(optlib_parser_dst_files))) +for f in optlib_parser_dst_files: + shutil.copy(f, dstdir + '/optlib') + print('Copying dsl files...') for f in ['dsl/es.c', 'dsl/es.h', 'dsl/optscript.c', 'dsl/optscript.h']: shutil.copy(srcdir + '/' + f, dstdir + '/' + f) Modified: src/filetypes.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -177,7 +177,7 @@ static void init_builtin_filetypes(void) FT_INIT( CMAKE, NONE, "CMake", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( NSIS, NSIS, "NSIS", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( ADA, ADA, "Ada", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( FORTH, NONE, "Forth", NULL, SOURCE_FILE, SCRIPT ); + FT_INIT( FORTH, FORTH, "Forth", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( ASCIIDOC, ASCIIDOC, "Asciidoc", NULL, SOURCE_FILE, MARKUP ); FT_INIT( ABAQUS, ABAQUS, "Abaqus", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( BATCH, BATCH, "Batch", NULL, SCRIPT, SCRIPT ); Modified: src/tagmanager/tm_parser.c 36 lines changed, 36 insertions(+), 0 deletions(-) =================================================================== @@ -1169,6 +1169,40 @@ static TMParserMapGroup group_LDSCRIPT[] = { {"unused", TM_ICON_NONE, tm_tag_undef_t}, }; +static TMParserMapEntry map_FORTH[] = { + {'w', tm_tag_function_t}, // word + {'v', tm_tag_variable_t}, // variable + {'c', tm_tag_macro_t}, // constant +}; +static TMParserMapGroup group_FORTH[] = { + {N_("Words"), TM_ICON_METHOD, tm_tag_function_t}, + {N_("Variables"), TM_ICON_VAR, tm_tag_variable_t}, + {N_("Constants"), TM_ICON_MACRO, tm_tag_macro_t}, +}; + +static TMParserMapEntry map_MESON[] = { + {'P', tm_tag_namespace_t}, // project + {'V', tm_tag_local_var_t}, // variable + {'S', tm_tag_macro_t}, // subdir + {'B', tm_tag_other_t}, // build + {'c', tm_tag_enumerator_t}, // custom + {'t', tm_tag_field_t}, // test + {'b', tm_tag_function_t}, // benchmark + {'r', tm_tag_member_t}, // run + {'m', tm_tag_package_t}, // module +}; +static TMParserMapGroup group_MESON[] = { + {N_("Projects"), TM_ICON_CLASS, tm_tag_namespace_t}, + {N_("Modules"), TM_ICON_NAMESPACE, tm_tag_package_t}, + {N_("Variables"), TM_ICON_NONE, tm_tag_local_var_t}, + {N_("Subdirs"), TM_ICON_OTHER, tm_tag_macro_t}, + {N_("Build Targets"), TM_ICON_METHOD, tm_tag_other_t}, + {N_("Custom Targets"), TM_ICON_METHOD, tm_tag_enumerator_t}, + {N_("Benchmark Targets"), TM_ICON_METHOD, tm_tag_function_t}, + {N_("Run Targets"), TM_ICON_METHOD, tm_tag_member_t}, + {N_("Tests"), TM_ICON_NONE, tm_tag_field_t}, +}; + typedef struct { TMParserMapEntry *entries; @@ -1244,6 +1278,8 @@ static TMParserMap parser_map[] = { MAP_ENTRY(RAKU), MAP_ENTRY(OCAML), MAP_ENTRY(LDSCRIPT), + MAP_ENTRY(FORTH), + MAP_ENTRY(MESON), }; /* make sure the parser map is consistent and complete */ G_STATIC_ASSERT(G_N_ELEMENTS(parser_map) == TM_PARSER_COUNT); Modified: src/tagmanager/tm_parser.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -142,6 +142,8 @@ enum TM_PARSER_RAKU, TM_PARSER_OCAML, TM_PARSER_LDSCRIPT, + TM_PARSER_FORTH, + TM_PARSER_MESON, TM_PARSER_COUNT }; Modified: src/tagmanager/tm_parsers.h 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -76,6 +76,8 @@ AutoItParser, \ Perl6Parser, \ OcamlParser, \ - LdScriptParser + LdScriptParser, \ + ForthParser, \ + MesonParser #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2024