svn commit: r35278 - /dev/incubator/netbeans/incubating-netbeans-jackpot/
Author: jlahoda Date: Sun Aug 18 05:51:45 2019 New Revision: 35278 Log: Deleting artifacts of a failed vote. Removed: dev/incubator/netbeans/incubating-netbeans-jackpot/ - 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
svn commit: r35277 - /dev/netbeans/netbeans-jackpot/ /release/netbeans/netbeans-jackpot/ /release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc1/ /release/netbeans/netbeans-jackpot/netbeans-jackp
Author: jlahoda Date: Sun Aug 18 05:50:56 2019 New Revision: 35277 Log: Publishing apache-netbeans-jackpot-11.1-vc2 as apache-netbeans-jackpot-11.1 after a successfull vote. Added: release/netbeans/netbeans-jackpot/ - copied from r35086, dev/netbeans/netbeans-jackpot/ release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/ - copied from r35117, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/ release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-bin.zip - copied unchanged from r35117, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-bin-vc2.zip release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-bin.zip.asc - copied unchanged from r35118, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-bin-vc2.zip.asc release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-bin.zip.sha512 - copied, changed from r35117, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-bin-vc2.zip.sha512 release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1.zip - copied unchanged from r35117, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-vc2.zip release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1.zip.asc - copied unchanged from r35118, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-vc2.zip.asc release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1.zip.sha512 - copied, changed from r35117, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-vc2.zip.sha512 Removed: dev/netbeans/netbeans-jackpot/ release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc1/ release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-bin-vc2.zip release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-bin-vc2.zip.sha512 release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-vc2.zip release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-vc2.zip.sha512 Copied: release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-bin.zip.sha512 (from r35117, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-bin-vc2.zip.sha512) == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-bin-vc2.zip.sha512 (original) +++ release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1-bin.zip.sha512 Sun Aug 18 05:50:56 2019 @@ -1 +1 @@ -af36197648cd4861208c35539e7ad0cf5ca5e111e75fb43f9ab03f609d46a070036d7d045c3b91916df3280f2136fefb694ad1fceda44f875619f08fb088a6be apache-netbeans-jackpot-11.1-bin-vc2.zip +af36197648cd4861208c35539e7ad0cf5ca5e111e75fb43f9ab03f609d46a070036d7d045c3b91916df3280f2136fefb694ad1fceda44f875619f08fb088a6be apache-netbeans-jackpot-11.1-bin.zip Copied: release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1.zip.sha512 (from r35117, dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-vc2.zip.sha512) == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-11.1-vc2/apache-netbeans-jackpot-11.1-vc2.zip.sha512 (original) +++ release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/apache-netbeans-jackpot-11.1.zip.sha512 Sun Aug 18 05:50:56 2019 @@ -1 +1 @@ -c0480b2ebd1c474038ac4be221fe23260fc8e75f799bbea7c45a76e8bcddfc7bf96606b343b5a92d2c0c2cdc763b0678010d2828efba2e245a4355e6f2009a0b apache-netbeans-jackpot-11.1-vc2.zip +c0480b2ebd1c474038ac4be221fe23260fc8e75f799bbea7c45a76e8bcddfc7bf96606b343b5a92d2c0c2cdc763b0678010d2828efba2e245a4355e6f2009a0b apache-netbeans-jackpot-11.1.zip - 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
[jira] [Commented] (NETBEANS-2999) NetBeans has consumed entire heap with WeakListenerImpl$ListenerReference
[ https://issues.apache.org/jira/browse/NETBEANS-2999?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16909854#comment-16909854 ] Shevek commented on NETBEANS-2999: -- "Finalizer" #3 daemon prio=8 os_prio=0 tid=0x7f203c092800 nid=0x189c runnable [0x7f2015357000] java.lang.Thread.State: RUNNABLE at java.util.Arrays$ArrayList.indexOf(Arrays.java:3860) at java.util.Arrays$ArrayList.contains(Arrays.java:3868) at java.util.IdentityHashMap$KeySet.removeAll(IdentityHashMap.java:999) at org.openide.util.lookup.ProxyLookup.setData(ProxyLookup.java:283) at org.openide.util.lookup.ProxyLookup.unregisterTemplate(ProxyLookup.java:249) - locked <0x0007254c1ee0> (a org.netbeans.spi.project.support.DelegatingLookupImpl) at org.openide.util.lookup.ProxyLookup.access$400(ProxyLookup.java:50) at org.openide.util.lookup.ProxyLookup$WeakRef.run(ProxyLookup.java:727) at org.openide.util.lookup.ProxyLookup$R.finalize(ProxyLookup.java:345) at java.lang.System$2.invokeFinalize(System.java:1270) at java.lang.ref.Finalizer.runFinalizer(Finalizer.java:102) at java.lang.ref.Finalizer.access$100(Finalizer.java:34) at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:217) > NetBeans has consumed entire heap with WeakListenerImpl$ListenerReference > - > > Key: NETBEANS-2999 > URL: https://issues.apache.org/jira/browse/NETBEANS-2999 > Project: NetBeans > Issue Type: Bug >Affects Versions: 11.1 >Reporter: Shevek >Priority: Major > Attachments: netbeans-all-listener-references.png > > > See image. A random sampling suggests that they're all calling > FileChangeListener. > Randomly sampling: ListenerReference.weakListener.source is a FolderObj on > /tmp, or a pointer into .cache/netbeans/11.1index -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Commented] (NETBEANS-2999) NetBeans has consumed entire heap with WeakListenerImpl$ListenerReference
[ https://issues.apache.org/jira/browse/NETBEANS-2999?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16909853#comment-16909853 ] Shevek commented on NETBEANS-2999: -- Randomly selected interesting threads: "RepositoryUpdater.worker" #1031 daemon prio=1 os_prio=0 tid=0x7f1f2012b800 nid=0x7104 runnable [0x7f1fe8eb2000] java.lang.Thread.State: RUNNABLE at org.openide.filesystems.MemoryFileSystem$Mapper.getURL(MemoryFileSystem.java:409) at org.openide.filesystems.URLMapper.findURL(URLMapper.java:115) at org.openide.filesystems.FileObject.toURL(FileObject.java:1216) at org.netbeans.modules.java.source.indexing.APTUtils.get(APTUtils.java:144) at org.netbeans.modules.java.source.nbjavac.indexing.MultiPassCompileWorker.compile(MultiPassCompileWorker.java:173) at org.netbeans.modules.java.source.indexing.JavaCustomIndexer.index(JavaCustomIndexer.java:361) at org.netbeans.modules.parsing.spi.indexing.Indexable$MyAccessor$2.run(Indexable.java:138) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.runIndexer(RepositoryUpdater.java:275) at org.netbeans.modules.parsing.spi.indexing.Indexable$MyAccessor.index(Indexable.java:136) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.doIndex(RepositoryUpdater.java:2750) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.access$800(RepositoryUpdater.java:2154) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$1.run(RepositoryUpdater.java:2636) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$1.run(RepositoryUpdater.java:2634) at org.netbeans.modules.parsing.impl.indexing.errors.TaskCache.refreshTransaction(TaskCache.java:540) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.index(RepositoryUpdater.java:2634) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$3.call(RepositoryUpdater.java:3300) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work$3.call(RepositoryUpdater.java:3255) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$4.run(RepositoryUpdater.java:2127) at org.openide.util.lookup.Lookups.executeWith(Lookups.java:279) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.runInContext(RepositoryUpdater.java:2123) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.runInContext(RepositoryUpdater.java:2104) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.access$1500(RepositoryUpdater.java:136) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.scanFiles(RepositoryUpdater.java:3255) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$FileListWork.getDone(RepositoryUpdater.java:3785) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Work.doTheWork(RepositoryUpdater.java:3420) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Task._run(RepositoryUpdater.java:6183) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Task.access$4300(RepositoryUpdater.java:5834) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Task$2$1.run(RepositoryUpdater.java:6099) at org.openide.util.lookup.Lookups.executeWith(Lookups.java:279) at org.netbeans.modules.parsing.impl.RunWhenScanFinishedSupport.performScan(RunWhenScanFinishedSupport.java:83) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Task$2.call(RepositoryUpdater.java:6095) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Task$2.call(RepositoryUpdater.java:6091) at org.netbeans.modules.masterfs.filebasedfs.utils.FileChangedManager.priorityIO(FileChangedManager.java:153) at org.netbeans.modules.masterfs.providers.ProvidedExtensions.priorityIO(ProvidedExtensions.java:335) at org.netbeans.modules.parsing.nb.DataObjectEnvFactory.runPriorityIO(DataObjectEnvFactory.java:118) at org.netbeans.modules.parsing.impl.Utilities.runPriorityIO(Utilities.java:67) at org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater$Task.run(RepositoryUpdater.java:6091) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at org.openide.util.RequestProcessor$Task.run(RequestProcessor.java:1418) at org.netbeans.modules.openide.util.GlobalLookup.execute(GlobalLookup.java:45) at org.openide.util.lookup.Lookups.executeWith(Lookups.java:278) at org.openide.util.RequestProcessor$Processor.run(RequestProcessor.java:2033) "Refresh-After-WindowActivated" #787 daemon prio=1 os_prio=0 tid=0x7f1f28172000 nid=0x4581 in
[jira] [Updated] (NETBEANS-2999) NetBeans has consumed entire heap with WeakListenerImpl$ListenerReference
[ https://issues.apache.org/jira/browse/NETBEANS-2999?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Shevek updated NETBEANS-2999: - Description: See image. A random sampling suggests that they're all calling FileChangeListener. Randomly sampling: ListenerReference.weakListener.source is a FolderObj on /tmp, or a pointer into .cache/netbeans/11.1index was:See image. > NetBeans has consumed entire heap with WeakListenerImpl$ListenerReference > - > > Key: NETBEANS-2999 > URL: https://issues.apache.org/jira/browse/NETBEANS-2999 > Project: NetBeans > Issue Type: Bug >Affects Versions: 11.1 >Reporter: Shevek >Priority: Major > Attachments: netbeans-all-listener-references.png > > > See image. A random sampling suggests that they're all calling > FileChangeListener. > Randomly sampling: ListenerReference.weakListener.source is a FolderObj on > /tmp, or a pointer into .cache/netbeans/11.1index -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Created] (NETBEANS-2999) NetBeans has consumed entire heap with WeakListenerImpl$ListenerReference
Shevek created NETBEANS-2999: Summary: NetBeans has consumed entire heap with WeakListenerImpl$ListenerReference Key: NETBEANS-2999 URL: https://issues.apache.org/jira/browse/NETBEANS-2999 Project: NetBeans Issue Type: Bug Affects Versions: 11.1 Reporter: Shevek Attachments: netbeans-all-listener-references.png See image. -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Updated] (NETBEANS-2082) Scroll to the caret position when code fold feature is run
[ https://issues.apache.org/jira/browse/NETBEANS-2082?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Junichi Yamamoto updated NETBEANS-2082: --- Component/s: (was: php - Editor) editor - Code folding > Scroll to the caret position when code fold feature is run > -- > > Key: NETBEANS-2082 > URL: https://issues.apache.org/jira/browse/NETBEANS-2082 > Project: NetBeans > Issue Type: Bug > Components: editor - Code folding >Affects Versions: 10.0, 11.0 > Environment: Netbeans 11 with OpenJDK 12. > Darwin MacBook-Pro-2.local 18.5.0 Darwin Kernel Version 18.5.0: Mon Mar 11 > 20:40:32 PDT 2019; root:xnu-4903.251.3~3/RELEASE_X86_64 x86_64 > Netbeans 10 with OpenJDK 11. > Darwin MacBook-Pro-2.local 18.2.0 Darwin Kernel Version 18.2.0: Thu Dec 20 > 20:46:53 PST 2018; root:xnu-4903.241.1~1/RELEASE_X86_64 x86_64 >Reporter: Pier Luigi >Priority: Major > Attachments: DemoPHPCodeFoldingProblem_NB11.php, netbeans-2082.gif > > > Collapsing a block often results in a jump of the editor to an incorrect > editing position (and scrolling the page cause a rejump to that position > after a second of scroll inactivity). > The same sources works perfectly with Netbeans 8.2. -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Updated] (NETBEANS-2082) Scroll to the caret position when code fold feature is run
[ https://issues.apache.org/jira/browse/NETBEANS-2082?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Junichi Yamamoto updated NETBEANS-2082: --- Summary: Scroll to the caret position when code fold feature is run (was: PHP code fold not work properly ) > Scroll to the caret position when code fold feature is run > -- > > Key: NETBEANS-2082 > URL: https://issues.apache.org/jira/browse/NETBEANS-2082 > Project: NetBeans > Issue Type: Bug > Components: php - Editor >Affects Versions: 10.0, 11.0 > Environment: Netbeans 11 with OpenJDK 12. > Darwin MacBook-Pro-2.local 18.5.0 Darwin Kernel Version 18.5.0: Mon Mar 11 > 20:40:32 PDT 2019; root:xnu-4903.251.3~3/RELEASE_X86_64 x86_64 > Netbeans 10 with OpenJDK 11. > Darwin MacBook-Pro-2.local 18.2.0 Darwin Kernel Version 18.2.0: Thu Dec 20 > 20:46:53 PST 2018; root:xnu-4903.241.1~1/RELEASE_X86_64 x86_64 >Reporter: Pier Luigi >Priority: Major > Attachments: DemoPHPCodeFoldingProblem_NB11.php, netbeans-2082.gif > > > Collapsing a block often results in a jump of the editor to an incorrect > editing position (and scrolling the page cause a rejump to that position > after a second of scroll inactivity). > The same sources works perfectly with Netbeans 8.2. -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Commented] (NETBEANS-2082) PHP code fold not work properly
[ https://issues.apache.org/jira/browse/NETBEANS-2082?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16909841#comment-16909841 ] Junichi Yamamoto commented on NETBEANS-2082: Thank you for attaching it. Reproducible. Maybe, this problem is not PHP area but editor area, I think. I can reproduce it not only PHP but also Java. Scroll to the caret position. !netbeans-2082.gif! > PHP code fold not work properly > > > Key: NETBEANS-2082 > URL: https://issues.apache.org/jira/browse/NETBEANS-2082 > Project: NetBeans > Issue Type: Bug > Components: php - Editor >Affects Versions: 10.0, 11.0 > Environment: Netbeans 11 with OpenJDK 12. > Darwin MacBook-Pro-2.local 18.5.0 Darwin Kernel Version 18.5.0: Mon Mar 11 > 20:40:32 PDT 2019; root:xnu-4903.251.3~3/RELEASE_X86_64 x86_64 > Netbeans 10 with OpenJDK 11. > Darwin MacBook-Pro-2.local 18.2.0 Darwin Kernel Version 18.2.0: Thu Dec 20 > 20:46:53 PST 2018; root:xnu-4903.241.1~1/RELEASE_X86_64 x86_64 >Reporter: Pier Luigi >Priority: Major > Attachments: DemoPHPCodeFoldingProblem_NB11.php, netbeans-2082.gif > > > Collapsing a block often results in a jump of the editor to an incorrect > editing position (and scrolling the page cause a rejump to that position > after a second of scroll inactivity). > The same sources works perfectly with Netbeans 8.2. -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Updated] (NETBEANS-2082) PHP code fold not work properly
[ https://issues.apache.org/jira/browse/NETBEANS-2082?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Junichi Yamamoto updated NETBEANS-2082: --- Attachment: netbeans-2082.gif > PHP code fold not work properly > > > Key: NETBEANS-2082 > URL: https://issues.apache.org/jira/browse/NETBEANS-2082 > Project: NetBeans > Issue Type: Bug > Components: php - Editor >Affects Versions: 10.0, 11.0 > Environment: Netbeans 11 with OpenJDK 12. > Darwin MacBook-Pro-2.local 18.5.0 Darwin Kernel Version 18.5.0: Mon Mar 11 > 20:40:32 PDT 2019; root:xnu-4903.251.3~3/RELEASE_X86_64 x86_64 > Netbeans 10 with OpenJDK 11. > Darwin MacBook-Pro-2.local 18.2.0 Darwin Kernel Version 18.2.0: Thu Dec 20 > 20:46:53 PST 2018; root:xnu-4903.241.1~1/RELEASE_X86_64 x86_64 >Reporter: Pier Luigi >Priority: Major > Attachments: DemoPHPCodeFoldingProblem_NB11.php, netbeans-2082.gif > > > Collapsing a block often results in a jump of the editor to an incorrect > editing position (and scrolling the page cause a rejump to that position > after a second of scroll inactivity). > The same sources works perfectly with Netbeans 8.2. -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Resolved] (NETBEANS-2994) PHP - formatting of unary operators adds extra space
[
https://issues.apache.org/jira/browse/NETBEANS-2994?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Junichi Yamamoto resolved NETBEANS-2994.
Resolution: Fixed
Fix Version/s: 11.2
Fixed.
> PHP - formatting of unary operators adds extra space
>
>
> Key: NETBEANS-2994
> URL: https://issues.apache.org/jira/browse/NETBEANS-2994
> Project: NetBeans
> Issue Type: Bug
> Components: php - Formatting Indentation
>Affects Versions: 11.1
>Reporter: Tomáš Procházka
>Assignee: Junichi Yamamoto
>Priority: Minor
> Labels: pull-request-available
> Fix For: 11.2
>
> Time Spent: 20m
> Remaining Estimate: 0h
>
> Formatting of unary operators in PHP adds extra space around operator, where
> it is not wanted.
> Input:
> {code:java}
> $noSpace++;
> $spaces ++;
> $afterIndexNoSpace[ 1 ]++;
> $afterIndexSpaces[ 1 ] ++;
> ++$noSpace;
> ++ $spaces;
> ++ $afterIndex[ 1 ];{code}
> # In PHP project properties set Formatting - Use project specific options.
> # Language: PHP, Category: Spaces
> # Uncheck Around Operators - Unary Operators
> # Format code
> Actual result:
> {code:java}
> $noSpace++; // OK
> $spaces ++; // Still one space left
> $afterIndexNoSpace[ 1 ] ++; // Space is added before ++
> $afterIndexSpaces[ 1 ] ++; // Still one space left before ++
> ++$noSpace;
> ++$spaces;
> ++$afterIndex[ 1 ];
> {code}
> Expected result:
> {code:java}
> $noSpace++;
> $spaces++;
> $afterIndexNoSpace[ 1 ]++;
> $afterIndexSpaces[ 1 ]++;
> ++$noSpace;
> ++$spaces;
> ++$afterIndex[ 1 ];
> {code}
--
This message was sent by Atlassian JIRA
(v7.6.14#76016)
-
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
[jira] [Resolved] (NETBEANS-501) Support (clone $object)->method() in PHP
[ https://issues.apache.org/jira/browse/NETBEANS-501?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Junichi Yamamoto resolved NETBEANS-501. --- Resolution: Fixed Fix Version/s: 11.2 Fixed. > Support (clone $object)->method() in PHP > > > Key: NETBEANS-501 > URL: https://issues.apache.org/jira/browse/NETBEANS-501 > Project: NetBeans > Issue Type: Bug > Components: php - Editor >Reporter: Varun Agrawal >Assignee: Junichi Yamamoto >Priority: Minor > Labels: pull-request-available > Fix For: 11.2 > > Time Spent: 20m > Remaining Estimate: 0h > > PHP supports this. While NetBeans support (new $object)->method(), it doesn't > support clone keyword here. -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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 master updated: NETBEANS-544: Merge conflicts resolver doesn't recognize "|||||||" conflict markers
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new aec24cf NETBEANS-544: Merge conflicts resolver doesn't recognize
"|||" conflict markers
new 87ae192 Merge pull request #1333 from
hodawg04/svn-merge-conflict-resolver
aec24cf is described below
commit aec24cfe381462245d798fb25431f8de21333bb4
Author: Aaron Ho-Means
AuthorDate: Wed Jun 26 15:12:28 2019 -0600
NETBEANS-544: Merge conflicts resolver doesn't recognize "|||" conflict
markers
Added lines from the Git modules ResolveConflictsExecutor removing the base
diff from the local copy head.
---
.../ui/update/ResolveConflictsExecutor.java| 97 --
1 file changed, 53 insertions(+), 44 deletions(-)
diff --git
a/ide/subversion/src/org/netbeans/modules/subversion/ui/update/ResolveConflictsExecutor.java
b/ide/subversion/src/org/netbeans/modules/subversion/ui/update/ResolveConflictsExecutor.java
index 577e83c..8105f01 100644
---
a/ide/subversion/src/org/netbeans/modules/subversion/ui/update/ResolveConflictsExecutor.java
+++
b/ide/subversion/src/org/netbeans/modules/subversion/ui/update/ResolveConflictsExecutor.java
@@ -19,25 +19,22 @@
package org.netbeans.modules.subversion.ui.update;
-import java.io.*;
-import java.util.*;
import java.awt.*;
+import java.io.*;
import java.nio.charset.Charset;
+import java.util.*;
import java.util.logging.Level;
import javax.swing.*;
-import org.netbeans.modules.subversion.ui.commit.ConflictResolvedAction;
-import org.netbeans.spi.diff.*;
-
-import org.openide.util.*;
-import org.openide.windows.TopComponent;
-import org.openide.filesystems.*;
-
import org.netbeans.api.diff.*;
import org.netbeans.api.queries.FileEncodingQuery;
import org.netbeans.modules.subversion.Subversion;
import org.netbeans.modules.subversion.client.*;
+import org.netbeans.modules.subversion.ui.commit.ConflictResolvedAction;
import org.netbeans.modules.versioning.util.Utils;
-
+import org.netbeans.spi.diff.*;
+import org.openide.filesystems.*;
+import org.openide.util.*;
+import org.openide.windows.TopComponent;
import org.tigris.subversion.svnclientadapter.*;
/**
@@ -48,16 +45,17 @@ import org.tigris.subversion.svnclientadapter.*;
* @author Martin Entlicher
*/
public class ResolveConflictsExecutor extends SvnProgressSupport {
-
+
private static final String TMP_PREFIX = "merge"; // NOI18N
-
+
static final String CHANGE_LEFT = "<<< "; // NOI18N
static final String CHANGE_RIGHT = ">>> "; // NOI18N
static final String CHANGE_DELIMETER = "==="; // NOI18N
+static final String CHANGE_BASE_DELIMETER = "|||"; // NOI18N
static final String LOCAL_FILE_SUFFIX = ".mine"; // NOI18N
static final String WORKING_FILE_SUFFIX = ".working"; // NOI18N
-
+
private String leftFileRevision = null;
private String rightFileRevision = null;
@@ -77,7 +75,7 @@ public class ResolveConflictsExecutor extends
SvnProgressSupport {
if (merge == null) {
throw new IllegalStateException("No Merge engine found."); //
NOI18N
}
-
+
try {
FileObject fo = FileUtil.toFileObject(file);
if(fo == null) {
@@ -86,12 +84,12 @@ public class ResolveConflictsExecutor extends
SvnProgressSupport {
}
FileLock lock = fo.lock();
boolean mergeWriterCreated = false;
-try {
+try {
mergeWriterCreated = handleMergeFor(file, fo, lock, merge);
} finally {
if(!mergeWriterCreated && lock != null) {
lock.releaseLock();
-}
+}
}
} catch (FileAlreadyLockedException e) {
SwingUtilities.invokeLater(new Runnable() {
@@ -108,8 +106,8 @@ public class ResolveConflictsExecutor extends
SvnProgressSupport {
});
} catch (IOException ioex) {
if (NESTED_CONFLICT.equals(ioex.getMessage())) {
-JOptionPane.showMessageDialog(null,
NbBundle.getMessage(ResolveConflictsExecutor.class, "MSG_NestedConflicts"),
-
NbBundle.getMessage(ResolveConflictsExecutor.class,
"MSG_NestedConflicts_Title"),
+JOptionPane.showMessageDialog(null,
NbBundle.getMessage(ResolveConflictsExecutor.class, "MSG_NestedConflicts"),
+
NbBundle.getMessage(ResolveConflictsExecutor.class,
"MSG_NestedConflicts_Title"),
JOptionPane.WARNING_MESSAGE);
Utils.openFile(file);
} else {
@@ -117,7 +115,7 @@ public class ResolveConflictsExecutor extends
SvnProgressSupport {
}
}
[netbeans] branch master updated: [NETBEANS-2721] - remove remaining toURL() deprecations
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 3498ed8 [NETBEANS-2721] - remove remaining toURL() deprecations
3498ed8 is described below
commit 3498ed8164c3d82c390dd4dad477630b43c2b827
Author: Brad Walker
AuthorDate: Tue Jun 18 09:53:19 2019 -0600
[NETBEANS-2721] - remove remaining toURL() deprecations
Remove the remaining File.toURL() deprecations.
---
.../org/netbeans/modules/websvc/manager/codegen/Wsdl2Java.java| 2 +-
.../src/org/netbeans/modules/html/editor/javadoc/HelpManager.java | 2 +-
.../src/org/netbeans/modules/palette/ui/TextImporterUI.java | 6 +++---
.../src/org/netbeans/modules/xml/catalog/CatalogEntryPanel.java | 2 +-
.../modules/xml/retriever/catalog/impl/CatalogModelImpl.java | 4 ++--
.../org/netbeans/modules/xsl/transform/TransformPerformer.java| 2 +-
.../src/org/netbeans/modules/form/editors/CustomIconEditor.java | 8
.../netbeans/modules/j2ee/persistence/util/CustomClassLoader.java | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/codegen/Wsdl2Java.java
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/codegen/Wsdl2Java.java
index 7c86455..10ac3f5 100644
---
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/codegen/Wsdl2Java.java
+++
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/codegen/Wsdl2Java.java
@@ -208,7 +208,7 @@ public class Wsdl2Java {
private boolean createJaxRpcProxyJars(Properties properties) {
try {
-String wsdlUrlName = new
File(webServiceData.getURL()).toURI().toURL().toString();
+String wsdlUrlName = new
File(webServiceData.getWsdlFile()).toURI().toURL().toString();
createJaxrpcConfigFile(wsdlUrlName, properties);
ExecutorTask executorTask =
ActionUtils.runTarget(FileUtil.toFileObject(getAntScript()),
diff --git
a/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java
b/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java
index dc16064..3220200 100644
---
a/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java
+++
b/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java
@@ -109,7 +109,7 @@ public class HelpManager {
File f = InstalledFileLocator.getDefault().locate(help, null,
false); //NoI18N
if (f != null){
try {
-URL urll = f.toURL();
+URL urll = f.toURI().toURL();
urll = FileUtil.getArchiveRoot(urll);
helpZipURL = new URI(urll.getProtocol(),
urll.getFile(), urll.getRef()).toString();
} catch (java.net.MalformedURLException e){
diff --git
a/ide/spi.palette/src/org/netbeans/modules/palette/ui/TextImporterUI.java
b/ide/spi.palette/src/org/netbeans/modules/palette/ui/TextImporterUI.java
index 2ed47da..fb9af24 100644
--- a/ide/spi.palette/src/org/netbeans/modules/palette/ui/TextImporterUI.java
+++ b/ide/spi.palette/src/org/netbeans/modules/palette/ui/TextImporterUI.java
@@ -254,7 +254,7 @@ private void
btnSelectLargeIconActionPerformed(java.awt.event.ActionEvent evt) {
if( null != icon ) {
lblLargeIcon.setIcon(icon);
try {
-largeIconPath = iconFile.toURL().toExternalForm();
+largeIconPath = iconFile.toURI().toURL().toExternalForm();
} catch (MalformedURLException ex) {
//TODO log error
}
@@ -269,7 +269,7 @@ private void
btnSelectSmallIconActionPerformed(java.awt.event.ActionEvent evt) {
if( null != icon ) {
lblSmallIcon.setIcon(icon);
try {
-smallIconPath = iconFile.toURL().toExternalForm();
+smallIconPath = iconFile.toURI().toURL().toExternalForm();
} catch (MalformedURLException ex) {
//TODO log error
}
@@ -308,7 +308,7 @@ private void
btnSelectSmallIconActionPerformed(java.awt.event.ActionEvent evt) {
private Icon readIconFromFile( File iconFile ) {
try {
-Image img = ImageIO.read( iconFile.toURL() );
+Image img = ImageIO.read( iconFile.toURI().toURL() );
if( null != img ) {
ImageIcon res = new ImageIcon( img );
if( res.getIconWidth() > 32 || res.getIconHeight() > 32 ) {
diff --git
a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogEntryPanel.java
b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogEntryPanel.java
index cef640d..d609cb9 100644
---
[jira] [Commented] (NETBEANS-2894) Warning - could not install some modules
[ https://issues.apache.org/jira/browse/NETBEANS-2894?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16909787#comment-16909787 ] Ole Hoppe commented on NETBEANS-2894: - Got the exact same error, too, on KDE neon 5.16 and JDK 11.0.2. Had copied the settings from 11.0 in /home/username/.netbeans to 11.1 before starting the first time. After removing this copy starting with a fresh install and not importing previous settings Netbeans started nicely. > Warning - could not install some modules > > > Key: NETBEANS-2894 > URL: https://issues.apache.org/jira/browse/NETBEANS-2894 > Project: NetBeans > Issue Type: Bug >Affects Versions: 11.1 >Reporter: Andreas Ernst >Priority: Major > > If i remember correcly, on some start of NetBeans, NetBeans wants to install > a module, this works. > But after a new start of NetBeans i get this error: > > Warning - could not install some modules: > Nashorn Integration - No module providing the capability > com.oracle.js.parser.implementation could be found. > 27 further modules could not be installed due to the above problems. > Warning - could not install some modules: > org.netbeans.libs.nashorn - No module providing the capability > com.oracle.js.parser.implementation could be found. > org.netbeans.modules.javascript2.doc - The module > org.netbeans.libs.nashorn would also need to be installed. > org.netbeans.modules.javascript2.extdoc - The module > org.netbeans.modules.javascript2.doc would also need to be installed. > org.netbeans.modules.javascript2.sdoc - The module > org.netbeans.modules.javascript2.doc would also need to be installed. > org.netbeans.modules.javascript2.jsdoc - The module > org.netbeans.modules.javascript2.doc would also need to be installed. > org.netbeans.modules.javascript2.model - The module > org.netbeans.libs.nashorn would also need to be installed. > org.netbeans.modules.javascript2.model - The module > org.netbeans.modules.javascript2.doc would also need to be installed. > org.netbeans.modules.javascript2.knockout - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.javascript2.prototypejs - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.javascript2.editor - The module > org.netbeans.libs.nashorn would also need to be installed. > org.netbeans.modules.javascript2.editor - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.javascript2.editor - The module > org.netbeans.modules.javascript2.doc would also need to be installed. > org.netbeans.modules.javascript2.jquery - The module > org.netbeans.modules.javascript2.editor would also need to be installed. > org.netbeans.modules.javascript2.jquery - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.javascript2.extjs - The module > org.netbeans.modules.javascript2.editor would also need to be installed. > org.netbeans.modules.javascript2.extjs - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.javascript2.nodejs - The module > org.netbeans.modules.javascript2.editor would also need to be installed. > org.netbeans.modules.javascript2.nodejs - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.html.angular - The module > org.netbeans.modules.javascript2.editor would also need to be installed. > org.netbeans.modules.html.angular - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.html.knockout - The module > org.netbeans.modules.javascript2.editor would also need to be installed. > org.netbeans.modules.html.knockout - The module > org.netbeans.modules.javascript2.knockout would also need to be installed. > org.netbeans.modules.javascript2.source.query - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.javascript2.requirejs - The module > org.netbeans.modules.javascript2.editor would also need to be installed. > org.netbeans.modules.javascript2.requirejs - The module > org.netbeans.modules.javascript2.model would also need to be installed. > org.netbeans.modules.javascript2.kit - The module > org.netbeans.modules.javascript2.prototypejs would also need to be installed. > org.netbeans.modules.javascript2.kit - The module > org.netbeans.modules.javascript2.editor would also need to be
[netbeans] branch master updated: [NETBEANS-501] Support (clone $object)->method() in PHP
This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a77ee5f [NETBEANS-501] Support (clone $object)->method() in PHP
new c5ab3ba Merge pull request #1435 from junichi11/netbeans-501-cc-clone
a77ee5f is described below
commit a77ee5fdb7b0b92993428408faa544aca2b9cc3c
Author: Junichi Yamamoto
AuthorDate: Sat Aug 17 12:29:53 2019 +0900
[NETBEANS-501] Support (clone $object)->method() in PHP
- Restore the current token sequence offset to the clone expression end
offset when `clone` keyword is found
---
.../php/editor/model/impl/VariousUtils.java| 37 +
.../data/testfiles/completion/lib/nb501/nb501.php | 40 ++
.../lib/nb501/nb501.php.testNb501_01.completion| 5 ++
.../lib/nb501/nb501.php.testNb501_02.completion| 5 ++
.../lib/nb501/nb501.php.testNb501_03a.completion | 4 ++
.../lib/nb501/nb501.php.testNb501_03b.completion | 5 ++
.../completion/PHPCodeCompletionNb501Test.java | 62 ++
7 files changed, 158 insertions(+)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
index a6dd8c9..b29a2ae 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
@@ -1092,6 +1092,7 @@ public final class VariousUtils {
int leftBraces = 0;
int rightBraces = State.PARAMS.equals(state) ? 1 : 0;
int arrayBrackets = 0;
+CloneExpressionInfo cloneInfo = new CloneExpressionInfo();
StringBuilder metaAll = new StringBuilder();
while (!state.equals(State.INVALID) && !state.equals(State.STOP) &&
tokenSequence.movePrevious() && skipWhitespaces(tokenSequence)) {
Token token = tokenSequence.token();
@@ -1104,9 +1105,11 @@ public final class VariousUtils {
if (isReference(token)) {
metaAll.insert(0, PRE_OPERATION_TYPE_DELIMITER +
VariousUtils.METHOD_TYPE_PREFIX);
state = State.REFERENCE;
+cloneInfo.setReference(state);
} else if (isStaticReference(token)) {
metaAll.insert(0, PRE_OPERATION_TYPE_DELIMITER +
VariousUtils.METHOD_TYPE_PREFIX);
state = State.STATIC_REFERENCE;
+cloneInfo.setReference(state);
} else if (state.equals(State.STOP)) {
metaAll.insert(0, PRE_OPERATION_TYPE_DELIMITER +
VariousUtils.FUNCTION_TYPE_PREFIX);
}
@@ -1130,6 +1133,7 @@ public final class VariousUtils {
if (isRightBracket(token)) {
rightBraces++;
state = State.PARAMS;
+cloneInfo.setEndOffset(tokenSequence.offset());
} else if (isRightArryBracket(token)) {
arrayBrackets++;
state = State.IDX;
@@ -1152,6 +1156,7 @@ public final class VariousUtils {
} else if (isRightBracket(token)) {
rightBraces++;
state = State.PARAMS;
+cloneInfo.setEndOffset(tokenSequence.offset());
} else if (isRightArryBracket(token)) {
arrayBrackets++;
state = State.IDX;
@@ -1179,6 +1184,15 @@ public final class VariousUtils {
if (leftBraces == rightBraces) {
state = State.FUNCTION;
}
+// NETBEANS-501
+if (PHPTokenId.PHP_CLONE == token.id()
+&& cloneInfo.getEndOffset() != -1
+&& cloneInfo.getReference() != null) {
+tokenSequence.move(cloneInfo.getEndOffset());
+tokenSequence.moveNext();
+state = cloneInfo.getReference();
+rightBraces--;
+}
break;
case FUNCTION:
state = State.INVALID;
@@ -1795,4 +1809,27 @@ public final class VariousUtils {
public static boolean isSemiType(String typeName) {
return typeName != null &&
typeName.contains(PRE_OPERATION_TYPE_DELIMITER);
}
+
+//~ inner class
+private static class CloneExpressionInfo {
+
+private int endOffset = -1;
+private State
[netbeans] branch master updated: [NETBEANS-2994] PHP - formatting of unary operators adds extra space
This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b2629a4 [NETBEANS-2994] PHP - formatting of unary operators adds
extra space
new 6979da7 Merge pull request #1436 from
junichi11/netbeans-2994-formatting-unary-operators
b2629a4 is described below
commit b2629a4694a7ae56b47190a6c935da86816ea06a
Author: Junichi Yamamoto
AuthorDate: Sat Aug 17 21:16:34 2019 +0900
[NETBEANS-2994] PHP - formatting of unary operators adds extra space
- Didn't fix curly brace array access cases (e.g. `++$test{0}`) because it
is hardly used and it is deprecated since PHP 7.4
- If we fix the above case, we have to consider the following case:
```
function test() {
// something
}
++$test{0}
```
Example:
```
$test++;
$test ++;
$testArray[1]++;
$testArray[1] ++;
test()[2]++;
test()[2] ++;
++$test;
++ $test;
++ $testArray[1];
++test()[2];
++ test()[2];
```
Before:
```
$test++;
$test ++;
$testArray[1] ++;
$testArray[1] ++;
test()[2] ++;
test()[2] ++;
++$test;
++$test;
++$testArray[1];
++test()[2];
++test()[2];
```
After:
```
$test++;
$test++;
$testArray[1]++;
$testArray[1]++;
test()[2]++;
test()[2]++;
++$test;
++$test;
++$testArray[1];
++test()[2];
++test()[2];
```
---
.../modules/php/editor/indent/FormatVisitor.java | 10 --
.../formatting/spaces/netbeans2994_01.php | 36 +
.../spaces/netbeans2994_01.php.formatted | 37 ++
.../formatting/spaces/netbeans2994_02.php | 36 +
.../spaces/netbeans2994_02.php.formatted | 37 ++
.../php/editor/indent/PHPFormatterSpacesTest.java | 13
6 files changed, 166 insertions(+), 3 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
index 7fef1e6..f4bbeb7 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
@@ -2083,10 +2083,14 @@ public class FormatVisitor extends DefaultVisitor {
tokens.add(new
FormatToken(FormatToken.Kind.WHITESPACE_AROUND_KEY_VALUE_OP, ts.offset() +
ts.token().length()));
} else if (TokenUtilities.textEquals(txt2, "++") // NOI18N
|| TokenUtilities.textEquals(txt2, "--")) { // NOI18N
-if (ts.movePrevious()) {
-if (ts.token().id() == PHPTokenId.PHP_VARIABLE ||
ts.token().id() == PHPTokenId.PHP_STRING) {
+Token previousToken =
LexUtilities.findPrevious(ts, Arrays.asList(PHPTokenId.PHP_OPERATOR,
PHPTokenId.WHITESPACE));
+if (previousToken != null) {
+if (previousToken.id() == PHPTokenId.PHP_VARIABLE
+|| previousToken.id() == PHPTokenId.PHP_STRING
+|| (previousToken.id() == PHPTokenId.PHP_TOKEN
&& TokenUtilities.equals(previousToken.text(), "]"))) { // NOI18N
tokens.add(new
FormatToken(FormatToken.Kind.WHITESPACE_AROUND_UNARY_OP, ts.offset() +
ts.token().length()));
-} else if (ts.token().id() != PHPTokenId.WHITESPACE) {
+} else if (previousToken.id() == PHPTokenId.PHP_TOKEN
&& TokenUtilities.equals(previousToken.text(), ".")) { // NOI18N
+// see PHPFormatterBrokenTest.testIssue197074_02
tokens.add(new
FormatToken(FormatToken.Kind.WHITESPACE, ts.offset() + ts.token().length()));
}
ts.move(origOffset);
diff --git
a/php/php.editor/test/unit/data/testfiles/formatting/spaces/netbeans2994_01.php
b/php/php.editor/test/unit/data/testfiles/formatting/spaces/netbeans2994_01.php
new file mode 100644
index 000..d3534ec
--- /dev/null
+++
b/php/php.editor/test/unit/data/testfiles/formatting/spaces/netbeans2994_01.php
@@ -0,0 +1,36 @@
+http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+function test() {
+return [1, 2, 3];
+}
+
+$test++;
+$test ++;
+$testArray[1]++;
+$testArray[1] ++;
[netbeans] branch master updated (bb4ad6c -> 0e94db6)
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.git. from bb4ad6c Ensuring the correct address is used when connecting to debugger, instead of hardcoding InetAddress.getLocalHost().getHostName(). add 610b8d4 Fixing Select in Projects for OpenJDK project tests. new 0e94db6 Fixing Select in Projects for OpenJDK project tests. (#1357) 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: .../openjdk/project/LogicalViewProviderImpl.java | 102 - 1 file changed, 98 insertions(+), 4 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] 01/01: Fixing Select in Projects for OpenJDK project tests. (#1357)
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.git commit 0e94db651e336e5d2be41c3f668a6945238fd213 Merge: bb4ad6c 610b8d4 Author: Jan Lahoda AuthorDate: Sat Aug 17 17:36:36 2019 +0200 Fixing Select in Projects for OpenJDK project tests. (#1357) .../openjdk/project/LogicalViewProviderImpl.java | 102 - 1 file changed, 98 insertions(+), 4 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] branch master updated: Ensuring the correct address is used when connecting to debugger, instead of hardcoding InetAddress.getLocalHost().getHostName().
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.git
The following commit(s) were added to refs/heads/master by this push:
new bb4ad6c Ensuring the correct address is used when connecting to
debugger, instead of hardcoding InetAddress.getLocalHost().getHostName().
bb4ad6c is described below
commit bb4ad6c2c1641f320c526816682042d6a493fe85
Author: Jan Lahoda
AuthorDate: Sat Aug 17 17:35:49 2019 +0200
Ensuring the correct address is used when connecting to debugger, instead
of hardcoding InetAddress.getLocalHost().getHostName().
---
.../modules/java/openjdk/jtreg/ActionProviderImpl.java| 5 +++--
.../org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java| 11 +++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
index a288455..7d5767b 100644
---
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
+++
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
@@ -76,6 +76,7 @@ import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.NbBundle.Messages;
+import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.Lookups;
import org.openide.util.lookup.ServiceProvider;
@@ -255,8 +256,8 @@ public class ActionProviderImpl implements ActionProvider {
JPDAStart s = new JPDAStart(io,
COMMAND_DEBUG_SINGLE); //XXX command
s.setAdditionalSourcePath(fullSourcePath);
try {
-int connectTo = s.execute(prj);
-Socket clientSocket = new
Socket(InetAddress.getLocalHost(), connectTo);
+Pair
connectTo = s.execute(prj);
+Socket clientSocket = new
Socket(connectTo.first() != null ? connectTo.first() :
InetAddress.getLocalHost().getHostName(), connectTo.second());
BACKGROUND.post(new
Copy(clientSocket.getInputStream(), server.getOutputStream(), clientSocket));
BACKGROUND.post(new
Copy(server.getInputStream(), clientSocket.getOutputStream(), clientSocket));
} catch (Throwable ex) {
diff --git
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
index 9cdba00..f488aeb 100644
---
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
+++
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java
@@ -40,6 +40,7 @@ import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.project.Project;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileUtil;
+import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.windows.InputOutput;
@@ -66,7 +67,7 @@ public class JPDAStart implements Runnable {
private ClassPath additionalSourcePath;
-private final Object[] lock = new Object[2];
+private final Object[] lock = new Object[3];
private Project project;
private final String actionName;
@@ -80,7 +81,7 @@ public class JPDAStart implements Runnable {
/**
* returns the port/address that the debugger listens to..
*/
-public int execute(Project project) throws Throwable {
+public Pair execute(Project project) throws Throwable {
this.project = project;
io.getOut().println("NetBeans: JPDA Listening Start..."); //NOI18N
//getLog().debug("Entering synch lock"); //NOI18N
@@ -94,7 +95,7 @@ public class JPDAStart implements Runnable {
throw ((Throwable) lock[1]); //NOI18N
}
}
-return (Integer)lock[0];
+return Pair.of((String) lock[2], (Integer)lock[0]);
}
@Override
@@ -123,11 +124,13 @@ public class JPDAStart implements Runnable {
final Map args = lc.defaultArguments();
String address = lc.startListening(args);
//try {
-int port =
Integer.parseInt(address.substring(address.indexOf(':') + 1));
+int colon = address.indexOf(':');
+int port = Integer.parseInt(address.substring(colon
[jira] [Assigned] (NETBEANS-2149) Space-Formatting of == and === in PHP does not match "Binary Operators"
[ https://issues.apache.org/jira/browse/NETBEANS-2149?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Junichi Yamamoto reassigned NETBEANS-2149: -- Assignee: Junichi Yamamoto > Space-Formatting of == and === in PHP does not match "Binary Operators" > --- > > Key: NETBEANS-2149 > URL: https://issues.apache.org/jira/browse/NETBEANS-2149 > Project: NetBeans > Issue Type: Bug > Components: php - Formatting Indentation >Affects Versions: 10.0, 11.1 >Reporter: Manuel Bohninger >Assignee: Junichi Yamamoto >Priority: Trivial > > When formatting code the current release does not interpret == or === as a > binary operator, but as an assignment Operator instead. > Autoformatting the following code: > $a=$b==$c; > $a=$b===$c; > With Spaces around "Binary Operators" only results in: > $a=$b== $c; > $a=$b=== $c; > Expected behavior would be: > $a=$b == $c; > $a=$b === $c; > Adding "Assignment Operators" results in: > $a = $b == $c; > $a = $b === $c; > -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
[jira] [Updated] (NETBEANS-2994) PHP - formatting of unary operators adds extra space
[
https://issues.apache.org/jira/browse/NETBEANS-2994?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
ASF GitHub Bot updated NETBEANS-2994:
-
Labels: pull-request-available (was: )
> PHP - formatting of unary operators adds extra space
>
>
> Key: NETBEANS-2994
> URL: https://issues.apache.org/jira/browse/NETBEANS-2994
> Project: NetBeans
> Issue Type: Bug
> Components: php - Formatting Indentation
>Affects Versions: 11.1
>Reporter: Tomáš Procházka
>Assignee: Junichi Yamamoto
>Priority: Minor
> Labels: pull-request-available
>
> Formatting of unary operators in PHP adds extra space around operator, where
> it is not wanted.
> Input:
> {code:java}
> $noSpace++;
> $spaces ++;
> $afterIndexNoSpace[ 1 ]++;
> $afterIndexSpaces[ 1 ] ++;
> ++$noSpace;
> ++ $spaces;
> ++ $afterIndex[ 1 ];{code}
> # In PHP project properties set Formatting - Use project specific options.
> # Language: PHP, Category: Spaces
> # Uncheck Around Operators - Unary Operators
> # Format code
> Actual result:
> {code:java}
> $noSpace++; // OK
> $spaces ++; // Still one space left
> $afterIndexNoSpace[ 1 ] ++; // Space is added before ++
> $afterIndexSpaces[ 1 ] ++; // Still one space left before ++
> ++$noSpace;
> ++$spaces;
> ++$afterIndex[ 1 ];
> {code}
> Expected result:
> {code:java}
> $noSpace++;
> $spaces++;
> $afterIndexNoSpace[ 1 ]++;
> $afterIndexSpaces[ 1 ]++;
> ++$noSpace;
> ++$spaces;
> ++$afterIndex[ 1 ];
> {code}
--
This message was sent by Atlassian JIRA
(v7.6.14#76016)
-
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
[jira] [Updated] (NETBEANS-501) Support (clone $object)->method() in PHP
[ https://issues.apache.org/jira/browse/NETBEANS-501?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] ASF GitHub Bot updated NETBEANS-501: Labels: pull-request-available (was: ) > Support (clone $object)->method() in PHP > > > Key: NETBEANS-501 > URL: https://issues.apache.org/jira/browse/NETBEANS-501 > Project: NetBeans > Issue Type: Bug > Components: php - Editor >Reporter: Varun Agrawal >Assignee: Junichi Yamamoto >Priority: Minor > Labels: pull-request-available > > PHP supports this. While NetBeans support (new $object)->method(), it doesn't > support clone keyword here. -- This message was sent by Atlassian JIRA (v7.6.14#76016) - 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
