[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
Closed #3441. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#event-10742666505 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
We already have a newer version of Scintilla. Closing. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1775468908 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
#3551 already includes lexilla 5.2.6, no need to apply this on-top. This the author isn't replying anyway I would just close this. We must not forget the GDScript fix though. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1722315549 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
Works for me on top of #3551 but with very limited testing (C/C++/Python). @kugel- have you had a chance to review? -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1722118102 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
@kugel- > this seems to be an artifact of an earlier lexilla update. I checked and in fact the GDScript filedef was never quite correct. It was copied almost verbatim from the Python filedef without a significant change since being added in f59e520. A point-in-time build based on f59e520 is missing the annotation style the same as I noted earlier: ![geany-git-f59e520-gdscript](https://github.com/geany/geany/assets/59004801/30468a6b-c8de-4d06-bd71-8bae9ef6ca1b) > Would you mind creating a separate PR for that? @Azq2's fork is a good enough place to finally correct the file def, I think. I'm loath to clutter the PR queue with a one-line diff. In any case it would have to follow a merged update to Lexilla and/or Scintilla, and @Davidy22 may end up getting there first: https://github.com/geany/geany/issues/3111#issuecomment-1607800756 -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-186293 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
@rdipardo good catch. However, this seems to be an artifact of an earlier lexilla update. Would you mind creating a separate PR for that? @Azq2 Why did you only update lexilla? We typically update both components together. And regardless, there is lexilla 5.2.5. Can you please target that? -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1640409820 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
GDScript's new annotation style has not been fully integrated yet. The [file type definition] still contains a `decorator=decorator` mapping. As a result, annotations don't show in [GDScript files] (lines 49, 51): ![gdscript-lexilla-524-no-annotations](https://github.com/geany/geany/assets/59004801/bc600a6d-5c6c-4b75-8ca3-affd679ffce6) This appears to be a trivial fix: ~~~diff diff --git a/data/filedefs/filetypes.gdscript b/data/filedefs/filetypes.gdscript index 9b3b63951..d2ca49ffe 100644 --- a/data/filedefs/filetypes.gdscript +++ b/data/filedefs/filetypes.gdscript @@ -19 +19 @@ word2=keyword_2 -decorator=decorator +annotation=decorator ~~~ ![gdscript-lexilla-524-with-annotations](https://github.com/geany/geany/assets/59004801/7896aa77-6cf6-4dba-a24f-52dff48a4f75) [GDScript files]: https://github.com/ScintillaOrg/lexilla/blob/dbdf25855177f0c5b3bc4520713fccd48c251257/test/examples/gdscript/AllStyles.gd [file type definition]: https://github.com/Azq2/my-geany/blob/569e6f8990c756923cf17adb0038ada3ea7285dc/data/filedefs/filetypes.gdscript#L19 -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1610356458 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
Really sorry, but I'm in the middle of moving to a new home. I won't have spare time for another week or three. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1567444345 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
ping @kugel- -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1565784488 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
I hope to have a look here after my vacations in about two weeks -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1510753081 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
I guess updating one without the other is why Neil split them. So long as no lexer needs a capability only available in a newer Scintilla it should be ok. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1510376329 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
I wonder if it is OK to just update Lexilla and not Scintilla as well? But probably better than nothing and we can update Scintilla afterwards anyway. -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1510374543 You are receiving this because you are subscribed to this thread. Message ID:
[Github-comments] Re: [geany/geany] Update lexilla to 5.2.4 (PR #3441)
I can't test ATM, but looks good by inspection, all new styles seem to have made it into `highlightingmappings.h`, well done. I had a thought while inspecting that filetypes files should include all lexer property settings, even if set to Lexilla default or commented out, since Lexilla only code-documents them. I will open an issue for it. Maybe you could add them to the four filetypes you modify here (but not any others). -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/3441#issuecomment-1493212251 You are receiving this because you are subscribed to this thread. Message ID: