Commits August 2024

commits@lists.geany.org

2 participants
29 discussions

Looking for Help with Customisation and Development of Geany Plugin
by aliiceebell＠gmail.com 31 Aug '24

31 Aug '24

Hello Everyone, Even though I'm new to Geany, I'm pleased by how adaptable and lightweight it is as an IDE. I've just now begun dabbling in the realm of Geany plugin development, and I would welcome some counsel and direction from individuals with greater expertise in this field. I want to specifically make a custom plugin that will make my workflow more efficient. A few ideas come to mind, such incorporating an advanced syntax highlighting system for a lesser-known programming language that I use regularly. Still, I'm having trouble understanding the recommended practices for creating and managing plugins as well as Geany's plugin architecture. I would be very grateful for any advice on the following: Starting Point: Would you suggest any in-depth manuals or other resources to someone who is just starting out with Geany plugin development? I've read the official literature, but I'm still in need of more in-depth guides or illustrations to help me better understand the fundamental ideas. Development Tools: Which libraries and tools are necessary to know in order to create plugins quickly and effectively? Exist any specific combinations or setups that help to streamline the process? Best Practices: When creating Geany plugins, what are some typical errors or dangers to watch out for? I would be grateful for any guidance in writing clear, maintainable code. Contributions from the Community: Ultimately, what is the process for returning a plugin to the community? Are there any particular rules or procedures to adhere to? https://lists.geany.org/hyperkitty/list/commits@lists.geany.org/thread/GUH4… https://www.igmguru.com/cloud-computing/gcp-certification-training https://lists.geany.org/hyperkitty/list/commits@lists.geany.org/thread/IGV5… Thank you in advance.

1 0

[geany/geany-osx] a58ad9: Remove extra spacing between menus
by Jiří Techet 18 Aug '24

18 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 18 Aug 2024 20:38:47 UTC Commit: a58ad9676f74729e3dc37abe9e1c7dd529501e2d https://github.com/geany/geany-osx/commit/a58ad9676f74729e3dc37abe9e1c7dd52… Log Message: ----------- Remove extra spacing between menus 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, 0 insertions(+), 10 deletions(-) =================================================================== @@ -6340,16 +6340,6 @@ window.background.csd evview.view.content-view { border-radius: 0 0 6px 6px; } -window.background:not(.csd) > menu, -window.background:not(.csd) > menu > menu -{ - padding: 4px 6px; - border-radius: 0; -} -window.background:not(.csd) > menu > menuitem -{ - padding: 4px 6px; -} background.csd > grid.horizontal > paned.horizontal > box.vertical > scrolledwindow { border-radius: 0 0 0 6px; Modified: Prof-Gnome/gtk-3.0/main-light.css 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -6323,16 +6323,6 @@ window.background.csd evview.view.content-view { border-radius: 0 0 6px 6px; } -window.background:not(.csd) > menu, -window.background:not(.csd) > menu > menu -{ - padding: 4px 6px; - border-radius: 0; -} -window.background:not(.csd) > menu > menuitem -{ - padding: 4px 6px; -} background.csd > grid.horizontal > paned.horizontal > box.vertical > scrolledwindow { border-radius: 0 0 0 6px; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3c6021: Convert Nim to builtin filetype and use Scintilla Nim lexer for it
by Jiří Techet 18 Aug '24

18 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 16 Aug 2024 20:16:18 UTC Commit: 3c6021ee6614d987b7b6bfcb4eab1c049b067732 https://github.com/geany/geany/commit/3c6021ee6614d987b7b6bfcb4eab1c049b067… Log Message: ----------- Convert Nim to builtin filetype and use Scintilla Nim lexer for it Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.Nim.conf data/filedefs/filetypes.nim data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexNim.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -57,7 +57,7 @@ filetypes_dist = \ filedefs/filetypes.markdown \ filedefs/filetypes.matlab \ filedefs/filetypes.Meson.conf \ - filedefs/filetypes.Nim.conf \ + filedefs/filetypes.nim \ filedefs/filetypes.nsis \ filedefs/filetypes.objectivec \ filedefs/filetypes.pascal \ Modified: data/filedefs/filetypes.Nim.conf 64 lines changed, 0 insertions(+), 64 deletions(-) =================================================================== @@ -1,64 +0,0 @@ -# For complete documentation of this file, please see Geany's main documentation - -[keywords] -# all items must be in one line -primary=addr and as asm bind block break case cast concept const continue converter defer discard distinct div do elif else end enum except export finally for from func if import in include interface is isnot iterator let macro method mixin mod nil not notin object of or out proc ptr raise ref return shl shr static template try tuple type using var when while xor yield -# additional keywords, will be highlighted with style "word2" -identifiers=array auto bool byte char int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 Natural Ordinal Positive seq string nil true false result echo openArray lent sink assert doAssert spawn parallel - -[lexer_properties] -fold.quotes.nim=1 -lexer.nim.keywords2.no.sub.identifiers=1 - -[settings] -# default extension used when saving files -extension=nim -# MIME type -mime_type=text/x-nim -# single comment char, like # in this file -comment_single=# -comment_use_indent=true -comment_open=#[ -comment_close=]# -tag_parser=Python -lexer_filetype=Python - -[indentation] -width=2 -# 0 is spaces, 1 is tabs, 2 is tab & spaces -type=0 - -[build-menu] -FT_00_LB=nim c -FT_00_CM=nim c "%f" -FT_00_WD=%d -FT_02_LB=_Lint -FT_02_CM=nimpretty --maxLineLen:80 "%f" -EX_01_WD= -error_regex=(.+)$([0-9]+),\s+([0-9]+)$\s+Error -FT_01_LB=nim r -FT_01_CM=nim r "%f" -FT_01_WD=%d - -[styling] -# Edit these in the colorscheme .conf file instead -default=default -commentline=comment_line -number=number_1 -string=string_1 -character=character -word=keyword_1 -triple=string_2 -tripledouble=string_2 -classname=type -defname=function -operator=operator -identifier=identifier_1 -commentblock=comment -stringeol=string_eol -word2=keyword_2 -decorator=decorator -fstring=string_1 -fcharacter=character -ftriple=string_2 -ftripledouble=string_2 Modified: data/filedefs/filetypes.nim 71 lines changed, 71 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,71 @@ +# 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 +commentdoc=comment_doc +commentline=comment_line +commentlinedoc=comment_doc +number=number_1 +string=string_1 +character=character +word=keyword_1 +triple=string_2 +tripledouble=string_2 +backticks=identifier_1 +funcname=identifier_1 +stringeol=string_eol +numerror=error +operator=operator +identifier=identifier_1 + +[keywords] +# all items must be in one line +keywords=addr and array as asm assert auto bind block bool break byte case cast char concept const continue converter defer discard distinct div do doAssert echo elif else end enum except export false finally float float32 float64 for from func if import in include int int16 int32 int64 int8 interface is isnot iterator lent let macro method mixin mod Natural nil nil not notin object of openArray or Ordinal out parallel Positive proc ptr raise ref result return seq shl shr sink spawn static string template true try tuple type uint uint16 uint32 uint64 uint8 using var when while xor yield + +[lexer_properties] + +[settings] +# default extension used when saving files +extension=nim + +# MIME type +mime_type=text/x-nim + +# 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-menu] +FT_00_LB=nim c +FT_00_CM=nim c "%f" +FT_00_WD=%d +FT_02_LB=_Lint +FT_02_CM=nimpretty --maxLineLen:80 "%f" +EX_01_WD= +error_regex=(.+)$([0-9]+),\s+([0-9]+)$\s+Error +FT_01_LB=nim r +FT_01_CM=nim r "%f" +FT_01_WD=%d Modified: data/filetype_extensions.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -88,7 +88,7 @@ None=*; # Note: restarting is required after editing groups [Groups] -Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Nim;Scala;Swift; +Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift; Script=Dockerfile;Graphviz;TypeScript;Meson; Markup= Misc=JSON; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -272,6 +272,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexMake.cxx', 'scintilla/lexilla/lexers/LexMarkdown.cxx', 'scintilla/lexilla/lexers/LexMatlab.cxx', + 'scintilla/lexilla/lexers/LexNim.cxx', 'scintilla/lexilla/lexers/LexNsis.cxx', 'scintilla/lexilla/lexers/LexNull.cxx', 'scintilla/lexilla/lexers/LexPascal.cxx', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -42,6 +42,7 @@ lexilla/lexers/LexLua.cxx \ lexilla/lexers/LexMake.cxx \ lexilla/lexers/LexMarkdown.cxx \ lexilla/lexers/LexMatlab.cxx \ +lexilla/lexers/LexNim.cxx \ lexilla/lexers/LexNsis.cxx \ lexilla/lexers/LexNull.cxx \ lexilla/lexers/LexPascal.cxx \ Modified: scintilla/lexilla/lexers/LexNim.cxx 814 lines changed, 814 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,814 @@ +// Scintilla source code edit control +/** @file LexNim.cxx +** Lexer for Nim +** Written by Jad Altahan (github.com/xv) +** Nim manual: https://nim-lang.org/docs/manual.html +**/ +// 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 + +enum NumType { + Binary, + Octal, + Exponent, + Hexadecimal, + Decimal, + FormatError +}; + +int GetNumStyle(const int numType) noexcept { + if (numType == NumType::FormatError) { + return SCE_NIM_NUMERROR; + } + + return SCE_NIM_NUMBER; +} + +constexpr bool IsLetter(const int ch) noexcept { + // 97 to 122 || 65 to 90 + return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); +} + +bool IsAWordChar(const int ch) noexcept { + return ch < 0x80 && (isalnum(ch) || ch == '_' || ch == '.'); +} + +int IsNumHex(const StyleContext &sc) noexcept { + return sc.chNext == 'x' || sc.chNext == 'X'; +} + +int IsNumBinary(const StyleContext &sc) noexcept { + return sc.chNext == 'b' || sc.chNext == 'B'; +} + +int IsNumOctal(const StyleContext &sc) { + return IsADigit(sc.chNext) || sc.chNext == 'o'; +} + +constexpr bool IsNewline(const int ch) noexcept { + return (ch == '\n' || ch == '\r'); +} + +bool IsFuncName(const char *str) noexcept { + const char *identifiers[] = { + "proc", + "func", + "macro", + "method", + "template", + "iterator", + "converter" + }; + + for (const char *id : identifiers) { + if (strcmp(str, id) == 0) { + return true; + } + } + + return false; +} + +constexpr bool IsTripleLiteral(const int style) noexcept { + return style == SCE_NIM_TRIPLE || style == SCE_NIM_TRIPLEDOUBLE; +} + +constexpr bool IsLineComment(const int style) noexcept { + return style == SCE_NIM_COMMENTLINE || style == SCE_NIM_COMMENTLINEDOC; +} + +constexpr bool IsStreamComment(const int style) noexcept { + return style == SCE_NIM_COMMENT || style == SCE_NIM_COMMENTDOC; +} + +// Adopted from Accessor.cxx +int GetIndent(const Sci_Position line, Accessor &styler) { + Sci_Position startPos = styler.LineStart(line); + const Sci_Position eolPos = styler.LineStart(line + 1) - 1; + + char ch = styler[startPos]; + int style = styler.StyleAt(startPos); + + int indent = 0; + bool inPrevPrefix = line > 0; + Sci_Position posPrev = inPrevPrefix ? styler.LineStart(line - 1) : 0; + + // No fold points inside triple literals + while ((IsASpaceOrTab(ch) || IsTripleLiteral(style)) && (startPos < eolPos)) { + if (inPrevPrefix) { + const char chPrev = styler[posPrev++]; + if (chPrev != ' ' && chPrev != '\t') { + inPrevPrefix = false; + } + } + + if (ch == '\t') { + indent = (indent / 8 + 1) * 8; + } else { + indent++; + } + + startPos++; + ch = styler[startPos]; + style = styler.StyleAt(startPos); + } + + // Prevent creating fold lines for comments if indented + if (!(IsStreamComment(style) || IsLineComment(style))) + indent += SC_FOLDLEVELBASE; + + if (styler.LineStart(line) == styler.Length() + || IsASpaceOrTab(ch) + || IsNewline(ch) + || IsStreamComment(style) + || IsLineComment(style)) { + return indent | SC_FOLDLEVELWHITEFLAG; + } else { + return indent; + } +} + +int IndentAmount(const Sci_Position line, Accessor &styler) { + const int indent = GetIndent(line, styler); + const int indentLevel = indent & SC_FOLDLEVELNUMBERMASK; + return indentLevel <= SC_FOLDLEVELBASE ? indent : indentLevel | (indent & ~SC_FOLDLEVELNUMBERMASK); +} + +struct OptionsNim { + bool fold; + bool foldCompact; + bool highlightRawStrIdent; + + OptionsNim() { + fold = true; + foldCompact = true; + highlightRawStrIdent = false; + } +}; + +static const char *const nimWordListDesc[] = { + "Keywords", + nullptr +}; + +struct OptionSetNim : public OptionSet<OptionsNim> { + OptionSetNim() { + DefineProperty("lexer.nim.raw.strings.highlight.ident", &OptionsNim::highlightRawStrIdent, + "Set to 1 to enable highlighting generalized raw string identifiers. " + "Generalized raw string identifiers are anything other than r (or R)."); + + DefineProperty("fold", &OptionsNim::fold); + DefineProperty("fold.compact", &OptionsNim::foldCompact); + + DefineWordListSets(nimWordListDesc); + } +}; + +LexicalClass lexicalClasses[] = { + // Lexer Nim SCLEX_NIM SCE_NIM_: + 0, "SCE_NIM_DEFAULT", "default", "White space", + 1, "SCE_NIM_COMMENT", "comment block", "Block comment", + 2, "SCE_NIM_COMMENTDOC", "comment block doc", "Block doc comment", + 3, "SCE_NIM_COMMENTLINE", "comment line", "Line comment", + 4, "SCE_NIM_COMMENTLINEDOC", "comment doc", "Line doc comment", + 5, "SCE_NIM_NUMBER", "literal numeric", "Number", + 6, "SCE_NIM_STRING", "literal string", "String", + 7, "SCE_NIM_CHARACTER", "literal string", "Single quoted string", + 8, "SCE_NIM_WORD", "keyword", "Keyword", + 9, "SCE_NIM_TRIPLE", "literal string", "Triple quotes", + 10, "SCE_NIM_TRIPLEDOUBLE", "literal string", "Triple double quotes", + 11, "SCE_NIM_BACKTICKS", "operator definition", "Identifiers", + 12, "SCE_NIM_FUNCNAME", "identifier", "Function name definition", + 13, "SCE_NIM_STRINGEOL", "error literal string", "String is not closed", + 14, "SCE_NIM_NUMERROR", "numeric error", "Numeric format error", + 15, "SCE_NIM_OPERATOR", "operator", "Operators", + 16, "SCE_NIM_IDENTIFIER", "identifier", "Identifiers", +}; + +} + +class LexerNim : public DefaultLexer { + CharacterSet setWord; + WordList keywords; + OptionsNim options; + OptionSetNim osNim; + +public: + LexerNim() : + DefaultLexer("nim", SCLEX_NIM, lexicalClasses, ELEMENTS(lexicalClasses)), + setWord(CharacterSet::setAlphaNum, "_", 0x80, true) { } + + virtual ~LexerNim() { } + + void SCI_METHOD Release() noexcept override { + delete this; + } + + int SCI_METHOD Version() const noexcept override { + return lvRelease5; + } + + const char * SCI_METHOD PropertyNames() override { + return osNim.PropertyNames(); + } + + int SCI_METHOD PropertyType(const char *name) override { + return osNim.PropertyType(name); + } + + const char * SCI_METHOD DescribeProperty(const char *name) override { + return osNim.DescribeProperty(name); + } + + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + + const char * SCI_METHOD PropertyGet(const char* key) override { + return osNim.PropertyGet(key); + } + + const char * SCI_METHOD DescribeWordListSets() override { + return osNim.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 *) noexcept override { + return nullptr; + } + + int SCI_METHOD LineEndTypesSupported() noexcept override { + return SC_LINE_END_TYPE_UNICODE; + } + + int SCI_METHOD PrimaryStyleFromStyle(int style) noexcept override { + return style; + } + + static ILexer5 *LexerFactoryNim() { + return new LexerNim(); + } +}; + +Sci_Position SCI_METHOD LexerNim::PropertySet(const char *key, const char *val) { + if (osNim.PropertySet(&options, key, val)) { + return 0; + } + + return -1; +} + +Sci_Position SCI_METHOD LexerNim::WordListSet(int n, const char *wl) { + WordList *wordListN = nullptr; + + switch (n) { + case 0: + wordListN = &keywords; + 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 LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, + int initStyle, IDocument *pAccess) { + // No one likes a leaky string + if (initStyle == SCE_NIM_STRINGEOL) { + initStyle = SCE_NIM_DEFAULT; + } + + Accessor styler(pAccess, nullptr); + StyleContext sc(startPos, length, initStyle, styler); + + // Nim supports nested block comments! + Sci_Position lineCurrent = styler.GetLine(startPos); + int commentNestLevel = lineCurrent > 0 ? styler.GetLineState(lineCurrent - 1) : 0; + + int numType = NumType::Decimal; + int decimalCount = 0; + + bool funcNameExists = false; + bool isStylingRawString = false; + bool isStylingRawStringIdent = false; + + for (; sc.More(); sc.Forward()) { + if (sc.atLineStart) { + if (sc.state == SCE_NIM_STRING) { + sc.SetState(SCE_NIM_STRING); + } + + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + + // Handle string line continuation + if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r') && + (sc.state == SCE_NIM_STRING || sc.state == SCE_NIM_CHARACTER) && !isStylingRawString) { + sc.Forward(); + + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + + continue; + } + + switch (sc.state) { + case SCE_NIM_OPERATOR: + funcNameExists = false; + sc.SetState(SCE_NIM_DEFAULT); + break; + case SCE_NIM_NUMBER: + // For a type suffix, such as 0x80'u8 + if (sc.ch == '\'') { + if (sc.chNext == 'i' || sc.chNext == 'I' || + sc.chNext == 'u' || sc.chNext == 'U' || + sc.chNext == 'f' || sc.chNext == 'F' || + sc.chNext == 'd' || sc.chNext == 'D') { + sc.Forward(2); + } + } else if (sc.ch == '.') { + if (IsADigit(sc.chNext)) { + sc.Forward(); + } else if (numType <= NumType::Exponent) { + sc.SetState(SCE_NIM_OPERATOR); + break; + } else { + decimalCount++; + + if (numType == NumType::Decimal) { + if (decimalCount <= 1 && !IsAWordChar(sc.chNext)) { + break; + } + } else if (numType == NumType::Hexadecimal) { + if (decimalCount <= 1 && IsADigit(sc.chNext, 16)) { + break; + } + + sc.SetState(SCE_NIM_OPERATOR); + break; + } + } + } else if (sc.ch == '_') { + // Accept only one underscore between digits + if (IsADigit(sc.chNext)) { + sc.Forward(); + } + } else if (numType == NumType::Decimal) { + if (sc.chPrev != '\'' && (sc.ch == 'e' || sc.ch == 'E')) { + numType = NumType::Exponent; + + if (sc.chNext == '-' || sc.chNext == '+') { + sc.Forward(); + } + + break; + } + + if (IsADigit(sc.ch)) { + break; + } + } else if (numType == NumType::Hexadecimal) { + if (IsADigit(sc.ch, 16)) { + break; + } + } else if (IsADigit(sc.ch)) { + if (numType == NumType::Exponent) { + break; + } + + if (numType == NumType::Octal) { + // Accept only 0-7 + if (sc.ch <= '7') { + break; + } + } else if (numType == NumType::Binary) { + // Accept only 0 and 1 + if (sc.ch <= '1') { + break; + } + } + + numType = NumType::FormatError; + break; + } + + sc.ChangeState(GetNumStyle(numType)); + sc.SetState(SCE_NIM_DEFAULT); + break; + case SCE_NIM_IDENTIFIER: + if (sc.ch == '.' || !IsAWordChar(sc.ch)) { + char s[100]; + sc.GetCurrent(s, sizeof(s)); + int style = SCE_NIM_IDENTIFIER; + + if (keywords.InList(s) && !funcNameExists) { + // Prevent styling keywords if they are sub-identifiers + const Sci_Position segStart = styler.GetStartSegment() - 1; + if (segStart < 0 || styler.SafeGetCharAt(segStart, '\0') != '.') { + style = SCE_NIM_WORD; + } + } else if (funcNameExists) { + style = SCE_NIM_FUNCNAME; + } + + sc.ChangeState(style); + sc.SetState(SCE_NIM_DEFAULT); + + if (style == SCE_NIM_WORD) { + funcNameExists = IsFuncName(s); + } else { + funcNameExists = false; + } + } + + if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') { + isStylingRawStringIdent = true; + + if (options.highlightRawStrIdent) { + if (styler.SafeGetCharAt(sc.currentPos + 2) == '\"' && + styler.SafeGetCharAt(sc.currentPos + 3) == '\"') { + sc.ChangeState(SCE_NIM_TRIPLEDOUBLE); + } else { + sc.ChangeState(SCE_NIM_STRING); + } + } + + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_FUNCNAME: + if (sc.ch == '`') { + funcNameExists = false; + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + // Prevent leaking the style to the next line if not closed + funcNameExists = false; + + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_COMMENT: + if (sc.Match(']', '#')) { + if (commentNestLevel > 0) { + commentNestLevel--; + } + + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + sc.Forward(); + + if (commentNestLevel == 0) { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + } else if (sc.Match('#', '[')) { + commentNestLevel++; + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + break; + case SCE_NIM_COMMENTDOC: + if (sc.Match("]##")) { + if (commentNestLevel > 0) { + commentNestLevel--; + } + + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + sc.Forward(2); + + if (commentNestLevel == 0) { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + } else if (sc.Match("##[")) { + commentNestLevel++; + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + break; + case SCE_NIM_COMMENTLINE: + case SCE_NIM_COMMENTLINEDOC: + if (sc.atLineStart) { + sc.SetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_STRING: + if (!isStylingRawStringIdent && !isStylingRawString && sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (isStylingRawString && sc.ch == '\"' && sc.chNext == '\"') { + // Forward in situations such as r"a""bc\" so that "bc\" wouldn't be + // considered a string of its own + sc.Forward(); + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_CHARACTER: + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_BACKTICKS: + if (sc.ch == '`' ) { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_TRIPLEDOUBLE: + if (sc.Match(R"(""")")) { + + // Outright forward all " after the closing """ as a triple double + // + // A valid example where this is needed is: """8 double quotes->"""""""" + // You can have as many """ at the end as you wish, as long as the actual + // closing literal is there + while (sc.ch == '"') { + sc.Forward(); + } + + sc.SetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_TRIPLE: + if (sc.Match("'''")) { + sc.Forward(2); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + } + + if (sc.state == SCE_NIM_DEFAULT) { + // Number + if (IsADigit(sc.ch)) { + sc.SetState(SCE_NIM_NUMBER); + + numType = NumType::Decimal; + decimalCount = 0; + + if (sc.ch == '0') { + if (IsNumHex(sc)) { + numType = NumType::Hexadecimal; + } else if (IsNumBinary(sc)) { + numType = NumType::Binary; + } else if (IsNumOctal(sc)) { + numType = NumType::Octal; + } + + if (numType != NumType::Decimal) { + sc.Forward(); + } + } + } + // Raw string + else if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') { + isStylingRawString = true; + + // Triple doubles can be raw strings too. How sweet + if (styler.SafeGetCharAt(sc.currentPos + 2) == '\"' && + styler.SafeGetCharAt(sc.currentPos + 3) == '\"') { + sc.SetState(SCE_NIM_TRIPLEDOUBLE); + } else { + sc.SetState(SCE_NIM_STRING); + } + + const int rawStrStyle = options.highlightRawStrIdent ? IsLetter(sc.ch) : + (sc.ch == 'r' || sc.ch == 'R'); + + if (rawStrStyle) { + sc.Forward(); + + if (sc.state == SCE_NIM_TRIPLEDOUBLE) { + sc.Forward(2); + } + } else { + // Anything other than r/R is considered a general raw string identifier + isStylingRawStringIdent = true; + sc.SetState(SCE_NIM_IDENTIFIER); + } + } + // String and triple double literal + else if (sc.ch == '\"') { + isStylingRawString = false; + + if (sc.Match(R"(""")")) { + sc.SetState(SCE_NIM_TRIPLEDOUBLE); + + // Keep forwarding until the total opening literal count is 5 + // A valid example where this is needed is: """""<-5 double quotes""" + while (sc.ch == '"') { + sc.Forward(); + + if (sc.Match(R"(""")")) { + sc.Forward(); + break; + } + } + } else { + sc.SetState(SCE_NIM_STRING); + } + } + // Charecter and triple literal + else if (sc.ch == '\'') { + if (sc.Match("'''")) { + sc.SetState(SCE_NIM_TRIPLE); + } else { + sc.SetState(SCE_NIM_CHARACTER); + } + } + // Operator definition + else if (sc.ch == '`') { + if (funcNameExists) { + sc.SetState(SCE_NIM_FUNCNAME); + } else { + sc.SetState(SCE_NIM_BACKTICKS); + } + } + // Keyword + else if (iswordstart(sc.ch)) { + sc.SetState(SCE_NIM_IDENTIFIER); + } + // Comments + else if (sc.ch == '#') { + if (sc.Match("##[") || sc.Match("#[")) { + commentNestLevel++; + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + + if (sc.Match("##[")) { + sc.SetState(SCE_NIM_COMMENTDOC); + sc.Forward(); + } else if (sc.Match("#[")) { + sc.SetState(SCE_NIM_COMMENT); + sc.Forward(); + } else if (sc.Match("##")) { + sc.SetState(SCE_NIM_COMMENTLINEDOC); + } else { + sc.SetState(SCE_NIM_COMMENTLINE); + } + } + // Operators + else if (strchr("()[]{}:=;-\\/&%$!+<>|^?,.*~@", sc.ch)) { + sc.SetState(SCE_NIM_OPERATOR); + } + } + + if (sc.atLineEnd) { + funcNameExists = false; + isStylingRawString = false; + isStylingRawStringIdent = false; + } + } + + sc.Complete(); +} + +void SCI_METHOD LexerNim::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess) { + if (!options.fold) { + return; + } + + Accessor styler(pAccess, nullptr); + + const Sci_Position docLines = styler.GetLine(styler.Length()); + const Sci_Position maxPos = startPos + length; + const Sci_Position maxLines = styler.GetLine(maxPos == styler.Length() ? maxPos : maxPos - 1); + + Sci_Position lineCurrent = styler.GetLine(startPos); + int indentCurrent = IndentAmount(lineCurrent, styler); + + while (lineCurrent > 0) { + lineCurrent--; + indentCurrent = IndentAmount(lineCurrent, styler); + + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + break; + } + } + + int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; + indentCurrent = indentCurrentLevel | (indentCurrent & ~SC_FOLDLEVELNUMBERMASK); + + while (lineCurrent <= docLines && lineCurrent <= maxLines) { + Sci_Position lineNext = lineCurrent + 1; + int indentNext = indentCurrent; + int lev = indentCurrent; + + if (lineNext <= docLines) { + indentNext = IndentAmount(lineNext, styler); + } + + if (indentNext & SC_FOLDLEVELWHITEFLAG) { + indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel; + } + + while (lineNext < docLines && (indentNext & SC_FOLDLEVELWHITEFLAG)) { + lineNext++; + indentNext = IndentAmount(lineNext, styler); + } + + const int indentNextLevel = indentNext & SC_FOLDLEVELNUMBERMASK; + indentNext = indentNextLevel | (indentNext & ~SC_FOLDLEVELNUMBERMASK); + + const int levelBeforeComments = std::max(indentCurrentLevel, indentNextLevel); + + Sci_Position skipLine = lineNext; + int skipLevel = indentNextLevel; + + while (--skipLine > lineCurrent) { + const int skipLineIndent = IndentAmount(skipLine, styler); + + if (options.foldCompact) { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel) { + skipLevel = levelBeforeComments; + } + + const int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG; + styler.SetLevel(skipLine, skipLevel | whiteFlag); + } else { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel && + !(skipLineIndent & SC_FOLDLEVELWHITEFLAG)) { + skipLevel = levelBeforeComments; + } + + styler.SetLevel(skipLine, skipLevel); + } + } + + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + } + + styler.SetLevel(lineCurrent, options.foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG); + + indentCurrent = indentNext; + indentCurrentLevel = indentNextLevel; + lineCurrent = lineNext; + } +} + +LexerModule lmNim(SCLEX_NIM, LexerNim::LexerFactoryNim, "nim", nimWordListDesc); \ No newline at end of file Modified: scintilla/lexilla/src/Lexilla.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -200,6 +200,7 @@ static void AddGeanyLexers() &lmLua, &lmMake, &lmMarkdown, + &lmNim, &lmNsis, &lmNull, &lmOctave, Modified: scintilla/scintilla_changes.patch 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -99,6 +99,7 @@ index cd4b23617..af4a73db4 100644 + &lmLua, + &lmMake, + &lmMarkdown, ++ &lmNim, + &lmNsis, + &lmNull, + &lmOctave, Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -192,6 +192,7 @@ static void init_builtin_filetypes(void) FT_INIT( RAKU, RAKU, "Raku", NULL, SOURCE_FILE, SCRIPT ); 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 ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,7 @@ typedef enum GEANY_FILETYPES_RAKU, GEANY_FILETYPES_CIL, GEANY_FILETYPES_PROLOG, + GEANY_FILETYPES_NIM, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -1035,6 +1035,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(MAKE); init_styleset_case(MATLAB); init_styleset_case(MARKDOWN); + init_styleset_case(NIM); init_styleset_case(NSIS); init_styleset_case(OBJECTIVEC); init_styleset_case(PASCAL); @@ -1130,6 +1131,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(MAKE); styleset_case(MARKDOWN); styleset_case(MATLAB); + styleset_case(NIM); styleset_case(NSIS); styleset_case(OBJECTIVEC); styleset_case(PASCAL); @@ -1676,6 +1678,13 @@ gboolean highlighting_is_string_style(gint lexer, gint style) case SCLEX_AU3: return (style == SCE_AU3_STRING); + + case SCLEX_NIM: + return (style == SCE_NIM_STRING || + style == SCE_NIM_CHARACTER || + style == SCE_NIM_TRIPLE || + style == SCE_NIM_TRIPLEDOUBLE || + style == SCE_NIM_STRINGEOL); } return FALSE; } @@ -1922,6 +1931,12 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_VISUALPROLOG_COMMENT_LINE || style == SCE_VISUALPROLOG_COMMENT_KEY || style == SCE_VISUALPROLOG_COMMENT_KEY_ERROR); + + case SCLEX_NIM: + return (style == SCE_NIM_COMMENT || + style == SCE_NIM_COMMENTDOC || + style == SCE_NIM_COMMENTLINE || + style == SCE_NIM_COMMENTLINEDOC); } return FALSE; } Modified: src/highlightingmappings.h 29 lines changed, 29 insertions(+), 0 deletions(-) =================================================================== @@ -1162,6 +1162,35 @@ static const HLKeyword highlighting_keywords_MATLAB[] = #define highlighting_properties_MATLAB EMPTY_PROPERTIES +/* Nim */ +#define highlighting_lexer_NIM SCLEX_NIM +static const HLStyle highlighting_styles_NIM[] = +{ + { SCE_NIM_DEFAULT, "default", FALSE }, + { SCE_NIM_COMMENT, "comment", FALSE }, + { SCE_NIM_COMMENTDOC, "commentdoc", FALSE }, + { SCE_NIM_COMMENTLINE, "commentline", FALSE }, + { SCE_NIM_COMMENTLINEDOC, "commentlinedoc", FALSE }, + { SCE_NIM_NUMBER, "number", FALSE }, + { SCE_NIM_STRING, "string", FALSE }, + { SCE_NIM_CHARACTER, "character", FALSE }, + { SCE_NIM_WORD, "word", FALSE }, + { SCE_NIM_TRIPLE, "triple", FALSE }, + { SCE_NIM_TRIPLEDOUBLE, "tripledouble", FALSE }, + { SCE_NIM_BACKTICKS, "backticks", FALSE }, + { SCE_NIM_FUNCNAME, "funcname", FALSE }, + { SCE_NIM_STRINGEOL, "stringeol", FALSE }, + { SCE_NIM_NUMERROR, "numerror", FALSE }, + { SCE_NIM_OPERATOR, "operator", FALSE }, + { SCE_NIM_IDENTIFIER, "identifier", FALSE } +}; +static const HLKeyword highlighting_keywords_NIM[] = +{ + { 0, "keywords", FALSE }, +}; +#define highlighting_properties_NIM EMPTY_PROPERTIES + + /* NSIS */ #define highlighting_lexer_NSIS SCLEX_NSIS static const HLStyle highlighting_styles_NSIS[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2522d6: Merge pull request #3648 from techee/nim_lexer
by Jiří Techet 18 Aug '24

