You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/05/27 10:41:54 UTC
[netbeans] branch release120 updated (16abbbf -> 631bd69)
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a change to branch release120
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 16abbbf Merge pull request #2146 from apache/master
add fd48113 [NETBEANS-3858] Checking if the iterator has a next element, before moving to it.
add a59ca00 Merge pull request #2157 from jlahoda/NETBEANS-3858
add 21bddb5 [NETBEANS-4370] Fix Yaml Lexer in-mustache EOF fails
add 4fac990 Merge pull request #2156 from lkishalmi/NETBEANS-4370
add 0345e02 [NETBEANS-4365] Fix NetBeans New Action Wizard.
add 37fba0a Merge pull request #2154 from lkishalmi/NETBEANS-4365
new 631bd69 Merge pull request #2159 from apache/master
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:
.../project/ui/wizard/action/DataModel.java | 87 ++++++++++++----------
.../project/ui/wizard/action/DataModelTest.java | 4 +-
.../netbeans/modules/languages/yaml/YamlLexer.java | 6 ++
.../data/testfiles/issue_NETBEANS-4370_1.yaml.txt | 3 +
.../issue_NETBEANS-4370_1.yaml.txt.tokens.txt | 9 +++
.../data/testfiles/issue_NETBEANS-4370_2.yaml.txt | 3 +
.../issue_NETBEANS-4370_2.yaml.txt.tokens.txt | 9 +++
.../modules/languages/yaml/YamlLexerTest.java | 12 ++-
.../source/parsing/ParameterNameProviderImpl.java | 2 +-
9 files changed, 92 insertions(+), 43 deletions(-)
create mode 100644 ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt
create mode 100644 ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_1.yaml.txt.tokens.txt
create mode 100644 ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt
create mode 100644 ide/languages.yaml/test/unit/data/testfiles/issue_NETBEANS-4370_2.yaml.txt.tokens.txt
---------------------------------------------------------------------
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 #2159 from apache/master
Posted by sk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch release120
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 631bd69cd6112b1cc4c892c24e3e605b1ba04241
Merge: 16abbbf 37fba0a
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Wed May 27 12:41:39 2020 +0200
Merge pull request #2159 from apache/master
Sync master to release 12.0 beta 6
.../project/ui/wizard/action/DataModel.java | 87 ++++++++++++----------
.../project/ui/wizard/action/DataModelTest.java | 4 +-
.../netbeans/modules/languages/yaml/YamlLexer.java | 6 ++
.../data/testfiles/issue_NETBEANS-4370_1.yaml.txt | 3 +
.../issue_NETBEANS-4370_1.yaml.txt.tokens.txt | 9 +++
.../data/testfiles/issue_NETBEANS-4370_2.yaml.txt | 3 +
.../issue_NETBEANS-4370_2.yaml.txt.tokens.txt | 9 +++
.../modules/languages/yaml/YamlLexerTest.java | 12 ++-
.../source/parsing/ParameterNameProviderImpl.java | 2 +-
9 files changed, 92 insertions(+), 43 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