Commits October 2020

commits@lists.geany.org

1 participants
80 discussions

[geany/geany] 8d6fca: Update NEWS with transaltions updates done so far since 1.36
by Frank Lanitz 10 Oct '20

10 Oct '20

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 10 Oct 2020 10:30:57 UTC Commit: 8d6fca4c821ed3e6d319b758038f5b7ebefb396e https://github.com/geany/geany/commit/8d6fca4c821ed3e6d319b758038f5b7ebefb3… Log Message: ----------- Update NEWS with transaltions updates done so far since 1.36 Modified Paths: -------------- NEWS Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,8 @@ Geany 1.37 (unreleased) + Internationalization + * New translations: ie + * Updated translations: de, id, lv, pl, pt, ru, sv Geany 1.36 (September 28, 2019) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 28a5b1: Add support for selecting the default Python command
by Colomban Wendling 10 Oct '20

10 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 18 Jul 2019 16:19:11 UTC Commit: 28a5b1029b4f43a405f6dd1fa4eac66abf6dcb00 https://github.com/geany/geany/commit/28a5b1029b4f43a405f6dd1fa4eac66abf6dc… Log Message: ----------- Add support for selecting the default Python command Add a configure option to select the command used as the Python interpreter by default in the Python filetype. This can typically be useful if a setup has non-standard paths or do not provide a generic `python` interpreter but only versioned ones. Modified Paths: -------------- configure.ac data/Makefile.am data/filedefs/filetypes.python.in Modified: configure.ac 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -145,6 +145,14 @@ AM_COND_IF([MINGW], AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))]) AC_SUBST([pkgdatadir]) +# The default Python command +AC_ARG_WITH([python-command], + [AS_HELP_STRING([--with-python-command], + [the default Python command [default=python]])], + [with_python_command=$withval], + [with_python_command=python]) +AC_SUBST([PYTHON_COMMAND], [$with_python_command]) + # Documentation tools GEANY_CHECK_DOCUTILS GEANY_CHECK_DOXYGEN @@ -176,6 +184,7 @@ AC_CONFIG_FILES([ plugins/Makefile po/Makefile.in data/Makefile + data/filedefs/filetypes.python doc/Makefile doc/geany.1 geany.pc Modified: data/Makefile.am 12 lines changed, 9 insertions(+), 3 deletions(-) =================================================================== @@ -2,7 +2,7 @@ colorschemes = \ colorschemes/alt.conf -filetypes = \ +filetypes_dist = \ filedefs/filetypes.abaqus \ filedefs/filetypes.abc \ filedefs/filetypes.actionscript \ @@ -57,7 +57,6 @@ filetypes = \ filedefs/filetypes.php \ filedefs/filetypes.po \ filedefs/filetypes.powershell \ - filedefs/filetypes.python \ filedefs/filetypes.r \ filedefs/filetypes.restructuredtext \ filedefs/filetypes.ruby \ @@ -75,6 +74,10 @@ filetypes = \ filedefs/filetypes.yaml \ filedefs/filetypes.zephir +# generated filetypes +filetypes_nodist = \ + filedefs/filetypes.python + tagfiles = \ tags/std99.c.tags \ tags/std.php.tags \ @@ -106,7 +109,7 @@ templates = \ nobase_dist_pkgdata_DATA = \ $(colorschemes) \ - $(filetypes) \ + $(filetypes_dist) \ $(tagfiles) \ $(template_files) \ $(templates) \ @@ -115,6 +118,9 @@ nobase_dist_pkgdata_DATA = \ ui_toolbar.xml \ geany.glade +nobase_pkgdata_DATA = \ + $(filetypes_nodist) + if GTK3 nobase_dist_pkgdata_DATA += \ geany-3.0.css \ Modified: data/filedefs/filetypes.python.in 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -72,12 +72,12 @@ context_action_cmd= # %e will be replaced by the filename without extension # (use only one of it at one time) FT_00_LB=_Compile -FT_00_CM=python -m py_compile "%f" +FT_00_CM=@PYTHON_COMMAND@ -m py_compile "%f" FT_00_WD= FT_02_LB=_Lint FT_02_CM=pep8 --max-line-length=80 "%f" FT_02_WD= error_regex=(.+):([0-9]+):([0-9]+) EX_00_LB=_Execute -EX_00_CM=python "%f" +EX_00_CM=@PYTHON_COMMAND@ "%f" EX_00_WD= -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 13f761: Use the `py` launcher for Python filetype on Windows
by Colomban Wendling 10 Oct '20

10 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 18 Jul 2019 16:21:18 UTC Commit: 13f7618e101f0ec18d637d98038901b004d8243d https://github.com/geany/geany/commit/13f7618e101f0ec18d637d98038901b004d82… Log Message: ----------- Use the `py` launcher for Python filetype on Windows Fixes #2211. Modified Paths: -------------- configure.ac Modified: configure.ac 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -145,12 +145,14 @@ AM_COND_IF([MINGW], AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))]) AC_SUBST([pkgdatadir]) -# The default Python command +# The default Python command. On Windows, use the `py` launcher by default AC_ARG_WITH([python-command], [AS_HELP_STRING([--with-python-command], - [the default Python command [default=python]])], + [the default Python command [defaults to "py" on Windows and "python" otherwise]])], [with_python_command=$withval], - [with_python_command=python]) + [with_python_command=auto]) +AS_IF([test "x$with_python_command" = xauto], + [AM_COND_IF([MINGW], [with_python_command=py], [with_python_command=python])]) AC_SUBST([PYTHON_COMMAND], [$with_python_command]) # Documentation tools -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b2151b: Merge pull request #2223 from b4n/windows-py-command
by Colomban Wendling 10 Oct '20

