Commits August 2024

commits@lists.geany.org

2 participants
29 discussions

[geany/geany] c94262: Add CIL lexer/filetype
by Christian Schrötter 09 Aug '24

09 Aug '24

Branch: refs/heads/master Author: Christian Schrötter <cs(a)fnx.li> Committer: Christian Schrötter <cs(a)fnx.li> Date: Fri, 02 Aug 2024 00:03:00 UTC Commit: c942622e453362f1f93a9d73e143815c5ae26db8 https://github.com/geany/geany/commit/c942622e453362f1f93a9d73e143815c5ae26… Log Message: ----------- Add CIL lexer/filetype Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.cil data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexCIL.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/editor.c src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ filetypes_dist = \ filedefs/filetypes.bibtex \ filedefs/filetypes.c \ filedefs/filetypes.caml \ + filedefs/filetypes.cil \ filedefs/filetypes.Clojure.conf \ filedefs/filetypes.cmake \ filedefs/filetypes.cobol \ Modified: data/filedefs/filetypes.cil 61 lines changed, 61 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,61 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +commentline=comment_line +string=string +keyword=type +keyword2=keyword_2 +keyword3=keyword_1 +label=preprocessor +operator=operator +stringeol=string_eol +identifier=identifier_1 + +[keywords] +# Credits: Jad Altahan (github.com/xv) - https://sourceforge.net/p/scintilla/feature-requests/1265/#fa85/e6e8/8255/9… +keywords=bool char float32 float64 int int8 int16 int32 int64 native nullref object string typedref uint8 uint32 unsigned abstract ansi assembly auto autochar beforefieldinit catch cdecl cil class compilercontrolled explicit extends extern famandassem family famorassem fastcall final finally forwardref hidebysig implements initonly instance interface internalcall lasterr literal managed nested newslot noinlining nomangle nooptimization notserialized optil pinvokeimpl platformapi preservesig private privatescope public reqsecobj rtspecialname runtime sealed sequential serializable specialname static stdcall strict synchronized thiscall unicode unmanaged unmanagedexp valuetype vararg virtual void winapi +metadata=.addon .assembly .cctor .class .corflags .ctor .custom .data .emitbyte .entrypoint .event .export .field .file .fire .get .hash .imagebase .import .language .line .locale .localized .locals .manifestres .maxstack .method .module .mresource .namespace .other .override .pack .param .pdirect .permission .permissionset .property .property .publickey .publickeytoken .removeon .set .size .stackreserve .subsystem .try .ver .vtable .vtentry .vtfixup .zeroinit +opcode=add add.ovf add.ovf.un and arglist beq beq.s bge bge.s bge.un bge.un.s bgt bgt.s bgt.un bgt.un.s ble ble.s ble.un ble.un.s blt blt.s blt.un blt.un.s bne.un bne.un.s box br br.s break brfalse brfalse.s brinst brinst.s brnull brnull.s brtrue brtrue.s brzero brzero.s bstr call calli callmostderived callvirt castclass ceq cgt cgt.un ckfinite ckfinite clt clt.un constrained. conv.i conv.i1 conv.i2 conv.i4 conv.i8 conv.ovf.i conv.ovf.i.un conv.ovf.i1 conv.ovf.i1.un conv.ovf.i2 conv.ovf.i2.un conv.ovf.i4 conv.ovf.i4.un conv.ovf.i8 conv.ovf.i8.un conv.ovf.u conv.ovf.u.un conv.ovf.u1 conv.ovf.u1.un conv.ovf.u2 conv.ovf.u2.un conv.ovf.u4 conv.ovf.u4.un conv.ovf.u8 conv.ovf.u8.un conv.r.un conv.r4 conv.r8 conv.u conv.u1 conv.u2 conv.u4 conv.u8 cpblk cpobj div div.un dup endfault endfilter endfinally initblk initobj isinst jmp ldarg ldarg.0 ldarg.1 ldarg.2 ldarg.3 ldarg.s ldarga ldarga.s ldc.i4 ldc.i4.0 ldc.i4.1 ldc.i4.2 ldc.i4.3 ldc.i4.4 ldc.i4.5 ldc.i4.6 ldc.i4.7 ldc.i4.8 ldc.i4.m1 ldc .i4.s ldc.i8 ldc.r4 ldc.r8 ldelem ldelem.i ldelem.i1 ldelem.i2 ldelem.i4 ldelem.i8 ldelem.r4 ldelem.r8 ldelem.ref ldelem.u1 ldelem.u2 ldelem.u4 ldelema ldfld ldflda ldftn ldind.i ldind.i1 ldind.i2 ldind.i4 ldind.i8 ldind.r4 ldind.r8 ldind.ref ldind.u1 ldind.u2 ldind.u4 ldlen ldloc ldloc.0 ldloc.1 ldloc.2 ldloc.3 ldloc.s ldloca ldloca.s ldnull ldobj ldsfld ldsflda ldstr ldtoken ldvirtftn leave leave.s localloc mkrefany mul mul.ovf mul.ovf.un neg newarr newobj no. nop not or pop readonly. refanytype refanyval rem rem.un ret rethrow shl shr shr.un sizeof starg starg.s stelem stelem.i stelem.i1 stelem.i2 stelem.i4 stelem.i8 stelem.r4 stelem.r8 stelem.ref stfld stind.i stind.i1 stind.i2 stind.i4 stind.i8 stind.r4 stind.r8 stind.ref stloc stloc.0 stloc.1 stloc.2 stloc.3 stloc.s stobj stsfld sub sub.ovf sub.ovf.un switch tail. throw unaligned. unbox unbox.any volatile. xor + +[settings] +lexer_filetype=CIL + +# default extension used when saving files +extension=il + +# MIME type +mime_type=text/x-cil + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, 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=1 + +[build_settings] +## %f will be replaced by the complete filename +## %e will be replaced by the filename without extension +#compiler=ilasm /OUTPUT="%e.exe" "%f" +#run_cmd="./%e.exe" Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ BibTeX=*.bib; CAML=*.ml;*.mli; C=*.c;*.xpm; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; +CIL=*.il;*.cil; Clojure=*.clj;*.cljs;*.cljc; CUDA=*.cu;*.cuh;*.h; C#=*.cs; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -251,6 +251,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexBasic.cxx', 'scintilla/lexilla/lexers/LexBatch.cxx', 'scintilla/lexilla/lexers/LexCaml.cxx', + 'scintilla/lexilla/lexers/LexCIL.cxx', 'scintilla/lexilla/lexers/LexCmake.cxx', 'scintilla/lexilla/lexers/LexCOBOL.cxx', 'scintilla/lexilla/lexers/LexCoffeeScript.cxx', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,7 @@ lexilla/lexers/LexAU3.cxx \ lexilla/lexers/LexBash.cxx \ lexilla/lexers/LexBasic.cxx \ lexilla/lexers/LexBatch.cxx \ +lexilla/lexers/LexCIL.cxx \ lexilla/lexers/LexCOBOL.cxx \ lexilla/lexers/LexCPP.cxx \ lexilla/lexers/LexCSS.cxx \ Modified: scintilla/lexilla/lexers/LexCIL.cxx 410 lines changed, 410 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,410 @@ +// Scintilla source code edit control +/** @file LexCIL.cxx + ** Lexer for Common Intermediate Language + ** Written by Jad Altahan (github.com/xv) + ** CIL manual: https://www.ecma-international.org/publications/standards/Ecma-335.htm + **/ +// Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include <string> +#include <string_view> +#include <map> +#include <algorithm> +#include <functional> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "StringCopy.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 + +bool IsAWordChar(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.'); +} + +bool IsOperator(const int ch) { + if ((ch < 0x80) && (isalnum(ch))) + return false; + + if (strchr("!%&*+-/<=>@^|~()[]{}", ch)) { + return true; + } + + return false; +} + +constexpr bool IsStreamCommentStyle(const int style) noexcept { + return style == SCE_CIL_COMMENT; +} + +struct OptionsCIL { + bool fold; + bool foldComment; + bool foldCommentMultiline; + bool foldCompact; + + OptionsCIL() { + fold = true; + foldComment = false; + foldCommentMultiline = true; + foldCompact = true; + } +}; + +static const char *const cilWordListDesc[] = { + "Primary CIL keywords", + "Metadata", + "Opcode instructions", + 0 +}; + +struct OptionSetCIL : public OptionSet<OptionsCIL> { + OptionSetCIL() { + DefineProperty("fold", &OptionsCIL::fold); + DefineProperty("fold.comment", &OptionsCIL::foldComment); + + DefineProperty("fold.cil.comment.multiline", &OptionsCIL::foldCommentMultiline, + "Set this property to 0 to disable folding multi-line comments when fold.comment=1."); + + DefineProperty("fold.compact", &OptionsCIL::foldCompact); + + DefineWordListSets(cilWordListDesc); + } +}; + +LexicalClass lexicalClasses[] = { + // Lexer CIL SCLEX_CIL SCE_CIL_: + 0, "SCE_CIL_DEFAULT", "default", "White space", + 1, "SCE_CIL_COMMENT", "comment", "Multi-line comment", + 2, "SCE_CIL_COMMENTLINE", "comment line", "Line comment", + 3, "SCE_CIL_WORD", "keyword", "Keyword 1", + 4, "SCE_CIL_WORD2", "keyword", "Keyword 2", + 5, "SCE_CIL_WORD3", "keyword", "Keyword 3", + 6, "SCE_CIL_STRING", "literal string", "Double quoted string", + 7, "SCE_CIL_LABEL", "label", "Code label", + 8, "SCE_CIL_OPERATOR", "operator", "Operators", + 9, "SCE_CIL_STRINGEOL", "error literal string", "String is not closed", + 10, "SCE_CIL_IDENTIFIER", "identifier", "Identifiers", +}; + +} + +class LexerCIL : public DefaultLexer { + WordList keywords, keywords2, keywords3; + OptionsCIL options; + OptionSetCIL osCIL; + +public: + LexerCIL() : DefaultLexer("cil", SCLEX_CIL, lexicalClasses, ELEMENTS(lexicalClasses)) { } + + virtual ~LexerCIL() { } + + void SCI_METHOD Release() override { + delete this; + } + + int SCI_METHOD Version() const override { + return lvRelease5; + } + + const char * SCI_METHOD PropertyNames() override { + return osCIL.PropertyNames(); + } + + int SCI_METHOD PropertyType(const char *name) override { + return osCIL.PropertyType(name); + } + + const char * SCI_METHOD DescribeProperty(const char *name) override { + return osCIL.DescribeProperty(name); + } + + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + + const char * SCI_METHOD PropertyGet(const char* key) override { + return osCIL.PropertyGet(key); + } + + const char * SCI_METHOD DescribeWordListSets() override { + return osCIL.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 0; + } + + int SCI_METHOD LineEndTypesSupported() override { + return SC_LINE_END_TYPE_UNICODE; + } + + int SCI_METHOD PrimaryStyleFromStyle(int style) override { + return style; + } + + static ILexer5 *LexerFactoryCIL() { + return new LexerCIL(); + } +}; + +Sci_Position SCI_METHOD LexerCIL::PropertySet(const char *key, const char *val) { + if (osCIL.PropertySet(&options, key, val)) { + return 0; + } + + return -1; +} + +Sci_Position SCI_METHOD LexerCIL::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + + switch (n) { + case 0: + wordListN = &keywords; + break; + case 1: + wordListN = &keywords2; + break; + case 2: + wordListN = &keywords3; + break; + } + + Sci_Position firstModification = -1; + + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + + return firstModification; +} + +void SCI_METHOD LexerCIL::Lex(Sci_PositionU startPos, Sci_Position length, + int initStyle, IDocument *pAccess) { + if (initStyle == SCE_CIL_STRINGEOL) { + initStyle = SCE_CIL_DEFAULT; + } + + Accessor styler(pAccess, NULL); + StyleContext sc(startPos, length, initStyle, styler); + + bool identAtLineStart = false, // Checks if an identifier is at line start (ignoring spaces) + canStyleLabels = false; // Checks if conditions are met to style SCE_CIL_LABEL + + for (; sc.More(); sc.Forward()) { + if (sc.atLineStart) { + if (sc.state == SCE_CIL_STRING) { + sc.SetState(SCE_CIL_STRING); + } + + identAtLineStart = true; + } + + // Handle string line continuation + if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r') && + (sc.state == SCE_CIL_STRING)) { + sc.Forward(); + + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + + continue; + } + + switch (sc.state) { + case SCE_CIL_OPERATOR: + sc.SetState(SCE_CIL_DEFAULT); + break; + case SCE_CIL_IDENTIFIER: + if (!IsAWordChar(sc.ch)) { + if (canStyleLabels && (sc.ch == ':' && sc.chNext != ':')) { + sc.ChangeState(SCE_CIL_LABEL); + sc.ForwardSetState(SCE_CIL_DEFAULT); + } else { + char kwSize[100]; + sc.GetCurrent(kwSize, sizeof(kwSize)); + int style = SCE_CIL_IDENTIFIER; + + if (keywords.InList(kwSize)) { + style = SCE_CIL_WORD; + } else if (keywords2.InList(kwSize)) { + style = SCE_CIL_WORD2; + } else if (keywords3.InList(kwSize)) { + style = SCE_CIL_WORD3; + } + + sc.ChangeState(style); + sc.SetState(SCE_CIL_DEFAULT); + } + } + break; + case SCE_CIL_COMMENT: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_CIL_DEFAULT); + } + break; + case SCE_CIL_COMMENTLINE: + if (sc.atLineStart) { + sc.SetState(SCE_CIL_DEFAULT); + } + break; + case SCE_CIL_STRING: + if (sc.ch == '\\') { + if (sc.chNext == '"' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '"') { + sc.ForwardSetState(SCE_CIL_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_CIL_STRINGEOL); + sc.ForwardSetState(SCE_CIL_DEFAULT); + } + break; + } + + if (sc.state == SCE_CIL_DEFAULT) { + // String + if (sc.ch == '"') { + sc.SetState(SCE_CIL_STRING); + } + // Keyword + else if (IsAWordChar(sc.ch)) { + // Allow setting SCE_CIL_LABEL style only if the label is the + // first token in the line and does not start with a dot or a digit + canStyleLabels = identAtLineStart && !(sc.ch == '.' || IsADigit(sc.ch)); + sc.SetState(SCE_CIL_IDENTIFIER); + } + // Multi-line comment + else if (sc.Match('/', '*')) { + sc.SetState(SCE_CIL_COMMENT); + sc.Forward(); + } + // Line comment + else if (sc.Match('/', '/')) { + sc.SetState(SCE_CIL_COMMENTLINE); + } + // Operators + else if (IsOperator(sc.ch)) { + sc.SetState(SCE_CIL_OPERATOR); + } + } + + if (!IsASpace(sc.ch)) { + identAtLineStart = false; + } + } + + sc.Complete(); +} + +void SCI_METHOD LexerCIL::Fold(Sci_PositionU startPos, Sci_Position length, + int initStyle, IDocument *pAccess) { + if (!options.fold) { + return; + } + + LexAccessor styler(pAccess); + + const Sci_PositionU endPos = startPos + length; + Sci_Position lineCurrent = styler.GetLine(startPos); + + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16; + + int style = initStyle; + int styleNext = styler.StyleAt(startPos); + int levelNext = levelCurrent; + int visibleChars = 0; + + char chNext = styler[startPos]; + + for (Sci_PositionU i = startPos; i < endPos; i++) { + const char ch = chNext; + int stylePrev = style; + + chNext = styler.SafeGetCharAt(i + 1); + style = styleNext; + styleNext = styler.StyleAt(i + 1); + + const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + + if (options.foldComment && + options.foldCommentMultiline && IsStreamCommentStyle(style)) { + if (!IsStreamCommentStyle(stylePrev)) { + levelNext++; + } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + levelNext--; + } + } + + if (style == SCE_CIL_OPERATOR) { + if (ch == '{') { + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + + if (!IsASpace(ch)) { + visibleChars++; + } + + if (atEOL || (i == endPos - 1)) { + int lev = levelCurrent | levelNext << 16; + if (visibleChars == 0 && options.foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelCurrent < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + + lineCurrent++; + levelCurrent = levelNext; + + if (options.foldCompact && + i == static_cast<Sci_PositionU>(styler.Length() - 1)) { + styler.SetLevel(lineCurrent, lev | SC_FOLDLEVELWHITEFLAG); + } + + visibleChars = 0; + } + } +} + +LexerModule lmCIL(SCLEX_CIL, LexerCIL::LexerFactoryCIL, "cil", cilWordListDesc); \ No newline at end of file Modified: scintilla/lexilla/src/Lexilla.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -178,6 +178,7 @@ static void AddGeanyLexers() &lmBash, &lmBatch, &lmCaml, + &lmCIL, &lmCmake, &lmCOBOL, &lmCoffeeScript, Modified: scintilla/scintilla_changes.patch 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -77,6 +77,7 @@ index cd4b23617..af4a73db4 100644 + &lmBash, + &lmBatch, + &lmCaml, ++ &lmCIL, + &lmCmake, + &lmCOBOL, + &lmCoffeeScript, Modified: src/editor.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1313,6 +1313,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) switch (lexer) { + case SCLEX_CIL: case SCLEX_CPP: case SCLEX_D: case SCLEX_HTML: /* for PHP & JS */ Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -190,6 +190,7 @@ static void init_builtin_filetypes(void) FT_INIT( JULIA, JULIA, "Julia", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( AU3, AUTOIT, "AutoIt", NULL, SCRIPT, SCRIPT ); FT_INIT( RAKU, RAKU, "Raku", NULL, SOURCE_FILE, SCRIPT ); + FT_INIT( CIL, NONE, "CIL", NULL, SOURCE_FILE, COMPILED ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -110,6 +110,7 @@ typedef enum GEANY_FILETYPES_JULIA, GEANY_FILETYPES_AU3, GEANY_FILETYPES_RAKU, + GEANY_FILETYPES_CIL, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -1007,6 +1007,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(BATCH); init_styleset_case(C); init_styleset_case(CAML); + init_styleset_case(CIL); init_styleset_case(CMAKE); init_styleset_case(COBOL); init_styleset_case(COFFEESCRIPT); @@ -1100,6 +1101,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(BATCH); styleset_case(C); styleset_case(CAML); + styleset_case(CIL); styleset_case(CMAKE); styleset_case(COBOL); styleset_case(COFFEESCRIPT); @@ -1579,6 +1581,10 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_H_SGML_SIMPLESTRING || style == SCE_H_SINGLESTRING); + case SCLEX_CIL: + return (style == SCE_CIL_STRING || + style == SCE_CIL_STRINGEOL); + case SCLEX_CMAKE: return (style == SCE_CMAKE_STRINGDQ || style == SCE_CMAKE_STRINGLQ || @@ -1804,6 +1810,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_HPHP_COMMENTLINE || style == SCE_H_SGML_COMMENT); + case SCLEX_CIL: + return ( + style == SCE_CIL_COMMENT || + style == SCE_CIL_COMMENTLINE); + case SCLEX_CMAKE: return (style == SCE_CMAKE_COMMENT); Modified: src/highlightingmappings.h 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -344,6 +344,31 @@ static const HLKeyword highlighting_keywords_CAML[] = #define highlighting_properties_CAML EMPTY_PROPERTIES +/* CIL */ +#define highlighting_lexer_CIL SCLEX_CIL +static const HLStyle highlighting_styles_CIL[] = +{ + { SCE_CIL_DEFAULT, "default", FALSE }, + { SCE_CIL_COMMENT, "comment", FALSE }, + { SCE_CIL_COMMENTLINE, "commentline", FALSE }, + { SCE_CIL_WORD, "keyword", FALSE }, + { SCE_CIL_WORD2, "keyword2", FALSE }, + { SCE_CIL_WORD3, "keyword3", FALSE }, + { SCE_CIL_STRING, "string", FALSE }, + { SCE_CIL_LABEL, "label", FALSE }, + { SCE_CIL_OPERATOR, "operator", FALSE }, + { SCE_CIL_STRINGEOL, "stringeol", FALSE }, + { SCE_CIL_IDENTIFIER, "identifier", FALSE } +}; +static const HLKeyword highlighting_keywords_CIL[] = +{ + { 0, "keywords", FALSE }, + { 1, "metadata", FALSE }, + { 2, "opcode", FALSE } +}; +#define highlighting_properties_CIL EMPTY_PROPERTIES + + /* CMake */ #define highlighting_lexer_CMAKE SCLEX_CMAKE static const HLStyle highlighting_styles_CMAKE[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5c32d4: Merge pull request #3480 from froonix/cil
by Jiří Techet 09 Aug '24

09 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 09 Aug 2024 21:22:56 UTC Commit: 5c32d4b56cc8e5d1da28a54fdcdb1029ca224770 https://github.com/geany/geany/commit/5c32d4b56cc8e5d1da28a54fdcdb1029ca224… Log Message: ----------- Merge pull request #3480 from froonix/cil Add CIL lexer/filetype Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.cil data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexCIL.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/editor.c src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ filetypes_dist = \ filedefs/filetypes.bibtex \ filedefs/filetypes.c \ filedefs/filetypes.caml \ + filedefs/filetypes.cil \ filedefs/filetypes.Clojure.conf \ filedefs/filetypes.cmake \ filedefs/filetypes.cobol \ Modified: data/filedefs/filetypes.cil 61 lines changed, 61 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,61 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +commentline=comment_line +string=string +keyword=type +keyword2=keyword_2 +keyword3=keyword_1 +label=preprocessor +operator=operator +stringeol=string_eol +identifier=identifier_1 + +[keywords] +# Credits: Jad Altahan (github.com/xv) - https://sourceforge.net/p/scintilla/feature-requests/1265/#fa85/e6e8/8255/9… +keywords=bool char float32 float64 int int8 int16 int32 int64 native nullref object string typedref uint8 uint32 unsigned abstract ansi assembly auto autochar beforefieldinit catch cdecl cil class compilercontrolled explicit extends extern famandassem family famorassem fastcall final finally forwardref hidebysig implements initonly instance interface internalcall lasterr literal managed nested newslot noinlining nomangle nooptimization notserialized optil pinvokeimpl platformapi preservesig private privatescope public reqsecobj rtspecialname runtime sealed sequential serializable specialname static stdcall strict synchronized thiscall unicode unmanaged unmanagedexp valuetype vararg virtual void winapi +metadata=.addon .assembly .cctor .class .corflags .ctor .custom .data .emitbyte .entrypoint .event .export .field .file .fire .get .hash .imagebase .import .language .line .locale .localized .locals .manifestres .maxstack .method .module .mresource .namespace .other .override .pack .param .pdirect .permission .permissionset .property .property .publickey .publickeytoken .removeon .set .size .stackreserve .subsystem .try .ver .vtable .vtentry .vtfixup .zeroinit +opcode=add add.ovf add.ovf.un and arglist beq beq.s bge bge.s bge.un bge.un.s bgt bgt.s bgt.un bgt.un.s ble ble.s ble.un ble.un.s blt blt.s blt.un blt.un.s bne.un bne.un.s box br br.s break brfalse brfalse.s brinst brinst.s brnull brnull.s brtrue brtrue.s brzero brzero.s bstr call calli callmostderived callvirt castclass ceq cgt cgt.un ckfinite ckfinite clt clt.un constrained. conv.i conv.i1 conv.i2 conv.i4 conv.i8 conv.ovf.i conv.ovf.i.un conv.ovf.i1 conv.ovf.i1.un conv.ovf.i2 conv.ovf.i2.un conv.ovf.i4 conv.ovf.i4.un conv.ovf.i8 conv.ovf.i8.un conv.ovf.u conv.ovf.u.un conv.ovf.u1 conv.ovf.u1.un conv.ovf.u2 conv.ovf.u2.un conv.ovf.u4 conv.ovf.u4.un conv.ovf.u8 conv.ovf.u8.un conv.r.un conv.r4 conv.r8 conv.u conv.u1 conv.u2 conv.u4 conv.u8 cpblk cpobj div div.un dup endfault endfilter endfinally initblk initobj isinst jmp ldarg ldarg.0 ldarg.1 ldarg.2 ldarg.3 ldarg.s ldarga ldarga.s ldc.i4 ldc.i4.0 ldc.i4.1 ldc.i4.2 ldc.i4.3 ldc.i4.4 ldc.i4.5 ldc.i4.6 ldc.i4.7 ldc.i4.8 ldc.i4.m1 ldc .i4.s ldc.i8 ldc.r4 ldc.r8 ldelem ldelem.i ldelem.i1 ldelem.i2 ldelem.i4 ldelem.i8 ldelem.r4 ldelem.r8 ldelem.ref ldelem.u1 ldelem.u2 ldelem.u4 ldelema ldfld ldflda ldftn ldind.i ldind.i1 ldind.i2 ldind.i4 ldind.i8 ldind.r4 ldind.r8 ldind.ref ldind.u1 ldind.u2 ldind.u4 ldlen ldloc ldloc.0 ldloc.1 ldloc.2 ldloc.3 ldloc.s ldloca ldloca.s ldnull ldobj ldsfld ldsflda ldstr ldtoken ldvirtftn leave leave.s localloc mkrefany mul mul.ovf mul.ovf.un neg newarr newobj no. nop not or pop readonly. refanytype refanyval rem rem.un ret rethrow shl shr shr.un sizeof starg starg.s stelem stelem.i stelem.i1 stelem.i2 stelem.i4 stelem.i8 stelem.r4 stelem.r8 stelem.ref stfld stind.i stind.i1 stind.i2 stind.i4 stind.i8 stind.r4 stind.r8 stind.ref stloc stloc.0 stloc.1 stloc.2 stloc.3 stloc.s stobj stsfld sub sub.ovf sub.ovf.un switch tail. throw unaligned. unbox unbox.any volatile. xor + +[settings] +lexer_filetype=CIL + +# default extension used when saving files +extension=il + +# MIME type +mime_type=text/x-cil + +# these characters define word boundaries when making selections and searching +# using word matching options +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, 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=1 + +[build_settings] +## %f will be replaced by the complete filename +## %e will be replaced by the filename without extension +#compiler=ilasm /OUTPUT="%e.exe" "%f" +#run_cmd="./%e.exe" Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ BibTeX=*.bib; CAML=*.ml;*.mli; C=*.c;*.xpm; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; +CIL=*.il;*.cil; Clojure=*.clj;*.cljs;*.cljc; CUDA=*.cu;*.cuh;*.h; C#=*.cs; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -251,6 +251,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexBasic.cxx', 'scintilla/lexilla/lexers/LexBatch.cxx', 'scintilla/lexilla/lexers/LexCaml.cxx', + 'scintilla/lexilla/lexers/LexCIL.cxx', 'scintilla/lexilla/lexers/LexCmake.cxx', 'scintilla/lexilla/lexers/LexCOBOL.cxx', 'scintilla/lexilla/lexers/LexCoffeeScript.cxx', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,7 @@ lexilla/lexers/LexAU3.cxx \ lexilla/lexers/LexBash.cxx \ lexilla/lexers/LexBasic.cxx \ lexilla/lexers/LexBatch.cxx \ +lexilla/lexers/LexCIL.cxx \ lexilla/lexers/LexCOBOL.cxx \ lexilla/lexers/LexCPP.cxx \ lexilla/lexers/LexCSS.cxx \ Modified: scintilla/lexilla/lexers/LexCIL.cxx 410 lines changed, 410 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,410 @@ +// Scintilla source code edit control +/** @file LexCIL.cxx + ** Lexer for Common Intermediate Language + ** Written by Jad Altahan (github.com/xv) + ** CIL manual: https://www.ecma-international.org/publications/standards/Ecma-335.htm + **/ +// Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include <string> +#include <string_view> +#include <map> +#include <algorithm> +#include <functional> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "StringCopy.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 + +bool IsAWordChar(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.'); +} + +bool IsOperator(const int ch) { + if ((ch < 0x80) && (isalnum(ch))) + return false; + + if (strchr("!%&*+-/<=>@^|~()[]{}", ch)) { + return true; + } + + return false; +} + +constexpr bool IsStreamCommentStyle(const int style) noexcept { + return style == SCE_CIL_COMMENT; +} + +struct OptionsCIL { + bool fold; + bool foldComment; + bool foldCommentMultiline; + bool foldCompact; + + OptionsCIL() { + fold = true; + foldComment = false; + foldCommentMultiline = true; + foldCompact = true; + } +}; + +static const char *const cilWordListDesc[] = { + "Primary CIL keywords", + "Metadata", + "Opcode instructions", + 0 +}; + +struct OptionSetCIL : public OptionSet<OptionsCIL> { + OptionSetCIL() { + DefineProperty("fold", &OptionsCIL::fold); + DefineProperty("fold.comment", &OptionsCIL::foldComment); + + DefineProperty("fold.cil.comment.multiline", &OptionsCIL::foldCommentMultiline, + "Set this property to 0 to disable folding multi-line comments when fold.comment=1."); + + DefineProperty("fold.compact", &OptionsCIL::foldCompact); + + DefineWordListSets(cilWordListDesc); + } +}; + +LexicalClass lexicalClasses[] = { + // Lexer CIL SCLEX_CIL SCE_CIL_: + 0, "SCE_CIL_DEFAULT", "default", "White space", + 1, "SCE_CIL_COMMENT", "comment", "Multi-line comment", + 2, "SCE_CIL_COMMENTLINE", "comment line", "Line comment", + 3, "SCE_CIL_WORD", "keyword", "Keyword 1", + 4, "SCE_CIL_WORD2", "keyword", "Keyword 2", + 5, "SCE_CIL_WORD3", "keyword", "Keyword 3", + 6, "SCE_CIL_STRING", "literal string", "Double quoted string", + 7, "SCE_CIL_LABEL", "label", "Code label", + 8, "SCE_CIL_OPERATOR", "operator", "Operators", + 9, "SCE_CIL_STRINGEOL", "error literal string", "String is not closed", + 10, "SCE_CIL_IDENTIFIER", "identifier", "Identifiers", +}; + +} + +class LexerCIL : public DefaultLexer { + WordList keywords, keywords2, keywords3; + OptionsCIL options; + OptionSetCIL osCIL; + +public: + LexerCIL() : DefaultLexer("cil", SCLEX_CIL, lexicalClasses, ELEMENTS(lexicalClasses)) { } + + virtual ~LexerCIL() { } + + void SCI_METHOD Release() override { + delete this; + } + + int SCI_METHOD Version() const override { + return lvRelease5; + } + + const char * SCI_METHOD PropertyNames() override { + return osCIL.PropertyNames(); + } + + int SCI_METHOD PropertyType(const char *name) override { + return osCIL.PropertyType(name); + } + + const char * SCI_METHOD DescribeProperty(const char *name) override { + return osCIL.DescribeProperty(name); + } + + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + + const char * SCI_METHOD PropertyGet(const char* key) override { + return osCIL.PropertyGet(key); + } + + const char * SCI_METHOD DescribeWordListSets() override { + return osCIL.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 0; + } + + int SCI_METHOD LineEndTypesSupported() override { + return SC_LINE_END_TYPE_UNICODE; + } + + int SCI_METHOD PrimaryStyleFromStyle(int style) override { + return style; + } + + static ILexer5 *LexerFactoryCIL() { + return new LexerCIL(); + } +}; + +Sci_Position SCI_METHOD LexerCIL::PropertySet(const char *key, const char *val) { + if (osCIL.PropertySet(&options, key, val)) { + return 0; + } + + return -1; +} + +Sci_Position SCI_METHOD LexerCIL::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + + switch (n) { + case 0: + wordListN = &keywords; + break; + case 1: + wordListN = &keywords2; + break; + case 2: + wordListN = &keywords3; + break; + } + + Sci_Position firstModification = -1; + + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + + return firstModification; +} + +void SCI_METHOD LexerCIL::Lex(Sci_PositionU startPos, Sci_Position length, + int initStyle, IDocument *pAccess) { + if (initStyle == SCE_CIL_STRINGEOL) { + initStyle = SCE_CIL_DEFAULT; + } + + Accessor styler(pAccess, NULL); + StyleContext sc(startPos, length, initStyle, styler); + + bool identAtLineStart = false, // Checks if an identifier is at line start (ignoring spaces) + canStyleLabels = false; // Checks if conditions are met to style SCE_CIL_LABEL + + for (; sc.More(); sc.Forward()) { + if (sc.atLineStart) { + if (sc.state == SCE_CIL_STRING) { + sc.SetState(SCE_CIL_STRING); + } + + identAtLineStart = true; + } + + // Handle string line continuation + if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r') && + (sc.state == SCE_CIL_STRING)) { + sc.Forward(); + + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + + continue; + } + + switch (sc.state) { + case SCE_CIL_OPERATOR: + sc.SetState(SCE_CIL_DEFAULT); + break; + case SCE_CIL_IDENTIFIER: + if (!IsAWordChar(sc.ch)) { + if (canStyleLabels && (sc.ch == ':' && sc.chNext != ':')) { + sc.ChangeState(SCE_CIL_LABEL); + sc.ForwardSetState(SCE_CIL_DEFAULT); + } else { + char kwSize[100]; + sc.GetCurrent(kwSize, sizeof(kwSize)); + int style = SCE_CIL_IDENTIFIER; + + if (keywords.InList(kwSize)) { + style = SCE_CIL_WORD; + } else if (keywords2.InList(kwSize)) { + style = SCE_CIL_WORD2; + } else if (keywords3.InList(kwSize)) { + style = SCE_CIL_WORD3; + } + + sc.ChangeState(style); + sc.SetState(SCE_CIL_DEFAULT); + } + } + break; + case SCE_CIL_COMMENT: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_CIL_DEFAULT); + } + break; + case SCE_CIL_COMMENTLINE: + if (sc.atLineStart) { + sc.SetState(SCE_CIL_DEFAULT); + } + break; + case SCE_CIL_STRING: + if (sc.ch == '\\') { + if (sc.chNext == '"' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '"') { + sc.ForwardSetState(SCE_CIL_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_CIL_STRINGEOL); + sc.ForwardSetState(SCE_CIL_DEFAULT); + } + break; + } + + if (sc.state == SCE_CIL_DEFAULT) { + // String + if (sc.ch == '"') { + sc.SetState(SCE_CIL_STRING); + } + // Keyword + else if (IsAWordChar(sc.ch)) { + // Allow setting SCE_CIL_LABEL style only if the label is the + // first token in the line and does not start with a dot or a digit + canStyleLabels = identAtLineStart && !(sc.ch == '.' || IsADigit(sc.ch)); + sc.SetState(SCE_CIL_IDENTIFIER); + } + // Multi-line comment + else if (sc.Match('/', '*')) { + sc.SetState(SCE_CIL_COMMENT); + sc.Forward(); + } + // Line comment + else if (sc.Match('/', '/')) { + sc.SetState(SCE_CIL_COMMENTLINE); + } + // Operators + else if (IsOperator(sc.ch)) { + sc.SetState(SCE_CIL_OPERATOR); + } + } + + if (!IsASpace(sc.ch)) { + identAtLineStart = false; + } + } + + sc.Complete(); +} + +void SCI_METHOD LexerCIL::Fold(Sci_PositionU startPos, Sci_Position length, + int initStyle, IDocument *pAccess) { + if (!options.fold) { + return; + } + + LexAccessor styler(pAccess); + + const Sci_PositionU endPos = startPos + length; + Sci_Position lineCurrent = styler.GetLine(startPos); + + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16; + + int style = initStyle; + int styleNext = styler.StyleAt(startPos); + int levelNext = levelCurrent; + int visibleChars = 0; + + char chNext = styler[startPos]; + + for (Sci_PositionU i = startPos; i < endPos; i++) { + const char ch = chNext; + int stylePrev = style; + + chNext = styler.SafeGetCharAt(i + 1); + style = styleNext; + styleNext = styler.StyleAt(i + 1); + + const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + + if (options.foldComment && + options.foldCommentMultiline && IsStreamCommentStyle(style)) { + if (!IsStreamCommentStyle(stylePrev)) { + levelNext++; + } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + levelNext--; + } + } + + if (style == SCE_CIL_OPERATOR) { + if (ch == '{') { + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + + if (!IsASpace(ch)) { + visibleChars++; + } + + if (atEOL || (i == endPos - 1)) { + int lev = levelCurrent | levelNext << 16; + if (visibleChars == 0 && options.foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelCurrent < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + + lineCurrent++; + levelCurrent = levelNext; + + if (options.foldCompact && + i == static_cast<Sci_PositionU>(styler.Length() - 1)) { + styler.SetLevel(lineCurrent, lev | SC_FOLDLEVELWHITEFLAG); + } + + visibleChars = 0; + } + } +} + +LexerModule lmCIL(SCLEX_CIL, LexerCIL::LexerFactoryCIL, "cil", cilWordListDesc); \ No newline at end of file Modified: scintilla/lexilla/src/Lexilla.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -178,6 +178,7 @@ static void AddGeanyLexers() &lmBash, &lmBatch, &lmCaml, + &lmCIL, &lmCmake, &lmCOBOL, &lmCoffeeScript, Modified: scintilla/scintilla_changes.patch 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -77,6 +77,7 @@ index cd4b23617..af4a73db4 100644 + &lmBash, + &lmBatch, + &lmCaml, ++ &lmCIL, + &lmCmake, + &lmCOBOL, + &lmCoffeeScript, Modified: src/editor.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1312,6 +1312,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci) switch (lexer) { + case SCLEX_CIL: case SCLEX_CPP: case SCLEX_D: case SCLEX_HTML: /* for PHP & JS */ Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -190,6 +190,7 @@ static void init_builtin_filetypes(void) FT_INIT( JULIA, JULIA, "Julia", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( AU3, AUTOIT, "AutoIt", NULL, SCRIPT, SCRIPT ); FT_INIT( RAKU, RAKU, "Raku", NULL, SOURCE_FILE, SCRIPT ); + FT_INIT( CIL, NONE, "CIL", NULL, SOURCE_FILE, COMPILED ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -110,6 +110,7 @@ typedef enum GEANY_FILETYPES_JULIA, GEANY_FILETYPES_AU3, GEANY_FILETYPES_RAKU, + GEANY_FILETYPES_CIL, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -1007,6 +1007,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(BATCH); init_styleset_case(C); init_styleset_case(CAML); + init_styleset_case(CIL); init_styleset_case(CMAKE); init_styleset_case(COBOL); init_styleset_case(COFFEESCRIPT); @@ -1100,6 +1101,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(BATCH); styleset_case(C); styleset_case(CAML); + styleset_case(CIL); styleset_case(CMAKE); styleset_case(COBOL); styleset_case(COFFEESCRIPT); @@ -1579,6 +1581,10 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_H_SGML_SIMPLESTRING || style == SCE_H_SINGLESTRING); + case SCLEX_CIL: + return (style == SCE_CIL_STRING || + style == SCE_CIL_STRINGEOL); + case SCLEX_CMAKE: return (style == SCE_CMAKE_STRINGDQ || style == SCE_CMAKE_STRINGLQ || @@ -1804,6 +1810,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_HPHP_COMMENTLINE || style == SCE_H_SGML_COMMENT); + case SCLEX_CIL: + return ( + style == SCE_CIL_COMMENT || + style == SCE_CIL_COMMENTLINE); + case SCLEX_CMAKE: return (style == SCE_CMAKE_COMMENT); Modified: src/highlightingmappings.h 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -344,6 +344,31 @@ static const HLKeyword highlighting_keywords_CAML[] = #define highlighting_properties_CAML EMPTY_PROPERTIES +/* CIL */ +#define highlighting_lexer_CIL SCLEX_CIL +static const HLStyle highlighting_styles_CIL[] = +{ + { SCE_CIL_DEFAULT, "default", FALSE }, + { SCE_CIL_COMMENT, "comment", FALSE }, + { SCE_CIL_COMMENTLINE, "commentline", FALSE }, + { SCE_CIL_WORD, "keyword", FALSE }, + { SCE_CIL_WORD2, "keyword2", FALSE }, + { SCE_CIL_WORD3, "keyword3", FALSE }, + { SCE_CIL_STRING, "string", FALSE }, + { SCE_CIL_LABEL, "label", FALSE }, + { SCE_CIL_OPERATOR, "operator", FALSE }, + { SCE_CIL_STRINGEOL, "stringeol", FALSE }, + { SCE_CIL_IDENTIFIER, "identifier", FALSE } +}; +static const HLKeyword highlighting_keywords_CIL[] = +{ + { 0, "keywords", FALSE }, + { 1, "metadata", FALSE }, + { 2, "opcode", FALSE } +}; +#define highlighting_properties_CIL EMPTY_PROPERTIES + + /* CMake */ #define highlighting_lexer_CMAKE SCLEX_CMAKE static const HLStyle highlighting_styles_CMAKE[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] dd9a3d: Update headerbar color
by Jiří Techet 07 Aug '24

07 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 06 Aug 2024 22:15:03 UTC Commit: dd9a3dab63b16afdd33d5b76e9e4ac0078139a8b https://github.com/geany/geany-osx/commit/dd9a3dab63b16afdd33d5b76e9e4ac007… Log Message: ----------- Update headerbar color Modified Paths: -------------- Prof-Gnome/gtk-3.0/theme-colors/colors-light.css Modified: Prof-Gnome/gtk-3.0/theme-colors/colors-light.css 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -45,7 +45,7 @@ @define-color rad_chk_bg #0078d7; @define-color modelbutton_bg #0078d7; /**/ -@define-color headerbar_color #d5d6da;/*#c6c6c6;*//*#d0d0d0;*//*#d0d3d8;*//*#d0d0d0;*/ +@define-color headerbar_color #f2f2f2;/*#c6c6c6;*//*#d0d0d0;*//*#d0d3d8;*//*#d0d0d0;*/ @define-color headerbar_selected_accent_color shade(@color_accent_2, 0.88); /**/ @define-color shadows_light #ffffff; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 4c037f: Some minor color tweaks
by Jiří Techet 06 Aug '24

06 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 06 Aug 2024 21:56:37 UTC Commit: 4c037fcae044a00f888b8817f3673e24e7d24877 https://github.com/geany/geany-osx/commit/4c037fcae044a00f888b8817f3673e24e… Log Message: ----------- Some minor color tweaks Modified Paths: -------------- Prof-Gnome/gtk-3.0/theme-colors/colors-light.css Modified: Prof-Gnome/gtk-3.0/theme-colors/colors-light.css 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -15,7 +15,7 @@ @define-color sidebar_selected_text_color #ffffff; @define-color sidebar_selected_text_shadow_color #000000; /**/ -@define-color osd_button_text_color #eeeeec; +@define-color osd_button_text_color #eeeeee; /**/ @define-color headerbar_text_color #303030; @define-color headerbar_text_shadow_color transparent; @@ -58,7 +58,7 @@ @define-color theme_fg_color #303030; /* widget base background color */ -@define-color base_bg_color #eeeeee; +@define-color base_bg_color #f2f2f2; @define-color theme_bg_color #f2f2f2; @define-color osd_bg_color #353535; /* @@ -72,7 +72,7 @@ base background color of selections @color_600 */ @define-color theme_selected_fg_color #ffffff; /* base background color of insensitive widgets */ -@define-color insensitive_bg_color #f8fafa;/*#faf9f8;*/ +@define-color insensitive_bg_color #f2f2f2;/*#faf9f8;*/ /* text foreground color of insensitive widgets */ @define-color insensitive_fg_color @disabled_text_color; @@ -90,7 +90,7 @@ widget base background color on backdrop windows */ @define-color theme_unfocused_bg_color #e6e6e6; /* text widgets and the like base background color on backdrop windows */ -@define-color theme_unfocused_base_color #fcfcfc; +@define-color theme_unfocused_base_color #f2f2f2; /* base background color of selections on backdrop windows */ @define-color theme_unfocused_selected_bg_color @color_600; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 4cb38c: Update checked button color
by Jiří Techet 06 Aug '24

06 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 06 Aug 2024 21:53:55 UTC Commit: 4cb38c2564a967c512d134bb28c47e25f7ccb0f3 https://github.com/geany/geany-osx/commit/4cb38c2564a967c512d134bb28c47e25f… Log Message: ----------- Update checked button color Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-dark.css Prof-Gnome/gtk-3.0/main-light.css Modified: Prof-Gnome/gtk-3.0/main-dark.css 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -632,7 +632,7 @@ button:checked:hover, button:checked { border-color: @borders; - background-image: image(#777777); + background-image: image(#666666); box-shadow: none; } notebook > header > tabs > arrow:active, Modified: Prof-Gnome/gtk-3.0/main-light.css 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -630,7 +630,7 @@ button:checked:hover, button:checked { border-color: @borders; - background-image: image(#999999); + background-image: image(#c2c2c2); box-shadow: none; } notebook > header > tabs > arrow:active, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] c7a837: Use symbolic color names for tab color definitions
by Jiří Techet 06 Aug '24

06 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 06 Aug 2024 21:53:12 UTC Commit: c7a837dcfec6ee2a24dfaad2c622449c34870896 https://github.com/geany/geany-osx/commit/c7a837dcfec6ee2a24dfaad2c622449c3… Log Message: ----------- Use symbolic color names for tab color definitions Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-dark.css Prof-Gnome/gtk-3.0/main-light.css Modified: Prof-Gnome/gtk-3.0/main-dark.css 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -3013,31 +3013,31 @@ notebook > header.top > tabs { margin-bottom: -2px; } notebook > header.top > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: none solid; } -notebook > header.top > tabs > tab:checked { background-color: #444444; border-color: #111111; } +notebook > header.top > tabs > tab:checked { background-color: @theme_bg_color; border-color: #111111; } notebook > header.bottom { border-top-style: solid; } notebook > header.bottom > tabs { margin-top: -2px; } notebook > header.bottom > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: none solid; } -notebook > header.bottom > tabs > tab:checked { background-color: #444444; border-color: #111111; } +notebook > header.bottom > tabs > tab:checked { background-color: @theme_bg_color; border-color: #111111; } notebook > header.left { border-right-style: solid; } notebook > header.left > tabs { margin-right: -2px; } notebook > header.left > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: solid none; } -notebook > header.left > tabs > tab:checked { background-color: #444444; border-color: #111111; } +notebook > header.left > tabs > tab:checked { background-color: @theme_bg_color; border-color: #111111; } notebook > header.right { border-left-style: solid; } notebook > header.right > tabs { margin-left: -2px; } notebook > header.right > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: solid none; } -notebook > header.right > tabs > tab:checked { background-color: #444444; border-color: #111111; } +notebook > header.right > tabs > tab:checked { background-color: @theme_bg_color; border-color: #111111; } notebook > header.top > tabs > arrow { border-top-style: none; } @@ -3230,7 +3230,7 @@ notebook > header.bottom tab { padding-top: 1px; } notebook > stack:not(:only-child) { - background-color: #454545; + background-color: @theme_bg_color; /*transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);*/ } /*(((((((((( Scrollbars ))))))))) )*/ Modified: Prof-Gnome/gtk-3.0/main-light.css 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -3009,31 +3009,31 @@ notebook > header.top > tabs { margin-bottom: -2px; } notebook > header.top > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: none solid; } -notebook > header.top > tabs > tab:checked { background-color: #f3f3f3; border-color: #c0c0c0; } +notebook > header.top > tabs > tab:checked { background-color: @theme_bg_color; border-color: #c0c0c0; } notebook > header.bottom { border-top-style: solid; } notebook > header.bottom > tabs { margin-top: -2px; } notebook > header.bottom > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: none solid; } -notebook > header.bottom > tabs > tab:checked { background-color: #f3f3f3; border-color: #c0c0c0; } +notebook > header.bottom > tabs > tab:checked { background-color: @theme_bg_color; border-color: #c0c0c0; } notebook > header.left { border-right-style: solid; } notebook > header.left > tabs { margin-right: -2px; } notebook > header.left > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: solid none; } -notebook > header.left > tabs > tab:checked { background-color: #f3f3f3; border-color: #c0c0c0; } +notebook > header.left > tabs > tab:checked { background-color: @theme_bg_color; border-color: #c0c0c0; } notebook > header.right { border-left-style: solid; } notebook > header.right > tabs { margin-left: -2px; } notebook > header.right > tabs > tab { padding-top: 3px; padding-bottom: 3px; border-color: transparent; border-width: 1px; border-style: solid none; } -notebook > header.right > tabs > tab:checked { background-color: #f3f3f3; border-color: #c0c0c0; } +notebook > header.right > tabs > tab:checked { background-color: @theme_bg_color; border-color: #c0c0c0; } notebook > header.top > tabs > arrow { border-top-style: none; } @@ -3224,7 +3224,7 @@ notebook > header.top tab { notebook > header.bottom tab { padding-top: 1px; } -notebook > stack:not(:only-child) { background-color: rgba(246,246,246,0.98);/*#ffffff;*/ } +notebook > stack:not(:only-child) { background-color: @theme_bg_color;/*#ffffff;*/ } /*(((((((((( Scrollbars ))))))))) )*/ scrollbar -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 473c05: Update pt_br translation (#3929)
by Puro_osso 04 Aug '24

