(netbeans) 01/01: Merge pull request #6981 from junichi11/php-gh-6980-incorrect-formatting
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a commit to branch php-nb22-features in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 35a83e09a5926dd4e54725927a7941429f9e091c Merge: 2100f39631 452a636fe8 Author: Junichi Yamamoto AuthorDate: Sun Jan 21 18:56:46 2024 +0900 Merge pull request #6981 from junichi11/php-gh-6980-incorrect-formatting Fix incorrect formatting after use statements #6980 .../modules/php/editor/indent/TokenFormatter.java | 8 + .../formatting/blankLines/issueGH6980_01.php | 22 + .../issueGH6980_01.php.testGH6980_01.formatted | 24 +++ .../formatting/blankLines/issueGH6980_02.php | 24 +++ .../issueGH6980_02.php.testGH6980_02.formatted | 26 .../formatting/blankLines/issueGH6980_03.php | 25 +++ .../issueGH6980_03.php.testGH6980_03.formatted | 27 .../blankLines/issueGH6980_NSWithBlock01.php | 24 +++ ...hBlock01.php.testGH6980_NSWithBlock01.formatted | 27 .../blankLines/issueGH6980_NSWithBlock02.php | 26 ...hBlock02.php.testGH6980_NSWithBlock02.formatted | 30 ++ .../blankLines/issueGH6980_NSWithBlock03.php | 27 ...hBlock03.php.testGH6980_NSWithBlock03.formatted | 30 ++ .../editor/indent/PHPFormatterBlankLinesTest.java | 36 ++ 14 files changed, 356 insertions(+) - 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
(netbeans) branch php-nb22-features updated (2100f39631 -> 35a83e09a5)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb22-features in repository https://gitbox.apache.org/repos/asf/netbeans.git from 2100f39631 Update issue report template for NB21 release candidates add 452a636fe8 Fix incorrect formatting after use statements #6980 new 35a83e09a5 Merge pull request #6981 from junichi11/php-gh-6980-incorrect-formatting 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/php/editor/indent/TokenFormatter.java | 8 + .../formatting/blankLines/issueGH6980_01.php | 22 + .../issueGH6980_01.php.testGH6980_01.formatted | 24 +++ .../formatting/blankLines/issueGH6980_02.php | 24 +++ .../issueGH6980_02.php.testGH6980_02.formatted | 26 .../formatting/blankLines/issueGH6980_03.php | 25 +++ .../issueGH6980_03.php.testGH6980_03.formatted | 27 .../blankLines/issueGH6980_NSWithBlock01.php | 24 +++ ...hBlock01.php.testGH6980_NSWithBlock01.formatted | 27 .../blankLines/issueGH6980_NSWithBlock02.php | 26 ...hBlock02.php.testGH6980_NSWithBlock02.formatted | 30 ++ .../blankLines/issueGH6980_NSWithBlock03.php | 27 ...hBlock03.php.testGH6980_NSWithBlock03.formatted | 30 ++ .../editor/indent/PHPFormatterBlankLinesTest.java | 36 ++ 14 files changed, 356 insertions(+) create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php.testGH6980_01.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php.testGH6980_02.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php.testGH6980_03.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php.testGH6980_NSWithBlock01.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php.testGH6980_NSWithBlock02.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php.testGH6980_NSWithBlock03.formatted - 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
(netbeans-jackpot30) 01/01: Merge pull request #35 from jlahoda/release20
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git commit b197e3a9561a236854f938f01efab13fc4ea7ee2 Merge: 13e22c1 db7b360 Author: Jan Lahoda AuthorDate: Sun Jan 21 09:57:48 2024 +0100 Merge pull request #35 from jlahoda/release20 Upgrading to NetBeans 20 .github/workflows/main.yml | 68 ++ .travis.yml| 37 cmdline/README.md | 8 +-- cmdline/build.xml | 14 - .../jackpot30/cmdline/lib/CreateStandaloneJar.java | 21 ++- cmdline/maven/pom.xml | 4 +- .../modules/jackpot30/maven/RunJackpot30Test.java | 2 +- cmdline/maven/tests/fail-on-warnings/golden| 2 +- cmdline/maven/tests/sl-failure/golden | 2 +- cmdline/processor/build.xml| 4 +- cmdline/processor/nbproject/project.properties | 3 +- cmdline/tool/build.xml | 10 +--- cmdline/tool/nbproject/project.properties | 3 +- cmdline/tool/scripts/pom.xml | 2 +- .../netbeans/modules/jackpot30/cmdline/Main.java | 33 +-- .../modules/jackpot30/cmdline/CreateToolTest.java | 6 +- .../modules/jackpot30/cmdline/MainTest.java| 7 +++ 17 files changed, 157 insertions(+), 69 deletions(-) - 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
(netbeans-jackpot30) branch master updated (13e22c1 -> b197e3a)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git from 13e22c1 Fixing tests. add db7b360 Upgrading to NetBeans 20 new b197e3a Merge pull request #35 from jlahoda/release20 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: .github/workflows/main.yml | 68 ++ .travis.yml| 37 cmdline/README.md | 8 +-- cmdline/build.xml | 14 - .../jackpot30/cmdline/lib/CreateStandaloneJar.java | 21 ++- cmdline/maven/pom.xml | 4 +- .../modules/jackpot30/maven/RunJackpot30Test.java | 2 +- cmdline/maven/tests/fail-on-warnings/golden| 2 +- cmdline/maven/tests/sl-failure/golden | 2 +- cmdline/processor/build.xml| 4 +- cmdline/processor/nbproject/project.properties | 3 +- cmdline/tool/build.xml | 10 +--- cmdline/tool/nbproject/project.properties | 3 +- cmdline/tool/scripts/pom.xml | 2 +- .../netbeans/modules/jackpot30/cmdline/Main.java | 33 +-- .../modules/jackpot30/cmdline/CreateToolTest.java | 6 +- .../modules/jackpot30/cmdline/MainTest.java| 7 +++ 17 files changed, 157 insertions(+), 69 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 .travis.yml - 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