10 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 10 Oct 2020 07:29:23 UTC Commit: b2151bd5f0abdbae94b2fe6b0a39e3b0a6e4f583 https://github.com/geany/geany/commit/b2151bd5f0abdbae94b2fe6b0a39e3b0a6e4f… Log Message: ----------- Merge pull request #2223 from b4n/windows-py-command Allow to select the Python command, and use `py` on Windows Modified Paths: -------------- configure.ac data/Makefile.am data/filedefs/filetypes.python.in Modified: configure.ac 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -142,6 +142,16 @@ AM_COND_IF([MINGW], AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))]) AC_SUBST([pkgdatadir]) +# The default Python command. On Windows, use the `py` launcher by default +AC_ARG_WITH([python-command], + [AS_HELP_STRING([--with-python-command], + [the default Python command [defaults to "py" on Windows and "python" otherwise]])], + [with_python_command=$withval], + [with_python_command=auto]) +AS_IF([test "x$with_python_command" = xauto], + [AM_COND_IF([MINGW], [with_python_command=py], [with_python_command=python])]) +AC_SUBST([PYTHON_COMMAND], [$with_python_command]) + # Documentation tools GEANY_CHECK_DOCUTILS GEANY_CHECK_DOXYGEN @@ -173,6 +183,7 @@ AC_CONFIG_FILES([ plugins/Makefile po/Makefile.in data/Makefile + data/filedefs/filetypes.python doc/Makefile doc/geany.1 geany.pc Modified: data/Makefile.am 12 lines changed, 9 insertions(+), 3 deletions(-) =================================================================== @@ -2,7 +2,7 @@ colorschemes = \ colorschemes/alt.conf -filetypes = \ +filetypes_dist = \ filedefs/filetypes.abaqus \ filedefs/filetypes.abc \ filedefs/filetypes.actionscript \ @@ -60,7 +60,6 @@ filetypes = \ filedefs/filetypes.php \ filedefs/filetypes.po \ filedefs/filetypes.powershell \ - filedefs/filetypes.python \ filedefs/filetypes.r \ filedefs/filetypes.restructuredtext \ filedefs/filetypes.ruby \ @@ -80,6 +79,10 @@ filetypes = \ filedefs/filetypes.yaml \ filedefs/filetypes.zephir +# generated filetypes +filetypes_nodist = \ + filedefs/filetypes.python + tagfiles = \ tags/std99.c.tags \ tags/std.php.tags \ @@ -111,7 +114,7 @@ templates = \ nobase_dist_pkgdata_DATA = \ $(colorschemes) \ - $(filetypes) \ + $(filetypes_dist) \ $(tagfiles) \ $(template_files) \ $(templates) \ @@ -120,6 +123,9 @@ nobase_dist_pkgdata_DATA = \ ui_toolbar.xml \ geany.glade +nobase_pkgdata_DATA = \ + $(filetypes_nodist) + if GTK3 nobase_dist_pkgdata_DATA += \ geany-3.0.css \ Modified: data/filedefs/filetypes.python.in 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -72,12 +72,12 @@ context_action_cmd= # %e will be replaced by the filename without extension # (use only one of it at one time) FT_00_LB=_Compile -FT_00_CM=python -m py_compile "%f" +FT_00_CM=@PYTHON_COMMAND@ -m py_compile "%f" FT_00_WD= FT_02_LB=_Lint FT_02_CM=pep8 --max-line-length=80 "%f" FT_02_WD= error_regex=(.+):([0-9]+):([0-9]+) EX_00_LB=_Execute -EX_00_CM=python "%f" +EX_00_CM=@PYTHON_COMMAND@ "%f" EX_00_WD= -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9f049a: Define text color when setting dark background
by Forest 09 Oct '20

09 Oct '20

Branch: refs/heads/master Author: Forest <forestcode(a)ixio.org> Committer: Forest <forestcode(a)ixio.org> Date: Tue, 01 Oct 2019 19:39:02 UTC Commit: 9f049a7b40838e4f026270533eb877761e7f6945 https://github.com/geany/geany/commit/9f049a7b40838e4f026270533eb877761e7f6… Log Message: ----------- Define text color when setting dark background Some Gtk themes define a dark foreground color for selected text, so when we set the background to dark red, it becomes difficult to read. We must therefore set a foreground color that will remain legible against our background. Fixes #2332 Modified Paths: -------------- data/geany.css data/geany.gtkrc Modified: data/geany.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -22,6 +22,7 @@ } #geany-search-entry-no-match:selected /* GTK < 3.20 */, #geany-search-entry-no-match selection /* GTK >= 3.20 */ { + color: #fff; background-color: #771111; } Modified: data/geany.gtkrc 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -21,6 +21,7 @@ style "geany-search-entry-no-match-style" { base[NORMAL] = "#ffff66666666" text[NORMAL] = "#ffffffffffff" base[SELECTED] = "#777711111111" + text[SELECTED] = "#ffffffffffff" # try and remove the entry background image on pixmap engine so that our # background color is visible, and we don't end up with white text on white # background (workaround for Adwaita 3.20). -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 397b24: Merge pull request #2613 from techee/integration_fix
by Colomban Wendling 09 Oct '20

09 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 09 Oct 2020 09:28:55 UTC Commit: 397b24d6da711f32836a564928c4bb8004d438eb https://github.com/geany/geany/commit/397b24d6da711f32836a564928c4bb8004d43… Log Message: ----------- Merge pull request #2613 from techee/integration_fix Fix gtk2/gtk3 mac integration test Modified Paths: -------------- m4/geany-mac-integration.m4 Modified: m4/geany-mac-integration.m4 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -12,8 +12,8 @@ AC_DEFUN([GEANY_CHECK_MAC_INTEGRATION], AM_CONDITIONAL(ENABLE_MAC_INTEGRATION, [test "x$geany_enable_mac_integration" = "xyes"]) AM_COND_IF(ENABLE_MAC_INTEGRATION, [ - AS_IF([test "x$enable_gtk3" = xyes], - [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk3)], - [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk2)]) + AS_IF([test "x$enable_gtk2" = xyes], + [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk2)], + [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk3)]) ]) ]) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fb2872: Merge pull request #2399 from b4n/smalltalk
by Colomban Wendling 09 Oct '20

09 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 09 Oct 2020 09:26:16 UTC Commit: fb2872097dc66ab7508962192bd5d0e840160968 https://github.com/geany/geany/commit/fb2872097dc66ab7508962192bd5d0e840160… Log Message: ----------- Merge pull request #2399 from b4n/smalltalk Add Smalltalk filetype Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.smalltalk data/filetype_extensions.conf scintilla/Makefile.am scintilla/lexers/LexSmalltalk.cxx scintilla/scintilla_changes.patch scintilla/src/Catalogue.cxx src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -67,6 +67,7 @@ filetypes = \ filedefs/filetypes.rust \ filedefs/filetypes.Scala.conf \ filedefs/filetypes.sh \ + filedefs/filetypes.smalltalk \ filedefs/filetypes.sql \ filedefs/filetypes.Swift.conf \ filedefs/filetypes.TypeScript.conf \ Modified: data/filedefs/filetypes.smalltalk 56 lines changed, 56 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,56 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +special=operator +symbol=identifier_1 +assignment=operator +return=operator +number=number_1 +binary=operator +special_selector=keyword_3 +keyword_send=keyword_2 +global=class +self=keyword_1 +super=keyword_1 +nil=keyword_1 +bool=keyword_1 +comment=comment +string=string_1 +character=character + +[keywords] +# all items must be in one line +special_selector=ifTrue: ifFalse: whileTrue: whileFalse: ifNil: ifNotNil: whileTrue whileFalse repeat isNil notNil + +[settings] +# default extension used when saving files +extension=st + +# MIME type +mime_type=text/x-smalltalk + +# the following characters are these which a "word" can contains, see documentation +#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 Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -65,6 +65,7 @@ Rust=*.rs; Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile; Scala=*.scala;*.scl; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;.bashrc;bash.bashrc;.bash_*;bash_*;*.m4;PKGBUILD;*profile; +Smalltalk=*.st; SQL=*.sql; Swift=*.swift; Tcl=*.tcl;*.tk;*.wish;*.exp; Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -42,6 +42,7 @@ lexers/LexPO.cxx \ lexers/LexR.cxx \ lexers/LexRuby.cxx \ lexers/LexRust.cxx \ +lexers/LexSmalltalk.cxx \ lexers/LexSQL.cxx \ lexers/LexTCL.cxx \ lexers/LexTxt2tags.cxx \ Modified: scintilla/lexers/LexSmalltalk.cxx 324 lines changed, 324 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,324 @@ +// Scintilla source code edit control +/** @file LexSmalltalk.cxx + ** Lexer for Smalltalk language. + ** Written by Sergey Philippov, sphilippov-at-gmail-dot-com + **/ +// Copyright 1998-2002 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 "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + +using namespace Scintilla; + +/* +| lexTable classificationBlock charClasses | +charClasses := #(#DecDigit #Letter #Special #Upper #BinSel). +lexTable := ByteArray new: 128. +classificationBlock := [ :charClass :chars | + | flag | + flag := 1 bitShift: (charClasses indexOf: charClass) - 1. + chars do: [ :char | lexTable at: char codePoint + 1 put: ((lexTable at: char codePoint + 1) bitOr: flag)]]. + +classificationBlock + value: #DecDigit value: '0123456789'; + value: #Letter value: '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; + value: #Special value: '()[]{};.^:'; + value: #BinSel value: '~@%&*-+=|\/,<>?!'; + value: #Upper value: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. + +((String new: 500) streamContents: [ :stream | + stream crLf; nextPutAll: 'static int ClassificationTable[256] = {'. + lexTable keysAndValuesDo: [ :index :value | + ((index - 1) rem: 16) == 0 ifTrue: [ + stream crLf; tab] + ifFalse: [ + stream space]. + stream print: value. + index ~= 256 ifTrue: [ + stream nextPut: $,]]. + stream crLf; nextPutAll: '};'; crLf. + + charClasses keysAndValuesDo: [ :index :name | + stream + crLf; + nextPutAll: ( + ('static inline bool is<1s>(int ch) {return (ch > 0) && (ch %< 0x80) && ((ClassificationTable[ch] & <2p>) != 0);}') + expandMacrosWith: name with: (1 bitShift: (index - 1))) + ]]) edit +*/ + +// autogenerated {{{{ + +static int ClassificationTable[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 16, 0, 0, 0, 16, 16, 0, 4, 4, 16, 16, 16, 16, 4, 16, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 16, 16, 16, 16, + 16, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 4, 16, 4, 4, 2, + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 16, 4, 16, 0, +}; + +static inline bool isDecDigit(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 1) != 0);} +static inline bool isLetter(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 2) != 0);} +static inline bool isSpecial(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 4) != 0);} +static inline bool isUpper(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 8) != 0);} +static inline bool isBinSel(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 16) != 0);} +// autogenerated }}}} + +static inline bool isAlphaNumeric(int ch) { + return isDecDigit(ch) || isLetter(ch); +} + +static inline bool isDigitOfRadix(int ch, int radix) +{ + if (isDecDigit(ch)) + return (ch - '0') < radix; + else if (!isUpper(ch)) + return false; + else + return (ch - 'A' + 10) < radix; +} + +static inline void skipComment(StyleContext& sc) +{ + while (sc.More() && sc.ch != '\"') + sc.Forward(); +} + +static inline void skipString(StyleContext& sc) +{ + while (sc.More()) { + if (sc.ch == '\'') { + if (sc.chNext != '\'') + return; + sc.Forward(); + } + sc.Forward(); + } +} + +static void handleHash(StyleContext& sc) +{ + if (isSpecial(sc.chNext)) { + sc.SetState(SCE_ST_SPECIAL); + return; + } + + sc.SetState(SCE_ST_SYMBOL); + sc.Forward(); + if (sc.ch == '\'') { + sc.Forward(); + skipString(sc); + } + else { + if (isLetter(sc.ch)) { + while (isAlphaNumeric(sc.chNext) || sc.chNext == ':') + sc.Forward(); + } + else if (isBinSel(sc.ch)) { + while (isBinSel(sc.chNext)) + sc.Forward(); + } + } +} + +static inline void handleSpecial(StyleContext& sc) +{ + if (sc.ch == ':' && sc.chNext == '=') { + sc.SetState(SCE_ST_ASSIGN); + sc.Forward(); + } + else { + if (sc.ch == '^') + sc.SetState(SCE_ST_RETURN); + else + sc.SetState(SCE_ST_SPECIAL); + } +} + +static inline void skipInt(StyleContext& sc, int radix) +{ + while (isDigitOfRadix(sc.chNext, radix)) + sc.Forward(); +} + +static void handleNumeric(StyleContext& sc) +{ + char num[256]; + int nl; + int radix; + + sc.SetState(SCE_ST_NUMBER); + num[0] = static_cast<char>(sc.ch); + nl = 1; + while (isDecDigit(sc.chNext)) { + num[nl++] = static_cast<char>(sc.chNext); + sc.Forward(); + if (nl+1 == sizeof(num)/sizeof(num[0])) // overrun check + break; + } + if (sc.chNext == 'r') { + num[nl] = 0; + if (num[0] == '-') + radix = atoi(num + 1); + else + radix = atoi(num); + sc.Forward(); + if (sc.chNext == '-') + sc.Forward(); + skipInt(sc, radix); + } + else + radix = 10; + if (sc.chNext != '.' || !isDigitOfRadix(sc.GetRelative(2), radix)) + return; + sc.Forward(); + skipInt(sc, radix); + if (sc.chNext == 's') { + // ScaledDecimal + sc.Forward(); + while (isDecDigit(sc.chNext)) + sc.Forward(); + return; + } + else if (sc.chNext != 'e' && sc.chNext != 'd' && sc.chNext != 'q') + return; + sc.Forward(); + if (sc.chNext == '+' || sc.chNext == '-') + sc.Forward(); + skipInt(sc, radix); +} + +static inline void handleBinSel(StyleContext& sc) +{ + sc.SetState(SCE_ST_BINARY); + while (isBinSel(sc.chNext)) + sc.Forward(); +} + +static void handleLetter(StyleContext& sc, WordList* specialSelectorList) +{ + char ident[256]; + int il; + int state; + bool doubleColonPresent; + + sc.SetState(SCE_ST_DEFAULT); + + ident[0] = static_cast<char>(sc.ch); + il = 1; + while (isAlphaNumeric(sc.chNext)) { + ident[il++] = static_cast<char>(sc.chNext); + sc.Forward(); + if (il+2 == sizeof(ident)/sizeof(ident[0])) // overrun check + break; + } + + if (sc.chNext == ':') { + doubleColonPresent = true; + ident[il++] = ':'; + sc.Forward(); + } + else + doubleColonPresent = false; + ident[il] = 0; + + if (specialSelectorList->InList(ident)) + state = SCE_ST_SPEC_SEL; + else if (doubleColonPresent) + state = SCE_ST_KWSEND; + else if (isUpper(ident[0])) + state = SCE_ST_GLOBAL; + else { + if (!strcmp(ident, "self")) + state = SCE_ST_SELF; + else if (!strcmp(ident, "super")) + state = SCE_ST_SUPER; + else if (!strcmp(ident, "nil")) + state = SCE_ST_NIL; + else if (!strcmp(ident, "true") || !strcmp(ident, "false")) + state = SCE_ST_BOOL; + else + state = SCE_ST_DEFAULT; + } + + sc.ChangeState(state); +} + +static void colorizeSmalltalkDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *wordLists[], Accessor &styler) +{ + StyleContext sc(startPos, length, initStyle, styler); + + if (initStyle == SCE_ST_COMMENT) { + skipComment(sc); + if (sc.More()) + sc.Forward(); + } + else if (initStyle == SCE_ST_STRING) { + skipString(sc); + if (sc.More()) + sc.Forward(); + } + + for (; sc.More(); sc.Forward()) { + int ch; + + ch = sc.ch; + if (ch == '\"') { + sc.SetState(SCE_ST_COMMENT); + sc.Forward(); + skipComment(sc); + } + else if (ch == '\'') { + sc.SetState(SCE_ST_STRING); + sc.Forward(); + skipString(sc); + } + else if (ch == '#') + handleHash(sc); + else if (ch == '$') { + sc.SetState(SCE_ST_CHARACTER); + sc.Forward(); + } + else if (isSpecial(ch)) + handleSpecial(sc); + else if (isDecDigit(ch)) + handleNumeric(sc); + else if (isLetter(ch)) + handleLetter(sc, wordLists[0]); + else if (isBinSel(ch)) { + if (ch == '-' && isDecDigit(sc.chNext)) + handleNumeric(sc); + else + handleBinSel(sc); + } + else + sc.SetState(SCE_ST_DEFAULT); + } + sc.Complete(); +} + +static const char* const smalltalkWordListDesc[] = { + "Special selectors", + 0 +}; + +LexerModule lmSmalltalk(SCLEX_SMALLTALK, colorizeSmalltalkDoc, "smalltalk", NULL, smalltalkWordListDesc); Modified: scintilla/scintilla_changes.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -171,7 +171,7 @@ index ed47aa8..e58f1ab 100644 LINK_LEXER(lmRust); - LINK_LEXER(lmSAS); - LINK_LEXER(lmScriptol); -- LINK_LEXER(lmSmalltalk); + LINK_LEXER(lmSmalltalk); - LINK_LEXER(lmSML); - LINK_LEXER(lmSorc); - LINK_LEXER(lmSpecman); Modified: scintilla/src/Catalogue.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -99,6 +99,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmR); LINK_LEXER(lmRuby); LINK_LEXER(lmRust); + LINK_LEXER(lmSmalltalk); LINK_LEXER(lmSQL); LINK_LEXER(lmTCL); LINK_LEXER(lmTxt2tags); Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -186,6 +186,7 @@ static void init_builtin_filetypes(void) FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( GO, GO, "Go", NULL, SOURCE_FILE, COMPILED ); FT_INIT( ZEPHIR, ZEPHIR, "Zephir", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( SMALLTALK, NONE, "Smalltalk", NULL, SOURCE_FILE, SCRIPT ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -106,6 +106,7 @@ typedef enum GEANY_FILETYPES_GO, GEANY_FILETYPES_ZEPHIR, GEANY_FILETYPES_BIBTEX, + GEANY_FILETYPES_SMALLTALK, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1064,6 +1064,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(RUBY); init_styleset_case(RUST); init_styleset_case(SH); + init_styleset_case(SMALLTALK); init_styleset_case(SQL); init_styleset_case(TCL); init_styleset_case(TXT2TAGS); @@ -1152,6 +1153,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(RUBY); styleset_case(RUST); styleset_case(SH); + styleset_case(SMALLTALK); styleset_case(SQL); styleset_case(TCL); styleset_case(TXT2TAGS); Modified: src/highlightingmappings.h 29 lines changed, 29 insertions(+), 0 deletions(-) =================================================================== @@ -1409,6 +1409,35 @@ static const HLKeyword highlighting_keywords_SH[] = #define highlighting_properties_SH EMPTY_PROPERTIES +/* SMALLTALK */ +#define highlighting_lexer_SMALLTALK SCLEX_SMALLTALK +static const HLStyle highlighting_styles_SMALLTALK[] = +{ + { SCE_ST_DEFAULT, "default", FALSE }, + { SCE_ST_SPECIAL, "special", FALSE }, + { SCE_ST_SYMBOL, "symbol", FALSE }, + { SCE_ST_ASSIGN, "assignment", FALSE }, + { SCE_ST_RETURN, "return", FALSE }, + { SCE_ST_NUMBER, "number", FALSE }, + { SCE_ST_BINARY, "binary", FALSE }, + { SCE_ST_SPEC_SEL, "special_selector", FALSE }, + { SCE_ST_KWSEND, "keyword_send", FALSE }, + { SCE_ST_GLOBAL, "global", FALSE }, + { SCE_ST_SELF, "self", FALSE }, + { SCE_ST_SUPER, "super", FALSE }, + { SCE_ST_NIL, "nil", FALSE }, + { SCE_ST_BOOL, "bool", FALSE }, + { SCE_ST_COMMENT, "comment", FALSE }, + { SCE_ST_STRING, "string", FALSE }, + { SCE_ST_CHARACTER, "character", FALSE } +}; +static const HLKeyword highlighting_keywords_SMALLTALK[] = +{ + { 0, "special_selector", FALSE } +}; +#define highlighting_properties_SMALLTALK EMPTY_PROPERTIES + + /* SQL */ #define highlighting_lexer_SQL SCLEX_SQL static const HLStyle highlighting_styles_SQL[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d36912: Merge pull request #2333 from foresto/nomatch-text-color
by Colomban Wendling 09 Oct '20

09 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 09 Oct 2020 09:17:00 UTC Commit: d369123a2d2fe3a9d10422e16211f6bb4e882721 https://github.com/geany/geany/commit/d369123a2d2fe3a9d10422e16211f6bb4e882… Log Message: ----------- Merge pull request #2333 from foresto/nomatch-text-color Define text color when setting dark background in find dialog Modified Paths: -------------- data/geany.css data/geany.gtkrc Modified: data/geany.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -22,6 +22,7 @@ } #geany-search-entry-no-match:selected /* GTK < 3.20 */, #geany-search-entry-no-match selection /* GTK >= 3.20 */ { + color: #fff; background-color: #771111; } Modified: data/geany.gtkrc 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -21,6 +21,7 @@ style "geany-search-entry-no-match-style" { base[NORMAL] = "#ffff66666666" text[NORMAL] = "#ffffffffffff" base[SELECTED] = "#777711111111" + text[SELECTED] = "#ffffffffffff" # try and remove the entry background image on pixmap engine so that our # background color is visible, and we don't end up with white text on white # background (workaround for Adwaita 3.20). -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5dc643: Fix gtk2/gtk3 mac integration test
by Jiří Techet 08 Oct '20

08 Oct '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 08 Oct 2020 13:27:16 UTC Commit: 5dc643ee18181b6b4bfb8ca79a4591e6c2f25a9a https://github.com/geany/geany/commit/5dc643ee18181b6b4bfb8ca79a4591e6c2f25… Log Message: ----------- Fix gtk2/gtk3 mac integration test Modified Paths: -------------- m4/geany-mac-integration.m4 Modified: m4/geany-mac-integration.m4 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -12,8 +12,8 @@ AC_DEFUN([GEANY_CHECK_MAC_INTEGRATION], AM_CONDITIONAL(ENABLE_MAC_INTEGRATION, [test "x$geany_enable_mac_integration" = "xyes"]) AM_COND_IF(ENABLE_MAC_INTEGRATION, [ - AS_IF([test "x$enable_gtk3" = xyes], - [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk3)], - [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk2)]) + AS_IF([test "x$enable_gtk2" = xyes], + [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk2)], + [PKG_CHECK_MODULES(MAC_INTEGRATION, gtk-mac-integration-gtk3)]) ]) ]) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d7d181: Add Smalltalk filetype
by Snowflake the Pony 05 Oct '20

