* Lexilla to version 5.19 * Scintilla to version 5.30 ---- Notes: * sources taken from repositories with important (in my opinion) post-release fixes * new Scintilla's features are not used You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/3292
-- Commit Summary --
* Update Lexilla and Scintilla:
-- File Changes --
M meson.build (3) M scintilla/Makefile.am (3) M scintilla/gtk/Converter.h (7) M scintilla/gtk/PlatGTK.cxx (492) M scintilla/gtk/ScintillaGTK.cxx (208) M scintilla/gtk/ScintillaGTK.h (6) M scintilla/gtk/ScintillaGTKAccessible.cxx (9) A scintilla/gtk/Wrappers.h (109) M scintilla/include/Scintilla.h (55) M scintilla/include/Scintilla.iface (65) M scintilla/include/ScintillaCall.h (10) M scintilla/include/ScintillaMessages.h (9) M scintilla/include/ScintillaStructures.h (26) M scintilla/include/ScintillaTypes.h (34) M scintilla/lexilla/include/SciLexer.h (1) M scintilla/lexilla/lexers/LexBash.cxx (8) M scintilla/lexilla/lexers/LexBatch.cxx (9) M scintilla/lexilla/lexers/LexCPP.cxx (109) M scintilla/lexilla/lexers/LexCmake.cxx (2) M scintilla/lexilla/lexers/LexGDScript.cxx (1) M scintilla/lexilla/lexers/LexHTML.cxx (59) M scintilla/lexilla/lexers/LexJulia.cxx (4) M scintilla/lexilla/lexers/LexMarkdown.cxx (120) M scintilla/lexilla/lexers/LexMatlab.cxx (168) M scintilla/lexilla/lexers/LexPowerShell.cxx (36) M scintilla/lexilla/lexers/LexProps.cxx (39) M scintilla/lexilla/lexers/LexPython.cxx (48) M scintilla/lexilla/lexers/LexR.cxx (108) M scintilla/lexilla/lexers/LexRuby.cxx (191) M scintilla/lexilla/lexers/LexVHDL.cxx (18) M scintilla/lexilla/lexlib/LexAccessor.cxx (9) M scintilla/lexilla/lexlib/LexAccessor.h (16) M scintilla/lexilla/lexlib/OptionSet.h (2) M scintilla/lexilla/lexlib/PropSetSimple.cxx (2) M scintilla/lexilla/lexlib/StyleContext.cxx (28) M scintilla/lexilla/lexlib/StyleContext.h (66) M scintilla/lexilla/lexlib/WordList.cxx (1) M scintilla/lexilla/version.txt (2) M scintilla/src/CallTip.cxx (18) M scintilla/src/CallTip.h (6) M scintilla/src/CaseFolder.cxx (34) M scintilla/src/CaseFolder.h (8) M scintilla/src/CellBuffer.cxx (182) M scintilla/src/CellBuffer.h (33) A scintilla/src/ChangeHistory.cxx (422) A scintilla/src/ChangeHistory.h (112) M scintilla/src/ContractionState.cxx (83) M scintilla/src/ContractionState.h (1) M scintilla/src/Decoration.cxx (48) M scintilla/src/Decoration.h (2) M scintilla/src/Document.cxx (55) M scintilla/src/Document.h (10) M scintilla/src/EditModel.cxx (8) M scintilla/src/EditModel.h (6) M scintilla/src/EditView.cxx (375) M scintilla/src/EditView.h (13) M scintilla/src/Editor.cxx (292) M scintilla/src/Editor.h (45) D scintilla/src/FontQuality.h (27) M scintilla/src/Geometry.cxx (20) M scintilla/src/Geometry.h (1) M scintilla/src/Indicator.cxx (20) M scintilla/src/KeyMap.cxx (4) M scintilla/src/KeyMap.h (2) M scintilla/src/LineMarker.cxx (31) M scintilla/src/MarginView.cxx (24) M scintilla/src/Partitioning.h (128) M scintilla/src/PerLine.cxx (36) M scintilla/src/PerLine.h (40) M scintilla/src/Platform.h (2) M scintilla/src/PositionCache.cxx (94) M scintilla/src/PositionCache.h (50) M scintilla/src/RESearch.cxx (31) M scintilla/src/RunStyles.cxx (118) M scintilla/src/RunStyles.h (10) M scintilla/src/ScintillaBase.cxx (16) M scintilla/src/ScintillaBase.h (1) M scintilla/src/Selection.h (4) M scintilla/src/SparseVector.h (143) M scintilla/src/SplitVector.h (28) M scintilla/src/UniConversion.cxx (4) M scintilla/src/UniConversion.h (2) M scintilla/src/UniqueString.cxx (2) M scintilla/src/UniqueString.h (7) M scintilla/src/ViewStyle.cxx (74) M scintilla/src/ViewStyle.h (3) M scintilla/version.txt (2)
-- Patch Links --
https://github.com/geany/geany/pull/3292.patch https://github.com/geany/geany/pull/3292.diff
@data-man pushed 1 commit.
cf1f524c193c063c95f86efe9b908b6b311f86dd Update Lexilla and Scintilla:
From a quick look there is a new lexical element SCE_P_ATTRIBUTE which needs to be mapped [here](https://github.com/geany/geany/blob/563d94d856ff5ee799f8c8505681ba4544514c33...).
@data-man pushed 1 commit.
d93003c6d8d831e19a93b08d8ed059281dfb4fca Add SCE_P_ATTRIBUTE
@data-man pushed 1 commit.
d97c016651db4f2c90147d293f8932ad9b8559c3 Add `style == SCE_P_ATTRIBUTE` to `highlighting_is_string_style`
sources taken from repositories with important (in my opinion) post-release fixes
I would rather not add patches not found in the target scintilla release, unless there's a very good reason. If the post-release fixes are important, then lets just wait for 5.3.1
@kugel- requested changes on this pull request.
{ SCE_P_FCHARACTER, "fcharacter", FALSE },
- { SCE_P_FTRIPLE, "ftriple", FALSE }, - { SCE_P_FTRIPLEDOUBLE, "ftripledouble", FALSE }, + { SCE_P_FTRIPLE, "ftriple", FALSE }, + { SCE_P_FTRIPLEDOUBLE, "ftripledouble", FALSE }, + { SCE_P_ATTRIBUTE, "fattribute", FALSE },
fattribute -> attribute, or is this intention?
@@ -1436,7 +1436,8 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
style == SCE_P_FCHARACTER || style == SCE_P_FTRIPLE || style == SCE_P_FTRIPLEDOUBLE || - style == SCE_P_STRINGEOL); + style == SCE_P_STRINGEOL || + style == SCE_P_ATTRIBUTE);
If I understand the usage in LexPython.cxx correctly then this new style is totally not a string, It seems to refer to Python class attributes, i.e. this is more of an identifier like class members.
@data-man pushed 2 commits.
04ade6a1ad564dae4dbdad98b888d097696b0742 Checkout releases 37c4b3dcaf032649c1577e1bb692670d76f24a13 Python's corrections
@data-man pushed 2 commits.
97958bbf52d46e75516cba7d37ac17865eda143f Merge branch 'master' of https://github.com/geany/geany into scintilla_upd 7b3ded0fee82f67aa57442b5ea6a7efc767c95a9 Update Lexilla to 5.2.0 and Scintilla to 5.3.1 versions.
Update Lexilla to 5.2.0 and Scintilla to 5.3.1 versions.
Scintilla 5.3.1, released 12 October 2022. Lexilla 5.2.0, released 12 October 2022.
Closed as unnecessary after two months of ignoring it.
Closed #3292.
Geany is a volunteer project, nobody is working on it full time. So just because it hasn't been actioned in some arbitrary time does not mean its unnecessary, just that nobody has had time to review, test and merge yet.
github-comments@lists.geany.org