You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2025/12/06 15:01:10 UTC
(netbeans) branch master updated (190f8f35878 -> 3c74da127a0)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 190f8f35878 Merge pull request #9054 from troizet/folding_heredoc_nowdoc
add 36133581e94 Fixes coloring display for macro values splitted on multiple new lines
new 3c74da127a0 Merge pull request #9063 from haidubogdan/fix_jflex_coloring_for_macro_value_on_multiple_lines
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../antlr4/coloring/JflexAntlrColoringLexer.g4 | 24 ++++--
.../languages/jflex/resources/TemplateHelp.html | 4 +-
.../languages/jflex/resources/package-info.java | 4 +-
.../lexer/macro_value_splitted_on_new_lines.jflex | 25 ++++++
.../macro_value_splitted_on_new_lines.jflex.lexer | 99 ++++++++++++++++++++++
.../data/testfiles/lexer/rule_pipe_operator.jflex | 21 +++++
.../testfiles/lexer/rule_pipe_operator.jflex.lexer | 62 ++++++++++++++
.../languages/jflex/lexer/JflexLexerTest.java | 8 ++
8 files changed, 238 insertions(+), 9 deletions(-)
copy java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/templates/Description.html => ide/languages.jflex/src/org/netbeans/modules/languages/jflex/resources/TemplateHelp.html (82%)
create mode 100644 ide/languages.jflex/test/unit/data/testfiles/lexer/macro_value_splitted_on_new_lines.jflex
create mode 100644 ide/languages.jflex/test/unit/data/testfiles/lexer/macro_value_splitted_on_new_lines.jflex.lexer
create mode 100644 ide/languages.jflex/test/unit/data/testfiles/lexer/rule_pipe_operator.jflex
create mode 100644 ide/languages.jflex/test/unit/data/testfiles/lexer/rule_pipe_operator.jflex.lexer
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) 01/01: Merge pull request #9063 from haidubogdan/fix_jflex_coloring_for_macro_value_on_multiple_lines
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 3c74da127a004805a56627507a4f0016e26097e5
Merge: 190f8f35878 36133581e94
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sat Dec 6 16:01:04 2025 +0100
Merge pull request #9063 from haidubogdan/fix_jflex_coloring_for_macro_value_on_multiple_lines
Fixes jflex coloring display for macro values splitted on multiple new lines
.../antlr4/coloring/JflexAntlrColoringLexer.g4 | 24 ++++--
.../languages/jflex/resources/TemplateHelp.html | 29 +++++++
.../languages/jflex/resources/package-info.java | 4 +-
.../lexer/macro_value_splitted_on_new_lines.jflex | 25 ++++++
.../macro_value_splitted_on_new_lines.jflex.lexer | 99 ++++++++++++++++++++++
.../data/testfiles/lexer/rule_pipe_operator.jflex | 21 +++++
.../testfiles/lexer/rule_pipe_operator.jflex.lexer | 62 ++++++++++++++
.../languages/jflex/lexer/JflexLexerTest.java | 8 ++
8 files changed, 265 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists