This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 21bddb5 [NETBEANS-4370] Fix Yaml Lexer in-mustache EOF fails new 4fac990 Merge pull request #2156 from lkishalmi/NETBEANS-4370 21bddb5 is described below commit 21bddb5e1155fa4d0edf798b01532d083573e365 Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Mon May 25 09:20:41 2020 -0700 [NETBEANS-4370] Fix Yaml Lexer in-mustache EOF fails --- .../src/org/netbeans/modules/languages/yaml/YamlLexer.java | 6 ++++++ .../test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt | 3 +++ .../data/testfiles/issue_NETBEANS-4370_1.yaml.txt.tokens.txt | 9 +++++++++ .../test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt | 3 +++ .../data/testfiles/issue_NETBEANS-4370_2.yaml.txt.tokens.txt | 9 +++++++++ .../org/netbeans/modules/languages/yaml/YamlLexerTest.java | 12 +++++++++++- 6 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLexer.java b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLexer.java index 9b189ff..3c7dd55 100644 --- a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLexer.java +++ b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLexer.java @@ -468,6 +468,12 @@ public final class YamlLexer implements Lexer<YamlTokenId> { case ISA_CURLY: state = ISI_WHITESPACE; return token(YamlTokenId.TEXT); + case ISI_MUSTACHE: + state = ISI_WHITESPACE; + return token(YamlTokenId.MUSTACHE); + case ISI_MUSTACHE_QUOTE: + state = ISI_WHITESPACE; + return token(YamlTokenId.MUSTACHE); case ISI_PHP: state = ISI_WHITESPACE; return token(YamlTokenId.PHP); diff --git a/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt new file mode 100644 index 0000000..07f6ba4 --- /dev/null +++ b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt @@ -0,0 +1,3 @@ +.t.e.s.t. SimpleMustache +k: {{a +.e.o.f. \ No newline at end of file diff --git a/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt.tokens.txt b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt.tokens.txt new file mode 100644 index 0000000..57a900d --- /dev/null +++ b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt.tokens.txt @@ -0,0 +1,9 @@ +.t.e.s.t. SimpleMustache +TEXT "k: ", la=2, st=0 +MUSTACHE_DELIMITER "{{", st=13 +MUSTACHE "a", la=1, st=0 +----- EOF ----- + +<Unnamed test> +----- EOF ----- + diff --git a/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt new file mode 100644 index 0000000..b967254 --- /dev/null +++ b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt @@ -0,0 +1,3 @@ +.t.e.s.t. SimpleMustacheQuote +k: {{ '}} +.e.o.f. \ No newline at end of file diff --git a/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt.tokens.txt b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt.tokens.txt new file mode 100644 index 0000000..7e811bf --- /dev/null +++ b/ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt.tokens.txt @@ -0,0 +1,9 @@ +.t.e.s.t. SimpleMustacheQuote +TEXT "k: ", la=2, st=0 +MUSTACHE_DELIMITER "{{", st=13 +MUSTACHE " '}}", la=1, st=0 +----- EOF ----- + +<Unnamed test> +----- EOF ----- + diff --git a/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlLexerTest.java b/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlLexerTest.java index e0463ef..18886f1 100644 --- a/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlLexerTest.java +++ b/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlLexerTest.java @@ -65,7 +65,17 @@ public class YamlLexerTest extends YamlTestBase { YamlTokenId.language()); } - public void testIssue246124() throws Exception { + public void testNETBEANS_4370_1() throws Exception { + LexerTestUtilities.checkTokenDump(this, "testfiles/issue_NETBEANS-4370_1.yaml.txt", + YamlTokenId.language()); + } + + public void testNETBEANS_4370_2() throws Exception { + LexerTestUtilities.checkTokenDump(this, "testfiles/issue_NETBEANS-4370_2.yaml.txt", + YamlTokenId.language()); + } + + public void testIssue246124() throws Exception { LexerTestUtilities.checkTokenDump(this, "testfiles/issue246124.yaml", YamlTokenId.language()); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists