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: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
