Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Fri, 20 Dec 2024 22:34:35 UTC Commit: 72fa1b457e932bb70c3380f157792a1b36ad9cb5 https://github.com/geany/geany/commit/72fa1b457e932bb70c3380f157792a1b36ad9c...

Log Message: ----------- Add mappings for newly introduced styles

Also fixes incorrectly spelled (wrt. the config file) SCE_RUST_BYTESTRINGR name.

Modified Paths: -------------- data/filedefs/filetypes.html data/filedefs/filetypes.rust src/highlighting.c src/highlightingmappings.h

Modified: data/filedefs/filetypes.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -57,10 +57,10 @@ jscript_keyword=keyword_1 jscript_doublestring=string_2 jscript_singlestring=string_1 - jscript_symbols=operator jscript_stringeol=string_eol jscript_regex=regex +jscript_templateliteral=string_1

python_default=default python_commentline=comment_line

Modified: data/filedefs/filetypes.rust 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -22,6 +22,8 @@ identifier=identifier_1 lifetime=parameter macro=preprocessor lexerror=error +cstring=string_1 +cstringraw=string_2

[keywords] # all items must be in one line

Modified: src/highlighting.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1572,10 +1572,12 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_HJA_SINGLESTRING || style == SCE_HJA_STRINGEOL || style == SCE_HJA_REGEX || + style == SCE_HJA_TEMPLATELITERAL || style == SCE_HJ_DOUBLESTRING || style == SCE_HJ_SINGLESTRING || style == SCE_HJ_STRINGEOL || style == SCE_HJ_REGEX || + style == SCE_HJ_TEMPLATELITERAL || style == SCE_HPA_CHARACTER || style == SCE_HPA_STRING || style == SCE_HPA_TRIPLE || @@ -1623,6 +1625,8 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_RUST_STRINGR || style == SCE_RUST_BYTESTRING || style == SCE_RUST_BYTESTRINGR || + style == SCE_RUST_CSTRING || + style == SCE_RUST_CSTRINGR || style == SCE_RUST_LEXERROR);

case SCLEX_COFFEESCRIPT:

Modified: src/highlightingmappings.h 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -889,6 +889,7 @@ static const HLStyle highlighting_styles_HTML[] = { SCE_HJ_SYMBOLS, "jscript_symbols", FALSE }, { SCE_HJ_STRINGEOL, "jscript_stringeol", FALSE }, { SCE_HJ_REGEX, "jscript_regex", FALSE }, + { SCE_HJ_TEMPLATELITERAL, "jscript_templateliteral", FALSE },

/* for HB, VBScript?, use the same styles as for JavaScript */ { SCE_HB_START, "jscript_start", FALSE }, @@ -924,6 +925,7 @@ static const HLStyle highlighting_styles_HTML[] = { SCE_HJA_SYMBOLS, "jscript_symbols", FALSE }, { SCE_HJA_STRINGEOL, "jscript_stringeol", FALSE }, { SCE_HJA_REGEX, "jscript_regex", FALSE }, + { SCE_HJA_TEMPLATELITERAL, "jscript_templateliteral", FALSE },

/* embedded Python */ { SCE_HP_START, "jscript_start", FALSE }, @@ -1681,8 +1683,10 @@ static const HLStyle highlighting_styles_RUST[] = { SCE_RUST_MACRO, "macro", FALSE }, { SCE_RUST_LEXERROR, "lexerror", FALSE }, { SCE_RUST_BYTESTRING, "bytestring", FALSE }, - { SCE_RUST_BYTESTRINGR, "bytestringr", FALSE }, - { SCE_RUST_BYTECHARACTER, "bytecharacter", FALSE } + { SCE_RUST_BYTESTRINGR, "bytestringraw", FALSE }, + { SCE_RUST_BYTECHARACTER, "bytecharacter", FALSE }, + { SCE_RUST_CSTRING, "cstring", FALSE }, + { SCE_RUST_CSTRINGR, "cstringraw", FALSE } }; static const HLKeyword highlighting_keywords_RUST[] = {

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).