04 Aug '24

Branch: refs/heads/master Author: Puro_osso <125617376+daviii-lopes(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 04 Aug 2024 11:51:35 UTC Commit: 473c058e8da74779ff230e12dd77ef6cefeae2b2 https://github.com/geany/geany/commit/473c058e8da74779ff230e12dd77ef6cefeae… Log Message: ----------- Update pt_br translation (#3929) Co-authored-by: Davi Lopes <ctt_davi(a)proton.me> Modified Paths: -------------- po/pt_BR.po Modified: po/pt_BR.po 39 lines changed, 20 insertions(+), 19 deletions(-) =================================================================== @@ -5,20 +5,21 @@ # Adrovane Marques Kade <adrovane(a)gmail.com>, 2007-2013 # Rafael Peregrino da Silva <rperegrino(a)linuxmagazine.com.br>, 2011 # Felipe Braga <fbobraga(a)gmail.com>, 2015. +# Davi Lopes <ctt_davi(a)proton.me>, 2024. msgid "" msgstr "" "Project-Id-Version: Geany 2.0\n" "Report-Msgid-Bugs-To: https://github.com/geany/geany/issues\n" "POT-Creation-Date: 2023-10-04 23:48+0200\n" -"PO-Revision-Date: 2015-05-17 18:43-0200\n" -"Last-Translator: Felipe Braga <fbobraga(a)gmail.com>\n" +"PO-Revision-Date: 2024-08-01 04:38-0300\n" +"Last-Translator: Davi Lopes <frufru@balinha-de-menta>\n" "Language-Team: Brazilian Portuguese <gnome-pt_br-list(a)gnome.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Geany / PoHelper 2.1\n" #: geany.desktop.in:5 data/geany.glade:6456 msgid "Geany" @@ -539,15 +540,15 @@ msgstr "Ir para o último documento usado após fechar uma aba" #: data/geany.glade:2213 msgid "Set limit on visible characters in tab label." -msgstr "" +msgstr "Definir limite para os caracteres visíveis no rótulo da aba" #: data/geany.glade:2214 msgid "Tab label length:" -msgstr "" +msgstr "Largura do rótulo da aba" #: data/geany.glade:2226 msgid "Characters to be visible on the tab label of the file." -msgstr "" +msgstr "Caracteres que devem ser visíveis no rótulo da aba do arquivo." #: data/geany.glade:2254 msgid "<b>Editor tabs</b>" @@ -1036,7 +1037,7 @@ msgstr "Exibir final de linha" msgid "" "Shows line ending characters only when they differ from the file default " "line ending character" -msgstr "" +msgstr "Mostra os caracteres de fim de linha apenas quando são diferentes do caractere de fim de linha padrão " #: data/geany.glade:3923 msgid "Show line numbers" @@ -2092,7 +2093,7 @@ msgstr "_Novo..." #: data/geany.glade:8073 msgid "New from _Folder..." -msgstr "" +msgstr "Novo apartir da _Pasta..." #: data/geany.glade:8097 msgid "_Recent Projects" @@ -2334,7 +2335,7 @@ msgstr "Sobre o Geany" #: src/about.c:217 msgid "A fast and lightweight IDE" -msgstr "Um IDE rápida e leve" +msgstr "Uma IDE rápida e leve" #: src/about.c:239 #, c-format @@ -2599,7 +2600,7 @@ msgstr[1] "%d arquivos salvos." #: src/callbacks.c:353 msgid "Changes detected, reloading all will lose any changes and history." -msgstr "" +msgstr "Alterações detectadas, recarregar tudo causará perda de todas alterações e histórico." #: src/callbacks.c:354 #, fuzzy @@ -3409,7 +3410,7 @@ msgstr "Sair" #: src/keybindings.c:370 msgid "New from Folder" -msgstr "" +msgstr "Novo a partir da Pasta" #: src/keybindings.c:382 msgid "Undo" @@ -4631,11 +4632,11 @@ msgstr "%u ocorrências substituídas em %u documentos." #: src/search.c:1464 msgid "" "This operation will modify all open files which contain the text to replace." -msgstr "" +msgstr "Esta operação vai modificar todos os arquivos abertos que contém o texto para substituir." #: src/search.c:1465 msgid "Are you sure to replace in the whole session?" -msgstr "" +msgstr "Você tem certeza de que quer substituir a sessão inteira?" #: src/search.c:1630 msgid "Invalid directory for find in files." @@ -4699,15 +4700,15 @@ msgstr "" #: src/spawn.c:96 src/spawn.c:146 src/spawn.c:190 msgid "Text ended before matching quote was found" -msgstr "" +msgstr "O texto acabou antes de encontrar uma citação correspondente" #: src/spawn.c:132 msgid "Text was empty (or contained only whitespace)" -msgstr "" +msgstr "O Texto estava vazio (ou tinha apenas espacos em branco)" #: src/spawn.c:153 src/spawn.c:167 msgid "A quoted Windows program name must be entirely inside the quotes" -msgstr "" +msgstr "Um programa de Windows citado deve estar completamente dentro de aspas" #: src/spawn.c:260 #, fuzzy @@ -4809,7 +4810,7 @@ msgstr "Ordenar por _Aparecimento" #: src/symbols.c:2196 msgid "_Group by Type" -msgstr "" +msgstr "_Agrupar por Tipo" #: src/templates.c:81 #, c-format @@ -5476,7 +5477,7 @@ msgstr "" #: src/tagmanager/tm_parser.c:257 msgid "Articles" -msgstr "" +msgstr "Artigos" #: src/tagmanager/tm_parser.c:258 #, fuzzy @@ -5756,7 +5757,7 @@ msgstr "Pacote" #: src/tagmanager/tm_parser.c:1068 msgid "Tasks" -msgstr "" +msgstr "Tarefas" #: src/tagmanager/tm_parser.c:1092 #, fuzzy -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 03ad03: Add simple PluginExtension demo
by Jiří Techet 03 Aug '24

03 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 30 Jun 2024 09:52:40 UTC Commit: 03ad03b13127f4d0fb839fc83f845a1c66a22705 https://github.com/geany/geany/commit/03ad03b13127f4d0fb839fc83f845a1c66a22… Log Message: ----------- Add simple PluginExtension demo Modified Paths: -------------- plugins/Makefile.am plugins/demopluginext.c plugins/meson.build Modified: plugins/Makefile.am 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,7 @@ plugins_include_HEADERS = \ geanyplugin.h demoplugin_la_LDFLAGS = -module -avoid-version -no-undefined +demopluginext_la_LDFLAGS = -module -avoid-version -no-undefined demoproxy_la_LDFLAGS = -module -avoid-version -no-undefined classbuilder_la_LDFLAGS = -module -avoid-version -no-undefined htmlchars_la_LDFLAGS = -module -avoid-version -no-undefined @@ -32,9 +33,11 @@ plugin_LTLIBRARIES = \ # Plugins not to be installed noinst_LTLIBRARIES = \ demoplugin.la \ + demopluginext.la \ demoproxy.la demoplugin_la_SOURCES = demoplugin.c +demopluginext_la_SOURCES = demopluginext.c demoproxy_la_SOURCES = demoproxy.c classbuilder_la_SOURCES = classbuilder.c htmlchars_la_SOURCES = htmlchars.c @@ -44,6 +47,7 @@ filebrowser_la_SOURCES = filebrowser.c splitwindow_la_SOURCES = splitwindow.c demoplugin_la_CFLAGS = -DG_LOG_DOMAIN=\""Demoplugin"\" +demopluginext_la_CFLAGS = -DG_LOG_DOMAIN=\""Demopluginext"\" demoproxy_la_CFLAGS = -DG_LOG_DOMAIN=\""Demoproxy"\" classbuilder_la_CFLAGS = -DG_LOG_DOMAIN=\""Classbuilder"\" htmlchars_la_CFLAGS = -DG_LOG_DOMAIN=\""HTMLChars"\" @@ -53,6 +57,7 @@ filebrowser_la_CFLAGS = -DG_LOG_DOMAIN=\""FileBrowser"\" splitwindow_la_CFLAGS = -DG_LOG_DOMAIN=\""SplitWindow"\" demoplugin_la_LIBADD = $(top_builddir)/src/libgeany.la $(GTK_LIBS) +demopluginext_la_LIBADD = $(top_builddir)/src/libgeany.la $(GTK_LIBS) demoproxy_la_LIBADD = $(top_builddir)/src/libgeany.la $(GTK_LIBS) classbuilder_la_LIBADD = $(top_builddir)/src/libgeany.la $(GTK_LIBS) htmlchars_la_LIBADD = $(top_builddir)/src/libgeany.la $(GTK_LIBS) Modified: plugins/demopluginext.c 130 lines changed, 130 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,130 @@ +/* + * demopluginext.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2024 The Geany contributors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/** + * Demo plugin extension - example of a plugin using the PluginExtension API + * to provide simple autocompletion of Python keywords. This is the plugin + * example used in the documentation with full implementation of + * @c autocomplete_perform(). + * + * Note: This is not installed by default, but (on *nix) you can build it as follows: + * cd plugins + * make demopluginext.so + * + * Then copy or symlink the plugins/demopluginext.so file to ~/.config/geany/plugins + * - it will be loaded at next startup. + */ + +#include <geanyplugin.h> + +static gboolean autocomplete_provided(GeanyDocument *doc, gpointer data) +{ + return doc->file_type->id == GEANY_FILETYPES_PYTHON; +} + + +static void autocomplete_perform(GeanyDocument *doc, gboolean force, gpointer data) +{ + const gchar *kwd_str = "False None True and as assert async await break case class continue def del elif else except finally for from global if import in is lambda match nonlocal not or pass raise return try while with yield"; + gint pos = sci_get_current_position(doc->editor->sci); + gchar *word = editor_get_word_at_pos(doc->editor, pos, NULL); + gchar **kwd; + + if (word && *word) + { + GString *words = g_string_sized_new(100); + gchar **kwds = g_strsplit(kwd_str, " ", -1); + + foreach_strv(kwd, kwds) + { + if (g_str_has_prefix(*kwd, word)) + { + if (words->len > 0) + g_string_append(words, "\n"); + + g_string_append(words, *kwd); + } + } + + scintilla_send_message(doc->editor->sci, SCI_AUTOCSHOW, strlen(word), (sptr_t) words->str); + g_string_free(words, TRUE); + g_strfreev(kwds); + } + + g_free(word); +} + + +static PluginExtension extension = { + .autocomplete_provided = autocomplete_provided, + .autocomplete_perform = autocomplete_perform +}; + + +static gboolean on_editor_notify(G_GNUC_UNUSED GObject *obj, GeanyEditor *editor, SCNotification *nt, + G_GNUC_UNUSED gpointer user_data) +{ + if (nt->nmhdr.code == SCN_AUTOCSELECTION) + { + if (plugin_extension_autocomplete_provided(editor->document, &extension)) + { + /* we can be sure it was us who performed the autocompletion and + * not Geany or some other plugin extension */ + msgwin_status_add("PluginExtensionDemo autocompleted '%s'", nt->text); + } + } + + return FALSE; +} + + +static PluginCallback plugin_callbacks[] = { + {"editor-notify", (GCallback) &on_editor_notify, FALSE, NULL}, + {NULL, NULL, FALSE, NULL} +}; + + +static gboolean init_func(GeanyPlugin *plugin, gpointer pdata) +{ + plugin_extension_register(&extension, "Python keyword autocompletion", 450, NULL); + return TRUE; +} + + +static void cleanup_func(GeanyPlugin *plugin, gpointer pdata) +{ + plugin_extension_unregister(&extension); +} + + +G_MODULE_EXPORT +void geany_load_module(GeanyPlugin *plugin) +{ + plugin->info->name = "PluginExtensionDemo"; + plugin->info->description = "Demo performing simple Python keyword autocompletion"; + plugin->info->version = "1.0"; + plugin->info->author = "John Doe <john.doe(a)example.org>"; + + plugin->funcs->init = init_func; + plugin->funcs->cleanup = cleanup_func; + plugin->funcs->callbacks = plugin_callbacks; + + GEANY_PLUGIN_REGISTER(plugin, 248); +} Modified: plugins/meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -3,6 +3,7 @@ plugin_inc += iscintilla plugins = [ 'Demoplugin', + 'Demopluginext', 'Demoproxy', 'Classbuilder', 'HTMLChars', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 358d58: Add PluginExtension documentation
by Jiří Techet 03 Aug '24

03 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 30 Jun 2024 09:52:40 UTC Commit: 358d585c297d75f62bfe051ff1f250c4a38ca95b https://github.com/geany/geany/commit/358d585c297d75f62bfe051ff1f250c4a38ca… Log Message: ----------- Add PluginExtension documentation Co-authored-by: Colomban Wendling <ban(a)herbesfolles.org> Co-authored-by: Lex Trotman <elextr(a)gmail.com> Modified Paths: -------------- doc/plugins.dox src/pluginextension.c src/pluginextension.h Modified: doc/plugins.dox 143 lines changed, 143 insertions(+), 0 deletions(-) =================================================================== @@ -40,6 +40,7 @@ GeanyFuncs::cleanup functions). @section pluginsupport Plugin Support - @link howto Plugin HowTo @endlink - get started - @ref proxy +- @ref plugin_extension - @ref legacy - @link plugindata.h Plugin Datatypes and Macros @endlink - @link pluginsignals.c Plugin Signals @endlink @@ -54,6 +55,7 @@ GeanyFuncs::cleanup functions). - @link filetypes.h @endlink - @link keybindings.h @endlink - @link msgwindow.h @endlink +- @link pluginextension.h @endlink - @link project.h @endlink - @link sciwrappers.h Scintilla Wrapper Functions @endlink - @link spawn.h Spawning programs @endlink @@ -1116,4 +1118,145 @@ static void proxy_cleanup(GeanyPlugin *plugin, gpointer pdata) @endcode +@page plugin_extension Plugin Extension HowTo + +@section plugin_extension_intro Introduction + +Originally the Geany plugin API only allowed plugins to add to Geany +functionality, plugins could not modify Geany built-in functionality, but since +Geany 2.1 the PluginExtension API allows plugins to take over some of +the core Geany functionality: autocopletion, calltip display, symbol goto, and +typename highlighting inside document. + +@section plugin_extension_init Initialization and cleanup + +Plugins using the @c PluginExtension API are just normal plugins and behave as +described in @link howto Plugin HowTo@endlink. + +First, any plugin interested in using this interface has to register its +@c PluginExtension structure pointer using @c plugin_extension_register(). This +typically happens in the @c init() function of the plugin. Registered +@c PluginExtension pointers have to be unregistered before the plugin is +unloaded using @c plugin_extension_unregister(), typically inside the +@c cleanup() function of the plugin. + +@section plugin_extension_impl Implementing extensions + +Inside the @c PluginExtension struct, the plugin fills-in the pointers of the +functions it wishes to implement. Typically, these functions +come in pairs: + - functions assigned to members ending with @c _provided are used by Geany to + query the plugin whether it implements the particular feature for the passed + document + - functions assigned to members ending with @c _perform are used by Geany to + pass control to the plugin to perform the feature instead of performing the + Geany built-in functionality. + +When the plugin returns @c TRUE from the function assigned to the @c _provided +member of @c PluginExtension, it indicates +it wants to take control of the particular feature and disable Geany's +implementation. However, returning @c TRUE does not automatically guarantee that +the plugin's implementation is executed - if there are multiple plugins competing +for implementing a feature, the extension with the highest priority +passed into the @c plugin_extension_register() function gets executed. + +A plugin can perform a check if it gets executed for the +particular feature; e.g. for autocompletion the plugin can use +@c plugin_extension_autocomplete_provided() which returns @c TRUE if the +passed extension is executed, taking into account all registered extension +priorities and the return values of all functions assigned to +@c autocomplete_provided members of the registered extensions. +This can be used if the plugin needs to perform auxiliary actions outside the +function assigned to @c autocomplete_perform to verify it is actually active +for this feature. + +@section plugin_extension_ex Example + +Below you will find an example of a plugin implementing autocompletion for +Python. The full version of this code can be found under +plugins/demopluginext.c inside the Geany repository. + + +@code +/* License blob */ + +#include <geanyplugin.h> + +static gboolean autocomplete_provided(GeanyDocument *doc, gpointer data) +{ + /* Check whether the plugin provides the feature for the passed document */ + return doc->file_type->id == GEANY_FILETYPES_PYTHON; +} + + +static void autocomplete_perform(GeanyDocument *doc, gboolean force, gpointer data) +{ + /* The autocompletion logic comes here, including the autocompletion UI + * display (either using some custom widget or using Scintilla's + * SCI_AUTOCSHOW) */ +} + + +/* The PluginExtension struct - we only implement autocompletion here. */ +static PluginExtension extension = { + .autocomplete_provided = autocomplete_provided, + .autocomplete_perform = autocomplete_perform +}; + + +static gboolean on_editor_notify(G_GNUC_UNUSED GObject *obj, GeanyEditor *editor, SCNotification *nt, + G_GNUC_UNUSED gpointer user_data) +{ + if (nt->nmhdr.code == SCN_AUTOCSELECTION) + { + if (plugin_extension_autocomplete_provided(editor->document, &extension)) + { + /* This is an example of using plugin_extension_autocomplete_provided() + * to detect whether this plugin extension was used to perform + * autocompletion. */ + msgwin_status_add("PluginExtensionDemo autocompleted '%s'", nt->text); + } + } + + return FALSE; +} + + +static PluginCallback plugin_callbacks[] = { + {"editor-notify", (GCallback) &on_editor_notify, FALSE, NULL}, + {NULL, NULL, FALSE, NULL} +}; + + +static gboolean init_func(GeanyPlugin *plugin, gpointer pdata) +{ + /* Extension registration */ + plugin_extension_register(&extension, "Python keyword autocompletion", 450, NULL); + return TRUE; +} + + +static void cleanup_func(GeanyPlugin *plugin, gpointer pdata) +{ + /* Extension unregistration */ + plugin_extension_unregister(&extension); +} + + +G_MODULE_EXPORT +void geany_load_module(GeanyPlugin *plugin) +{ + plugin->info->name = "PluginExtensionDemo"; + plugin->info->description = "Demo performing simple Python keyword autocompletion"; + plugin->info->version = "1.0"; + plugin->info->author = "John Doe <john.doe(a)example.org>"; + + plugin->funcs->init = init_func; + plugin->funcs->cleanup = cleanup_func; + plugin->funcs->callbacks = plugin_callbacks; + + GEANY_PLUGIN_REGISTER(plugin, 248); +} +@endcode + */ Modified: src/pluginextension.c 102 lines changed, 102 insertions(+), 0 deletions(-) =================================================================== @@ -43,6 +43,49 @@ static gint sort_extension_entries(gconstpointer a, gconstpointer b) } +/** + * Registers the provided extension in Geany. There can be multiple extensions + * registered in Geany - these are sorted by the priority + * parameter. When executing functions assigned to the @c PluginExtension + * members ending with @c _perform, Geany goes + * through the registered extensions and executes the @c _perform() function of + * the first extension for which the function assigned to the corresponding + * @c _provided member returns @c TRUE. + * + * This function is typically called in the plugin's @c init() function. + * + * Plugins wishing to re-register themselves, e.g. with a different priority, + * should first unregister themselves using @c plugin_extension_unregister() + * and call @c plugin_extension_register() afterwards. + * + * @param extension A pointer to the @c PluginExtension structure to register. + * This pointer and the @c PluginExtension it points to have to remain valid + * until the extension is unregistered. All fields of the @c PluginExtension + * structure have to be fully initialized either to the @c NULL pointer or to a + * proper implementation. Usually, this structure is statically allocated which + * automatically zero-initializes uninitialized members as appropriate. + * @param ext_name Human-readable name of the extension that can appear in + * the user interface. The string should be reasonably unique so extensions can + * be distinguished from each other. + * @param priority Extension priority. The recommended values are: + * - if the extension is the only thing the plugin provides, and if it targets + * a single filetype, use 400 <= priority < 500. + * - if the extension is the only thing the plugin provides, but it targets + * several filetypes, use 300 <= priority < 400. + * - if the plugin provides other features than the extension, but it only + * targets a single filetype, use 200 <= priority < 300. + * - if the plugin provides other features than the extension, and targets + * several filetypes, use 100 <= priority < 200. + * - a priority of 0 or less is reserved, and using it has unspecified behavior. + * @param data User data passed to the functions from the @c PluginExtension + * struct. + * @warning Plugins are responsible for calling @c plugin_extension_unregister() + * when they no longer provide the extension and when the plugin is unloaded. + * + * @see @c plugin_extension_unregister(). + * + * @since 2.1 + **/ GEANY_API_SYMBOL void plugin_extension_register(PluginExtension *extension, const gchar *ext_name, gint priority, gpointer data) @@ -60,6 +103,17 @@ void plugin_extension_register(PluginExtension *extension, const gchar *ext_name } +/** + * Plugins are responsible for calling this function when they no longer + * provide the extension, at the latest in the plugin's @c cleanup() function. + * + * @param extension The @c PluginExtension structure pointer to unregister, as + * previously registered with @c plugin_extension_register(). + * + * @see @c plugin_extension_register(). + * + * @since 2.1 + **/ GEANY_API_SYMBOL void plugin_extension_unregister(PluginExtension *extension) { @@ -129,6 +183,31 @@ void plugin_extension_unregister(PluginExtension *extension) } G_STMT_END +/* + * Geany itself can also pass NULL as the extension parameter to determine + * whether there is any extension implementing autocompletion. Plugins should + * not use this and rely on Geany's extension list and the priorities so + * this feature is not documented in the plugin API. + */ +/** + * Plugins can call this function to check whether, based on the extensions + * registered and the provided extension priorities, the extension passed in + * the @c ext parameter is used for autocompletion. + * + * Plugins will typically call this function with their own @c PluginExtension + * to check, if they get (or got) executed for autocompletion of the + * provided document. This is useful for various auxiliary functions such as + * cleanups after the function assigned to @c autocomplete_perform is completed + * so plugins know they executed this function and do not have to store this + * information by some other means. + * + * @param doc Document for which the check is performed. + * @param ext The extension for which the check is performed. + * @return Returns @c TRUE if autocompletion provided by the passed extension + * is used, @c FALSE otherwise. + * + * @since 2.1 + **/ GEANY_API_SYMBOL gboolean plugin_extension_autocomplete_provided(GeanyDocument *doc, PluginExtension *ext) { @@ -142,6 +221,13 @@ void plugin_extension_autocomplete_perform(GeanyDocument *doc, gboolean force) } +/** + * Checks whether the provided extension is used for showing calltips. + * + * @see @c plugin_extension_autocomplete_provided() + * + * @since 2.1 + **/ GEANY_API_SYMBOL gboolean plugin_extension_calltips_provided(GeanyDocument *doc, PluginExtension *ext) { @@ -155,6 +241,14 @@ void plugin_extension_calltips_show(GeanyDocument *doc, gboolean force) } +/** + * Checks whether the provided extension is used for going to symbol + * definition/declaration. + * + * @see @c plugin_extension_autocomplete_provided() + * + * @since 2.1 + **/ GEANY_API_SYMBOL gboolean plugin_extension_goto_provided(GeanyDocument *doc, PluginExtension *ext) { @@ -168,6 +262,14 @@ gboolean plugin_extension_goto_perform(GeanyDocument *doc, gint pos, gboolean de } +/** + * Checks whether the provided extension is used for highlighting symbols in + * the document. + * + * @see @c plugin_extension_autocomplete_provided() + * + * @since 2.1 + **/ GEANY_API_SYMBOL gboolean plugin_extension_symbol_highlight_provided(GeanyDocument *doc, PluginExtension *ext) { Modified: src/pluginextension.h 129 lines changed, 128 insertions(+), 1 deletions(-) =================================================================== @@ -18,6 +18,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/** + * @file pluginextension.h + * This file defines an interface allowing plugins to take over some of the + * core functionality provided by Geany: autocompletion, calltips, + * symbol goto, and types highlighting inside document. + **/ + #ifndef GEANY_PLUGIN_EXTENSION_H #define GEANY_PLUGIN_EXTENSION_H 1 @@ -26,18 +33,138 @@ G_BEGIN_DECLS -typedef struct { +/** + * Structure serving as an interface between plugins and Geany allowing + * plugins to inform Geany about what features they provide and allowing + * Geany to delegate its functionality to the plugins. + * + * Depending on the functionality they provide, plugins should assign pointers + * to the functions implementing this interface to the appropriate members of + * the structure. Not all of the functions have to be implemented by the + * plugin - member pointers of unimplemented functions can be left to contain + * the @c NULL pointer. + * + * Typically, functions from this interface come in pairs. Functions assigned to + * the members ending with @c _provided inform Geany whether the plugin + * implements the given feature for the passed document. Functions assigned + * to the members ending with @c _perform are called by Geany at appropriate + * moments to inform the plugin when to perform the given feature. + * + * The extension is defined by the pointers in the PluginExtension structure and + * is registered in Geany using the @c plugin_extension_register() function. + * + * @warning The API provided by this file is subject to change and should not be + * considered stable at this point. That said, it is highly probable that if + * a change of this API is required in the future, it will not be of a major + * nature and should not require major modifications of the affected plugins + * (e.g. added/modified parameter of a function and similar changes). + **/ +typedef struct +{ + /** + * Pointer to function called by Geany to check whether the plugin + * implements autocompletion for the provided document. + * + * @param doc The document for which Geany is querying whether the plugin + * provides autocompletion. This allows plugins to restrict their + * autocompletion implementation to documents of specific filetypes or other + * characteristics. + * @param data User data passed during the @c plugin_extension_register() + * call. + * + * @return Plugins should return @c TRUE if they impelment autocompletion + * for the provided document, @c FALSE otherwise. + * + * @since 2.1 + **/ gboolean (*autocomplete_provided)(GeanyDocument *doc, gpointer data); + /** + * Pointer to function called by Geany to inform the plugin to perform + * autocompletion, e.g by showing an autocompletion popup window with + * suggestions. + * + * @param doc The document for which autocompletion is being performed. + * @param force @c TRUE when autocompletion was requested explicitly by the + * user, e.g. by pressing a keybinding requesting the autocompletion popup + * to appear. @c FALSE means autocompletion is being auto-performed as the + * user types, possibly allowing the plugin not to do anything if there are + * no meaningful suggestions. + * @param data User data passed during the @c plugin_extension_register() + * call. + * + * @since 2.1 + **/ void (*autocomplete_perform)(GeanyDocument *doc, gboolean force, gpointer data); + /** + * Pointer to function called by Geany to check whether the plugin + * implements calltips containing function signatures for the provided + * document. + * + * @see @c autocomplete_provided() for more details. + * + * @since 2.1 + **/ gboolean (*calltips_provided)(GeanyDocument *doc, gpointer data); + /** + * Pointer to function called by Geany to inform the plugin to show calltips. + * + * @see @c autocomplete_perform() for more details. + * + * @since 2.1 + **/ void (*calltips_show)(GeanyDocument *doc, gboolean force, gpointer data); + /** + * Pointer to function called by Geany to check whether the plugin implements + * symbol definition/declaration goto functionality. + * + * @see @c autocomplete_provided() for more details. + * + * @since 2.1 + **/ gboolean (*goto_provided)(GeanyDocument *doc, gpointer data); + /** + * Pointer to function called by Geany to inform the plugin to perform + * symbol goto. + * + * @param doc The document for which symbol goto is being performed. + * @param pos Scintilla position in the document at which the goto request + * was invoked (typically corresponds to the caret position or the position + * where the corresponding mouse event happened). + * @param definition If @c TRUE, this is the go to definition request, if + * @c FALSE, this is the goto declaration request. + * @param data User data passed during the @c plugin_extension_register() + * call. + * + * @return Plugins should return @c TRUE if the goto was performed, @c FALSE + * otherwise. Plugins that work asynchronously and do not know the result + * at the moment this function is called should return @c TRUE. However, such + * plugins can perform some synchronous pre-check such as whether there is + * an identifier at the caret position and if the necessary conditions are + * not satisfied and the plugins know that goto cannot be performed, they + * should return @c FALSE. + * + * @since 2.1 + **/ gboolean (*goto_perform)(GeanyDocument *doc, gint pos, gboolean definition, gpointer data); + /** + * Pointer to function called by Geany to check whether the plugin implements + * additional symbol (e.g. type) highlighting in Scintilla. + * + * @see @c autocomplete_provided() for more details. + * @note There is no function in the @c PluginExtension structure informing + * plugins to perform symbol highlighting. Plugins + * implementing symbol highlighting should perform it at the appropriate + * moments based on Scintilla and Geany events such as when the document + * becomes visible or when the document is modified. + * + * @since 2.1 + **/ gboolean (*symbol_highlight_provided)(GeanyDocument *doc, gpointer data); + /* Padding serving for possible future extensions of this API. */ void (*_dummy[100])(void); } PluginExtension; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d9dcf1: Bump plugin API
by Jiří Techet 03 Aug '24

03 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 30 Jun 2024 09:52:40 UTC Commit: d9dcf1edfc214e23415ebe175f1c176a8c1e7e76 https://github.com/geany/geany/commit/d9dcf1edfc214e23415ebe175f1c176a8c1e7… Log Message: ----------- Bump plugin API Modified Paths: -------------- src/plugindata.h Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -57,7 +57,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 247 +#define GEANY_API_VERSION 248 /* hack to have a different ABI when built with different GTK major versions * because loading plugins linked to a different one leads to crashes. -------------- 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 August 2024