18 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 18 Aug 2024 12:06:01 UTC Commit: 2522d6a795303e1dd3d48e0af383ee83e49bee15 https://github.com/geany/geany/commit/2522d6a795303e1dd3d48e0af383ee83e49be… Log Message: ----------- Merge pull request #3648 from techee/nim_lexer Convert Nim to builtin filetype and use Scintilla Nim lexer for it Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.Nim.conf data/filedefs/filetypes.nim data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexNim.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -57,7 +57,7 @@ filetypes_dist = \ filedefs/filetypes.markdown \ filedefs/filetypes.matlab \ filedefs/filetypes.Meson.conf \ - filedefs/filetypes.Nim.conf \ + filedefs/filetypes.nim \ filedefs/filetypes.nsis \ filedefs/filetypes.objectivec \ filedefs/filetypes.pascal \ Modified: data/filedefs/filetypes.Nim.conf 64 lines changed, 0 insertions(+), 64 deletions(-) =================================================================== @@ -1,64 +0,0 @@ -# For complete documentation of this file, please see Geany's main documentation - -[keywords] -# all items must be in one line -primary=addr and as asm bind block break case cast concept const continue converter defer discard distinct div do elif else end enum except export finally for from func if import in include interface is isnot iterator let macro method mixin mod nil not notin object of or out proc ptr raise ref return shl shr static template try tuple type using var when while xor yield -# additional keywords, will be highlighted with style "word2" -identifiers=array auto bool byte char int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 Natural Ordinal Positive seq string nil true false result echo openArray lent sink assert doAssert spawn parallel - -[lexer_properties] -fold.quotes.nim=1 -lexer.nim.keywords2.no.sub.identifiers=1 - -[settings] -# default extension used when saving files -extension=nim -# MIME type -mime_type=text/x-nim -# single comment char, like # in this file -comment_single=# -comment_use_indent=true -comment_open=#[ -comment_close=]# -tag_parser=Python -lexer_filetype=Python - -[indentation] -width=2 -# 0 is spaces, 1 is tabs, 2 is tab & spaces -type=0 - -[build-menu] -FT_00_LB=nim c -FT_00_CM=nim c "%f" -FT_00_WD=%d -FT_02_LB=_Lint -FT_02_CM=nimpretty --maxLineLen:80 "%f" -EX_01_WD= -error_regex=(.+)$([0-9]+),\s+([0-9]+)$\s+Error -FT_01_LB=nim r -FT_01_CM=nim r "%f" -FT_01_WD=%d - -[styling] -# Edit these in the colorscheme .conf file instead -default=default -commentline=comment_line -number=number_1 -string=string_1 -character=character -word=keyword_1 -triple=string_2 -tripledouble=string_2 -classname=type -defname=function -operator=operator -identifier=identifier_1 -commentblock=comment -stringeol=string_eol -word2=keyword_2 -decorator=decorator -fstring=string_1 -fcharacter=character -ftriple=string_2 -ftripledouble=string_2 Modified: data/filedefs/filetypes.nim 71 lines changed, 71 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,71 @@ +# 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 +commentdoc=comment_doc +commentline=comment_line +commentlinedoc=comment_doc +number=number_1 +string=string_1 +character=character +word=keyword_1 +triple=string_2 +tripledouble=string_2 +backticks=identifier_1 +funcname=identifier_1 +stringeol=string_eol +numerror=error +operator=operator +identifier=identifier_1 + +[keywords] +# all items must be in one line +keywords=addr and array as asm assert auto bind block bool break byte case cast char concept const continue converter defer discard distinct div do doAssert echo elif else end enum except export false finally float float32 float64 for from func if import in include int int16 int32 int64 int8 interface is isnot iterator lent let macro method mixin mod Natural nil nil not notin object of openArray or Ordinal out parallel Positive proc ptr raise ref result return seq shl shr sink spawn static string template true try tuple type uint uint16 uint32 uint64 uint8 using var when while xor yield + +[lexer_properties] + +[settings] +# default extension used when saving files +extension=nim + +# MIME type +mime_type=text/x-nim + +# 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-menu] +FT_00_LB=nim c +FT_00_CM=nim c "%f" +FT_00_WD=%d +FT_02_LB=_Lint +FT_02_CM=nimpretty --maxLineLen:80 "%f" +EX_01_WD= +error_regex=(.+)$([0-9]+),\s+([0-9]+)$\s+Error +FT_01_LB=nim r +FT_01_CM=nim r "%f" +FT_01_WD=%d Modified: data/filetype_extensions.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -88,7 +88,7 @@ None=*; # Note: restarting is required after editing groups [Groups] -Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Nim;Scala;Swift; +Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift; Script=Dockerfile;Graphviz;TypeScript;Meson; Markup= Misc=JSON; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -272,6 +272,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexMake.cxx', 'scintilla/lexilla/lexers/LexMarkdown.cxx', 'scintilla/lexilla/lexers/LexMatlab.cxx', + 'scintilla/lexilla/lexers/LexNim.cxx', 'scintilla/lexilla/lexers/LexNsis.cxx', 'scintilla/lexilla/lexers/LexNull.cxx', 'scintilla/lexilla/lexers/LexPascal.cxx', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -42,6 +42,7 @@ lexilla/lexers/LexLua.cxx \ lexilla/lexers/LexMake.cxx \ lexilla/lexers/LexMarkdown.cxx \ lexilla/lexers/LexMatlab.cxx \ +lexilla/lexers/LexNim.cxx \ lexilla/lexers/LexNsis.cxx \ lexilla/lexers/LexNull.cxx \ lexilla/lexers/LexPascal.cxx \ Modified: scintilla/lexilla/lexers/LexNim.cxx 814 lines changed, 814 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,814 @@ +// Scintilla source code edit control +/** @file LexNim.cxx +** Lexer for Nim +** Written by Jad Altahan (github.com/xv) +** Nim manual: https://nim-lang.org/docs/manual.html +**/ +// 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 + +enum NumType { + Binary, + Octal, + Exponent, + Hexadecimal, + Decimal, + FormatError +}; + +int GetNumStyle(const int numType) noexcept { + if (numType == NumType::FormatError) { + return SCE_NIM_NUMERROR; + } + + return SCE_NIM_NUMBER; +} + +constexpr bool IsLetter(const int ch) noexcept { + // 97 to 122 || 65 to 90 + return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); +} + +bool IsAWordChar(const int ch) noexcept { + return ch < 0x80 && (isalnum(ch) || ch == '_' || ch == '.'); +} + +int IsNumHex(const StyleContext &sc) noexcept { + return sc.chNext == 'x' || sc.chNext == 'X'; +} + +int IsNumBinary(const StyleContext &sc) noexcept { + return sc.chNext == 'b' || sc.chNext == 'B'; +} + +int IsNumOctal(const StyleContext &sc) { + return IsADigit(sc.chNext) || sc.chNext == 'o'; +} + +constexpr bool IsNewline(const int ch) noexcept { + return (ch == '\n' || ch == '\r'); +} + +bool IsFuncName(const char *str) noexcept { + const char *identifiers[] = { + "proc", + "func", + "macro", + "method", + "template", + "iterator", + "converter" + }; + + for (const char *id : identifiers) { + if (strcmp(str, id) == 0) { + return true; + } + } + + return false; +} + +constexpr bool IsTripleLiteral(const int style) noexcept { + return style == SCE_NIM_TRIPLE || style == SCE_NIM_TRIPLEDOUBLE; +} + +constexpr bool IsLineComment(const int style) noexcept { + return style == SCE_NIM_COMMENTLINE || style == SCE_NIM_COMMENTLINEDOC; +} + +constexpr bool IsStreamComment(const int style) noexcept { + return style == SCE_NIM_COMMENT || style == SCE_NIM_COMMENTDOC; +} + +// Adopted from Accessor.cxx +int GetIndent(const Sci_Position line, Accessor &styler) { + Sci_Position startPos = styler.LineStart(line); + const Sci_Position eolPos = styler.LineStart(line + 1) - 1; + + char ch = styler[startPos]; + int style = styler.StyleAt(startPos); + + int indent = 0; + bool inPrevPrefix = line > 0; + Sci_Position posPrev = inPrevPrefix ? styler.LineStart(line - 1) : 0; + + // No fold points inside triple literals + while ((IsASpaceOrTab(ch) || IsTripleLiteral(style)) && (startPos < eolPos)) { + if (inPrevPrefix) { + const char chPrev = styler[posPrev++]; + if (chPrev != ' ' && chPrev != '\t') { + inPrevPrefix = false; + } + } + + if (ch == '\t') { + indent = (indent / 8 + 1) * 8; + } else { + indent++; + } + + startPos++; + ch = styler[startPos]; + style = styler.StyleAt(startPos); + } + + // Prevent creating fold lines for comments if indented + if (!(IsStreamComment(style) || IsLineComment(style))) + indent += SC_FOLDLEVELBASE; + + if (styler.LineStart(line) == styler.Length() + || IsASpaceOrTab(ch) + || IsNewline(ch) + || IsStreamComment(style) + || IsLineComment(style)) { + return indent | SC_FOLDLEVELWHITEFLAG; + } else { + return indent; + } +} + +int IndentAmount(const Sci_Position line, Accessor &styler) { + const int indent = GetIndent(line, styler); + const int indentLevel = indent & SC_FOLDLEVELNUMBERMASK; + return indentLevel <= SC_FOLDLEVELBASE ? indent : indentLevel | (indent & ~SC_FOLDLEVELNUMBERMASK); +} + +struct OptionsNim { + bool fold; + bool foldCompact; + bool highlightRawStrIdent; + + OptionsNim() { + fold = true; + foldCompact = true; + highlightRawStrIdent = false; + } +}; + +static const char *const nimWordListDesc[] = { + "Keywords", + nullptr +}; + +struct OptionSetNim : public OptionSet<OptionsNim> { + OptionSetNim() { + DefineProperty("lexer.nim.raw.strings.highlight.ident", &OptionsNim::highlightRawStrIdent, + "Set to 1 to enable highlighting generalized raw string identifiers. " + "Generalized raw string identifiers are anything other than r (or R)."); + + DefineProperty("fold", &OptionsNim::fold); + DefineProperty("fold.compact", &OptionsNim::foldCompact); + + DefineWordListSets(nimWordListDesc); + } +}; + +LexicalClass lexicalClasses[] = { + // Lexer Nim SCLEX_NIM SCE_NIM_: + 0, "SCE_NIM_DEFAULT", "default", "White space", + 1, "SCE_NIM_COMMENT", "comment block", "Block comment", + 2, "SCE_NIM_COMMENTDOC", "comment block doc", "Block doc comment", + 3, "SCE_NIM_COMMENTLINE", "comment line", "Line comment", + 4, "SCE_NIM_COMMENTLINEDOC", "comment doc", "Line doc comment", + 5, "SCE_NIM_NUMBER", "literal numeric", "Number", + 6, "SCE_NIM_STRING", "literal string", "String", + 7, "SCE_NIM_CHARACTER", "literal string", "Single quoted string", + 8, "SCE_NIM_WORD", "keyword", "Keyword", + 9, "SCE_NIM_TRIPLE", "literal string", "Triple quotes", + 10, "SCE_NIM_TRIPLEDOUBLE", "literal string", "Triple double quotes", + 11, "SCE_NIM_BACKTICKS", "operator definition", "Identifiers", + 12, "SCE_NIM_FUNCNAME", "identifier", "Function name definition", + 13, "SCE_NIM_STRINGEOL", "error literal string", "String is not closed", + 14, "SCE_NIM_NUMERROR", "numeric error", "Numeric format error", + 15, "SCE_NIM_OPERATOR", "operator", "Operators", + 16, "SCE_NIM_IDENTIFIER", "identifier", "Identifiers", +}; + +} + +class LexerNim : public DefaultLexer { + CharacterSet setWord; + WordList keywords; + OptionsNim options; + OptionSetNim osNim; + +public: + LexerNim() : + DefaultLexer("nim", SCLEX_NIM, lexicalClasses, ELEMENTS(lexicalClasses)), + setWord(CharacterSet::setAlphaNum, "_", 0x80, true) { } + + virtual ~LexerNim() { } + + void SCI_METHOD Release() noexcept override { + delete this; + } + + int SCI_METHOD Version() const noexcept override { + return lvRelease5; + } + + const char * SCI_METHOD PropertyNames() override { + return osNim.PropertyNames(); + } + + int SCI_METHOD PropertyType(const char *name) override { + return osNim.PropertyType(name); + } + + const char * SCI_METHOD DescribeProperty(const char *name) override { + return osNim.DescribeProperty(name); + } + + Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; + + const char * SCI_METHOD PropertyGet(const char* key) override { + return osNim.PropertyGet(key); + } + + const char * SCI_METHOD DescribeWordListSets() override { + return osNim.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 *) noexcept override { + return nullptr; + } + + int SCI_METHOD LineEndTypesSupported() noexcept override { + return SC_LINE_END_TYPE_UNICODE; + } + + int SCI_METHOD PrimaryStyleFromStyle(int style) noexcept override { + return style; + } + + static ILexer5 *LexerFactoryNim() { + return new LexerNim(); + } +}; + +Sci_Position SCI_METHOD LexerNim::PropertySet(const char *key, const char *val) { + if (osNim.PropertySet(&options, key, val)) { + return 0; + } + + return -1; +} + +Sci_Position SCI_METHOD LexerNim::WordListSet(int n, const char *wl) { + WordList *wordListN = nullptr; + + switch (n) { + case 0: + wordListN = &keywords; + 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 LexerNim::Lex(Sci_PositionU startPos, Sci_Position length, + int initStyle, IDocument *pAccess) { + // No one likes a leaky string + if (initStyle == SCE_NIM_STRINGEOL) { + initStyle = SCE_NIM_DEFAULT; + } + + Accessor styler(pAccess, nullptr); + StyleContext sc(startPos, length, initStyle, styler); + + // Nim supports nested block comments! + Sci_Position lineCurrent = styler.GetLine(startPos); + int commentNestLevel = lineCurrent > 0 ? styler.GetLineState(lineCurrent - 1) : 0; + + int numType = NumType::Decimal; + int decimalCount = 0; + + bool funcNameExists = false; + bool isStylingRawString = false; + bool isStylingRawStringIdent = false; + + for (; sc.More(); sc.Forward()) { + if (sc.atLineStart) { + if (sc.state == SCE_NIM_STRING) { + sc.SetState(SCE_NIM_STRING); + } + + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + + // Handle string line continuation + if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r') && + (sc.state == SCE_NIM_STRING || sc.state == SCE_NIM_CHARACTER) && !isStylingRawString) { + sc.Forward(); + + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + + continue; + } + + switch (sc.state) { + case SCE_NIM_OPERATOR: + funcNameExists = false; + sc.SetState(SCE_NIM_DEFAULT); + break; + case SCE_NIM_NUMBER: + // For a type suffix, such as 0x80'u8 + if (sc.ch == '\'') { + if (sc.chNext == 'i' || sc.chNext == 'I' || + sc.chNext == 'u' || sc.chNext == 'U' || + sc.chNext == 'f' || sc.chNext == 'F' || + sc.chNext == 'd' || sc.chNext == 'D') { + sc.Forward(2); + } + } else if (sc.ch == '.') { + if (IsADigit(sc.chNext)) { + sc.Forward(); + } else if (numType <= NumType::Exponent) { + sc.SetState(SCE_NIM_OPERATOR); + break; + } else { + decimalCount++; + + if (numType == NumType::Decimal) { + if (decimalCount <= 1 && !IsAWordChar(sc.chNext)) { + break; + } + } else if (numType == NumType::Hexadecimal) { + if (decimalCount <= 1 && IsADigit(sc.chNext, 16)) { + break; + } + + sc.SetState(SCE_NIM_OPERATOR); + break; + } + } + } else if (sc.ch == '_') { + // Accept only one underscore between digits + if (IsADigit(sc.chNext)) { + sc.Forward(); + } + } else if (numType == NumType::Decimal) { + if (sc.chPrev != '\'' && (sc.ch == 'e' || sc.ch == 'E')) { + numType = NumType::Exponent; + + if (sc.chNext == '-' || sc.chNext == '+') { + sc.Forward(); + } + + break; + } + + if (IsADigit(sc.ch)) { + break; + } + } else if (numType == NumType::Hexadecimal) { + if (IsADigit(sc.ch, 16)) { + break; + } + } else if (IsADigit(sc.ch)) { + if (numType == NumType::Exponent) { + break; + } + + if (numType == NumType::Octal) { + // Accept only 0-7 + if (sc.ch <= '7') { + break; + } + } else if (numType == NumType::Binary) { + // Accept only 0 and 1 + if (sc.ch <= '1') { + break; + } + } + + numType = NumType::FormatError; + break; + } + + sc.ChangeState(GetNumStyle(numType)); + sc.SetState(SCE_NIM_DEFAULT); + break; + case SCE_NIM_IDENTIFIER: + if (sc.ch == '.' || !IsAWordChar(sc.ch)) { + char s[100]; + sc.GetCurrent(s, sizeof(s)); + int style = SCE_NIM_IDENTIFIER; + + if (keywords.InList(s) && !funcNameExists) { + // Prevent styling keywords if they are sub-identifiers + const Sci_Position segStart = styler.GetStartSegment() - 1; + if (segStart < 0 || styler.SafeGetCharAt(segStart, '\0') != '.') { + style = SCE_NIM_WORD; + } + } else if (funcNameExists) { + style = SCE_NIM_FUNCNAME; + } + + sc.ChangeState(style); + sc.SetState(SCE_NIM_DEFAULT); + + if (style == SCE_NIM_WORD) { + funcNameExists = IsFuncName(s); + } else { + funcNameExists = false; + } + } + + if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') { + isStylingRawStringIdent = true; + + if (options.highlightRawStrIdent) { + if (styler.SafeGetCharAt(sc.currentPos + 2) == '\"' && + styler.SafeGetCharAt(sc.currentPos + 3) == '\"') { + sc.ChangeState(SCE_NIM_TRIPLEDOUBLE); + } else { + sc.ChangeState(SCE_NIM_STRING); + } + } + + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_FUNCNAME: + if (sc.ch == '`') { + funcNameExists = false; + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + // Prevent leaking the style to the next line if not closed + funcNameExists = false; + + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_COMMENT: + if (sc.Match(']', '#')) { + if (commentNestLevel > 0) { + commentNestLevel--; + } + + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + sc.Forward(); + + if (commentNestLevel == 0) { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + } else if (sc.Match('#', '[')) { + commentNestLevel++; + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + break; + case SCE_NIM_COMMENTDOC: + if (sc.Match("]##")) { + if (commentNestLevel > 0) { + commentNestLevel--; + } + + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + sc.Forward(2); + + if (commentNestLevel == 0) { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + } else if (sc.Match("##[")) { + commentNestLevel++; + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + break; + case SCE_NIM_COMMENTLINE: + case SCE_NIM_COMMENTLINEDOC: + if (sc.atLineStart) { + sc.SetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_STRING: + if (!isStylingRawStringIdent && !isStylingRawString && sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (isStylingRawString && sc.ch == '\"' && sc.chNext == '\"') { + // Forward in situations such as r"a""bc\" so that "bc\" wouldn't be + // considered a string of its own + sc.Forward(); + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_CHARACTER: + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_BACKTICKS: + if (sc.ch == '`' ) { + sc.ForwardSetState(SCE_NIM_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_NIM_STRINGEOL); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_TRIPLEDOUBLE: + if (sc.Match(R"(""")")) { + + // Outright forward all " after the closing """ as a triple double + // + // A valid example where this is needed is: """8 double quotes->"""""""" + // You can have as many """ at the end as you wish, as long as the actual + // closing literal is there + while (sc.ch == '"') { + sc.Forward(); + } + + sc.SetState(SCE_NIM_DEFAULT); + } + break; + case SCE_NIM_TRIPLE: + if (sc.Match("'''")) { + sc.Forward(2); + sc.ForwardSetState(SCE_NIM_DEFAULT); + } + break; + } + + if (sc.state == SCE_NIM_DEFAULT) { + // Number + if (IsADigit(sc.ch)) { + sc.SetState(SCE_NIM_NUMBER); + + numType = NumType::Decimal; + decimalCount = 0; + + if (sc.ch == '0') { + if (IsNumHex(sc)) { + numType = NumType::Hexadecimal; + } else if (IsNumBinary(sc)) { + numType = NumType::Binary; + } else if (IsNumOctal(sc)) { + numType = NumType::Octal; + } + + if (numType != NumType::Decimal) { + sc.Forward(); + } + } + } + // Raw string + else if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') { + isStylingRawString = true; + + // Triple doubles can be raw strings too. How sweet + if (styler.SafeGetCharAt(sc.currentPos + 2) == '\"' && + styler.SafeGetCharAt(sc.currentPos + 3) == '\"') { + sc.SetState(SCE_NIM_TRIPLEDOUBLE); + } else { + sc.SetState(SCE_NIM_STRING); + } + + const int rawStrStyle = options.highlightRawStrIdent ? IsLetter(sc.ch) : + (sc.ch == 'r' || sc.ch == 'R'); + + if (rawStrStyle) { + sc.Forward(); + + if (sc.state == SCE_NIM_TRIPLEDOUBLE) { + sc.Forward(2); + } + } else { + // Anything other than r/R is considered a general raw string identifier + isStylingRawStringIdent = true; + sc.SetState(SCE_NIM_IDENTIFIER); + } + } + // String and triple double literal + else if (sc.ch == '\"') { + isStylingRawString = false; + + if (sc.Match(R"(""")")) { + sc.SetState(SCE_NIM_TRIPLEDOUBLE); + + // Keep forwarding until the total opening literal count is 5 + // A valid example where this is needed is: """""<-5 double quotes""" + while (sc.ch == '"') { + sc.Forward(); + + if (sc.Match(R"(""")")) { + sc.Forward(); + break; + } + } + } else { + sc.SetState(SCE_NIM_STRING); + } + } + // Charecter and triple literal + else if (sc.ch == '\'') { + if (sc.Match("'''")) { + sc.SetState(SCE_NIM_TRIPLE); + } else { + sc.SetState(SCE_NIM_CHARACTER); + } + } + // Operator definition + else if (sc.ch == '`') { + if (funcNameExists) { + sc.SetState(SCE_NIM_FUNCNAME); + } else { + sc.SetState(SCE_NIM_BACKTICKS); + } + } + // Keyword + else if (iswordstart(sc.ch)) { + sc.SetState(SCE_NIM_IDENTIFIER); + } + // Comments + else if (sc.ch == '#') { + if (sc.Match("##[") || sc.Match("#[")) { + commentNestLevel++; + lineCurrent = styler.GetLine(sc.currentPos); + styler.SetLineState(lineCurrent, commentNestLevel); + } + + if (sc.Match("##[")) { + sc.SetState(SCE_NIM_COMMENTDOC); + sc.Forward(); + } else if (sc.Match("#[")) { + sc.SetState(SCE_NIM_COMMENT); + sc.Forward(); + } else if (sc.Match("##")) { + sc.SetState(SCE_NIM_COMMENTLINEDOC); + } else { + sc.SetState(SCE_NIM_COMMENTLINE); + } + } + // Operators + else if (strchr("()[]{}:=;-\\/&%$!+<>|^?,.*~@", sc.ch)) { + sc.SetState(SCE_NIM_OPERATOR); + } + } + + if (sc.atLineEnd) { + funcNameExists = false; + isStylingRawString = false; + isStylingRawStringIdent = false; + } + } + + sc.Complete(); +} + +void SCI_METHOD LexerNim::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess) { + if (!options.fold) { + return; + } + + Accessor styler(pAccess, nullptr); + + const Sci_Position docLines = styler.GetLine(styler.Length()); + const Sci_Position maxPos = startPos + length; + const Sci_Position maxLines = styler.GetLine(maxPos == styler.Length() ? maxPos : maxPos - 1); + + Sci_Position lineCurrent = styler.GetLine(startPos); + int indentCurrent = IndentAmount(lineCurrent, styler); + + while (lineCurrent > 0) { + lineCurrent--; + indentCurrent = IndentAmount(lineCurrent, styler); + + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + break; + } + } + + int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; + indentCurrent = indentCurrentLevel | (indentCurrent & ~SC_FOLDLEVELNUMBERMASK); + + while (lineCurrent <= docLines && lineCurrent <= maxLines) { + Sci_Position lineNext = lineCurrent + 1; + int indentNext = indentCurrent; + int lev = indentCurrent; + + if (lineNext <= docLines) { + indentNext = IndentAmount(lineNext, styler); + } + + if (indentNext & SC_FOLDLEVELWHITEFLAG) { + indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel; + } + + while (lineNext < docLines && (indentNext & SC_FOLDLEVELWHITEFLAG)) { + lineNext++; + indentNext = IndentAmount(lineNext, styler); + } + + const int indentNextLevel = indentNext & SC_FOLDLEVELNUMBERMASK; + indentNext = indentNextLevel | (indentNext & ~SC_FOLDLEVELNUMBERMASK); + + const int levelBeforeComments = std::max(indentCurrentLevel, indentNextLevel); + + Sci_Position skipLine = lineNext; + int skipLevel = indentNextLevel; + + while (--skipLine > lineCurrent) { + const int skipLineIndent = IndentAmount(skipLine, styler); + + if (options.foldCompact) { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel) { + skipLevel = levelBeforeComments; + } + + const int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG; + styler.SetLevel(skipLine, skipLevel | whiteFlag); + } else { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel && + !(skipLineIndent & SC_FOLDLEVELWHITEFLAG)) { + skipLevel = levelBeforeComments; + } + + styler.SetLevel(skipLine, skipLevel); + } + } + + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + } + + styler.SetLevel(lineCurrent, options.foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG); + + indentCurrent = indentNext; + indentCurrentLevel = indentNextLevel; + lineCurrent = lineNext; + } +} + +LexerModule lmNim(SCLEX_NIM, LexerNim::LexerFactoryNim, "nim", nimWordListDesc); \ No newline at end of file Modified: scintilla/lexilla/src/Lexilla.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -200,6 +200,7 @@ static void AddGeanyLexers() &lmLua, &lmMake, &lmMarkdown, + &lmNim, &lmNsis, &lmNull, &lmOctave, Modified: scintilla/scintilla_changes.patch 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -99,6 +99,7 @@ index cd4b23617..af4a73db4 100644 + &lmLua, + &lmMake, + &lmMarkdown, ++ &lmNim, + &lmNsis, + &lmNull, + &lmOctave, Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -192,6 +192,7 @@ static void init_builtin_filetypes(void) FT_INIT( RAKU, RAKU, "Raku", NULL, SOURCE_FILE, SCRIPT ); 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 ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,7 @@ typedef enum GEANY_FILETYPES_RAKU, GEANY_FILETYPES_CIL, GEANY_FILETYPES_PROLOG, + GEANY_FILETYPES_NIM, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -1035,6 +1035,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(MAKE); init_styleset_case(MATLAB); init_styleset_case(MARKDOWN); + init_styleset_case(NIM); init_styleset_case(NSIS); init_styleset_case(OBJECTIVEC); init_styleset_case(PASCAL); @@ -1130,6 +1131,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(MAKE); styleset_case(MARKDOWN); styleset_case(MATLAB); + styleset_case(NIM); styleset_case(NSIS); styleset_case(OBJECTIVEC); styleset_case(PASCAL); @@ -1676,6 +1678,13 @@ gboolean highlighting_is_string_style(gint lexer, gint style) case SCLEX_AU3: return (style == SCE_AU3_STRING); + + case SCLEX_NIM: + return (style == SCE_NIM_STRING || + style == SCE_NIM_CHARACTER || + style == SCE_NIM_TRIPLE || + style == SCE_NIM_TRIPLEDOUBLE || + style == SCE_NIM_STRINGEOL); } return FALSE; } @@ -1922,6 +1931,12 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_VISUALPROLOG_COMMENT_LINE || style == SCE_VISUALPROLOG_COMMENT_KEY || style == SCE_VISUALPROLOG_COMMENT_KEY_ERROR); + + case SCLEX_NIM: + return (style == SCE_NIM_COMMENT || + style == SCE_NIM_COMMENTDOC || + style == SCE_NIM_COMMENTLINE || + style == SCE_NIM_COMMENTLINEDOC); } return FALSE; } Modified: src/highlightingmappings.h 29 lines changed, 29 insertions(+), 0 deletions(-) =================================================================== @@ -1162,6 +1162,35 @@ static const HLKeyword highlighting_keywords_MATLAB[] = #define highlighting_properties_MATLAB EMPTY_PROPERTIES +/* Nim */ +#define highlighting_lexer_NIM SCLEX_NIM +static const HLStyle highlighting_styles_NIM[] = +{ + { SCE_NIM_DEFAULT, "default", FALSE }, + { SCE_NIM_COMMENT, "comment", FALSE }, + { SCE_NIM_COMMENTDOC, "commentdoc", FALSE }, + { SCE_NIM_COMMENTLINE, "commentline", FALSE }, + { SCE_NIM_COMMENTLINEDOC, "commentlinedoc", FALSE }, + { SCE_NIM_NUMBER, "number", FALSE }, + { SCE_NIM_STRING, "string", FALSE }, + { SCE_NIM_CHARACTER, "character", FALSE }, + { SCE_NIM_WORD, "word", FALSE }, + { SCE_NIM_TRIPLE, "triple", FALSE }, + { SCE_NIM_TRIPLEDOUBLE, "tripledouble", FALSE }, + { SCE_NIM_BACKTICKS, "backticks", FALSE }, + { SCE_NIM_FUNCNAME, "funcname", FALSE }, + { SCE_NIM_STRINGEOL, "stringeol", FALSE }, + { SCE_NIM_NUMERROR, "numerror", FALSE }, + { SCE_NIM_OPERATOR, "operator", FALSE }, + { SCE_NIM_IDENTIFIER, "identifier", FALSE } +}; +static const HLKeyword highlighting_keywords_NIM[] = +{ + { 0, "keywords", FALSE }, +}; +#define highlighting_properties_NIM EMPTY_PROPERTIES + + /* NSIS */ #define highlighting_lexer_NSIS SCLEX_NSIS static const HLStyle highlighting_styles_NSIS[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4ff60a: Merge pull request #3171 from techee/prolog
by Jiří Techet 16 Aug '24