05 Oct '20

Branch: refs/heads/master Author: Snowflake the Pony <snowflakethepony(a)hotmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 05 Oct 2020 14:25:51 UTC Commit: d7d1810d2607574e57d94674a2637bc4dcdff84f https://github.com/geany/geany/commit/d7d1810d2607574e57d94674a2637bc4dcdff… Log Message: ----------- Add Smalltalk filetype Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.smalltalk data/filetype_extensions.conf scintilla/Makefile.am scintilla/lexers/LexSmalltalk.cxx scintilla/scintilla_changes.patch scintilla/src/Catalogue.cxx src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -67,6 +67,7 @@ filetypes = \ filedefs/filetypes.rust \ filedefs/filetypes.Scala.conf \ filedefs/filetypes.sh \ + filedefs/filetypes.smalltalk \ filedefs/filetypes.sql \ filedefs/filetypes.Swift.conf \ filedefs/filetypes.TypeScript.conf \ Modified: data/filedefs/filetypes.smalltalk 56 lines changed, 56 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,56 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +special=operator +symbol=identifier_1 +assignment=operator +return=operator +number=number_1 +binary=operator +special_selector=keyword_3 +keyword_send=keyword_2 +global=class +self=keyword_1 +super=keyword_1 +nil=keyword_1 +bool=keyword_1 +comment=comment +string=string_1 +character=character + +[keywords] +# all items must be in one line +special_selector=ifTrue: ifFalse: whileTrue: whileFalse: ifNil: ifNotNil: whileTrue whileFalse repeat isNil notNil + +[settings] +# default extension used when saving files +extension=st + +# MIME type +mime_type=text/x-smalltalk + +# the following characters are these which a "word" can contains, see documentation +#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 Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -65,6 +65,7 @@ Rust=*.rs; Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile; Scala=*.scala;*.scl; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;.bashrc;bash.bashrc;.bash_*;bash_*;*.m4;PKGBUILD;*profile; +Smalltalk=*.st; SQL=*.sql; Swift=*.swift; Tcl=*.tcl;*.tk;*.wish;*.exp; Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -42,6 +42,7 @@ lexers/LexPO.cxx \ lexers/LexR.cxx \ lexers/LexRuby.cxx \ lexers/LexRust.cxx \ +lexers/LexSmalltalk.cxx \ lexers/LexSQL.cxx \ lexers/LexTCL.cxx \ lexers/LexTxt2tags.cxx \ Modified: scintilla/lexers/LexSmalltalk.cxx 324 lines changed, 324 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,324 @@ +// Scintilla source code edit control +/** @file LexSmalltalk.cxx + ** Lexer for Smalltalk language. + ** Written by Sergey Philippov, sphilippov-at-gmail-dot-com + **/ +// Copyright 1998-2002 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 "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + +using namespace Scintilla; + +/* +| lexTable classificationBlock charClasses | +charClasses := #(#DecDigit #Letter #Special #Upper #BinSel). +lexTable := ByteArray new: 128. +classificationBlock := [ :charClass :chars | + | flag | + flag := 1 bitShift: (charClasses indexOf: charClass) - 1. + chars do: [ :char | lexTable at: char codePoint + 1 put: ((lexTable at: char codePoint + 1) bitOr: flag)]]. + +classificationBlock + value: #DecDigit value: '0123456789'; + value: #Letter value: '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; + value: #Special value: '()[]{};.^:'; + value: #BinSel value: '~@%&*-+=|\/,<>?!'; + value: #Upper value: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. + +((String new: 500) streamContents: [ :stream | + stream crLf; nextPutAll: 'static int ClassificationTable[256] = {'. + lexTable keysAndValuesDo: [ :index :value | + ((index - 1) rem: 16) == 0 ifTrue: [ + stream crLf; tab] + ifFalse: [ + stream space]. + stream print: value. + index ~= 256 ifTrue: [ + stream nextPut: $,]]. + stream crLf; nextPutAll: '};'; crLf. + + charClasses keysAndValuesDo: [ :index :name | + stream + crLf; + nextPutAll: ( + ('static inline bool is<1s>(int ch) {return (ch > 0) && (ch %< 0x80) && ((ClassificationTable[ch] & <2p>) != 0);}') + expandMacrosWith: name with: (1 bitShift: (index - 1))) + ]]) edit +*/ + +// autogenerated {{{{ + +static int ClassificationTable[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 16, 0, 0, 0, 16, 16, 0, 4, 4, 16, 16, 16, 16, 4, 16, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 16, 16, 16, 16, + 16, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 4, 16, 4, 4, 2, + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 16, 4, 16, 0, +}; + +static inline bool isDecDigit(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 1) != 0);} +static inline bool isLetter(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 2) != 0);} +static inline bool isSpecial(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 4) != 0);} +static inline bool isUpper(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 8) != 0);} +static inline bool isBinSel(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 16) != 0);} +// autogenerated }}}} + +static inline bool isAlphaNumeric(int ch) { + return isDecDigit(ch) || isLetter(ch); +} + +static inline bool isDigitOfRadix(int ch, int radix) +{ + if (isDecDigit(ch)) + return (ch - '0') < radix; + else if (!isUpper(ch)) + return false; + else + return (ch - 'A' + 10) < radix; +} + +static inline void skipComment(StyleContext& sc) +{ + while (sc.More() && sc.ch != '\"') + sc.Forward(); +} + +static inline void skipString(StyleContext& sc) +{ + while (sc.More()) { + if (sc.ch == '\'') { + if (sc.chNext != '\'') + return; + sc.Forward(); + } + sc.Forward(); + } +} + +static void handleHash(StyleContext& sc) +{ + if (isSpecial(sc.chNext)) { + sc.SetState(SCE_ST_SPECIAL); + return; + } + + sc.SetState(SCE_ST_SYMBOL); + sc.Forward(); + if (sc.ch == '\'') { + sc.Forward(); + skipString(sc); + } + else { + if (isLetter(sc.ch)) { + while (isAlphaNumeric(sc.chNext) || sc.chNext == ':') + sc.Forward(); + } + else if (isBinSel(sc.ch)) { + while (isBinSel(sc.chNext)) + sc.Forward(); + } + } +} + +static inline void handleSpecial(StyleContext& sc) +{ + if (sc.ch == ':' && sc.chNext == '=') { + sc.SetState(SCE_ST_ASSIGN); + sc.Forward(); + } + else { + if (sc.ch == '^') + sc.SetState(SCE_ST_RETURN); + else + sc.SetState(SCE_ST_SPECIAL); + } +} + +static inline void skipInt(StyleContext& sc, int radix) +{ + while (isDigitOfRadix(sc.chNext, radix)) + sc.Forward(); +} + +static void handleNumeric(StyleContext& sc) +{ + char num[256]; + int nl; + int radix; + + sc.SetState(SCE_ST_NUMBER); + num[0] = static_cast<char>(sc.ch); + nl = 1; + while (isDecDigit(sc.chNext)) { + num[nl++] = static_cast<char>(sc.chNext); + sc.Forward(); + if (nl+1 == sizeof(num)/sizeof(num[0])) // overrun check + break; + } + if (sc.chNext == 'r') { + num[nl] = 0; + if (num[0] == '-') + radix = atoi(num + 1); + else + radix = atoi(num); + sc.Forward(); + if (sc.chNext == '-') + sc.Forward(); + skipInt(sc, radix); + } + else + radix = 10; + if (sc.chNext != '.' || !isDigitOfRadix(sc.GetRelative(2), radix)) + return; + sc.Forward(); + skipInt(sc, radix); + if (sc.chNext == 's') { + // ScaledDecimal + sc.Forward(); + while (isDecDigit(sc.chNext)) + sc.Forward(); + return; + } + else if (sc.chNext != 'e' && sc.chNext != 'd' && sc.chNext != 'q') + return; + sc.Forward(); + if (sc.chNext == '+' || sc.chNext == '-') + sc.Forward(); + skipInt(sc, radix); +} + +static inline void handleBinSel(StyleContext& sc) +{ + sc.SetState(SCE_ST_BINARY); + while (isBinSel(sc.chNext)) + sc.Forward(); +} + +static void handleLetter(StyleContext& sc, WordList* specialSelectorList) +{ + char ident[256]; + int il; + int state; + bool doubleColonPresent; + + sc.SetState(SCE_ST_DEFAULT); + + ident[0] = static_cast<char>(sc.ch); + il = 1; + while (isAlphaNumeric(sc.chNext)) { + ident[il++] = static_cast<char>(sc.chNext); + sc.Forward(); + if (il+2 == sizeof(ident)/sizeof(ident[0])) // overrun check + break; + } + + if (sc.chNext == ':') { + doubleColonPresent = true; + ident[il++] = ':'; + sc.Forward(); + } + else + doubleColonPresent = false; + ident[il] = 0; + + if (specialSelectorList->InList(ident)) + state = SCE_ST_SPEC_SEL; + else if (doubleColonPresent) + state = SCE_ST_KWSEND; + else if (isUpper(ident[0])) + state = SCE_ST_GLOBAL; + else { + if (!strcmp(ident, "self")) + state = SCE_ST_SELF; + else if (!strcmp(ident, "super")) + state = SCE_ST_SUPER; + else if (!strcmp(ident, "nil")) + state = SCE_ST_NIL; + else if (!strcmp(ident, "true") || !strcmp(ident, "false")) + state = SCE_ST_BOOL; + else + state = SCE_ST_DEFAULT; + } + + sc.ChangeState(state); +} + +static void colorizeSmalltalkDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *wordLists[], Accessor &styler) +{ + StyleContext sc(startPos, length, initStyle, styler); + + if (initStyle == SCE_ST_COMMENT) { + skipComment(sc); + if (sc.More()) + sc.Forward(); + } + else if (initStyle == SCE_ST_STRING) { + skipString(sc); + if (sc.More()) + sc.Forward(); + } + + for (; sc.More(); sc.Forward()) { + int ch; + + ch = sc.ch; + if (ch == '\"') { + sc.SetState(SCE_ST_COMMENT); + sc.Forward(); + skipComment(sc); + } + else if (ch == '\'') { + sc.SetState(SCE_ST_STRING); + sc.Forward(); + skipString(sc); + } + else if (ch == '#') + handleHash(sc); + else if (ch == '$') { + sc.SetState(SCE_ST_CHARACTER); + sc.Forward(); + } + else if (isSpecial(ch)) + handleSpecial(sc); + else if (isDecDigit(ch)) + handleNumeric(sc); + else if (isLetter(ch)) + handleLetter(sc, wordLists[0]); + else if (isBinSel(ch)) { + if (ch == '-' && isDecDigit(sc.chNext)) + handleNumeric(sc); + else + handleBinSel(sc); + } + else + sc.SetState(SCE_ST_DEFAULT); + } + sc.Complete(); +} + +static const char* const smalltalkWordListDesc[] = { + "Special selectors", + 0 +}; + +LexerModule lmSmalltalk(SCLEX_SMALLTALK, colorizeSmalltalkDoc, "smalltalk", NULL, smalltalkWordListDesc); Modified: scintilla/scintilla_changes.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -171,7 +171,7 @@ index ed47aa8..e58f1ab 100644 LINK_LEXER(lmRust); - LINK_LEXER(lmSAS); - LINK_LEXER(lmScriptol); -- LINK_LEXER(lmSmalltalk); + LINK_LEXER(lmSmalltalk); - LINK_LEXER(lmSML); - LINK_LEXER(lmSorc); - LINK_LEXER(lmSpecman); Modified: scintilla/src/Catalogue.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -99,6 +99,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmR); LINK_LEXER(lmRuby); LINK_LEXER(lmRust); + LINK_LEXER(lmSmalltalk); LINK_LEXER(lmSQL); LINK_LEXER(lmTCL); LINK_LEXER(lmTxt2tags); Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -186,6 +186,7 @@ static void init_builtin_filetypes(void) FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( GO, GO, "Go", NULL, SOURCE_FILE, COMPILED ); FT_INIT( ZEPHIR, ZEPHIR, "Zephir", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( SMALLTALK, NONE, "Smalltalk", NULL, SOURCE_FILE, SCRIPT ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -106,6 +106,7 @@ typedef enum GEANY_FILETYPES_GO, GEANY_FILETYPES_ZEPHIR, GEANY_FILETYPES_BIBTEX, + GEANY_FILETYPES_SMALLTALK, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1064,6 +1064,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(RUBY); init_styleset_case(RUST); init_styleset_case(SH); + init_styleset_case(SMALLTALK); init_styleset_case(SQL); init_styleset_case(TCL); init_styleset_case(TXT2TAGS); @@ -1152,6 +1153,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(RUBY); styleset_case(RUST); styleset_case(SH); + styleset_case(SMALLTALK); styleset_case(SQL); styleset_case(TCL); styleset_case(TXT2TAGS); Modified: src/highlightingmappings.h 29 lines changed, 29 insertions(+), 0 deletions(-) =================================================================== @@ -1409,6 +1409,35 @@ static const HLKeyword highlighting_keywords_SH[] = #define highlighting_properties_SH EMPTY_PROPERTIES +/* SMALLTALK */ +#define highlighting_lexer_SMALLTALK SCLEX_SMALLTALK +static const HLStyle highlighting_styles_SMALLTALK[] = +{ + { SCE_ST_DEFAULT, "default", FALSE }, + { SCE_ST_SPECIAL, "special", FALSE }, + { SCE_ST_SYMBOL, "symbol", FALSE }, + { SCE_ST_ASSIGN, "assignment", FALSE }, + { SCE_ST_RETURN, "return", FALSE }, + { SCE_ST_NUMBER, "number", FALSE }, + { SCE_ST_BINARY, "binary", FALSE }, + { SCE_ST_SPEC_SEL, "special_selector", FALSE }, + { SCE_ST_KWSEND, "keyword_send", FALSE }, + { SCE_ST_GLOBAL, "global", FALSE }, + { SCE_ST_SELF, "self", FALSE }, + { SCE_ST_SUPER, "super", FALSE }, + { SCE_ST_NIL, "nil", FALSE }, + { SCE_ST_BOOL, "bool", FALSE }, + { SCE_ST_COMMENT, "comment", FALSE }, + { SCE_ST_STRING, "string", FALSE }, + { SCE_ST_CHARACTER, "character", FALSE } +}; +static const HLKeyword highlighting_keywords_SMALLTALK[] = +{ + { 0, "special_selector", FALSE } +}; +#define highlighting_properties_SMALLTALK EMPTY_PROPERTIES + + /* SQL */ #define highlighting_lexer_SQL SCLEX_SQL static const HLStyle highlighting_styles_SQL[] = -------------- 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 October 2020