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:44 UTC
[incubator-netbeans] branch 2ndDonation updated (b1cad1e -> f919864)
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 b1cad1e Merge pull request #625 from arusinha/bug#268488-fix-integration
add e29c5d6 #240529: Fixing folding of empty {}
new f919864 Merge pull request #626 from arusinha/bug#240529-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:
.../modules/javascript2/editor/JsStructureScanner.java | 13 +++++++++++--
.../unit/data/testfiles/coloring/czechChars.js.folds | 2 +-
.../test/unit/data/testfiles/structure/issue240529.js | 15 +++++++++++++++
.../unit/data/testfiles/structure/issue240529.js.folds | 16 ++++++++++++++++
.../javascript2/editor/JsStructureScannerTest.java | 4 ++++
5 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 javascript2.editor/test/unit/data/testfiles/structure/issue240529.js
create mode 100644 javascript2.editor/test/unit/data/testfiles/structure/issue240529.js.folds
---------------------------------------------------------------------
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 #626 from
arusinha/bug#240529-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 f919864725c12845cf2e26de0a529caee7957791
Merge: b1cad1e e29c5d6
Author: Junichi Yamamoto <ju...@gmail.com>
AuthorDate: Sat Jul 7 07:49:42 2018 +0900
Merge pull request #626 from arusinha/bug#240529-fix-integration
donation2_merge:#240529: Fixing folding of empty {}
.../modules/javascript2/editor/JsStructureScanner.java | 13 +++++++++++--
.../unit/data/testfiles/coloring/czechChars.js.folds | 2 +-
.../test/unit/data/testfiles/structure/issue240529.js | 15 +++++++++++++++
.../unit/data/testfiles/structure/issue240529.js.folds | 16 ++++++++++++++++
.../javascript2/editor/JsStructureScannerTest.java | 4 ++++
5 files changed, 47 insertions(+), 3 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