16 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 16 Aug 2024 20:06:50 UTC Commit: 4ff60a36bfd453415b2cc1dfe83206e6be5b8fe6 https://github.com/geany/geany/commit/4ff60a36bfd453415b2cc1dfe83206e6be5b8… Log Message: ----------- Merge pull request #3171 from techee/prolog Add Prolog filetype support Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.prolog data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexVisualProlog.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -65,6 +65,7 @@ filetypes_dist = \ filedefs/filetypes.php \ filedefs/filetypes.po \ filedefs/filetypes.powershell \ + filedefs/filetypes.prolog \ filedefs/filetypes.r \ filedefs/filetypes.raku \ filedefs/filetypes.restructuredtext \ Modified: data/filedefs/filetypes.prolog 78 lines changed, 78 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,78 @@ +[styling] +# Edit these in the colorscheme .conf file instead +default=default +key_major=keyword_1 +key_minor=keyword_2 +key_directive=keyword_1 +comment_block=comment +comment_line=comment +comment_key=comment +comment_key_error=comment +identifier=identifier +variable=default +anonymous=default +number=number_1 +operator=operator +string=string_1 +string_quote=string_1 +string_escape=string_1 +string_escape_error=error +string_eol=string_1 +embedded=string_1 +placeholder=string_1 + +[keywords] +# all items must be in one line +# From https://github.com/arthwang/vsc-prolog and https://github.com/mxw/vim-prolog +primary=abolish abolish_op abolish_record abort abs absolute_file_name accept access_file acos acyclic_term add_attribute alarm als append append_strings apply arg argc argv arithmetic_function arity array array_concat array_flat array_list asin assert asserta assertz at at_end_of_stream at_eof atan atom atom_chars atom_codes atom_concat atom_length atom_number atom_prefix atom_string atom_to_term atomic attach_suspensions attached_suspensions autoload autoload_tool b_external bag_abolish bag_count bag_create bag_dissolve bag_enter bag_erase bag_retrieve bagof begin_module between bind block breal breal_bounds breal_from_bounds breal_max breal_min byte_count bytes_to_term call call-2 call_c call_cleanup call_explicit call_priority call_with_depth_limit callable cancel_after_event canonical_path_name catch cd ceil ceiling char_code char_conversion char_int char_type character_count chdir clause clause_property close clrbit code_type collation_key comment compare compare_instances com pile compile_predicates compile_stream compile_term compile_term_annotated compiled_stream compound concat_atom concat_atoms concat_string concat_strings connect copy_stream_data copy_term copy_term_vars coroutine cos coverof cputime create_module current_after_event current_after_events current_arithmetic_function current_array current_atom current_blob current_built_in current_char_conversion current_compiled_file current_domain current_error current_flag current_format_predicate current_functor current_interrupt current_key current_macro current_module current_module_predicate current_op current_ouput current_pragma current_predicate current_record current_signal current_store current_stream current_struct current_suspension current_trigger cyclic_term date date_time_stamp date_time_value dbgcomp debug debug_reset debugging decval define_error define_macro delay delayed_goals delayed_goals_number delete delete_file demon denominator deprecated dim discontiguous display div domain domain_index downcase_atom duplicate_term dwim_match dwim_predicate dynamic e elif ensure_loaded enter_suspension_list env erase erase_all erase_array erase_macro erase_module errno_id error_id eval event event_after event_after_every event_create event_disable event_enable event_retrieve events_after events_defer events_nodefer exec exec_group existing_file exists exists_directory exists_file exit exit_block exp expand_clause expand_file_name expand_goal expand_macros external fail fail_if false file_base_name file_directory_name file_name_extension fileerrors findall fix flag flatten_array float float_fractional_part float_integer_part floor flush flush_output forall fork format format_predicate format_time frandom functor garbage_collect garbage_collect_atoms gcd get get0 get_byte get_char get_chtab get_code get_error_handler get_event_handler get_file_info get_flag get_interrupt_handler get_leash get_module_info get_priority get_prompt get_single_char get_stream get_stream_info get_suspension_data get_time get_timer get_var_bounds get_var_info getbit getcwd getenv getval global global_op ground halt hash help ignore import incval index init_suspension_list inline insert_suspension instance integer integer_atom is is_absolute_file_name is_array is_built_in is_dynamic is_event is_handle is_list is_locked is_predicate is_record is_stream is_suspension join_string keysort kill kill_display_matrix kill_suspension lcm length lib line_count line_position listen listing ln load local local_record local_time local_time_string locale_sort lock lock_pass log lsb macro make make_array make_directory make_display_matrix make_local_array make_suspension maplist max memberchk merge merge_set merge_suspension_lists message_hook message_to_string meta meta_attribute meta_bind meta_predicate min mkdir mod mode module module_interface msb msort mutex mutex_init name nb_linkarg nb_setarg new_socket_server nl nodbgcomp nodebug nonground nonvar normalize_space nospy not not_un ify notify_constrained notrace nth_clause number number_chars number_codes number_merge number_sort number_string numbervars numerator occurs on_signal once op open open_null_stream os_file_name parallel parse_time pathname pause peek_byte peek_char peek_code peer peer_deregister_multitask peer_do_multitask peer_get_property peer_multitask_confirm peer_multitask_terminate peer_queue_close peer_queue_create peer_queue_get_property peer_register_multitask phrase pi pipe plus popcount portray portray_clause portray_goal portray_term powm pragma pred predicate_property predsort print print_message print_message_lines printf profile prolog_to_os_filename prompt prompt1 prune_instances put put_byte put_char put_code qcompile random rational rationalize rdiv read read_annotated read_clause read_directory read_exdr read_history read_link read_pending_input read_string read_term read_token readvar real record record_create recorda recorded recorded_list recordz redefine_system_predicate reex port reference referenced_record rem remote_connect remote_connect_accept remote_connect_setup remote_disconnect remote_yield rename rename_file repeat rerecord reset_error_handler reset_error_handlers reset_event_handler retract retract_all retractall round same_file same_term schedule_suspensions schedule_woken see seed seeing seek seen select set_chtab set_error_handler set_event_handler set_flag set_input set_interrupt_handler set_leash set_output set_prolog_IO set_prompt set_stream set_stream_position set_stream_property set_suspension_data set_suspension_priority set_timer set_tty set_var_bounds setarg setbit setenv setlocale setof setup_and_call_cleanup setval sgn sh shelf shelf_abolish shelf_create shelf_dec shelf_get shelf_inc shelf_set shell sin size_file skip skipped sleep socket sort split_string sprintf spy spy_term spy_var sqrt stack_parameter stamp_date_time statistics store store_contains store_count store_create store_delete store_erase store_get store_inc store_set stored_keys stored_keys_and_values stream_position_data stream_property stream_select stream_truncate string string_code string_concat string_length string_list string_to_atom string_to_list struct sub_atom sub_string subcall subscript substring subsumes subsumes_chk succ suffix sum suspend suspension_to_goal suspensions swritef system tab tan tell telling term_hash term_string term_to_atom term_to_bytes term_variables test_and_setval throw time time_file times tmp_file told tool tool_body trace trace_call_port trace_exit_port trace_parent_port trace_point_port traceable trigger trim_stacks trimcore true truncate tty_get_capability tty_goto tty_put tty_size ttyflush tyi tyo type_of unget unifiable unify_with_occurs_check unix unlock unschedule_suspension unsetenv unskipped untraceable upcase_atom update_struct use_module var variable variant wait wait_for_input wake wildcard_match win_exec win_folder win_has_menu win_insert_menu win_insert_menu_item win_registry_get_value win_shell win_window_pos window_title with_output_to working_directory write write_canonical write_exdr write_term writeclause writef writeln writeq xget xor xset yield +# Visual Prolog keywords: https://wiki.visual-prolog.com/index.php?title=Language_Reference/Built-in_… +secondary=and anyflow apicall bininclude bound c class class_name clauses constant_name constants constructors convert delegate determ digits digitsOf do domains else elseif endif erroneous error errorExit export externally fact_address facts failure finally foreach free from fromEllipsis goal guard hasDomain if implement in include inherits interface isErroneous language lowerBound maxDigits message monitor multi namespace nondeterm options or orelse orrequires otherwise predicate_fullname predicate_name predicates procedure programPoint prolog properties requires resolve retractFactDb sizeBitsOf sizeOf sizeOfDomain sourcefile_lineno sourcefile_name sourcefile_timestamp stdcall succeed supports then thiscall toAny toBinary toBoolean toEllipsis toString toTerm trap try tryToTerm tryConvert typeDescriptorOf typeLibraryOf uncheckedConvert upperBound + +[lexer_properties] +lexer.visualprolog.verbatim.strings=0 +lexer.visualprolog.backquoted.strings=1 + +[settings] +# default extension used when saving files +extension=pro + +# MIME type +mime_type=text/x-prolog + +# 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 +# (use only one of it at one time) +compiler=swipl -c "%f" + +run_cmd=swipl -q -s "%f" + +# Parse syntax check error messages and warnings, examples: +# ERROR: goo.pro:12: +error_regex=.+: (.+):([0-9]+).* Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -62,6 +62,7 @@ Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;*.lpr; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; Po=*.po;*.pot; +Prolog=*.pro;*.P; Python=*.py;*.pyw;SConstruct;SConscript;wscript; PowerShell=*.ps1;*.psm1; reStructuredText=*.rest;*.reST;*.rst; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -290,6 +290,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexTxt2tags.cxx', 'scintilla/lexilla/lexers/LexVerilog.cxx', 'scintilla/lexilla/lexers/LexVHDL.cxx', + 'scintilla/lexilla/lexers/LexVisualProlog.cxx', 'scintilla/lexilla/lexers/LexYAML.cxx', 'scintilla/lexilla/lexlib/Accessor.cxx', 'scintilla/lexilla/lexlib/Accessor.h', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -60,6 +60,7 @@ lexilla/lexers/LexTCL.cxx \ lexilla/lexers/LexTxt2tags.cxx \ lexilla/lexers/LexVHDL.cxx \ lexilla/lexers/LexVerilog.cxx \ +lexilla/lexers/LexVisualProlog.cxx \ lexilla/lexers/LexYAML.cxx LEXLIB_SRCS = \ Modified: scintilla/lexilla/lexers/LexVisualProlog.cxx 695 lines changed, 695 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,695 @@ +// Scintilla source code edit control +/** @file LexVisualProlog.cxx +** Lexer for Visual Prolog. +**/ +// Author Thomas Linder Puls, PDC A/S, http://www.visual-prolog.com +// Based on Lexer for C++, C, Java, and JavaScript. +// Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +// The line state contains: +// In SCE_VISUALPROLOG_STRING: The closing quote and information about verbatim string. +// and a stack of nesting kinds: comment, embedded (syntax) and (syntax) place holder + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <string_view> +#include <vector> +#include <map> +#include <algorithm> +#include <functional> + +#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 "CharacterCategory.h" +#include "LexerModule.h" +#include "OptionSet.h" +#include "DefaultLexer.h" + +using namespace Scintilla; +using namespace Lexilla; + +namespace { +// Options used for LexerVisualProlog +struct OptionsVisualProlog { + bool verbatimStrings; + bool backQuotedStrings; + OptionsVisualProlog() { + verbatimStrings = true; + backQuotedStrings = false; + } +}; + +static const char* const visualPrologWordLists[] = { + "Major keywords (class, predicates, ...)", + "Minor keywords (if, then, try, ...)", + "Directive keywords without the '#' (include, requires, ...)", + "Documentation keywords without the '@' (short, detail, ...)", + 0, +}; + +struct OptionSetVisualProlog : public OptionSet<OptionsVisualProlog> { + OptionSetVisualProlog() { + DefineProperty("lexer.visualprolog.verbatim.strings", &OptionsVisualProlog::verbatimStrings, + "Set to 0 to disable highlighting verbatim strings using '@'."); + DefineProperty("lexer.visualprolog.backquoted.strings", &OptionsVisualProlog::backQuotedStrings, + "Set to 1 to enable using back quotes (``) to delimit strings."); + DefineWordListSets(visualPrologWordLists); + } +}; + +LexicalClass lexicalClasses[] = { + SCE_VISUALPROLOG_DEFAULT, "SCE_VISUALPROLOG_DEFAULT", "default", "Default style", + SCE_VISUALPROLOG_KEY_MAJOR, "SCE_VISUALPROLOG_KEY_MAJOR", "keyword major", "Major keyword", + SCE_VISUALPROLOG_KEY_MINOR, "SCE_VISUALPROLOG_KEY_MINOR", "keyword minor", "Minor keyword", + SCE_VISUALPROLOG_KEY_DIRECTIVE, "SCE_VISUALPROLOG_KEY_DIRECTIVE", "keyword preprocessor", "Directove keyword", + SCE_VISUALPROLOG_COMMENT_BLOCK, "SCE_VISUALPROLOG_COMMENT_BLOCK", "comment", "Multiline comment /* */", + SCE_VISUALPROLOG_COMMENT_LINE, "SCE_VISUALPROLOG_COMMENT_LINE", "comment line", "Line comment % ...", + SCE_VISUALPROLOG_COMMENT_KEY, "SCE_VISUALPROLOG_COMMENT_KEY", "comment documentation keyword", "Doc keyword in comment % @short ...", + SCE_VISUALPROLOG_COMMENT_KEY_ERROR, "SCE_VISUALPROLOG_COMMENT_KEY_ERROR", "comment", "A non recognized doc keyword % @qqq ...", + SCE_VISUALPROLOG_IDENTIFIER, "SCE_VISUALPROLOG_IDENTIFIER", "identifier", "Identifier (black)", + SCE_VISUALPROLOG_VARIABLE, "SCE_VISUALPROLOG_VARIABLE", "variable identifier", "Variable (green)", + SCE_VISUALPROLOG_ANONYMOUS, "SCE_VISUALPROLOG_ANONYMOUS", "variable anonymous identifier", "Anonymous Variable _XXX (dimmed green)", + SCE_VISUALPROLOG_NUMBER, "SCE_VISUALPROLOG_NUMBER", "numeric", "Number", + SCE_VISUALPROLOG_OPERATOR, "SCE_VISUALPROLOG_OPERATOR", "operator", "Operator", + SCE_VISUALPROLOG_STRING, "SCE_VISUALPROLOG_STRING", "literal string", "String literal", + SCE_VISUALPROLOG_STRING_QUOTE, "SCE_VISUALPROLOG_STRING_QUOTE", "literal string quote", "Quotes surrounding string literals", + SCE_VISUALPROLOG_STRING_ESCAPE, "SCE_VISUALPROLOG_STRING_ESCAPE", "literal string escapesequence", "Escape sequence in string literal", + SCE_VISUALPROLOG_STRING_ESCAPE_ERROR, "SCE_VISUALPROLOG_STRING_ESCAPE_ERROR", "error literal string escapesequence", "Error in escape sequence in string literal", + SCE_VISUALPROLOG_STRING_EOL, "SCE_VISUALPROLOG_STRING_EOL", "literal string multiline raw escapesequence", "Verbatim/multiline string literal EOL", + SCE_VISUALPROLOG_EMBEDDED, "SCE_VISUALPROLOG_EMBEDDED", "literal string embedded", "Embedded syntax [| ... |]", + SCE_VISUALPROLOG_PLACEHOLDER, "SCE_VISUALPROLOG_PLACEHOLDER", "operator embedded", "Syntax place holder {| ... |}:ident in embedded syntax" +}; + +LexicalClass getLexicalClass(int style) { + for (auto lc : lexicalClasses) { + if (style == lc.value) { + return lc; + } + } + return {style, "", "unused", ""}; +} + + +class LexerVisualProlog : public DefaultLexer { + WordList majorKeywords; + WordList minorKeywords; + WordList directiveKeywords; + WordList docKeywords; + OptionsVisualProlog options; + OptionSetVisualProlog osVisualProlog; +public: + LexerVisualProlog() : DefaultLexer("visualprolog", SCLEX_VISUALPROLOG) { + } + virtual ~LexerVisualProlog() { + } + void SCI_METHOD Release() override { + delete this; + } + int SCI_METHOD Version() const override { + return lvRelease5; + } + const char* SCI_METHOD PropertyNames() override { + return osVisualProlog.PropertyNames(); + } + int SCI_METHOD PropertyType(const char* name) override { + return osVisualProlog.PropertyType(name); + } + const char* SCI_METHOD DescribeProperty(const char* name) override { + return osVisualProlog.DescribeProperty(name); + } + Sci_Position SCI_METHOD PropertySet(const char* key, const char* val) override; + const char* SCI_METHOD PropertyGet(const char* key) override { + return osVisualProlog.PropertyGet(key); + } + const char* SCI_METHOD DescribeWordListSets() override { + return osVisualProlog.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 NamedStyles() override { + int namedStyles = 0; + for (auto lc : lexicalClasses) { + if (namedStyles < lc.value) { + namedStyles = lc.value; + } + } + return namedStyles; + } + const char* SCI_METHOD NameOfStyle(int style) override { + return getLexicalClass(style).name; + } + const char* SCI_METHOD TagsOfStyle(int style) override { + return getLexicalClass(style).tags; + } + const char* SCI_METHOD DescriptionOfStyle(int style) override { + return getLexicalClass(style).description; + } + + static ILexer5* LexerFactoryVisualProlog() { + return new LexerVisualProlog(); + } +}; + +Sci_Position SCI_METHOD LexerVisualProlog::PropertySet(const char* key, const char* val) { + if (osVisualProlog.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +Sci_Position SCI_METHOD LexerVisualProlog::WordListSet(int n, const char* wl) { + WordList* wordListN = 0; + switch (n) { + case 0: + wordListN = &majorKeywords; + break; + case 1: + wordListN = &minorKeywords; + break; + case 2: + wordListN = &directiveKeywords; + break; + case 3: + wordListN = &docKeywords; + break; + } + Sci_Position firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +static bool isLowerLetter(int ch) { + return ccLl == CategoriseCharacter(ch); +} + +static bool isUpperLetter(int ch) { + return ccLu == CategoriseCharacter(ch); +} + +static bool isAlphaNum(int ch) { + CharacterCategory cc = CategoriseCharacter(ch); + return (ccLu == cc || ccLl == cc || ccLt == cc || ccLm == cc || ccLo == cc || ccNd == cc || ccNl == cc || ccNo == cc); +} + +static bool isStringVerbatimOpenClose(int ch) { + CharacterCategory cc = CategoriseCharacter(ch); + return (ccPc <= cc && cc <= ccSo); +} + +static bool isIdChar(int ch) { + return ('_') == ch || isAlphaNum(ch); +} + +// Look ahead to see which colour "end" should have (takes colour after the following keyword) +static void endLookAhead(char s[], LexAccessor& styler, Sci_Position start) { + char ch = styler.SafeGetCharAt(start, '\n'); + while (' ' == ch) { + start++; + ch = styler.SafeGetCharAt(start, '\n'); + } + Sci_Position i = 0; + while (i < 100 && isLowerLetter(ch)) { + s[i] = ch; + i++; + ch = styler.SafeGetCharAt(start + i, '\n'); + } + s[i] = '\0'; +} + + +class lineState { +public: + bool verbatim = false; + int closingQuote = 0; + int kindStack = 0; + + bool isOpenStringVerbatim(int next) { + if (next > 0x7FFF) { + return false; + } + switch (next) { + case L'<': + closingQuote = L'>'; + return true; + case L'>': + closingQuote = L'<'; + return true; + case L'(': + closingQuote = L')'; + return true; + case L')': + closingQuote = L'('; + return true; + case L'[': + closingQuote = L']'; + return true; + case L']': + closingQuote = L'['; + return true; + case L'{': + closingQuote = L'}'; + return true; + case L'}': + closingQuote = L'{'; + return true; + case L'_': + case L'.': + case L',': + case L';': + return false; + default: + if (isStringVerbatimOpenClose(next)) { + closingQuote = next; + return true; + } else { + return false; + } + } + } + + enum kind { + none = 0, + comment = 1, + embedded = 2, + placeholder = 3 + }; + + void setState(int state) { + verbatim = state >> 31; + closingQuote = state >> 16 & 0x7FFF; + kindStack = state & 0xFFFF; + } + + int getState() { + return verbatim << 31 | closingQuote << 16 | (kindStack & 0xFFFF); + } + + void enter(kind k) { + kindStack = kindStack << 2 | k; + } + + void leave(kind k) { + if (k == currentKind()) { + kindStack = kindStack >> 2; + } + } + kind currentKind() { + return static_cast<kind>(kindStack & 0x3); + } + kind stateKind2(int ks) { + if (0 == ks) { + return none; + } else { + kind k1 = stateKind2(ks >> 2); + kind k2 = static_cast<kind>(ks & 0x3); + if (embedded == k1 && k2 == comment) { + return embedded; + } else { + return k2; + } + } + } + kind stateKind() { + return stateKind2(kindStack); + } +}; + +void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument* pAccess) { + LexAccessor styler(pAccess); + CharacterSet setDoxygen(CharacterSet::setAlpha, ""); + CharacterSet setNumber(CharacterSet::setNone, "0123456789abcdefABCDEFxoXO_"); + + StyleContext sc(startPos, length, initStyle, styler, 0x7f); + + int styleBeforeDocKeyword = SCE_VISUALPROLOG_DEFAULT; + + lineState ls; + if (sc.currentLine >= 1) { + ls.setState(styler.GetLineState(sc.currentLine - 1)); + } + + bool newState = false; + + for (; sc.More(); sc.Forward()) { + + Sci_Position currentLineEntry = sc.currentLine; + + if (newState) { + newState = false; + int state; + switch (ls.stateKind()) { + case lineState::comment: + state = SCE_VISUALPROLOG_COMMENT_BLOCK; + break; + case lineState::embedded: + state = SCE_VISUALPROLOG_EMBEDDED; + break; + case lineState::placeholder: + state = SCE_VISUALPROLOG_PLACEHOLDER; + break; + default: + state = SCE_VISUALPROLOG_DEFAULT; + break; + } + sc.SetState(state); + } + + // Determine if the current state should terminate. + switch (sc.state) { + case SCE_VISUALPROLOG_OPERATOR: + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + break; + case SCE_VISUALPROLOG_NUMBER: + // We accept almost anything because of hex, '.' and number suffixes + if (!(setNumber.Contains(sc.ch)) || (sc.Match('.') && IsADigit(sc.chNext))) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_IDENTIFIER: + if (!isIdChar(sc.ch)) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (0 == strcmp(s, "end")) { + endLookAhead(s, styler, sc.currentPos); + } + if (majorKeywords.InList(s)) { + sc.ChangeState(SCE_VISUALPROLOG_KEY_MAJOR); + } else if (minorKeywords.InList(s)) { + sc.ChangeState(SCE_VISUALPROLOG_KEY_MINOR); + } + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_VARIABLE: + case SCE_VISUALPROLOG_ANONYMOUS: + if (!isIdChar(sc.ch)) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_KEY_DIRECTIVE: + if (!isLowerLetter(sc.ch)) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (!directiveKeywords.InList(s + 1)) { + sc.ChangeState(SCE_VISUALPROLOG_IDENTIFIER); + } + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_COMMENT_LINE: + if (sc.MatchLineEnd()) { + int nextState = (lineState::comment == ls.currentKind()) ? SCE_VISUALPROLOG_COMMENT_BLOCK : SCE_VISUALPROLOG_DEFAULT; + sc.SetState(nextState); + } else if (sc.Match('@')) { + styleBeforeDocKeyword = SCE_VISUALPROLOG_COMMENT_LINE; + sc.SetState(SCE_VISUALPROLOG_COMMENT_KEY_ERROR); + } + break; + case SCE_VISUALPROLOG_COMMENT_BLOCK: + if (sc.Match('*', '/')) { + sc.Forward(); + ls.leave(lineState::comment); + newState = true; + } else if (sc.Match('/', '*')) { + sc.Forward(); + ls.enter(lineState::comment); + } else if (sc.Match('@')) { + styleBeforeDocKeyword = SCE_VISUALPROLOG_COMMENT_BLOCK; + sc.SetState(SCE_VISUALPROLOG_COMMENT_KEY_ERROR); + } + break; + case SCE_VISUALPROLOG_COMMENT_KEY_ERROR: + if (!setDoxygen.Contains(sc.ch) || sc.MatchLineEnd()) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (docKeywords.InList(s + 1)) { + sc.ChangeState(SCE_VISUALPROLOG_COMMENT_KEY); + } + if (SCE_VISUALPROLOG_COMMENT_LINE == styleBeforeDocKeyword && sc.MatchLineEnd()) { + // end line comment + int nextState = (lineState::comment == ls.currentKind()) ? SCE_VISUALPROLOG_COMMENT_BLOCK : SCE_VISUALPROLOG_DEFAULT; + sc.SetState(nextState); + } else { + sc.SetState(styleBeforeDocKeyword); + if (SCE_VISUALPROLOG_COMMENT_BLOCK == styleBeforeDocKeyword && sc.Match('*', '/')) { + // we have consumed the '*' if it comes immediately after the docKeyword + sc.Forward(); + ls.leave(lineState::comment); + newState = true; + } + } + } + break; + case SCE_VISUALPROLOG_STRING_ESCAPE_ERROR: + if (sc.atLineStart) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + break; + } + [[fallthrough]]; + case SCE_VISUALPROLOG_STRING_ESCAPE: + case SCE_VISUALPROLOG_STRING_QUOTE: + case SCE_VISUALPROLOG_STRING_EOL: + // return to SCE_VISUALPROLOG_STRING and treat as such (fallthrough) + sc.SetState(SCE_VISUALPROLOG_STRING); + [[fallthrough]]; + case SCE_VISUALPROLOG_STRING: + if (sc.MatchLineEnd() | sc.atLineEnd) { + if (ls.verbatim) { + sc.SetState(SCE_VISUALPROLOG_STRING_EOL); + } else { + ls.closingQuote = 0; + sc.SetState(SCE_VISUALPROLOG_STRING_ESCAPE_ERROR); + } + } else if (sc.Match(ls.closingQuote)) { + if (ls.verbatim && ls.closingQuote == sc.chNext) { + sc.SetState(SCE_VISUALPROLOG_STRING_ESCAPE); + sc.Forward(); + } else { + ls.closingQuote = 0; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + sc.ForwardSetState(SCE_VISUALPROLOG_DEFAULT); + } + } else if (!ls.verbatim && sc.Match('\\')) { + sc.SetState(SCE_VISUALPROLOG_STRING_ESCAPE_ERROR); + sc.Forward(); + if (sc.MatchLineEnd()) { + sc.ForwardSetState(SCE_VISUALPROLOG_DEFAULT); + } else { + if (sc.Match('"') || sc.Match('\'') || sc.Match('\\') || sc.Match('n') || sc.Match('l') || sc.Match('r') || sc.Match('t')) { + sc.ChangeState(SCE_VISUALPROLOG_STRING_ESCAPE); + } else if (sc.Match('u')) { + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + sc.ChangeState(SCE_VISUALPROLOG_STRING_ESCAPE); + } + } + } + } + } + } + } + break; + case SCE_VISUALPROLOG_EMBEDDED: + if (sc.Match('|', ']')) { + sc.Forward(); + ls.leave(lineState::embedded); + newState = true; + } else if (sc.Match('[', '|')) { + sc.Forward(); + ls.enter(lineState::embedded); + } else if (sc.Match('{', '|') && lineState::comment != ls.currentKind()) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } else if (sc.Match('/', '*')) { + sc.Forward(); + ls.enter(lineState::comment); + } else if (sc.Match('*', '/')) { + sc.Forward(); + ls.leave(lineState::comment); + newState = true; + } + break; + case SCE_VISUALPROLOG_PLACEHOLDER: + if (lineState::embedded == ls.currentKind()) { + sc.SetState(SCE_VISUALPROLOG_EMBEDDED); + } else { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + } + + if (currentLineEntry != sc.currentLine) { + styler.SetLineState(currentLineEntry, ls.getState()); + } + if (sc.MatchLineEnd() | sc.atLineEnd) { + if (sc.More()) { // currentLine can be outside the document + styler.SetLineState(sc.currentLine, ls.getState()); + } + } + + // Determine if a new state should be entered. + if (sc.state == SCE_VISUALPROLOG_DEFAULT) { + if (options.verbatimStrings && sc.Match('@') && ls.isOpenStringVerbatim(sc.chNext)) { + ls.verbatim = true; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + sc.Forward(); + } else if (IsADigit(sc.ch) || (sc.Match('.') && IsADigit(sc.chNext))) { + sc.SetState(SCE_VISUALPROLOG_NUMBER); + } else if (isLowerLetter(sc.ch)) { + sc.SetState(SCE_VISUALPROLOG_IDENTIFIER); + } else if (isUpperLetter(sc.ch)) { + sc.SetState(SCE_VISUALPROLOG_VARIABLE); + } else if (sc.Match('_')) { + sc.SetState(SCE_VISUALPROLOG_ANONYMOUS); + } else if (sc.Match('/', '*')) { + sc.SetState(SCE_VISUALPROLOG_COMMENT_BLOCK); + ls.enter(lineState::comment); + sc.Forward(); + } else if (sc.Match('%')) { + sc.SetState(SCE_VISUALPROLOG_COMMENT_LINE); + } else if (sc.Match('[', '|')) { + sc.SetState(SCE_VISUALPROLOG_EMBEDDED); + ls.enter(lineState::embedded); + sc.Forward(); + } else if (sc.Match('{', '|')) { + sc.SetState(SCE_VISUALPROLOG_PLACEHOLDER); + ls.enter(lineState::placeholder); + sc.Forward(); + } else if (sc.Match('|', '}')) { + sc.SetState(SCE_VISUALPROLOG_PLACEHOLDER); + sc.Forward(); + if (':' == sc.chNext) { + sc.Forward(); + for (; isIdChar(sc.chNext); sc.Forward()) { + } + } + ls.leave(lineState::placeholder); + newState = true; + } else if (sc.Match('\'')) { + ls.verbatim = false; + ls.closingQuote = '\''; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + } else if (sc.Match('"')) { + ls.verbatim = false; + ls.closingQuote = '"'; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + } else if (options.backQuotedStrings && sc.Match('`')) { + ls.verbatim = false; + ls.closingQuote = '`'; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + } else if (sc.Match('#')) { + sc.SetState(SCE_VISUALPROLOG_KEY_DIRECTIVE); + } else if (isoperator(static_cast<char>(sc.ch)) || sc.Match('\\') || + (!options.verbatimStrings && sc.Match('@'))) { + sc.SetState(SCE_VISUALPROLOG_OPERATOR); + } + } + } + sc.Complete(); + styler.Flush(); +} + +// Store both the current line's fold level and the next lines in the +// level store to make it easy to pick up with each increment +// and to make it possible to fiddle the current level for "} else {". + +#if defined(__clang__) +#if __has_warning("-Wunused-but-set-variable") +// Disable warning for visibleChars +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif +#endif + +void SCI_METHOD LexerVisualProlog::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument* pAccess) { + + LexAccessor styler(pAccess); + + Sci_PositionU endPos = startPos + length; + int visibleChars = 0; + Sci_Position currentLine = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (currentLine > 0) + levelCurrent = styler.LevelAt(currentLine - 1) >> 16; + int levelMinCurrent = levelCurrent; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + for (Sci_PositionU i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (style == SCE_VISUALPROLOG_OPERATOR) { + if (ch == '{') { + // Measure the minimum before a '{' to allow + // folding on "} else {" + if (levelMinCurrent > levelNext) { + levelMinCurrent = levelNext; + } + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + if (!IsASpace(ch)) + visibleChars++; + if (atEOL || (i == endPos - 1)) { + int levelUse = levelCurrent; + int lev = levelUse | levelNext << 16; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(currentLine)) { + styler.SetLevel(currentLine, lev); + } + currentLine++; + levelCurrent = levelNext; + levelMinCurrent = levelCurrent; + if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length() - 1))) { + // There is an empty line at end of file so give it same level and empty + styler.SetLevel(currentLine, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG); + } + visibleChars = 0; + } + } +} +} + +LexerModule lmVisualProlog(SCLEX_VISUALPROLOG, LexerVisualProlog::LexerFactoryVisualProlog, "visualprolog", visualPrologWordLists); Modified: scintilla/lexilla/src/Lexilla.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -220,6 +220,7 @@ static void AddGeanyLexers() &lmTxt2tags, &lmVerilog, &lmVHDL, + &lmVisualProlog, &lmXML, &lmYAML, }); Modified: scintilla/scintilla_changes.patch 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -119,6 +119,7 @@ index cd4b23617..af4a73db4 100644 + &lmTxt2tags, + &lmVerilog, + &lmVHDL, ++ &lmVisualProlog, + &lmXML, + &lmYAML, + }); Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -191,6 +191,7 @@ static void init_builtin_filetypes(void) 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 ); + FT_INIT( PROLOG, NONE, "Prolog", NULL, SOURCE_FILE, COMPILED ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -111,6 +111,7 @@ typedef enum GEANY_FILETYPES_AU3, GEANY_FILETYPES_RAKU, GEANY_FILETYPES_CIL, + GEANY_FILETYPES_PROLOG, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -1042,6 +1042,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(PHP); init_styleset_case(PO); init_styleset_case(POWERSHELL); + init_styleset_case(PROLOG); init_styleset_case(PYTHON); init_styleset_case(R); init_styleset_case(RAKU); @@ -1136,6 +1137,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(PHP); styleset_case(PO); styleset_case(POWERSHELL); + styleset_case(PROLOG); styleset_case(PYTHON); styleset_case(R); styleset_case(RAKU); @@ -1652,6 +1654,15 @@ gboolean highlighting_is_string_style(gint lexer, gint style) return (style == SCE_POWERSHELL_STRING || style == SCE_POWERSHELL_CHARACTER); + case SCLEX_VISUALPROLOG: + return (style == SCE_VISUALPROLOG_STRING || + style == SCE_VISUALPROLOG_STRING_QUOTE || + style == SCE_VISUALPROLOG_STRING_ESCAPE || + style == SCE_VISUALPROLOG_STRING_ESCAPE_ERROR || + style == SCE_VISUALPROLOG_STRING_EOL || + style == SCE_VISUALPROLOG_EMBEDDED || + style == SCE_VISUALPROLOG_PLACEHOLDER); + case SCLEX_BATCH: case SCLEX_DIFF: case SCLEX_LATEX: @@ -1905,6 +1916,12 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) case SCLEX_AU3: return (style == SCE_AU3_COMMENT || style == SCE_AU3_COMMENTBLOCK); + + case SCLEX_VISUALPROLOG: + return (style == SCE_VISUALPROLOG_COMMENT_BLOCK || + style == SCE_VISUALPROLOG_COMMENT_LINE || + style == SCE_VISUALPROLOG_COMMENT_KEY || + style == SCE_VISUALPROLOG_COMMENT_KEY_ERROR); } return FALSE; } Modified: src/highlightingmappings.h 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -1360,6 +1360,39 @@ static const HLKeyword highlighting_keywords_POWERSHELL[] = #define highlighting_properties_POWERSHELL EMPTY_PROPERTIES +/* Prolog */ +#define highlighting_lexer_PROLOG SCLEX_VISUALPROLOG +static const HLStyle highlighting_styles_PROLOG[] = +{ + { SCE_VISUALPROLOG_DEFAULT, "default", FALSE }, + { SCE_VISUALPROLOG_KEY_MAJOR, "key_major", FALSE }, + { SCE_VISUALPROLOG_KEY_MINOR, "key_minor", FALSE }, + { SCE_VISUALPROLOG_KEY_DIRECTIVE, "key_directive", FALSE }, + { SCE_VISUALPROLOG_COMMENT_BLOCK, "comment_block", FALSE }, + { SCE_VISUALPROLOG_COMMENT_LINE, "comment_line", FALSE }, + { SCE_VISUALPROLOG_COMMENT_KEY, "comment_key", FALSE }, + { SCE_VISUALPROLOG_COMMENT_KEY_ERROR, "comment_key_error", FALSE }, + { SCE_VISUALPROLOG_IDENTIFIER, "identifier", FALSE }, + { SCE_VISUALPROLOG_VARIABLE, "variable", FALSE }, + { SCE_VISUALPROLOG_ANONYMOUS, "anonymous", FALSE }, + { SCE_VISUALPROLOG_NUMBER, "number", FALSE }, + { SCE_VISUALPROLOG_OPERATOR, "operator", FALSE }, + { SCE_VISUALPROLOG_STRING, "string", FALSE }, + { SCE_VISUALPROLOG_STRING_QUOTE, "string_quote", FALSE }, + { SCE_VISUALPROLOG_STRING_ESCAPE, "string_escape", FALSE }, + { SCE_VISUALPROLOG_STRING_ESCAPE_ERROR, "string_escape_error", FALSE }, + { SCE_VISUALPROLOG_STRING_EOL, "string_eol", FALSE }, + { SCE_VISUALPROLOG_EMBEDDED, "embedded", FALSE }, + { SCE_VISUALPROLOG_PLACEHOLDER, "placeholder", FALSE }, +}; +static const HLKeyword highlighting_keywords_PROLOG[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, +}; +#define highlighting_properties_PROLOG EMPTY_PROPERTIES + + /* Python */ #define highlighting_lexer_PYTHON SCLEX_PYTHON static const HLStyle highlighting_styles_PYTHON[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 588427: Add Prolog filetype support
by Jiří Techet 16 Aug '24

16 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 16 Aug 2024 19:58:47 UTC Commit: 588427236ea7f14ff3a9d8f233653f32f8371d9f https://github.com/geany/geany/commit/588427236ea7f14ff3a9d8f233653f32f8371… Log Message: ----------- Add Prolog filetype support This patch adds basic Prolog support (only scintilla laxer, there's no ctags parser). I used swi-prolog for the compiler and run commands which I believe is the most commonly used prolog implementation. This patch contains keyword suggestions made by @rdipardo, thanks. Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.prolog data/filetype_extensions.conf meson.build scintilla/Makefile.am scintilla/lexilla/lexers/LexVisualProlog.cxx scintilla/lexilla/src/Lexilla.cxx scintilla/scintilla_changes.patch src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -65,6 +65,7 @@ filetypes_dist = \ filedefs/filetypes.php \ filedefs/filetypes.po \ filedefs/filetypes.powershell \ + filedefs/filetypes.prolog \ filedefs/filetypes.r \ filedefs/filetypes.raku \ filedefs/filetypes.restructuredtext \ Modified: data/filedefs/filetypes.prolog 78 lines changed, 78 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,78 @@ +[styling] +# Edit these in the colorscheme .conf file instead +default=default +key_major=keyword_1 +key_minor=keyword_2 +key_directive=keyword_1 +comment_block=comment +comment_line=comment +comment_key=comment +comment_key_error=comment +identifier=identifier +variable=default +anonymous=default +number=number_1 +operator=operator +string=string_1 +string_quote=string_1 +string_escape=string_1 +string_escape_error=error +string_eol=string_1 +embedded=string_1 +placeholder=string_1 + +[keywords] +# all items must be in one line +# From https://github.com/arthwang/vsc-prolog and https://github.com/mxw/vim-prolog +primary=abolish abolish_op abolish_record abort abs absolute_file_name accept access_file acos acyclic_term add_attribute alarm als append append_strings apply arg argc argv arithmetic_function arity array array_concat array_flat array_list asin assert asserta assertz at at_end_of_stream at_eof atan atom atom_chars atom_codes atom_concat atom_length atom_number atom_prefix atom_string atom_to_term atomic attach_suspensions attached_suspensions autoload autoload_tool b_external bag_abolish bag_count bag_create bag_dissolve bag_enter bag_erase bag_retrieve bagof begin_module between bind block breal breal_bounds breal_from_bounds breal_max breal_min byte_count bytes_to_term call call-2 call_c call_cleanup call_explicit call_priority call_with_depth_limit callable cancel_after_event canonical_path_name catch cd ceil ceiling char_code char_conversion char_int char_type character_count chdir clause clause_property close clrbit code_type collation_key comment compare compare_instances com pile compile_predicates compile_stream compile_term compile_term_annotated compiled_stream compound concat_atom concat_atoms concat_string concat_strings connect copy_stream_data copy_term copy_term_vars coroutine cos coverof cputime create_module current_after_event current_after_events current_arithmetic_function current_array current_atom current_blob current_built_in current_char_conversion current_compiled_file current_domain current_error current_flag current_format_predicate current_functor current_interrupt current_key current_macro current_module current_module_predicate current_op current_ouput current_pragma current_predicate current_record current_signal current_store current_stream current_struct current_suspension current_trigger cyclic_term date date_time_stamp date_time_value dbgcomp debug debug_reset debugging decval define_error define_macro delay delayed_goals delayed_goals_number delete delete_file demon denominator deprecated dim discontiguous display div domain domain_index downcase_atom duplicate_term dwim_match dwim_predicate dynamic e elif ensure_loaded enter_suspension_list env erase erase_all erase_array erase_macro erase_module errno_id error_id eval event event_after event_after_every event_create event_disable event_enable event_retrieve events_after events_defer events_nodefer exec exec_group existing_file exists exists_directory exists_file exit exit_block exp expand_clause expand_file_name expand_goal expand_macros external fail fail_if false file_base_name file_directory_name file_name_extension fileerrors findall fix flag flatten_array float float_fractional_part float_integer_part floor flush flush_output forall fork format format_predicate format_time frandom functor garbage_collect garbage_collect_atoms gcd get get0 get_byte get_char get_chtab get_code get_error_handler get_event_handler get_file_info get_flag get_interrupt_handler get_leash get_module_info get_priority get_prompt get_single_char get_stream get_stream_info get_suspension_data get_time get_timer get_var_bounds get_var_info getbit getcwd getenv getval global global_op ground halt hash help ignore import incval index init_suspension_list inline insert_suspension instance integer integer_atom is is_absolute_file_name is_array is_built_in is_dynamic is_event is_handle is_list is_locked is_predicate is_record is_stream is_suspension join_string keysort kill kill_display_matrix kill_suspension lcm length lib line_count line_position listen listing ln load local local_record local_time local_time_string locale_sort lock lock_pass log lsb macro make make_array make_directory make_display_matrix make_local_array make_suspension maplist max memberchk merge merge_set merge_suspension_lists message_hook message_to_string meta meta_attribute meta_bind meta_predicate min mkdir mod mode module module_interface msb msort mutex mutex_init name nb_linkarg nb_setarg new_socket_server nl nodbgcomp nodebug nonground nonvar normalize_space nospy not not_un ify notify_constrained notrace nth_clause number number_chars number_codes number_merge number_sort number_string numbervars numerator occurs on_signal once op open open_null_stream os_file_name parallel parse_time pathname pause peek_byte peek_char peek_code peer peer_deregister_multitask peer_do_multitask peer_get_property peer_multitask_confirm peer_multitask_terminate peer_queue_close peer_queue_create peer_queue_get_property peer_register_multitask phrase pi pipe plus popcount portray portray_clause portray_goal portray_term powm pragma pred predicate_property predsort print print_message print_message_lines printf profile prolog_to_os_filename prompt prompt1 prune_instances put put_byte put_char put_code qcompile random rational rationalize rdiv read read_annotated read_clause read_directory read_exdr read_history read_link read_pending_input read_string read_term read_token readvar real record record_create recorda recorded recorded_list recordz redefine_system_predicate reex port reference referenced_record rem remote_connect remote_connect_accept remote_connect_setup remote_disconnect remote_yield rename rename_file repeat rerecord reset_error_handler reset_error_handlers reset_event_handler retract retract_all retractall round same_file same_term schedule_suspensions schedule_woken see seed seeing seek seen select set_chtab set_error_handler set_event_handler set_flag set_input set_interrupt_handler set_leash set_output set_prolog_IO set_prompt set_stream set_stream_position set_stream_property set_suspension_data set_suspension_priority set_timer set_tty set_var_bounds setarg setbit setenv setlocale setof setup_and_call_cleanup setval sgn sh shelf shelf_abolish shelf_create shelf_dec shelf_get shelf_inc shelf_set shell sin size_file skip skipped sleep socket sort split_string sprintf spy spy_term spy_var sqrt stack_parameter stamp_date_time statistics store store_contains store_count store_create store_delete store_erase store_get store_inc store_set stored_keys stored_keys_and_values stream_position_data stream_property stream_select stream_truncate string string_code string_concat string_length string_list string_to_atom string_to_list struct sub_atom sub_string subcall subscript substring subsumes subsumes_chk succ suffix sum suspend suspension_to_goal suspensions swritef system tab tan tell telling term_hash term_string term_to_atom term_to_bytes term_variables test_and_setval throw time time_file times tmp_file told tool tool_body trace trace_call_port trace_exit_port trace_parent_port trace_point_port traceable trigger trim_stacks trimcore true truncate tty_get_capability tty_goto tty_put tty_size ttyflush tyi tyo type_of unget unifiable unify_with_occurs_check unix unlock unschedule_suspension unsetenv unskipped untraceable upcase_atom update_struct use_module var variable variant wait wait_for_input wake wildcard_match win_exec win_folder win_has_menu win_insert_menu win_insert_menu_item win_registry_get_value win_shell win_window_pos window_title with_output_to working_directory write write_canonical write_exdr write_term writeclause writef writeln writeq xget xor xset yield +# Visual Prolog keywords: https://wiki.visual-prolog.com/index.php?title=Language_Reference/Built-in_… +secondary=and anyflow apicall bininclude bound c class class_name clauses constant_name constants constructors convert delegate determ digits digitsOf do domains else elseif endif erroneous error errorExit export externally fact_address facts failure finally foreach free from fromEllipsis goal guard hasDomain if implement in include inherits interface isErroneous language lowerBound maxDigits message monitor multi namespace nondeterm options or orelse orrequires otherwise predicate_fullname predicate_name predicates procedure programPoint prolog properties requires resolve retractFactDb sizeBitsOf sizeOf sizeOfDomain sourcefile_lineno sourcefile_name sourcefile_timestamp stdcall succeed supports then thiscall toAny toBinary toBoolean toEllipsis toString toTerm trap try tryToTerm tryConvert typeDescriptorOf typeLibraryOf uncheckedConvert upperBound + +[lexer_properties] +lexer.visualprolog.verbatim.strings=0 +lexer.visualprolog.backquoted.strings=1 + +[settings] +# default extension used when saving files +extension=pro + +# MIME type +mime_type=text/x-prolog + +# 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 +# (use only one of it at one time) +compiler=swipl -c "%f" + +run_cmd=swipl -q -s "%f" + +# Parse syntax check error messages and warnings, examples: +# ERROR: goo.pro:12: +error_regex=.+: (.+):([0-9]+).* Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -62,6 +62,7 @@ Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;*.lpr; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; Po=*.po;*.pot; +Prolog=*.pro;*.P; Python=*.py;*.pyw;SConstruct;SConscript;wscript; PowerShell=*.ps1;*.psm1; reStructuredText=*.rest;*.reST;*.rst; Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -290,6 +290,7 @@ lexilla = static_library('lexilla', 'scintilla/lexilla/lexers/LexTxt2tags.cxx', 'scintilla/lexilla/lexers/LexVerilog.cxx', 'scintilla/lexilla/lexers/LexVHDL.cxx', + 'scintilla/lexilla/lexers/LexVisualProlog.cxx', 'scintilla/lexilla/lexers/LexYAML.cxx', 'scintilla/lexilla/lexlib/Accessor.cxx', 'scintilla/lexilla/lexlib/Accessor.h', Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -60,6 +60,7 @@ lexilla/lexers/LexTCL.cxx \ lexilla/lexers/LexTxt2tags.cxx \ lexilla/lexers/LexVHDL.cxx \ lexilla/lexers/LexVerilog.cxx \ +lexilla/lexers/LexVisualProlog.cxx \ lexilla/lexers/LexYAML.cxx LEXLIB_SRCS = \ Modified: scintilla/lexilla/lexers/LexVisualProlog.cxx 695 lines changed, 695 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,695 @@ +// Scintilla source code edit control +/** @file LexVisualProlog.cxx +** Lexer for Visual Prolog. +**/ +// Author Thomas Linder Puls, PDC A/S, http://www.visual-prolog.com +// Based on Lexer for C++, C, Java, and JavaScript. +// Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +// The line state contains: +// In SCE_VISUALPROLOG_STRING: The closing quote and information about verbatim string. +// and a stack of nesting kinds: comment, embedded (syntax) and (syntax) place holder + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <string_view> +#include <vector> +#include <map> +#include <algorithm> +#include <functional> + +#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 "CharacterCategory.h" +#include "LexerModule.h" +#include "OptionSet.h" +#include "DefaultLexer.h" + +using namespace Scintilla; +using namespace Lexilla; + +namespace { +// Options used for LexerVisualProlog +struct OptionsVisualProlog { + bool verbatimStrings; + bool backQuotedStrings; + OptionsVisualProlog() { + verbatimStrings = true; + backQuotedStrings = false; + } +}; + +static const char* const visualPrologWordLists[] = { + "Major keywords (class, predicates, ...)", + "Minor keywords (if, then, try, ...)", + "Directive keywords without the '#' (include, requires, ...)", + "Documentation keywords without the '@' (short, detail, ...)", + 0, +}; + +struct OptionSetVisualProlog : public OptionSet<OptionsVisualProlog> { + OptionSetVisualProlog() { + DefineProperty("lexer.visualprolog.verbatim.strings", &OptionsVisualProlog::verbatimStrings, + "Set to 0 to disable highlighting verbatim strings using '@'."); + DefineProperty("lexer.visualprolog.backquoted.strings", &OptionsVisualProlog::backQuotedStrings, + "Set to 1 to enable using back quotes (``) to delimit strings."); + DefineWordListSets(visualPrologWordLists); + } +}; + +LexicalClass lexicalClasses[] = { + SCE_VISUALPROLOG_DEFAULT, "SCE_VISUALPROLOG_DEFAULT", "default", "Default style", + SCE_VISUALPROLOG_KEY_MAJOR, "SCE_VISUALPROLOG_KEY_MAJOR", "keyword major", "Major keyword", + SCE_VISUALPROLOG_KEY_MINOR, "SCE_VISUALPROLOG_KEY_MINOR", "keyword minor", "Minor keyword", + SCE_VISUALPROLOG_KEY_DIRECTIVE, "SCE_VISUALPROLOG_KEY_DIRECTIVE", "keyword preprocessor", "Directove keyword", + SCE_VISUALPROLOG_COMMENT_BLOCK, "SCE_VISUALPROLOG_COMMENT_BLOCK", "comment", "Multiline comment /* */", + SCE_VISUALPROLOG_COMMENT_LINE, "SCE_VISUALPROLOG_COMMENT_LINE", "comment line", "Line comment % ...", + SCE_VISUALPROLOG_COMMENT_KEY, "SCE_VISUALPROLOG_COMMENT_KEY", "comment documentation keyword", "Doc keyword in comment % @short ...", + SCE_VISUALPROLOG_COMMENT_KEY_ERROR, "SCE_VISUALPROLOG_COMMENT_KEY_ERROR", "comment", "A non recognized doc keyword % @qqq ...", + SCE_VISUALPROLOG_IDENTIFIER, "SCE_VISUALPROLOG_IDENTIFIER", "identifier", "Identifier (black)", + SCE_VISUALPROLOG_VARIABLE, "SCE_VISUALPROLOG_VARIABLE", "variable identifier", "Variable (green)", + SCE_VISUALPROLOG_ANONYMOUS, "SCE_VISUALPROLOG_ANONYMOUS", "variable anonymous identifier", "Anonymous Variable _XXX (dimmed green)", + SCE_VISUALPROLOG_NUMBER, "SCE_VISUALPROLOG_NUMBER", "numeric", "Number", + SCE_VISUALPROLOG_OPERATOR, "SCE_VISUALPROLOG_OPERATOR", "operator", "Operator", + SCE_VISUALPROLOG_STRING, "SCE_VISUALPROLOG_STRING", "literal string", "String literal", + SCE_VISUALPROLOG_STRING_QUOTE, "SCE_VISUALPROLOG_STRING_QUOTE", "literal string quote", "Quotes surrounding string literals", + SCE_VISUALPROLOG_STRING_ESCAPE, "SCE_VISUALPROLOG_STRING_ESCAPE", "literal string escapesequence", "Escape sequence in string literal", + SCE_VISUALPROLOG_STRING_ESCAPE_ERROR, "SCE_VISUALPROLOG_STRING_ESCAPE_ERROR", "error literal string escapesequence", "Error in escape sequence in string literal", + SCE_VISUALPROLOG_STRING_EOL, "SCE_VISUALPROLOG_STRING_EOL", "literal string multiline raw escapesequence", "Verbatim/multiline string literal EOL", + SCE_VISUALPROLOG_EMBEDDED, "SCE_VISUALPROLOG_EMBEDDED", "literal string embedded", "Embedded syntax [| ... |]", + SCE_VISUALPROLOG_PLACEHOLDER, "SCE_VISUALPROLOG_PLACEHOLDER", "operator embedded", "Syntax place holder {| ... |}:ident in embedded syntax" +}; + +LexicalClass getLexicalClass(int style) { + for (auto lc : lexicalClasses) { + if (style == lc.value) { + return lc; + } + } + return {style, "", "unused", ""}; +} + + +class LexerVisualProlog : public DefaultLexer { + WordList majorKeywords; + WordList minorKeywords; + WordList directiveKeywords; + WordList docKeywords; + OptionsVisualProlog options; + OptionSetVisualProlog osVisualProlog; +public: + LexerVisualProlog() : DefaultLexer("visualprolog", SCLEX_VISUALPROLOG) { + } + virtual ~LexerVisualProlog() { + } + void SCI_METHOD Release() override { + delete this; + } + int SCI_METHOD Version() const override { + return lvRelease5; + } + const char* SCI_METHOD PropertyNames() override { + return osVisualProlog.PropertyNames(); + } + int SCI_METHOD PropertyType(const char* name) override { + return osVisualProlog.PropertyType(name); + } + const char* SCI_METHOD DescribeProperty(const char* name) override { + return osVisualProlog.DescribeProperty(name); + } + Sci_Position SCI_METHOD PropertySet(const char* key, const char* val) override; + const char* SCI_METHOD PropertyGet(const char* key) override { + return osVisualProlog.PropertyGet(key); + } + const char* SCI_METHOD DescribeWordListSets() override { + return osVisualProlog.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 NamedStyles() override { + int namedStyles = 0; + for (auto lc : lexicalClasses) { + if (namedStyles < lc.value) { + namedStyles = lc.value; + } + } + return namedStyles; + } + const char* SCI_METHOD NameOfStyle(int style) override { + return getLexicalClass(style).name; + } + const char* SCI_METHOD TagsOfStyle(int style) override { + return getLexicalClass(style).tags; + } + const char* SCI_METHOD DescriptionOfStyle(int style) override { + return getLexicalClass(style).description; + } + + static ILexer5* LexerFactoryVisualProlog() { + return new LexerVisualProlog(); + } +}; + +Sci_Position SCI_METHOD LexerVisualProlog::PropertySet(const char* key, const char* val) { + if (osVisualProlog.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +Sci_Position SCI_METHOD LexerVisualProlog::WordListSet(int n, const char* wl) { + WordList* wordListN = 0; + switch (n) { + case 0: + wordListN = &majorKeywords; + break; + case 1: + wordListN = &minorKeywords; + break; + case 2: + wordListN = &directiveKeywords; + break; + case 3: + wordListN = &docKeywords; + break; + } + Sci_Position firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +static bool isLowerLetter(int ch) { + return ccLl == CategoriseCharacter(ch); +} + +static bool isUpperLetter(int ch) { + return ccLu == CategoriseCharacter(ch); +} + +static bool isAlphaNum(int ch) { + CharacterCategory cc = CategoriseCharacter(ch); + return (ccLu == cc || ccLl == cc || ccLt == cc || ccLm == cc || ccLo == cc || ccNd == cc || ccNl == cc || ccNo == cc); +} + +static bool isStringVerbatimOpenClose(int ch) { + CharacterCategory cc = CategoriseCharacter(ch); + return (ccPc <= cc && cc <= ccSo); +} + +static bool isIdChar(int ch) { + return ('_') == ch || isAlphaNum(ch); +} + +// Look ahead to see which colour "end" should have (takes colour after the following keyword) +static void endLookAhead(char s[], LexAccessor& styler, Sci_Position start) { + char ch = styler.SafeGetCharAt(start, '\n'); + while (' ' == ch) { + start++; + ch = styler.SafeGetCharAt(start, '\n'); + } + Sci_Position i = 0; + while (i < 100 && isLowerLetter(ch)) { + s[i] = ch; + i++; + ch = styler.SafeGetCharAt(start + i, '\n'); + } + s[i] = '\0'; +} + + +class lineState { +public: + bool verbatim = false; + int closingQuote = 0; + int kindStack = 0; + + bool isOpenStringVerbatim(int next) { + if (next > 0x7FFF) { + return false; + } + switch (next) { + case L'<': + closingQuote = L'>'; + return true; + case L'>': + closingQuote = L'<'; + return true; + case L'(': + closingQuote = L')'; + return true; + case L')': + closingQuote = L'('; + return true; + case L'[': + closingQuote = L']'; + return true; + case L']': + closingQuote = L'['; + return true; + case L'{': + closingQuote = L'}'; + return true; + case L'}': + closingQuote = L'{'; + return true; + case L'_': + case L'.': + case L',': + case L';': + return false; + default: + if (isStringVerbatimOpenClose(next)) { + closingQuote = next; + return true; + } else { + return false; + } + } + } + + enum kind { + none = 0, + comment = 1, + embedded = 2, + placeholder = 3 + }; + + void setState(int state) { + verbatim = state >> 31; + closingQuote = state >> 16 & 0x7FFF; + kindStack = state & 0xFFFF; + } + + int getState() { + return verbatim << 31 | closingQuote << 16 | (kindStack & 0xFFFF); + } + + void enter(kind k) { + kindStack = kindStack << 2 | k; + } + + void leave(kind k) { + if (k == currentKind()) { + kindStack = kindStack >> 2; + } + } + kind currentKind() { + return static_cast<kind>(kindStack & 0x3); + } + kind stateKind2(int ks) { + if (0 == ks) { + return none; + } else { + kind k1 = stateKind2(ks >> 2); + kind k2 = static_cast<kind>(ks & 0x3); + if (embedded == k1 && k2 == comment) { + return embedded; + } else { + return k2; + } + } + } + kind stateKind() { + return stateKind2(kindStack); + } +}; + +void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument* pAccess) { + LexAccessor styler(pAccess); + CharacterSet setDoxygen(CharacterSet::setAlpha, ""); + CharacterSet setNumber(CharacterSet::setNone, "0123456789abcdefABCDEFxoXO_"); + + StyleContext sc(startPos, length, initStyle, styler, 0x7f); + + int styleBeforeDocKeyword = SCE_VISUALPROLOG_DEFAULT; + + lineState ls; + if (sc.currentLine >= 1) { + ls.setState(styler.GetLineState(sc.currentLine - 1)); + } + + bool newState = false; + + for (; sc.More(); sc.Forward()) { + + Sci_Position currentLineEntry = sc.currentLine; + + if (newState) { + newState = false; + int state; + switch (ls.stateKind()) { + case lineState::comment: + state = SCE_VISUALPROLOG_COMMENT_BLOCK; + break; + case lineState::embedded: + state = SCE_VISUALPROLOG_EMBEDDED; + break; + case lineState::placeholder: + state = SCE_VISUALPROLOG_PLACEHOLDER; + break; + default: + state = SCE_VISUALPROLOG_DEFAULT; + break; + } + sc.SetState(state); + } + + // Determine if the current state should terminate. + switch (sc.state) { + case SCE_VISUALPROLOG_OPERATOR: + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + break; + case SCE_VISUALPROLOG_NUMBER: + // We accept almost anything because of hex, '.' and number suffixes + if (!(setNumber.Contains(sc.ch)) || (sc.Match('.') && IsADigit(sc.chNext))) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_IDENTIFIER: + if (!isIdChar(sc.ch)) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (0 == strcmp(s, "end")) { + endLookAhead(s, styler, sc.currentPos); + } + if (majorKeywords.InList(s)) { + sc.ChangeState(SCE_VISUALPROLOG_KEY_MAJOR); + } else if (minorKeywords.InList(s)) { + sc.ChangeState(SCE_VISUALPROLOG_KEY_MINOR); + } + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_VARIABLE: + case SCE_VISUALPROLOG_ANONYMOUS: + if (!isIdChar(sc.ch)) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_KEY_DIRECTIVE: + if (!isLowerLetter(sc.ch)) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (!directiveKeywords.InList(s + 1)) { + sc.ChangeState(SCE_VISUALPROLOG_IDENTIFIER); + } + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + case SCE_VISUALPROLOG_COMMENT_LINE: + if (sc.MatchLineEnd()) { + int nextState = (lineState::comment == ls.currentKind()) ? SCE_VISUALPROLOG_COMMENT_BLOCK : SCE_VISUALPROLOG_DEFAULT; + sc.SetState(nextState); + } else if (sc.Match('@')) { + styleBeforeDocKeyword = SCE_VISUALPROLOG_COMMENT_LINE; + sc.SetState(SCE_VISUALPROLOG_COMMENT_KEY_ERROR); + } + break; + case SCE_VISUALPROLOG_COMMENT_BLOCK: + if (sc.Match('*', '/')) { + sc.Forward(); + ls.leave(lineState::comment); + newState = true; + } else if (sc.Match('/', '*')) { + sc.Forward(); + ls.enter(lineState::comment); + } else if (sc.Match('@')) { + styleBeforeDocKeyword = SCE_VISUALPROLOG_COMMENT_BLOCK; + sc.SetState(SCE_VISUALPROLOG_COMMENT_KEY_ERROR); + } + break; + case SCE_VISUALPROLOG_COMMENT_KEY_ERROR: + if (!setDoxygen.Contains(sc.ch) || sc.MatchLineEnd()) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (docKeywords.InList(s + 1)) { + sc.ChangeState(SCE_VISUALPROLOG_COMMENT_KEY); + } + if (SCE_VISUALPROLOG_COMMENT_LINE == styleBeforeDocKeyword && sc.MatchLineEnd()) { + // end line comment + int nextState = (lineState::comment == ls.currentKind()) ? SCE_VISUALPROLOG_COMMENT_BLOCK : SCE_VISUALPROLOG_DEFAULT; + sc.SetState(nextState); + } else { + sc.SetState(styleBeforeDocKeyword); + if (SCE_VISUALPROLOG_COMMENT_BLOCK == styleBeforeDocKeyword && sc.Match('*', '/')) { + // we have consumed the '*' if it comes immediately after the docKeyword + sc.Forward(); + ls.leave(lineState::comment); + newState = true; + } + } + } + break; + case SCE_VISUALPROLOG_STRING_ESCAPE_ERROR: + if (sc.atLineStart) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + break; + } + [[fallthrough]]; + case SCE_VISUALPROLOG_STRING_ESCAPE: + case SCE_VISUALPROLOG_STRING_QUOTE: + case SCE_VISUALPROLOG_STRING_EOL: + // return to SCE_VISUALPROLOG_STRING and treat as such (fallthrough) + sc.SetState(SCE_VISUALPROLOG_STRING); + [[fallthrough]]; + case SCE_VISUALPROLOG_STRING: + if (sc.MatchLineEnd() | sc.atLineEnd) { + if (ls.verbatim) { + sc.SetState(SCE_VISUALPROLOG_STRING_EOL); + } else { + ls.closingQuote = 0; + sc.SetState(SCE_VISUALPROLOG_STRING_ESCAPE_ERROR); + } + } else if (sc.Match(ls.closingQuote)) { + if (ls.verbatim && ls.closingQuote == sc.chNext) { + sc.SetState(SCE_VISUALPROLOG_STRING_ESCAPE); + sc.Forward(); + } else { + ls.closingQuote = 0; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + sc.ForwardSetState(SCE_VISUALPROLOG_DEFAULT); + } + } else if (!ls.verbatim && sc.Match('\\')) { + sc.SetState(SCE_VISUALPROLOG_STRING_ESCAPE_ERROR); + sc.Forward(); + if (sc.MatchLineEnd()) { + sc.ForwardSetState(SCE_VISUALPROLOG_DEFAULT); + } else { + if (sc.Match('"') || sc.Match('\'') || sc.Match('\\') || sc.Match('n') || sc.Match('l') || sc.Match('r') || sc.Match('t')) { + sc.ChangeState(SCE_VISUALPROLOG_STRING_ESCAPE); + } else if (sc.Match('u')) { + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + if (IsADigit(sc.chNext, 16)) { + sc.Forward(); + sc.ChangeState(SCE_VISUALPROLOG_STRING_ESCAPE); + } + } + } + } + } + } + } + break; + case SCE_VISUALPROLOG_EMBEDDED: + if (sc.Match('|', ']')) { + sc.Forward(); + ls.leave(lineState::embedded); + newState = true; + } else if (sc.Match('[', '|')) { + sc.Forward(); + ls.enter(lineState::embedded); + } else if (sc.Match('{', '|') && lineState::comment != ls.currentKind()) { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } else if (sc.Match('/', '*')) { + sc.Forward(); + ls.enter(lineState::comment); + } else if (sc.Match('*', '/')) { + sc.Forward(); + ls.leave(lineState::comment); + newState = true; + } + break; + case SCE_VISUALPROLOG_PLACEHOLDER: + if (lineState::embedded == ls.currentKind()) { + sc.SetState(SCE_VISUALPROLOG_EMBEDDED); + } else { + sc.SetState(SCE_VISUALPROLOG_DEFAULT); + } + break; + } + + if (currentLineEntry != sc.currentLine) { + styler.SetLineState(currentLineEntry, ls.getState()); + } + if (sc.MatchLineEnd() | sc.atLineEnd) { + if (sc.More()) { // currentLine can be outside the document + styler.SetLineState(sc.currentLine, ls.getState()); + } + } + + // Determine if a new state should be entered. + if (sc.state == SCE_VISUALPROLOG_DEFAULT) { + if (options.verbatimStrings && sc.Match('@') && ls.isOpenStringVerbatim(sc.chNext)) { + ls.verbatim = true; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + sc.Forward(); + } else if (IsADigit(sc.ch) || (sc.Match('.') && IsADigit(sc.chNext))) { + sc.SetState(SCE_VISUALPROLOG_NUMBER); + } else if (isLowerLetter(sc.ch)) { + sc.SetState(SCE_VISUALPROLOG_IDENTIFIER); + } else if (isUpperLetter(sc.ch)) { + sc.SetState(SCE_VISUALPROLOG_VARIABLE); + } else if (sc.Match('_')) { + sc.SetState(SCE_VISUALPROLOG_ANONYMOUS); + } else if (sc.Match('/', '*')) { + sc.SetState(SCE_VISUALPROLOG_COMMENT_BLOCK); + ls.enter(lineState::comment); + sc.Forward(); + } else if (sc.Match('%')) { + sc.SetState(SCE_VISUALPROLOG_COMMENT_LINE); + } else if (sc.Match('[', '|')) { + sc.SetState(SCE_VISUALPROLOG_EMBEDDED); + ls.enter(lineState::embedded); + sc.Forward(); + } else if (sc.Match('{', '|')) { + sc.SetState(SCE_VISUALPROLOG_PLACEHOLDER); + ls.enter(lineState::placeholder); + sc.Forward(); + } else if (sc.Match('|', '}')) { + sc.SetState(SCE_VISUALPROLOG_PLACEHOLDER); + sc.Forward(); + if (':' == sc.chNext) { + sc.Forward(); + for (; isIdChar(sc.chNext); sc.Forward()) { + } + } + ls.leave(lineState::placeholder); + newState = true; + } else if (sc.Match('\'')) { + ls.verbatim = false; + ls.closingQuote = '\''; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + } else if (sc.Match('"')) { + ls.verbatim = false; + ls.closingQuote = '"'; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + } else if (options.backQuotedStrings && sc.Match('`')) { + ls.verbatim = false; + ls.closingQuote = '`'; + sc.SetState(SCE_VISUALPROLOG_STRING_QUOTE); + } else if (sc.Match('#')) { + sc.SetState(SCE_VISUALPROLOG_KEY_DIRECTIVE); + } else if (isoperator(static_cast<char>(sc.ch)) || sc.Match('\\') || + (!options.verbatimStrings && sc.Match('@'))) { + sc.SetState(SCE_VISUALPROLOG_OPERATOR); + } + } + } + sc.Complete(); + styler.Flush(); +} + +// Store both the current line's fold level and the next lines in the +// level store to make it easy to pick up with each increment +// and to make it possible to fiddle the current level for "} else {". + +#if defined(__clang__) +#if __has_warning("-Wunused-but-set-variable") +// Disable warning for visibleChars +#pragma clang diagnostic ignored "-Wunused-but-set-variable" +#endif +#endif + +void SCI_METHOD LexerVisualProlog::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument* pAccess) { + + LexAccessor styler(pAccess); + + Sci_PositionU endPos = startPos + length; + int visibleChars = 0; + Sci_Position currentLine = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (currentLine > 0) + levelCurrent = styler.LevelAt(currentLine - 1) >> 16; + int levelMinCurrent = levelCurrent; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + for (Sci_PositionU i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (style == SCE_VISUALPROLOG_OPERATOR) { + if (ch == '{') { + // Measure the minimum before a '{' to allow + // folding on "} else {" + if (levelMinCurrent > levelNext) { + levelMinCurrent = levelNext; + } + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + if (!IsASpace(ch)) + visibleChars++; + if (atEOL || (i == endPos - 1)) { + int levelUse = levelCurrent; + int lev = levelUse | levelNext << 16; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(currentLine)) { + styler.SetLevel(currentLine, lev); + } + currentLine++; + levelCurrent = levelNext; + levelMinCurrent = levelCurrent; + if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length() - 1))) { + // There is an empty line at end of file so give it same level and empty + styler.SetLevel(currentLine, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG); + } + visibleChars = 0; + } + } +} +} + +LexerModule lmVisualProlog(SCLEX_VISUALPROLOG, LexerVisualProlog::LexerFactoryVisualProlog, "visualprolog", visualPrologWordLists); Modified: scintilla/lexilla/src/Lexilla.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -220,6 +220,7 @@ static void AddGeanyLexers() &lmTxt2tags, &lmVerilog, &lmVHDL, + &lmVisualProlog, &lmXML, &lmYAML, }); Modified: scintilla/scintilla_changes.patch 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -119,6 +119,7 @@ index cd4b23617..af4a73db4 100644 + &lmTxt2tags, + &lmVerilog, + &lmVHDL, ++ &lmVisualProlog, + &lmXML, + &lmYAML, + }); Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -191,6 +191,7 @@ static void init_builtin_filetypes(void) 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 ); + FT_INIT( PROLOG, NONE, "Prolog", NULL, SOURCE_FILE, COMPILED ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -111,6 +111,7 @@ typedef enum GEANY_FILETYPES_AU3, GEANY_FILETYPES_RAKU, GEANY_FILETYPES_CIL, + GEANY_FILETYPES_PROLOG, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -1042,6 +1042,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(PHP); init_styleset_case(PO); init_styleset_case(POWERSHELL); + init_styleset_case(PROLOG); init_styleset_case(PYTHON); init_styleset_case(R); init_styleset_case(RAKU); @@ -1136,6 +1137,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(PHP); styleset_case(PO); styleset_case(POWERSHELL); + styleset_case(PROLOG); styleset_case(PYTHON); styleset_case(R); styleset_case(RAKU); @@ -1652,6 +1654,15 @@ gboolean highlighting_is_string_style(gint lexer, gint style) return (style == SCE_POWERSHELL_STRING || style == SCE_POWERSHELL_CHARACTER); + case SCLEX_VISUALPROLOG: + return (style == SCE_VISUALPROLOG_STRING || + style == SCE_VISUALPROLOG_STRING_QUOTE || + style == SCE_VISUALPROLOG_STRING_ESCAPE || + style == SCE_VISUALPROLOG_STRING_ESCAPE_ERROR || + style == SCE_VISUALPROLOG_STRING_EOL || + style == SCE_VISUALPROLOG_EMBEDDED || + style == SCE_VISUALPROLOG_PLACEHOLDER); + case SCLEX_BATCH: case SCLEX_DIFF: case SCLEX_LATEX: @@ -1905,6 +1916,12 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) case SCLEX_AU3: return (style == SCE_AU3_COMMENT || style == SCE_AU3_COMMENTBLOCK); + + case SCLEX_VISUALPROLOG: + return (style == SCE_VISUALPROLOG_COMMENT_BLOCK || + style == SCE_VISUALPROLOG_COMMENT_LINE || + style == SCE_VISUALPROLOG_COMMENT_KEY || + style == SCE_VISUALPROLOG_COMMENT_KEY_ERROR); } return FALSE; } Modified: src/highlightingmappings.h 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -1360,6 +1360,39 @@ static const HLKeyword highlighting_keywords_POWERSHELL[] = #define highlighting_properties_POWERSHELL EMPTY_PROPERTIES +/* Prolog */ +#define highlighting_lexer_PROLOG SCLEX_VISUALPROLOG +static const HLStyle highlighting_styles_PROLOG[] = +{ + { SCE_VISUALPROLOG_DEFAULT, "default", FALSE }, + { SCE_VISUALPROLOG_KEY_MAJOR, "key_major", FALSE }, + { SCE_VISUALPROLOG_KEY_MINOR, "key_minor", FALSE }, + { SCE_VISUALPROLOG_KEY_DIRECTIVE, "key_directive", FALSE }, + { SCE_VISUALPROLOG_COMMENT_BLOCK, "comment_block", FALSE }, + { SCE_VISUALPROLOG_COMMENT_LINE, "comment_line", FALSE }, + { SCE_VISUALPROLOG_COMMENT_KEY, "comment_key", FALSE }, + { SCE_VISUALPROLOG_COMMENT_KEY_ERROR, "comment_key_error", FALSE }, + { SCE_VISUALPROLOG_IDENTIFIER, "identifier", FALSE }, + { SCE_VISUALPROLOG_VARIABLE, "variable", FALSE }, + { SCE_VISUALPROLOG_ANONYMOUS, "anonymous", FALSE }, + { SCE_VISUALPROLOG_NUMBER, "number", FALSE }, + { SCE_VISUALPROLOG_OPERATOR, "operator", FALSE }, + { SCE_VISUALPROLOG_STRING, "string", FALSE }, + { SCE_VISUALPROLOG_STRING_QUOTE, "string_quote", FALSE }, + { SCE_VISUALPROLOG_STRING_ESCAPE, "string_escape", FALSE }, + { SCE_VISUALPROLOG_STRING_ESCAPE_ERROR, "string_escape_error", FALSE }, + { SCE_VISUALPROLOG_STRING_EOL, "string_eol", FALSE }, + { SCE_VISUALPROLOG_EMBEDDED, "embedded", FALSE }, + { SCE_VISUALPROLOG_PLACEHOLDER, "placeholder", FALSE }, +}; +static const HLKeyword highlighting_keywords_PROLOG[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, +}; +#define highlighting_properties_PROLOG EMPTY_PROPERTIES + + /* Python */ #define highlighting_lexer_PYTHON SCLEX_PYTHON static const HLStyle highlighting_styles_PYTHON[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d9255c: Update Portuguese translation (#3933)
by Hugo Carvalho 15 Aug '24

