You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2018/07/06 22:49:27 UTC
[incubator-netbeans] branch 2ndDonation updated (ae7d2f1 -> b1cad1e)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a change to branch 2ndDonation
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from ae7d2f1 Merge pull request #621 from rtaneja1/rtaneja/donation2_233298fix
add 6febd66 #268488 : Fixing formatting for bower.json and package.json files
new b1cad1e Merge pull request #625 from arusinha/bug#268488-fix-integration
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:
.../editor/parser/SanitizingParser.java | 2 +-
.../testfiles/formatter/issue268488/bower.json | 8 ++++
.../formatter/issue268488/bower.json.formatted | 20 ++++++++++
.../testfiles/formatter/issue268488/package.json | 8 ++++
.../formatter/issue268488/package.json.formatted | 26 +++++++++++++
.../editor/formatter/Issue268488Test.java | 45 +++++++++-------------
6 files changed, 82 insertions(+), 27 deletions(-)
create mode 100644 javascript2.editor/test/unit/data/testfiles/formatter/issue268488/bower.json
create mode 100644 javascript2.editor/test/unit/data/testfiles/formatter/issue268488/bower.json.formatted
create mode 100644 javascript2.editor/test/unit/data/testfiles/formatter/issue268488/package.json
create mode 100644 javascript2.editor/test/unit/data/testfiles/formatter/issue268488/package.json.formatted
copy php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/NullableType.java => javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/formatter/Issue268488Test.java (72%)
---------------------------------------------------------------------
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
[incubator-netbeans] 01/01: Merge pull request #625 from
arusinha/bug#268488-fix-integration
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch 2ndDonation
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit b1cad1e50d012559b326285cd477c50366209add
Merge: ae7d2f1 6febd66
Author: Junichi Yamamoto <ju...@gmail.com>
AuthorDate: Sat Jul 7 07:49:24 2018 +0900
Merge pull request #625 from arusinha/bug#268488-fix-integration
donation2_merge: #268488 : Fixing formatting for bower.json and package.json files
.../editor/parser/SanitizingParser.java | 2 +-
.../testfiles/formatter/issue268488/bower.json | 8 +++
.../formatter/issue268488/bower.json.formatted | 20 ++++++
.../testfiles/formatter/issue268488/package.json | 8 +++
.../formatter/issue268488/package.json.formatted | 26 ++++++++
.../editor/formatter/Issue268488Test.java | 72 ++++++++++++++++++++++
6 files changed, 135 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
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