Scintilla: - SCI_GETTEXT, SCI_GETSELTEXT, and SCI_GETCURLINE behaviorial changes - Autocompletion on Wayland (see #3009)
Lexilla: - New parsers: gdscript (see #3012) and asciidoc (see #2986) but not imported yet
You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/3046
-- Commit Summary --
* Update to Scintilla 5.1.5 and Lexilla 5.1.4 * Adapt to SCI_GETTEXT changes
-- File Changes --
M scintilla/gtk/PlatGTK.cxx (11) M scintilla/lexilla/include/SciLexer.h (42) M scintilla/lexilla/lexers/LexBatch.cxx (64) M scintilla/lexilla/src/Lexilla.cxx (4) M scintilla/lexilla/version.txt (2) M scintilla/src/AutoComplete.cxx (5) M scintilla/src/Document.cxx (89) M scintilla/src/Editor.cxx (69) M scintilla/version.txt (2) M scripts/update-scintilla.sh (2) M src/sciwrappers.c (18)
-- Patch Links --
https://github.com/geany/geany/pull/3046.patch https://github.com/geany/geany/pull/3046.diff
I believe there is going to be a little enumeration conflict with the GDScript additions that would need to be resolved, are we merging this first and amending that, or some other approach?
If GDscript is part of upstream why is there a conflict since this comes from upstream?
In the linked PR that has the full GDScript addition that I've created here on the Geany pull request queue, the enumerations in scintilla/lexilla/include/LexicalStyles.iface and scintilla/lexilla/include/SciLexer.h are slightly different because I set them to 134 when adding them in Geany, but the geany source doesn't have asciiidoc yet which is the one that takes enumeration 134 in upstream so part of the fixes I did when working upstream was changing it to 135.
Well I suggest rebasing your PR after this is merged.
I'll merge this in a week or so in absence of impeding feedback
@kugel- IMO it can be merged now so the GDScript pull request can be made ready for merging to Geany.
Havn't noticed any problems with running this PR in last couple of weeks although not heavily tested.
Merged #3046 into master.
github-comments@lists.geany.org