15 Aug '24

Branch: refs/heads/master Author: Hugo Carvalho <hugokarvalho(a)hotmail.com> Committer: GitHub <noreply(a)github.com> Date: Thu, 15 Aug 2024 18:13:16 UTC Commit: d9255cb4f75e28a5920eab10e96baab21820f3dc https://github.com/geany/geany/commit/d9255cb4f75e28a5920eab10e96baab21820f… Log Message: ----------- Update Portuguese translation (#3933) Update pt.po file Modified Paths: -------------- po/pt.po Modified: po/pt.po 2143 lines changed, 1093 insertions(+), 1050 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-osx] 06c7ab: Revert "Use a slightly different shade of accent color"
by Jiří Techet 10 Aug '24

10 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 10 Aug 2024 21:03:55 UTC Commit: 06c7ab4e55e409ba4578b330ede627cfa9a6f553 https://github.com/geany/geany-osx/commit/06c7ab4e55e409ba4578b330ede627cfa… Log Message: ----------- Revert "Use a slightly different shade of accent color" This reverts commit bf3e4e1a8cc5b654811a903a4e82e1273e60acea. Modified Paths: -------------- Prof-Gnome/gtk-3.0/theme-colors/colors-dark.css Prof-Gnome/gtk-3.0/theme-colors/colors-light.css Modified: Prof-Gnome/gtk-3.0/theme-colors/colors-dark.css 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -38,15 +38,15 @@ @define-color headerbar_button_color #494949; @define-color osd_button_color #505050; /*color-accents*/ -@define-color color_accent #0078d7; -@define-color color_accent_2 #0078d7; -@define-color color_accent_3 #0078d7; -@define-color icontext_selected_bg #0078d7; +@define-color color_accent #3478cb; +@define-color color_accent_2 #3478cb; +@define-color color_accent_3 #3478cb; +@define-color icontext_selected_bg #3478cb; @define-color rad_chk_unchecked_border #303030; @define-color rad_chk_unchecked_bg_top #505050; @define-color rad_chk_unchecked_bg_bottom shade(#505050,0.92); -@define-color rad_chk_bg #0078d7; -@define-color modelbutton_bg #0078d7; +@define-color rad_chk_bg #3478cb; +@define-color modelbutton_bg #3478cb; /**/ @define-color headerbar_color #656565; @define-color headerbar_selected_accent_color shade(@color_accent_2, 0.88); Modified: Prof-Gnome/gtk-3.0/theme-colors/colors-light.css 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -38,12 +38,12 @@ @define-color headerbar_button_color #d0d0d0; @define-color osd_button_color #505050; /*color-accents*/ -@define-color color_accent #0078d7;/*#6398bb;*/ -@define-color color_accent_2 #0078d7;/*#707070;*/ -@define-color color_accent_3 #0078d7;/*#797d7d;*/ -@define-color icontext_selected_bg #0078d7; -@define-color rad_chk_bg #0078d7; -@define-color modelbutton_bg #0078d7; +@define-color color_accent #3e81d3;/*#6398bb;*/ +@define-color color_accent_2 #3e81d3;/*#707070;*/ +@define-color color_accent_3 #3e81d3;/*#797d7d;*/ +@define-color icontext_selected_bg #3e81d3; +@define-color rad_chk_bg #3e81d3; +@define-color modelbutton_bg #3e81d3; /**/ @define-color headerbar_color #f2f2f2;/*#c6c6c6;*//*#d0d0d0;*//*#d0d3d8;*//*#d0d0d0;*/ @define-color headerbar_selected_accent_color shade(@color_accent_2, 0.88); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4fadf8: Merge pull request #3560 from techee/cancel_popups
by Jiří Techet 10 Aug '24

