Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Scintilla 5.1.5 and Lexilla 5.1.4 #3046

Merged
merged 2 commits into from Jan 9, 2022

Conversation

kugel-
Copy link
Member

@kugel- kugel- commented Dec 7, 2021

Scintilla:

Lexilla:

Scintilla:
- SCI_GETTEXT, SCI_GETSELTEXT, and SCI_GETCURLINE behaviorial changes
- Autocompletion on Wayland (see geany#3009)

Lexilla:
- New parsers: gdscript (see geany#3012) and asciidoc (see geany#2986) but not imported yet
SCI_GETTEXT second parameter, the buffer length, does not account
for the NUL termination anymore. Therefore, take care to not tell
Scintilla to overwrite the last byte reserved for NUL termination.
@Davidy22
Copy link
Contributor

Davidy22 commented Dec 9, 2021

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?

@elextr
Copy link
Member

elextr commented Dec 9, 2021

If GDscript is part of upstream why is there a conflict since this comes from upstream?

@Davidy22
Copy link
Contributor

Davidy22 commented Dec 9, 2021

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.

@kugel-
Copy link
Member Author

kugel- commented Dec 9, 2021

Well I suggest rebasing your PR after this is merged.

@kugel-
Copy link
Member Author

kugel- commented Dec 25, 2021

I'll merge this in a week or so in absence of impeding feedback

@techee
Copy link
Member

techee commented Jan 7, 2022

@kugel- IMO it can be merged now so the GDScript pull request can be made ready for merging to Geany.

@elextr
Copy link
Member

elextr commented Jan 7, 2022

Havn't noticed any problems with running this PR in last couple of weeks although not heavily tested.

@kugel- kugel- merged commit a04f361 into geany:master Jan 9, 2022
@b4n b4n added this to the 1.39/2.0 milestone Feb 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants