You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/3441
-- Commit Summary --
* update lexilla to 5.2.4
-- File Changes --
M data/filedefs/filetypes.gdscript (1) M data/filedefs/filetypes.python.in (1) M data/filedefs/filetypes.r (4) M data/filedefs/filetypes.ruby (4) M scintilla/lexilla/include/Lexilla.h (16) M scintilla/lexilla/include/SciLexer.h (12) M scintilla/lexilla/lexers/LexBash.cxx (8) M scintilla/lexilla/lexers/LexBatch.cxx (31) M scintilla/lexilla/lexers/LexCPP.cxx (198) M scintilla/lexilla/lexers/LexCmake.cxx (2) M scintilla/lexilla/lexers/LexCoffeeScript.cxx (7) M scintilla/lexilla/lexers/LexDiff.cxx (57) M scintilla/lexilla/lexers/LexGDScript.cxx (43) M scintilla/lexilla/lexers/LexHTML.cxx (64) M scintilla/lexilla/lexers/LexJulia.cxx (4) M scintilla/lexilla/lexers/LexMake.cxx (36) M scintilla/lexilla/lexers/LexMarkdown.cxx (123) M scintilla/lexilla/lexers/LexMatlab.cxx (182) M scintilla/lexilla/lexers/LexPowerShell.cxx (83) M scintilla/lexilla/lexers/LexProps.cxx (39) M scintilla/lexilla/lexers/LexPython.cxx (103) M scintilla/lexilla/lexers/LexR.cxx (252) M scintilla/lexilla/lexers/LexRuby.cxx (778) M scintilla/lexilla/lexers/LexVHDL.cxx (18) M scintilla/lexilla/lexers/LexYAML.cxx (84) M scintilla/lexilla/lexlib/CharacterCategory.cxx (190) M scintilla/lexilla/lexlib/CharacterSet.h (10) M scintilla/lexilla/lexlib/LexAccessor.cxx (9) M scintilla/lexilla/lexlib/LexAccessor.h (30) M scintilla/lexilla/lexlib/LexerModule.h (2) M scintilla/lexilla/lexlib/OptionSet.h (2) M scintilla/lexilla/lexlib/PropSetSimple.cxx (2) M scintilla/lexilla/lexlib/StyleContext.cxx (39) M scintilla/lexilla/lexlib/StyleContext.h (104) M scintilla/lexilla/lexlib/WordList.cxx (23) M scintilla/lexilla/lexlib/WordList.h (1) M scintilla/lexilla/src/Lexilla.cxx (2) M scintilla/lexilla/version.txt (2) M src/highlightingmappings.h (38)
-- Patch Links --
https://github.com/geany/geany/pull/3441.patch https://github.com/geany/geany/pull/3441.diff
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).
@elextr,
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.
The [SciTE website](https://scintilla.org/SciTEDoc.html#DefinedVariables) lists every known property, including lexer properties. To your point, though, it's not very searchable.
Lexilla maintains a Python script to keep the properties table in sync with code changes:
https://github.com/ScintillaOrg/lexilla/blob/43ea736569d52ba6cf7e7325cf39009...
#2517 was an attempt to automate the extraction of property info from release tarballs.
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.
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.
I hope to have a look here after my vacations in about two weeks
ping @kugel-
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.
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):
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 files]: https://github.com/ScintillaOrg/lexilla/blob/dbdf25855177f0c5b3bc4520713fccd... [file type definition]: https://github.com/Azq2/my-geany/blob/569e6f8990c756923cf17adb0038ada3ea7285...
@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?
@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:
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
Works for me on top of #3551 but with very limited testing (C/C++/Python). @kugel- have you had a chance to review?
#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.
We already have a newer version of Scintilla. Closing.
Closed #3441.
github-comments@lists.geany.org