@kugel- pushed 2 commits.

7dcce183d90756468d07db7f6650d22da137ab1a fixup! Update Scintilla to version 5.3.6 3788b6fa478d4e33693c0919ab35d00f04e6e3b3 Map new python "attribute" mapping to identifier_2, by default.

[0001-Fix-assertion-failure-on-some-system-when-an-INDIC_S.patch.gz](https://github.com/geany/geany/files/12593500/0001-Fix-assertion-failure-on-...)

See:

* [geany-plugins#1272](https://github.com/geany/geany-plugins/issues/1272) * [scintilla/652df8](https://sourceforge.net/p/scintilla/code/ci/652df80a41a010f404be51410d921f2d...).

@kugel- pushed 4 commits.

32a450f4922419d0771be2479b7b97b6a363fa3a fixup! Map new python "attribute" mapping to identifier_2, by default. aeee043f1942e2c3e88fcda3cff5f89fdf35c773 Map new ruby lex classes to existing styles, for now. 37b15b0cf9739c04ff50f53944e2874b095e52b6 Handle new styles for strings in R (rawstrings, backticks, espaces) 1caf9e0708c1ee4f3747fa6005fcc55aca35bb40 Handle new nodepath style for gdscript

[Handle new styles for strings in R (rawstrings, backticks, espaces](https://github.com/geany/geany/pull/3551/commits/37b15b0cf9739c04ff50f53944e...)

I would defer to [@zufuliu's patch][0] as being simpler and slightly optimizing the iteration count. IIUC, [it's Geany's policy][1] to only consume upstream patches anyway.

[0]: https://github.com/ScintillaOrg/lexilla/issues/206#issuecomment-1732208654 [1]: https://github.com/geany/geany/pull/3171#issuecomment-1594078454

@elextr, yes, I see now the commit only touched filedefs (after expanding the diffs that GitHub's device fingerprinting scripts decided to collapse for my diminutive screen).

At least the Prolog enthusiasts now have a mentioned thread to follow, in case they want to know what's blocking #3171.

You should be able to set options in the `[lexer_proterties]` section of the filetype file, so you can try all those out and see what they do.

@eht16 do you know what's wrong with the Windows CI?

https://github.com/ScintillaOrg/lexilla/issues/206 fixed after the 5.2.7 release. I did not backport the fix. I think R is not relevant enough to carry an additional change to Lexilla, or is it?

@eht16 do you know what's wrong with the Windows CI?

No :(. I can succesfully build the image with normal Docker on a native Linux system. Either something changed on how the Gitlab runners are implemented or something in `pacman` changed, still unsure what is causing this. So far I didn't find any relevant information on the net. I'll try if it is enough to just create `/etc/mtab`.

I added a commit to enable the change history since it was trivial. Seems like a nice, user-visible change to take along (gives a bit of a modern feeling).

Before saving 

After saving 

AFAIK scintilla needs C++17 since version 4?

@eht16 what version of g++/libstdc++ is used for windows, nowhere does the version get printed in configure or build, grrrr?

In https://github.com/geany/geany/actions/runs/6322193707/job/17167381804?pr=35... we show basic build environment information. Adding the gcc/g++ version is easy, maybe also the libstdc++ version as well. Anything else you are missing? From the log of the image build, gcc 10.2 and libstdc++6 10.2 is used.

Is gcc 10 fine in general? We could upgrade the Mingw64 build image to Debian Bookworm (currently Bullseye) to get newer gcc versions but on my last attempt this caused weired errors and so I decided to postpone it to after the release.

The CI build is now running

It's running only because I added a workaround in https://github.com/geany/infrastructure/pull/10 to the image build which worked and I accidentally pushed the resulting image to the registry, so it can now be used for other builds. This is OK for the moment but I would still like to know the background of the /etc/mtab problem.

...

Is gcc 10 fine in general?

On an old machine (note to self: upgrade it) linux `g++ (Ubuntu 9.4.0-1ubuntu1~20.04.2) 9.4.0` works here (this PR builds and runs fine).

I really don't know what is wrong with the mingw build at this point.

Me neither. https://github.com/geany/infrastructure/pull/10 fixes the first problem with the Docker mingw64 image build. Since this is done now, I will test this PR on a real Windows system to see if it compiles there (I guess yes).

...

Adding the gcc/g++ version is easy, maybe also the libstdc++ version as well.

👍 Not aware of anything else.

Will do later.

@kugel- @elextr should we include the patch from https://groups.google.com/g/scintilla-interest/c/_tiE_nSaiG4/m/v0e8lzTjAQAJ here?

I'd say yes because the next Scintilla release might be after the upcoming Geany release and the issue might also affect Geany users.

I'm fine with merge. The failed Windows CI build is handled seperately.

Only one minor thing, I guess we should bump plugin API version because `GeanyIndentPrefs` and Scintilla itself are part of the plugin API.

Yes, it builds fine on native Windows as there the compiler from MSYS2 is used. Sorry forgot to mention this, all the build problems are specific to the used cross compiler toolchain used in the CI builds.

Fine. I'll merge and bump the plugin API separately.

Regarding https://groups.google.com/g/scintilla-interest/c/_tiE_nSaiG4/m/v0e8lzTjAQAJ, I think it's a bit too early to jump on that patch. The problem seems to an extreme edge case and the proposed solution is not yet released or even in Scintilla mainline.

@kugel- pushed 8 commits.

19336d22946b77bbcb5131544ea0e6317cdcf6b5 Update Scintilla to version 5.3.7 9aa597e945876aa61024de1ff6398fa5eba281f0 Map new python "attribute" mapping to identifier_2, by default. 7f78ddf694cda6a50f93dacb2d6008d6c6bcfdfe Map new ruby lex classes to existing styles, for now. 0f04b2437c4f6e6dd9bd4ed5ace1c27dd16c1efb Handle new styles for strings in R (rawstrings, backticks, espaces) 59d8aee1a8bbb125c38257b60da85a5ae46de36f Handle new nodepath style for gdscript 560ec26d280253b177631dbae8ecdf92ec2fd88f Update scintilla_changes.patch 25c568726693baa9a15347f743f5b0dbbb656ca0 Enable new Scintilla "Change History" 75d528db86cc6f7a77024b39a0afe73fe74f0c4c Bump plugin API

I added a commit to enable the change history since it was trivial. Seems like a nice, user-visible change to take along (gives a bit of a modern feeling).

I'm a tad late to the party (as usual), but I don't think it should be enabled by default. Here's a few reasons: * I've seen it do odd stuff (when I <kbd>^Z</kbd>d a change on a line, it stayed green, yet didn't match the saved state), so I'm wondering if it's already stable enough… but maybe it's just because it matched *one* of the saved states of the file because I did save that previous state before!? * if you reload the file, everything becomes green… * if someone doesn't have the marker margin visible, background rendering is quite intrusive (especially after reloading the file :wink: ) * I personally don't understand the point of the feature. Why would I want to see changes since the file was loaded? It's might be nice to see which lines aren't saved, but having everything since the file was loaded I don't understand the use case. * I think it's not entirely obvious what the feature is about if you don't know it. Meaning that if I just opened Geany, I could wonder what the heck was that thing. * Colors are a bit off with the default theme (or any for that matter), maybe we'd need some way to adjust that?

I guess Neil added this because somebody wanted it. I can see that there are times when knowing what was changed in a session is useful. Since last save is maybe less useful since most IDEs have autosave and lots of people seem to like it.

But as @b4n points out there are operations that can produce unusable results when blindly recording lines edited since session start.

Other IDEs (the ones I tested) show diffs to git, not just the session, thats probably more useful. Maybe, depends how good the diff algorithm is, I'm sure we all have seen excessive github diffs for small changes.

Styling just needs "somebody" to add settings for the relevant marker and indicator types to the colour schemes files.

Anyway, its in Scintilla, we might as well make it available to users, the only question is by default or not. I don't have a strong feeling either way.

"Change history" docs will be added in https://github.com/geany/geany/pull/3593.