10 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 09 Aug 2024 22:44:28 UTC Commit: 4fadf8e5d5f123b1bcf5e34d9d9925d63c6fd382 https://github.com/geany/geany/commit/4fadf8e5d5f123b1bcf5e34d9d9925d63c6fd… Log Message: ----------- Merge pull request #3560 from techee/cancel_popups Hide autocompletion and calltip popups when code scrolled Modified Paths: -------------- src/editor.c Modified: src/editor.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -500,6 +500,12 @@ static void on_update_ui(GeanyEditor *editor, G_GNUC_UNUSED SCNotification *nt) ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); + if (nt->updated & (SC_UPDATE_H_SCROLL | SC_UPDATE_V_SCROLL)) + { + SSM(sci, SCI_CALLTIPCANCEL, 0, 0); + SSM(sci, SCI_AUTOCCANCEL, 0, 0); + } + /* since Scintilla 2.24, SCN_UPDATEUI is also sent on scrolling though we don't need to handle * this and so ignore every SCN_UPDATEUI events except for content and selection changes */ if (! (nt->updated & SC_UPDATE_CONTENT) && ! (nt->updated & SC_UPDATE_SELECTION)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 12f567: Hide autocompletion and calltip popups when code scrolled
by Jiří Techet 10 Aug '24

10 Aug '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 09 Aug 2024 22:30:49 UTC Commit: 12f56701eff1a8ac504fff7d0cfc4998811c05f7 https://github.com/geany/geany/commit/12f56701eff1a8ac504fff7d0cfc4998811c0… Log Message: ----------- Hide autocompletion and calltip popups when code scrolled When autocompletion or calltip popup is displayed and the user scrolls the editor window (e.g. using a mouse wheel), these popups are still displayed and become detached from the original point which is quite ugly. We can just simply dismiss them when the window scrolls. Modified Paths: -------------- src/editor.c Modified: src/editor.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -500,6 +500,12 @@ static void on_update_ui(GeanyEditor *editor, G_GNUC_UNUSED SCNotification *nt) ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); + if (nt->updated & (SC_UPDATE_H_SCROLL | SC_UPDATE_V_SCROLL)) + { + SSM(sci, SCI_CALLTIPCANCEL, 0, 0); + SSM(sci, SCI_AUTOCCANCEL, 0, 0); + } + /* since Scintilla 2.24, SCN_UPDATEUI is also sent on scrolling though we don't need to handle * this and so ignore every SCN_UPDATEUI events except for content and selection changes */ if (! (nt->updated & SC_UPDATE_CONTENT) && ! (nt->updated & SC_UPDATE_SELECTION)) -------------- 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