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:55 UTC

[netbeans] 01/01: Merge pull request #2159 from apache/master

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