[netbeans] branch delivery updated (fa78c10 -> 842baf1)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from fa78c10  [NETBEANS-4930] Upgrade Gradle Tooling 6.7 with JDK-15 Support
 add 842baf1  [lsp] partial fix of invalidation of breakpoints during file 
open (#2462)

No new revisions were added by this update.

Summary of changes:
 .../server/protocol/TextDocumentServiceImpl.java   |  46 -
 .../java/lsp/server/protocol/ServerTest.java   | 212 ++---
 2 files changed, 219 insertions(+), 39 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 delivery updated (832de2c -> fa78c10)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 832de2c  Merge pull request #2474 from 
entlicher/MavenMainClass_delivery
 add fa78c10  [NETBEANS-4930] Upgrade Gradle Tooling 6.7 with JDK-15 Support

No new revisions were added by this update.

Summary of changes:
 extide/gradle/external/binaries-list   |  2 +-
 ...-bin-license.txt => gradle-6.7-bin-license.txt} |  2 +-
 2-bin-notice.txt => gradle-6.7-bin-notice.txt} |  0
 extide/gradle/netbeans-gradle-tooling/build.gradle |  6 ++
 .../gradle/wrapper/gradle-wrapper.properties   |  2 +-
 .../api/execute/GradleDistributionManager.java |  1 +
 extide/libs.gradle/external/binaries-list  |  2 +-
 ...ense.txt => gradle-tooling-api-6.7-license.txt} |  4 ++--
 ...otice.txt => gradle-tooling-api-6.7-notice.txt} |  0
 extide/libs.gradle/manifest.mf |  2 +-
 extide/libs.gradle/nbproject/project.properties|  2 +-
 extide/libs.gradle/nbproject/project.xml   |  2 +-
 .../org/netbeans/nbbuild/extlibs/ignored-overlaps  | 25 +++---
 13 files changed, 29 insertions(+), 21 deletions(-)
 rename extide/gradle/external/{gradle-4.10.2-bin-license.txt => 
gradle-6.7-bin-license.txt} (99%)
 rename extide/gradle/external/{gradle-4.10.2-bin-notice.txt => 
gradle-6.7-bin-notice.txt} (100%)
 rename extide/libs.gradle/external/{gradle-tooling-api-6.6-license.txt => 
gradle-tooling-api-6.7-license.txt} (99%)
 rename extide/libs.gradle/external/{gradle-tooling-api-6.6-notice.txt => 
gradle-tooling-api-6.7-notice.txt} (100%)


-
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-4746) Running test in Maven is slower than in Ant

2020-10-22 Thread Jaroslav Tulach (Jira)


[ 
https://issues.apache.org/jira/browse/NETBEANS-4746?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17218853#comment-17218853
 ] 

Jaroslav Tulach commented on NETBEANS-4746:
---

Looks like both problems would be solved by using 
[mavendaemon|https://github.com/mvndaemon/mvnd].

> Running test in Maven is slower than in Ant
> ---
>
> Key: NETBEANS-4746
> URL: https://issues.apache.org/jira/browse/NETBEANS-4746
> Project: NetBeans
>  Issue Type: Task
>  Components: projects - Maven
>Affects Versions: 12.0
>Reporter: Jaroslav Tulach
>Assignee: Jaroslav Tulach
>Priority: Minor
> Attachments: justtest.diff, preexec-6.patch
>
>
> NetBeans users has just recently complained that Maven support is slower than 
> Ant - some even claimed they [rather maintain dual Ant script 
> support|http://mail-archives.apache.org/mod_mbox//netbeans-dev/202008.mbox/browser]
>  than wait for Maven to launch. I've created this issue to investigate the 
> problem.
> First of all we need a sample project: [^justtest.diff] - apply it {{patch 
> -p1  it with Maven:
> {code:java}
> $ time JAVA_HOME=~/bin/jdk-8/ mvn -quiet 
> -Dtest=com.mycompany.justtest.MainTest process-test-classes surefire:test
> ---
>  T E S T S
> ---
> Running com.mycompany.justtest.MainTest
> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.071 sec
> Results :Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
> real0m2,633s
> user0m6,986s
> sys 0m0,257s
> {code}
> and you can also run it with Ant:
> {code:java}
>  time JAVA_HOME=~/bin/jdk-8/ ant -q test-single 
> -Djavac.includes=com/mycompany/justtest/MainTest.java 
> -Dtest.includes=com/mycompany/justtest/MainTest.java
> BUILD SUCCESSFUL
> Total time: 1 second
> real0m1,899s
> user0m4,250s
> sys 0m0,244s
>  {code}
> 2.6s vs. 1.9s! Really? Is that the problem? Probably not, I guess the 
> difference is the integration into the IDE then.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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-4931) nb-javac breaks project test classes

2020-10-22 Thread Javier A. Ortiz (Jira)
Javier A. Ortiz created NETBEANS-4931:
-

 Summary: nb-javac breaks project test classes
 Key: NETBEANS-4931
 URL: https://issues.apache.org/jira/browse/NETBEANS-4931
 Project: NetBeans
  Issue Type: Bug
Affects Versions: 12.0, 12.1
Reporter: Javier A. Ortiz


Something changed with nb-javac (upgrade?) that affects both 12.0 and 12.1. All 
of sudden the red icons started showing up in the test classes complaining 
about missing definitions (classes, methods, etc.) from stuff within the same 
project.

 

Tried reinstalling and nothing. The project compiles and runs but some 
functionality is just not there due to this. Was able to fix it by uninstalling 
nb-javac plugin.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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-4292) Compile on save checkbox is disabled for ANT and maven projects

2020-10-22 Thread Alfonso Maestre (Jira)


[ 
https://issues.apache.org/jira/browse/NETBEANS-4292?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17219173#comment-17219173
 ] 

Alfonso Maestre commented on NETBEANS-4292:
---

You need to have:
 * Installed the nb-javac plugin
 * Have a maven project and not a gradle one

to have this check option enabled.

> Compile on save checkbox is disabled for ANT and maven projects
> ---
>
> Key: NETBEANS-4292
> URL: https://issues.apache.org/jira/browse/NETBEANS-4292
> Project: NetBeans
>  Issue Type: Bug
>  Components: projects - Generic Infrastructure
>Affects Versions: 12.0
> Environment: Product Version: Apache NetBeans IDE 12.0-beta3
> Java: 11.0.6; OpenJDK 64-Bit Server VM 11.0.6+10
> Runtime: OpenJDK Runtime Environment 11.0.6+10
> System: Mac OS X version 10.15.3 running on x86_64; UTF-8; en_IN (nb)
>Reporter: Manikantan Narender Nath
>Priority: Major
>  Labels: netcat
> Attachments: no-compile-on-save-ant.png, no-compile-on-save-maven.png
>
>
> The compile on save option in Project properties | Build | compiling panel is 
> disabled.
> It is disabled for new projects, existing projects. (see attachments 
> no-compile-on-save-*.png)



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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-4932) get it done

2020-10-22 Thread yoshitha (Jira)
yoshitha created NETBEANS-4932:
--

 Summary: get it done
 Key: NETBEANS-4932
 URL: https://issues.apache.org/jira/browse/NETBEANS-4932
 Project: NetBeans
  Issue Type: Bug
  Components: cnd - Execution, cnd - Project
Affects Versions: 12.0
Reporter: yoshitha
 Fix For: 12.0


java.lang.AssertionError: Unsupported removeType=RETAIN_LAST_CARET in nested 
transactionjava.lang.AssertionError: Unsupported removeType=RETAIN_LAST_CARET 
in nested transaction at 
org.netbeans.api.editor.caret.EditorCaret.runTransaction(EditorCaret.java:1689) 
at org.netbeans.api.editor.caret.EditorCaret.setDot(EditorCaret.java:577) at 
org.netbeans.api.editor.caret.EditorCaret.setDot(EditorCaret.java:546) at 
org.netbeans.modules.uihandler.SubmitPanel.propertyChange(SubmitPanel.java:161) 
at 
java.desktop/java.beans.PropertyChangeSupport.fire(PropertyChangeSupport.java:341)
 at 
java.desktop/java.beans.PropertyChangeSupport.firePropertyChange(PropertyChangeSupport.java:333)
 at 
java.desktop/java.beans.PropertyChangeSupport.firePropertyChange(PropertyChangeSupport.java:266)
 at org.openide.explorer.ExplorerManager$2.run(ExplorerManager.java:866) at 
org.netbeans.modules.openide.util.NbMutexEventProvider$Event.doEvent(NbMutexEventProvider.java:95)
 at 
org.netbeans.modules.openide.util.NbMutexEventProvider$Event.readAccess(NbMutexEventProvider.java:70)
 at 
org.netbeans.modules.openide.util.LazyMutexImplementation.readAccess(LazyMutexImplementation.java:66)
 at org.openide.util.Mutex.readAccess(Mutex.java:235) at 
org.openide.explorer.ExplorerManager.fireInAWT(ExplorerManager.java:863) at 
org.openide.explorer.ExplorerManager$1AtomicSetSelectedNodes.fire(ExplorerManager.java:269)
 at 
org.openide.explorer.ExplorerManager.setSelectedNodes(ExplorerManager.java:280) 
at org.netbeans.modules.uihandler.SubmitPanel.caretUpdate(SubmitPanel.java:180) 
at 
java.desktop/javax.swing.text.JTextComponent.fireCaretUpdate(JTextComponent.java:412)
 at 
java.desktop/javax.swing.text.JTextComponent$MutableCaretEvent.fire(JTextComponent.java:4489)
 at 
java.desktop/javax.swing.text.JTextComponent$MutableCaretEvent.stateChanged(JTextComponent.java:4511)
 at org.netbeans.api.editor.caret.EditorCaret$6.run(EditorCaret.java:1733) at 
org.netbeans.modules.editor.lib2.view.ViewUtils.runInEDT(ViewUtils.java:413) at 
org.netbeans.api.editor.caret.EditorCaret.fireStateChanged(EditorCaret.java:1742)
 at 
org.netbeans.api.editor.caret.EditorCaret.runTransaction(EditorCaret.java:1664) 
at org.netbeans.api.editor.caret.EditorCaret.setDot(EditorCaret.java:577) at 
org.netbeans.api.editor.caret.EditorCaret.setDot(EditorCaret.java:546) at 
org.netbeans.editor.BaseKit$BeginAction.actionPerformed(BaseKit.java:3664) at 
org.netbeans.editor.BaseAction.actionPerformed(BaseAction.java:322) at 
org.netbeans.spi.editor.AbstractEditorAction.actionPerformed(AbstractEditorAction.java:445)
 at 
org.netbeans.editor.BaseKit$KitCompoundAction.actionPerformed(BaseKit.java:1954)
 at org.netbeans.editor.BaseAction.actionPerformed(BaseAction.java:322) at 
org.netbeans.spi.editor.AbstractEditorAction.actionPerformed(AbstractEditorAction.java:445)
 at 
java.desktop/javax.swing.SwingUtilities.notifyAction(SwingUtilities.java:1810) 
at java.desktop/javax.swing.JComponent.processKeyBinding(JComponent.java:2900) 
at java.desktop/javax.swing.JComponent.processKeyBindings(JComponent.java:2948) 
at java.desktop/javax.swing.JComponent.processKeyEvent(JComponent.java:2862) at 
java.desktop/java.awt.Component.processEvent(Component.java:6391) at 
java.desktop/java.awt.Container.processEvent(Container.java:2263) at 
java.desktop/java.awt.Component.dispatchEventImpl(Component.java:4990) at 
java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2321) at 
java.desktop/java.awt.Component.dispatchEvent(Component.java:4822) at 
java.desktop/java.awt.KeyboardFocusManager.redispatchEvent(KeyboardFocusManager.java:1950)
 at 
java.desktop/java.awt.DefaultKeyboardFocusManager.dispatchKeyEvent(DefaultKeyboardFocusManager.java:870)
 at 
java.desktop/java.awt.DefaultKeyboardFocusManager.preDispatchKeyEvent(DefaultKeyboardFocusManager.java:1139)
 at 
java.desktop/java.awt.DefaultKeyboardFocusManager.typeAheadAssertions(DefaultKeyboardFocusManager.java:1009)
 at 
java.desktop/java.awt.DefaultKeyboardFocusManager.dispatchEvent(DefaultKeyboardFocusManager.java:835)
 at java.desktop/java.awt.Component.dispatchEventImpl(Component.java:4871) at 
java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2321) at 
java.desktop/java.awt.Window.dispatchEventImpl(Window.java:2769) at 
java.desktop/java.awt.Component.dispatchEvent(Component.java:4822) at 
java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:772) at 
java.desktop/java.awt.EventQueue$4.run(EventQueue.java:721) at 
java.desktop/java.awt.EventQueue$4.run(EventQueue.java:715) at 

[netbeans] branch delivery updated (842baf1 -> f643345)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 842baf1  [lsp] partial fix of invalidation of breakpoints during file 
open (#2462)
 add f643345  StatusDisplayer messages remoted to LSP client. (#2478)

No new revisions were added by this update.

Summary of changes:
 .../server/protocol/NbCodeClientCapabilities.java  |  87 +++
 .../lsp/server/protocol/NbCodeClientWrapper.java   | 120 +
 .../lsp/server/protocol/NbCodeLanguageClient.java  |  49 +
 .../modules/java/lsp/server/protocol/Server.java   |  83 --
 .../server/protocol/ShowStatusMessageParams.java   |  78 ++
 .../server/protocol/TextDocumentServiceImpl.java   |   5 +-
 .../lsp/server/protocol/WorkspaceServiceImpl.java  |  33 +-
 .../lsp/server/protocol/WorkspaceUIContext.java|  62 +++
 .../lsp/server/ui/AbstractLspStatusDisplayer.java  |   5 +-
 .../modules/java/lsp/server/ui/UIContext.java  |  15 +++
 .../java/lsp/server/protocol/ServerTest.java   |  24 +++--
 java/java.lsp.server/vscode/src/extension.ts   |  38 ++-
 java/java.lsp.server/vscode/src/protocol.ts|  35 ++
 13 files changed, 583 insertions(+), 51 deletions(-)
 create mode 100644 
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientCapabilities.java
 create mode 100644 
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java
 create mode 100644 
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeLanguageClient.java
 create mode 100644 
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ShowStatusMessageParams.java
 create mode 100644 
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceUIContext.java
 create mode 100644 java/java.lsp.server/vscode/src/protocol.ts


-
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 delivery updated (5689b67 -> a171d50)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 5689b67  Reducing LSP server messages on startup.
 add a171d50  [NETBEANS-4910] Correcting open and close events sent from 
the LSP client to the LSP server.

No new revisions were added by this update.

Summary of changes:
 .../org/netbeans/api/editor/EditorRegistry.java|   5 +
 .../editor/lib2/EditorApiPackageAccessor.java  |   3 +
 .../lsp/client/bindings/BreadcrumbsImpl.java   |   3 +
 .../TextDocumentSyncServerCapabilityHandler.java   | 141 ++---
 ...extDocumentSyncServerCapabilityHandlerTest.java | 349 +
 5 files changed, 457 insertions(+), 44 deletions(-)
 create mode 100644 
ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandlerTest.java


-
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-4933) JavaDB won't start

2020-10-22 Thread John RD (Jira)
John RD created NETBEANS-4933:
-

 Summary: JavaDB won't start
 Key: NETBEANS-4933
 URL: https://issues.apache.org/jira/browse/NETBEANS-4933
 Project: NetBeans
  Issue Type: Bug
Affects Versions: 12.1
 Environment: Product Version: Apache NetBeans IDE 12.1
Java: 15.0.1; Java HotSpot(TM) 64-Bit Server VM 15.0.1+9-18
Runtime: Java(TM) SE Runtime Environment 15.0.1+9-18
System: Windows 10 version 10.0 running on amd64; Cp1252; it_IT (nb)
User directory: C:\Users\johnrdorazio\AppData\Roaming\NetBeans\12.1
Cache directory: C:\Users\johnrdorazio\AppData\Local\NetBeans\Cache\12.1
Reporter: John RD
 Attachments: Netbeans Java DB.jpg

Similarly to [https://bz.apache.org/netbeans/show_bug.cgi?id=257948] , my 
JavaDB connections starting going haywire a couple days ago.

They were working nicely with Netbeans 12.1 and Glassfish 5.1 and JDK 15 until 
two days ago. I use the embedded driver in my codebase, and I used Services -> 
JavaDB to inspect my tables from within the Netbeans IDE. 

Two days ago, without having changed anything on my system or in my setup, 
Services -> JavaDB stopped connecting to the database. JavaDB simply won't 
start. Until two days ago, I would get a prompt asking for username and 
password (which were empty). Now, I just get this in the output window:

 

{color:#de350b}{{Usage: java [options]  [args...]}}
{{ (to execute a class)}}
{{ or java [options] -jar  [args...]}}
{{ (to execute a jar file)}}
{{ or java [options] -m [/] [args...]}}
{{ java [options] --module [/] [args...]}}
{{ (to execute the main class in a module)}}
{{ or java [options]  [args]}}
{{ (to execute a single source-file program)}}{{Arguments following the main 
class, source file, -jar ,}}
{{ -m or --module / are passed as the arguments to}}
{{ main class.}}{{where options include:}}{color}

{color:#de350b}{{-cp }}
{{ -classpath }}
{{ --class-path }}
{{ A ; separated list of directories, JAR archives,}}
{{ and ZIP archives to search for class files.}}
{{ -p }}
{{ --module-path ...}}
{{ A ; separated list of directories, each directory}}
{{ is a directory of modules.}}
{{ --upgrade-module-path ...}}
{{ A ; separated list of directories, each directory}}
{{ is a directory of modules that replace upgradeable}}
{{ modules in the runtime image}}
{{ --add-modules [,...]}}
{{ root modules to resolve in addition to the initial module.}}
{{  can also be ALL-DEFAULT, ALL-SYSTEM,}}
{{ ALL-MODULE-PATH.}}
{{ --list-modules}}
{{ list observable modules and exit}}
{{ -d }}
{{ --describe-module }}
{{ describe a module and exit}}
{{ --dry-run create VM and load main class but do not execute main method.}}
{{ The --dry-run option may be useful for validating the}}
{{ command-line options such as the module system configuration.}}
{{ --validate-modules}}
{{ validate all modules and exit}}
{{ The --validate-modules option may be useful for finding}}
{{ conflicts and other errors with modules on the module path.}}
{{ -D=}}
{{ set a system property}}
{{ -verbose:[class|module|gc|jni]}}
{{ enable verbose output for the given subsystem}}
{{ -version print product version to the error stream and exit}}
{{ --version print product version to the output stream and exit}}
{{ -showversion print product version to the error stream and continue}}
{{ --show-version}}
{{ print product version to the output stream and continue}}
{{ --show-module-resolution}}
{{ show module resolution output during startup}}
{{ -? -h -help}}
{{ print this help message to the error stream}}
{{ --help print this help message to the output stream}}
{{ -X print help on extra options to the error stream}}
{{ --help-extra print help on extra options to the output stream}}
{{ -ea[:...|:]}}
{{ -enableassertions[:...|:]}}
{{ enable assertions with specified granularity}}
{{ -da[:...|:]}}
{{ -disableassertions[:...|:]}}
{{ disable assertions with specified granularity}}
{{ -esa | -enablesystemassertions}}
{{ enable system assertions}}
{{ -dsa | -disablesystemassertions}}
{{ disable system assertions}}
{{ -agentlib:[=]}}
{{ load native agent library , e.g. -agentlib:jdwp}}
{{ see also -agentlib:jdwp=help}}
{{ -agentpath:[=]}}
{{ load native agent library by full pathname}}
{{ -javaagent:[=]}}
{{ load Java programming language agent, see java.lang.instrument}}
{{ -splash:}}
{{ show splash screen with specified image}}
{{ HiDPI scaled images are automatically supported and used}}
{{ if available. The unscaled image filename, e.g. image.ext,}}
{{ should always be passed as the argument to the -splash option.}}
{{ The most appropriate scaled image provided will be picked up}}
{{ automatically.}}
{{ See the SplashScreen API documentation for more information}}
{{ @argument files}}
{{ one or more argument files containing options}}
{{ -disable-@files}}
{{ prevent further argument file expansion}}
{{ --enable-preview}}
{{ allow classes to depend on preview 

[jira] [Commented] (NETBEANS-4933) JavaDB won't start

2020-10-22 Thread John RD (Jira)


[ 
https://issues.apache.org/jira/browse/NETBEANS-4933?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17219343#comment-17219343
 ] 

John RD commented on NETBEANS-4933:
---

I also tried starting from the command line as per the instructions given here 
[https://bz.apache.org/netbeans/show_bug.cgi?id=257948#c7] . I don't see any 
errors when doing that, see included screenshot.

I have verified paths are all correct in Java DB Properties. I'm at a loss as 
where to go from here.

> JavaDB won't start
> --
>
> Key: NETBEANS-4933
> URL: https://issues.apache.org/jira/browse/NETBEANS-4933
> Project: NetBeans
>  Issue Type: Bug
>Affects Versions: 12.1
> Environment: Product Version: Apache NetBeans IDE 12.1
> Java: 15.0.1; Java HotSpot(TM) 64-Bit Server VM 15.0.1+9-18
> Runtime: Java(TM) SE Runtime Environment 15.0.1+9-18
> System: Windows 10 version 10.0 running on amd64; Cp1252; it_IT (nb)
> User directory: C:\Users\johnrdorazio\AppData\Roaming\NetBeans\12.1
> Cache directory: C:\Users\johnrdorazio\AppData\Local\NetBeans\Cache\12.1
>Reporter: John RD
>Priority: Minor
>  Labels: derby
> Attachments: JavaDB from the command prompt.jpg, Netbeans Java DB.jpg
>
>
> Similarly to [https://bz.apache.org/netbeans/show_bug.cgi?id=257948] , my 
> JavaDB connections starting going haywire a couple days ago.
> They were working nicely with Netbeans 12.1 and Glassfish 5.1 and JDK 15 
> until two days ago. I use the embedded driver in my codebase, and I used 
> Services -> JavaDB to inspect my tables from within the Netbeans IDE. 
> Two days ago, without having changed anything on my system or in my setup, 
> Services -> JavaDB stopped connecting to the database. JavaDB simply won't 
> start. Until two days ago, I would get a prompt asking for username and 
> password (which were empty). Now, I just get this in the output window:
>  
> {color:#de350b}{{Usage: java [options]  [args...]}}
> {{ (to execute a class)}}
> {{ or java [options] -jar  [args...]}}
> {{ (to execute a jar file)}}
> {{ or java [options] -m [/] [args...]}}
> {{ java [options] --module [/] [args...]}}
> {{ (to execute the main class in a module)}}
> {{ or java [options]  [args]}}
> {{ (to execute a single source-file program)}}{{Arguments following the main 
> class, source file, -jar ,}}
> {{ -m or --module / are passed as the arguments to}}
> {{ main class.}}{{where options include:}}{color}
> {color:#de350b}{{-cp }}
> {{ -classpath }}
> {{ --class-path }}
> {{ A ; separated list of directories, JAR archives,}}
> {{ and ZIP archives to search for class files.}}
> {{ -p }}
> {{ --module-path ...}}
> {{ A ; separated list of directories, each directory}}
> {{ is a directory of modules.}}
> {{ --upgrade-module-path ...}}
> {{ A ; separated list of directories, each directory}}
> {{ is a directory of modules that replace upgradeable}}
> {{ modules in the runtime image}}
> {{ --add-modules [,...]}}
> {{ root modules to resolve in addition to the initial module.}}
> {{  can also be ALL-DEFAULT, ALL-SYSTEM,}}
> {{ ALL-MODULE-PATH.}}
> {{ --list-modules}}
> {{ list observable modules and exit}}
> {{ -d }}
> {{ --describe-module }}
> {{ describe a module and exit}}
> {{ --dry-run create VM and load main class but do not execute main method.}}
> {{ The --dry-run option may be useful for validating the}}
> {{ command-line options such as the module system configuration.}}
> {{ --validate-modules}}
> {{ validate all modules and exit}}
> {{ The --validate-modules option may be useful for finding}}
> {{ conflicts and other errors with modules on the module path.}}
> {{ -D=}}
> {{ set a system property}}
> {{ -verbose:[class|module|gc|jni]}}
> {{ enable verbose output for the given subsystem}}
> {{ -version print product version to the error stream and exit}}
> {{ --version print product version to the output stream and exit}}
> {{ -showversion print product version to the error stream and continue}}
> {{ --show-version}}
> {{ print product version to the output stream and continue}}
> {{ --show-module-resolution}}
> {{ show module resolution output during startup}}
> {{ -? -h -help}}
> {{ print this help message to the error stream}}
> {{ --help print this help message to the output stream}}
> {{ -X print help on extra options to the error stream}}
> {{ --help-extra print help on extra options to the output stream}}
> {{ -ea[:...|:]}}
> {{ -enableassertions[:...|:]}}
> {{ enable assertions with specified granularity}}
> {{ -da[:...|:]}}
> {{ -disableassertions[:...|:]}}
> {{ disable assertions with specified granularity}}
> {{ -esa | -enablesystemassertions}}
> {{ enable system assertions}}
> {{ -dsa | -disablesystemassertions}}
> {{ disable system assertions}}
> {{ -agentlib:[=]}}
> {{ load native agent library , e.g. -agentlib:jdwp}}
> {{ see also -agentlib:jdwp=help}}
> {{ 

[netbeans] branch delivery updated (a171d50 -> b6b73e7)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from a171d50  [NETBEANS-4910] Correcting open and close events sent from 
the LSP client to the LSP server.
 add b6b73e7  Handling of switch expressions and rule cases in Flow and 
NPECheck hint. (#2293)

No new revisions were added by this update.

Summary of changes:
 java/java.hints/nbproject/project.xml  |  4 +
 .../netbeans/modules/java/hints/bugs/NPECheck.java | 97 +++---
 .../modules/java/hints/introduce/Flow.java | 79 --
 .../modules/java/hints/HideFieldByVarTest.java | 15 +++-
 .../modules/java/hints/bugs/NPECheckTest.java  | 38 +
 .../modules/java/hints/introduce/FlowTest.java | 49 +++
 .../netbeans/api/java/source/TreeUtilities.java|  5 +-
 .../netbeans/modules/java/source/TreeShims.java| 25 ++
 8 files changed, 290 insertions(+), 22 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 delivery updated (f643345 -> 5689b67)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from f643345  StatusDisplayer messages remoted to LSP client. (#2478)
 add 5689b67  Reducing LSP server messages on startup.

No new revisions were added by this update.

Summary of changes:
 java/java.lsp.server/script/etc/nbcode.conf  |  2 +-
 java/java.lsp.server/vscode/package.json |  7 ++-
 java/java.lsp.server/vscode/src/extension.ts | 15 ---
 java/java.lsp.server/vscode/src/nbcode.ts|  4 
 4 files changed, 19 insertions(+), 9 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



[jira] [Commented] (NETBEANS-4746) Running test in Maven is slower than in Ant

2020-10-22 Thread Jesse Glick (Jira)


[ 
https://issues.apache.org/jira/browse/NETBEANS-4746?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17219305#comment-17219305
 ] 

Jesse Glick commented on NETBEANS-4746:
---

Intriguing. Looks like we would need 
https://github.com/mvndaemon/mvnd/issues/116 though.

> Running test in Maven is slower than in Ant
> ---
>
> Key: NETBEANS-4746
> URL: https://issues.apache.org/jira/browse/NETBEANS-4746
> Project: NetBeans
>  Issue Type: Task
>  Components: projects - Maven
>Affects Versions: 12.0
>Reporter: Jaroslav Tulach
>Assignee: Jaroslav Tulach
>Priority: Minor
> Attachments: justtest.diff, preexec-6.patch
>
>
> NetBeans users has just recently complained that Maven support is slower than 
> Ant - some even claimed they [rather maintain dual Ant script 
> support|http://mail-archives.apache.org/mod_mbox//netbeans-dev/202008.mbox/browser]
>  than wait for Maven to launch. I've created this issue to investigate the 
> problem.
> First of all we need a sample project: [^justtest.diff] - apply it {{patch 
> -p1  it with Maven:
> {code:java}
> $ time JAVA_HOME=~/bin/jdk-8/ mvn -quiet 
> -Dtest=com.mycompany.justtest.MainTest process-test-classes surefire:test
> ---
>  T E S T S
> ---
> Running com.mycompany.justtest.MainTest
> Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.071 sec
> Results :Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
> real0m2,633s
> user0m6,986s
> sys 0m0,257s
> {code}
> and you can also run it with Ant:
> {code:java}
>  time JAVA_HOME=~/bin/jdk-8/ ant -q test-single 
> -Djavac.includes=com/mycompany/justtest/MainTest.java 
> -Dtest.includes=com/mycompany/justtest/MainTest.java
> BUILD SUCCESSFUL
> Total time: 1 second
> real0m1,899s
> user0m4,250s
> sys 0m0,244s
>  {code}
> 2.6s vs. 1.9s! Really? Is that the problem? Probably not, I guess the 
> difference is the integration into the IDE then.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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 delivery updated (b6b73e7 -> ea854e5)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from b6b73e7  Handling of switch expressions and rule cases in Flow and 
NPECheck hint. (#2293)
 add ea854e5  Add support for static imports in code templates

No new revisions were added by this update.

Summary of changes:
 .../editor/java/JavaCodeTemplateProcessor.java | 40 ++-
 .../editor/java/JavaCodeTemplateProcessorTest.java | 79 --
 2 files changed, 112 insertions(+), 7 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



[jira] [Updated] (NETBEANS-4933) JavaDB won't start

2020-10-22 Thread John RD (Jira)


 [ 
https://issues.apache.org/jira/browse/NETBEANS-4933?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

John RD updated NETBEANS-4933:
--
Attachment: JavaDB from the command prompt.jpg

> JavaDB won't start
> --
>
> Key: NETBEANS-4933
> URL: https://issues.apache.org/jira/browse/NETBEANS-4933
> Project: NetBeans
>  Issue Type: Bug
>Affects Versions: 12.1
> Environment: Product Version: Apache NetBeans IDE 12.1
> Java: 15.0.1; Java HotSpot(TM) 64-Bit Server VM 15.0.1+9-18
> Runtime: Java(TM) SE Runtime Environment 15.0.1+9-18
> System: Windows 10 version 10.0 running on amd64; Cp1252; it_IT (nb)
> User directory: C:\Users\johnrdorazio\AppData\Roaming\NetBeans\12.1
> Cache directory: C:\Users\johnrdorazio\AppData\Local\NetBeans\Cache\12.1
>Reporter: John RD
>Priority: Minor
>  Labels: derby
> Attachments: JavaDB from the command prompt.jpg, Netbeans Java DB.jpg
>
>
> Similarly to [https://bz.apache.org/netbeans/show_bug.cgi?id=257948] , my 
> JavaDB connections starting going haywire a couple days ago.
> They were working nicely with Netbeans 12.1 and Glassfish 5.1 and JDK 15 
> until two days ago. I use the embedded driver in my codebase, and I used 
> Services -> JavaDB to inspect my tables from within the Netbeans IDE. 
> Two days ago, without having changed anything on my system or in my setup, 
> Services -> JavaDB stopped connecting to the database. JavaDB simply won't 
> start. Until two days ago, I would get a prompt asking for username and 
> password (which were empty). Now, I just get this in the output window:
>  
> {color:#de350b}{{Usage: java [options]  [args...]}}
> {{ (to execute a class)}}
> {{ or java [options] -jar  [args...]}}
> {{ (to execute a jar file)}}
> {{ or java [options] -m [/] [args...]}}
> {{ java [options] --module [/] [args...]}}
> {{ (to execute the main class in a module)}}
> {{ or java [options]  [args]}}
> {{ (to execute a single source-file program)}}{{Arguments following the main 
> class, source file, -jar ,}}
> {{ -m or --module / are passed as the arguments to}}
> {{ main class.}}{{where options include:}}{color}
> {color:#de350b}{{-cp }}
> {{ -classpath }}
> {{ --class-path }}
> {{ A ; separated list of directories, JAR archives,}}
> {{ and ZIP archives to search for class files.}}
> {{ -p }}
> {{ --module-path ...}}
> {{ A ; separated list of directories, each directory}}
> {{ is a directory of modules.}}
> {{ --upgrade-module-path ...}}
> {{ A ; separated list of directories, each directory}}
> {{ is a directory of modules that replace upgradeable}}
> {{ modules in the runtime image}}
> {{ --add-modules [,...]}}
> {{ root modules to resolve in addition to the initial module.}}
> {{  can also be ALL-DEFAULT, ALL-SYSTEM,}}
> {{ ALL-MODULE-PATH.}}
> {{ --list-modules}}
> {{ list observable modules and exit}}
> {{ -d }}
> {{ --describe-module }}
> {{ describe a module and exit}}
> {{ --dry-run create VM and load main class but do not execute main method.}}
> {{ The --dry-run option may be useful for validating the}}
> {{ command-line options such as the module system configuration.}}
> {{ --validate-modules}}
> {{ validate all modules and exit}}
> {{ The --validate-modules option may be useful for finding}}
> {{ conflicts and other errors with modules on the module path.}}
> {{ -D=}}
> {{ set a system property}}
> {{ -verbose:[class|module|gc|jni]}}
> {{ enable verbose output for the given subsystem}}
> {{ -version print product version to the error stream and exit}}
> {{ --version print product version to the output stream and exit}}
> {{ -showversion print product version to the error stream and continue}}
> {{ --show-version}}
> {{ print product version to the output stream and continue}}
> {{ --show-module-resolution}}
> {{ show module resolution output during startup}}
> {{ -? -h -help}}
> {{ print this help message to the error stream}}
> {{ --help print this help message to the output stream}}
> {{ -X print help on extra options to the error stream}}
> {{ --help-extra print help on extra options to the output stream}}
> {{ -ea[:...|:]}}
> {{ -enableassertions[:...|:]}}
> {{ enable assertions with specified granularity}}
> {{ -da[:...|:]}}
> {{ -disableassertions[:...|:]}}
> {{ disable assertions with specified granularity}}
> {{ -esa | -enablesystemassertions}}
> {{ enable system assertions}}
> {{ -dsa | -disablesystemassertions}}
> {{ disable system assertions}}
> {{ -agentlib:[=]}}
> {{ load native agent library , e.g. -agentlib:jdwp}}
> {{ see also -agentlib:jdwp=help}}
> {{ -agentpath:[=]}}
> {{ load native agent library by full pathname}}
> {{ -javaagent:[=]}}
> {{ load Java programming language agent, see java.lang.instrument}}
> {{ -splash:}}
> {{ show splash screen with specified image}}
> {{ HiDPI scaled images are automatically supported and used}}
> {{ if available. 

[netbeans] 03/18: Annotation processors may generate class files: -that have a name different from any source file in the source roots -even while running in the editor

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 5c2f2f275c0e0192449d31955d7db4ada705fd6d
Author: Jan Lahoda 
AuthorDate: Sun Oct 18 10:06:55 2020 +0200

Annotation processors may generate class files:
-that have a name different from any source file in the source roots
-even while running in the editor

But neither of these seems to be working - fixing.
---
 .../java/source/parsing/OutputFileManager.java |  48 ++--
 .../parsing/WriteArbitraryClassFileAPTest.java | 269 +
 2 files changed, 288 insertions(+), 29 deletions(-)

diff --git 
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java
 
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java
index 65bf36e..146ead0 100644
--- 
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java
+++ 
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/OutputFileManager.java
@@ -21,14 +21,12 @@ package org.netbeans.modules.java.source.parsing;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -116,22 +114,28 @@ public class OutputFileManager extends CachingFileManager 
{
 File activeRoot = getClassFolderForSource(l, sibling, baseName);
 if (activeRoot == null) {
 activeRoot = getClassFolderForApt(l, sibling, baseName);
+}
+if (activeRoot == null && siblings.hasSibling()) {
+URL siblingURL = siblings.getSibling();
+activeRoot = getClassFolderForSourceImpl(siblingURL);
 if (activeRoot == null) {
-//Deleted project
-if (this.scp.getRoots().length > 0) {
-LOG.log(
-Level.WARNING,
-"No output for class: {0} sibling: {1} srcRoots: 
{2}",//NOI18N
-new Object[]{
-className,
-sibling,
-this.scp
-});
-}
-throw new InvalidSourcePath ();
+activeRoot = getClassFolderForApt(siblingURL);
 }
 }
-assertValidRoot(activeRoot, l);
+if (activeRoot == null) {
+//Deleted project
+if (this.scp.getRoots().length > 0) {
+LOG.log(
+Level.WARNING,
+"No output for class: {0} sibling: {1} srcRoots: {2}", 
   //NOI18N
+new Object[]{
+className,
+sibling,
+this.scp
+});
+}
+throw new InvalidSourcePath ();
+}
 baseName = className.replace('.', File.separatorChar);   
//NOI18N
 String nameStr = baseName + '.' + FileObjects.SIG;
 final File f = new File (activeRoot, nameStr);
@@ -166,7 +170,6 @@ public class OutputFileManager extends CachingFileManager {
 throw new InvalidSourcePath ();
 }
 }
-assertValidRoot(activeRoot, l);
 final String path = FileObjects.resolveRelativePath(pkgName, 
relativeName);
 final File file = FileUtil.normalizeFile(new File 
(activeRoot,path.replace(FileObjects.NBFS_SEPARATOR_CHAR, File.separatorChar)));
 return tx.createFileObject(l, file, activeRoot,null,null);
@@ -461,17 +464,4 @@ public class OutputFileManager extends CachingFileManager {
 return ModuleLocation.cast(l).getModuleRoots();
 }
 }
-
-private void assertValidRoot(
-final File activeRoot,
-final Location l) throws IOException {
-final Collection roots = getLocationRoots(l);
-if (!roots.contains(BaseUtilities.toURI(activeRoot).toURL())) {
-throw new IOException(String.format(
-"Wrong cache folder: %s, allowed: %s, location: %s",
//NOI18N
-activeRoot,
-roots,
-l));
-}
-}
 }
diff --git 
a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/WriteArbitraryClassFileAPTest.java
 
b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/WriteArbitraryClassFileAPTest.java
new file mode 100644
index 000..586c925
--- 

[netbeans] 08/18: Make sure Maven project is refreshed before build is over

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit e3f1aeda5cf0dc2345fa1e74f58a99d572674bcd
Author: Jaroslav Tulach 
AuthorDate: Tue Oct 20 08:37:50 2020 +0200

Make sure Maven project is refreshed before build is over
---
 .../netbeans/modules/maven/ActionProviderImpl.java|  6 ++
 .../netbeans/modules/maven/NbMavenProjectImpl.java|  7 ---
 .../netbeans/modules/maven/api/NbMavenProject.java|  5 +++--
 .../maven/execute/MavenCommandLineExecutor.java   | 19 ---
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java 
b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
index a9dd035..add44f8 100644
--- a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
@@ -275,10 +275,8 @@ public class ActionProviderImpl implements ActionProvider {
 final ActionProgress listener = ActionProgress.start(lookup);
 final ExecutorTask task = RunUtils.run(rc);
 if (task != null) {
-task.addTaskListener(new TaskListener() {
-@Override public void taskFinished(Task t) {
-listener.finished(task.result() == 0);
-}
+task.addTaskListener((Task t) -> {
+listener.finished(task.result() == 0);
 });
 } else {
 listener.finished(false);
diff --git a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java 
b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
index ccc98b3..2708f1a 100644
--- a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
@@ -467,15 +467,16 @@ public final class NbMavenProjectImpl implements Project {
 
 
 
-public void fireProjectReload() {
+public RequestProcessor.Task fireProjectReload() {
 //#227101 not only AWT and project read/write mutex has to be checked, 
there are some additional more
 //complex scenarios that can lead to deadlock. Just give up and always 
fire changes in separate RP.
 if (Boolean.getBoolean("test.reload.sync")) {
 reloadTask.run();
 //for tests just do sync reload, even though silly, even sillier 
is to attempt to sync the threads..
-return;
+} else {
+reloadTask.schedule(0); //asuming here that schedule(0) will move 
the scheduled task in the queue if not yet executed
 }
-reloadTask.schedule(0); //asuming here that schedule(0) will move the 
scheduled task in the queue if not yet executed
+return reloadTask;
 }
 
 public static void refreshLocalRepository(NbMavenProjectImpl project) {
diff --git a/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java 
b/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java
index 17b90a5..8fdf544 100644
--- a/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java
+++ b/java/maven/src/org/netbeans/modules/maven/api/NbMavenProject.java
@@ -63,6 +63,7 @@ import org.openide.filesystems.FileUtil;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.openide.util.RequestProcessor;
+import org.openide.util.Task;
 import org.openide.util.Utilities;
 
 /**
@@ -546,8 +547,8 @@ public final class NbMavenProject {
 /**
  * 
  */ 
-private void fireProjectReload() {
-project.fireProjectReload();
+private RequestProcessor.Task fireProjectReload() {
+return project.fireProjectReload();
 }
 
 private void doFireReload() {
diff --git 
a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
 
b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
index 770e556..e920702 100644
--- 
a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
+++ 
b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
@@ -58,6 +58,8 @@ import org.netbeans.api.extexecution.base.Processes;
 import org.netbeans.api.java.platform.JavaPlatform;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.maven.NbMavenProjectImpl;
 import org.netbeans.modules.maven.api.Constants;
 import org.netbeans.modules.maven.api.FileUtilities;
 import org.netbeans.modules.maven.api.NbMavenProject;
@@ -318,18 +320,13 @@ public class MavenCommandLineExecutor extends 
AbstractMavenExecutor {
 ioput.getErr().close();
 actionStatesAtFinish(out.createResumeFromFinder(), 

[netbeans] 06/18: Support ActionProgress to allow observing Gradle build process

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 03801b1d8844852c16496d1b5071ad80b6432776
Author: Jaroslav Tulach 
AuthorDate: Tue Oct 20 08:28:14 2020 +0200

Support ActionProgress to allow observing Gradle build process
---
 .../src/org/netbeans/modules/gradle/ActionProviderImpl.java| 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java 
b/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
index 03ad503..a12e23a 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
@@ -76,6 +76,7 @@ import org.netbeans.api.project.FileOwnerQuery;
 import org.netbeans.api.project.ProjectUtils;
 import org.netbeans.modules.gradle.api.GradleBaseProject;
 import org.netbeans.modules.gradle.api.execute.RunConfig.ExecFlag;
+import org.netbeans.spi.project.ActionProgress;
 import org.netbeans.spi.project.support.ProjectOperations;
 import org.netbeans.spi.project.ui.support.DefaultProjectOperations;
 import org.openide.awt.ActionID;
@@ -205,7 +206,6 @@ public class ActionProviderImpl implements ActionProvider {
 if (argLine == null) {
 return;
 }
-
 final StringWriter writer = new StringWriter();
 
 PrintWriter out = new PrintWriter(writer);
@@ -258,10 +258,15 @@ public class ActionProviderImpl implements ActionProvider 
{
 boolean canReload = 
project.getLookup().lookup(BeforeReloadActionHook.class).beforeReload(action, 
ctx, 0, null);
 if (needReload && canReload) {
 String[] reloadArgs = RunUtils.evaluateActionArgs(project, 
mapping.getName(), mapping.getReloadArgs(), ctx);
-prj.reloadProject(true, maxQualily, reloadArgs);
+final ActionProgress g = ActionProgress.start(context);
+RequestProcessor.Task reloadTask = prj.reloadProject(true, 
maxQualily, reloadArgs);
+reloadTask.addTaskListener((t) -> {
+g.finished(true);
+});
 }
 } else {
 final ExecutorTask task = RunUtils.executeGradle(cfg, 
writer.toString());
+final ActionProgress g = ActionProgress.start(context);
 final Lookup outerCtx = ctx;
 task.addTaskListener((Task t) -> {
 try {
@@ -279,6 +284,7 @@ public class ActionProviderImpl implements ActionProvider {
 } finally {
 task.getInputOutput().getOut().close();
 task.getInputOutput().getErr().close();
+g.finished(task.result() == 0);
 }
 });
 }


-
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] 12/18: [lsp] partial fix of invalidation of breakpoints during file open (#2462)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit a2bdbacfea69ca1b68d16f5e6b650e9be5865bc4
Author: Svatopluk Dedic 
AuthorDate: Thu Oct 22 09:10:26 2020 +0200

[lsp] partial fix of invalidation of breakpoints during file open (#2462)

* Fixed reset of all breakpoints on document open.

* Tested position stability during didOpen.
---
 .../server/protocol/TextDocumentServiceImpl.java   |  46 -
 .../java/lsp/server/protocol/ServerTest.java   | 212 ++---
 2 files changed, 219 insertions(+), 39 deletions(-)

diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
index 5728e9a..e0a1df0 100644
--- 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
+++ 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
@@ -57,6 +57,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiConsumer;
 import java.util.prefs.Preferences;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -1009,19 +1010,32 @@ public class TextDocumentServiceImpl implements 
TextDocumentService, LanguageCli
 try {
 FileObject file = fromUri(params.getTextDocument().getUri());
 EditorCookie ec = file.getLookup().lookup(EditorCookie.class);
-Document doc = ec.openDocument();
-openedDocuments.put(params.getTextDocument().getUri(), doc);
-String text = params.getTextDocument().getText();
-try {
-doc.remove(0, doc.getLength());
-doc.insertString(0, text, null);
-} catch (BadLocationException ex) {
-//TODO: include stack trace:
-client.logMessage(new MessageParams(MessageType.Error, 
ex.getMessage()));
+Document doc = ec.getDocument();
+// the document may be not opened yet. Clash with in-memory 
content can happen only if
+// the doc was opened prior to request reception.
+if (doc != null) {
+String text = params.getTextDocument().getText();
+try {
+// could be faster with CharSequence, but requires a 
dependency on
+// org.netbeans.modules.editor.util
+if (!text.contentEquals(doc.getText(0, doc.getLength( {
+doc.remove(0, doc.getLength());
+doc.insertString(0, text, null);
+}
+} catch (BadLocationException ex) {
+Exceptions.printStackTrace(ex);
+//TODO: include stack trace:
+client.logMessage(new MessageParams(MessageType.Error, 
ex.getMessage()));
+}
+} else {
+doc = ec.openDocument();
 }
+openedDocuments.put(params.getTextDocument().getUri(), doc);
 runDiagnoticTasks(params.getTextDocument().getUri());
 } catch (IOException ex) {
 throw new IllegalStateException(ex);
+} finally {
+reportNotificationDone("didOpen", params);
 }
 }
 
@@ -1041,11 +1055,13 @@ public class TextDocumentServiceImpl implements 
TextDocumentService, LanguageCli
 }
 });
 runDiagnoticTasks(params.getTextDocument().getUri());
+reportNotificationDone("didChange", params);
 }
 
 @Override
 public void didClose(DidCloseTextDocumentParams params) {
 openedDocuments.remove(params.getTextDocument().getUri());
+reportNotificationDone("didClose", params);
 }
 
 @Override
@@ -1279,4 +1295,16 @@ public class TextDocumentServiceImpl implements 
TextDocumentService, LanguageCli
 }
 return edits;
 }
+
+private static void reportNotificationDone(String s, Object parameter) {
+if (HOOK_NOTIFICATION != null) {
+HOOK_NOTIFICATION.accept(s, parameter);
+}
+}
+
+/**
+ * For testing only; calls that do not return a result should call
+ * this hook, if defined, with the method name and parameter.
+ */
+static BiConsumer HOOK_NOTIFICATION = null;
 }
diff --git 
a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
 
b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
index 67d9409..4d7231c 100644
--- 

[netbeans] 09/18: [NETBEANS-4919] Avoiding dependency on javac internal classes from javadoc/.../Analyzer, using NetBeans' HTML information instead. (#2470)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 9a661976575b8ceecdf5c30bc077991b489e5da0
Author: Jan Lahoda 
AuthorDate: Wed Oct 21 06:47:37 2020 +0200

[NETBEANS-4919] Avoiding dependency on javac internal classes from 
javadoc/.../Analyzer, using NetBeans' HTML information instead. (#2470)

* [NETBEANS-4919] Avoiding dependency on javac internal classes from 
javadoc/.../Analyzer, using NetBeans' HTML information instead.

* Fixing TODOs.
---
 ide/html.editor.lib/nbproject/project.xml  |  1 +
 java/javadoc/nbproject/project.xml | 47 +-
 .../netbeans/modules/javadoc/hints/Analyzer.java   | 46 +++--
 3 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/ide/html.editor.lib/nbproject/project.xml 
b/ide/html.editor.lib/nbproject/project.xml
index 6f641d2..cd6c84d 100644
--- a/ide/html.editor.lib/nbproject/project.xml
+++ b/ide/html.editor.lib/nbproject/project.xml
@@ -269,6 +269,7 @@
 org.netbeans.modules.html.ojet
 org.netbeans.modules.html.parser
 org.netbeans.modules.html.validation
+org.netbeans.modules.javadoc
 org.netbeans.modules.javascript2.editor
 org.netbeans.modules.javascript2.html
 org.netbeans.modules.javascript2.jade
diff --git a/java/javadoc/nbproject/project.xml 
b/java/javadoc/nbproject/project.xml
index 23185af..94f56cd 100644
--- a/java/javadoc/nbproject/project.xml
+++ b/java/javadoc/nbproject/project.xml
@@ -52,15 +52,6 @@
 
 
 
-
org.netbeans.libs.javacimpl
-
-
-
-1
-
-
-
-
 
org.netbeans.modules.editor.bracesmatching
 
 
@@ -115,6 +106,31 @@
 
 
 
+
org.netbeans.modules.editor.util
+
+
+
+1
+1.73
+
+
+
+
org.netbeans.modules.html.editor.lib
+
+
+
+3
+3.42
+
+
+
+
org.netbeans.modules.html.parser
+
+1
+1.44
+
+
+
 
org.netbeans.modules.java.editor
 
 1
@@ -246,15 +262,6 @@
 
 
 
-
org.netbeans.modules.editor.util
-
-
-
-1
-1.73
-
-
-
 org.openide.util
 
 
@@ -317,6 +324,10 @@
 
 
 
+
org.netbeans.modules.java.j2seplatform
+
+
+
 
org.netbeans.modules.java.source
 
 
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java 
b/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
index 9ef27aa..5c92f69 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
@@ -57,14 +57,15 @@ import com.sun.source.util.DocSourcePositions;
 import com.sun.source.util.DocTreePath;
 import com.sun.source.util.DocTreePathScanner;
 import com.sun.source.util.TreePath;
-import com.sun.tools.doclint.HtmlTag;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -73,7 +74,6 @@ import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Name;
-import javax.lang.model.element.QualifiedNameable;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -86,6 +86,11 @@ import 

[netbeans] branch delivery updated (ea854e5 -> 2ae34a2)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from ea854e5  Add support for static imports in code templates
 add 2ae34a2  [NETBEANS-3588] Code Templates not working in Java Editor in 
for loops (#2444)

No new revisions were added by this update.

Summary of changes:
 .../editor/java/JavaCodeTemplateFilter.java| 175 -
 .../editor/java/JavaCodeTemplateProcessorTest.java |  47 +-
 2 files changed, 150 insertions(+), 72 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 release122 updated (249b77c -> 45bf3b3)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 249b77c  Upgrade payara-micro-maven-plugin to v1.3.0
 new 182b3c1  Stack trace analyzer needs to understand modular stack traces.
 new 54e4bff  Using Incomplete classpath to indicate unloadable Gradle 
project
 new 5c2f2f2  Annotation processors may generate class files: -that have a 
name different from any source file in the source roots -even while running in 
the editor
 new f6ef4ea  Reload external changes automatically in headless mode.
 new 91c7976  Notify successful execution as soon as Gradle build succeeds
 new 03801b1  Support ActionProgress to allow observing Gradle build process
 new cef1863  Perform BUILD when no single run/debug action is available
 new e3f1aed  Make sure Maven project is refreshed before build is over
 new 9a66197  [NETBEANS-4919] Avoiding dependency on javac internal classes 
from javadoc/.../Analyzer, using NetBeans' HTML information instead. (#2470)
 new 693cab3  Read mainClass configuration or property.
 new 1b29b55  [NETBEANS-4930] Upgrade Gradle Tooling 6.7 with JDK-15 Support
 new a2bdbac  [lsp] partial fix of invalidation of breakpoints during file 
open (#2462)
 new 15099a7  StatusDisplayer messages remoted to LSP client. (#2478)
 new 78a833a  Reducing LSP server messages on startup.
 new af35c99  [NETBEANS-4910] Correcting open and close events sent from 
the LSP client to the LSP server.
 new fc033ea  Handling of switch expressions and rule cases in Flow and 
NPECheck hint. (#2293)
 new 3e74232  Add support for static imports in code templates
 new 45bf3b3  [NETBEANS-3588] Code Templates not working in Java Editor in 
for loops (#2444)

The 18 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:
 extide/gradle/external/binaries-list   |   2 +-
 ...-bin-license.txt => gradle-6.7-bin-license.txt} |   2 +-
 2-bin-notice.txt => gradle-6.7-bin-notice.txt} |   0
 extide/gradle/netbeans-gradle-tooling/build.gradle |   6 +-
 .../gradle/wrapper/gradle-wrapper.properties   |   2 +-
 .../modules/gradle/ActionProviderImpl.java |  13 +-
 .../modules/gradle/NbGradleProjectImpl.java|   4 +-
 .../api/execute/GradleDistributionManager.java |   1 +
 .../modules/gradle/api/execute/RunUtils.java   |   4 +-
 .../gradle/execute/GradleDaemonExecutor.java   |  44 +++
 extide/libs.gradle/external/binaries-list  |   2 +-
 ...ense.txt => gradle-tooling-api-6.7-license.txt} |   4 +-
 ...otice.txt => gradle-tooling-api-6.7-notice.txt} |   0
 extide/libs.gradle/manifest.mf |   2 +-
 extide/libs.gradle/nbproject/project.properties|   2 +-
 extide/libs.gradle/nbproject/project.xml   |   2 +-
 .../org/netbeans/api/editor/EditorRegistry.java|   5 +
 .../editor/lib2/EditorApiPackageAccessor.java  |   3 +
 ide/html.editor.lib/nbproject/project.xml  |   1 +
 .../lsp/client/bindings/BreadcrumbsImpl.java   |   3 +
 .../TextDocumentSyncServerCapabilityHandler.java   | 141 ++---
 ...extDocumentSyncServerCapabilityHandlerTest.java | 349 +
 .../classpath/AbstractGradleClassPathImpl.java |  18 +-
 .../editor/java/JavaCodeTemplateFilter.java| 175 ++-
 .../editor/java/JavaCodeTemplateProcessor.java |  40 ++-
 .../editor/java/JavaCodeTemplateProcessorTest.java | 122 ++-
 java/java.hints/nbproject/project.properties   |   2 +-
 java/java.hints/nbproject/project.xml  |   4 +
 .../netbeans/modules/java/hints/bugs/NPECheck.java |  97 +-
 .../modules/java/hints/introduce/Flow.java |  79 -
 .../java/hints/project/IncompleteClassPath.java|   3 +-
 .../modules/java/hints/HideFieldByVarTest.java |  15 +-
 .../modules/java/hints/bugs/NPECheckTest.java  |  38 +++
 .../modules/java/hints/introduce/FlowTest.java |  49 +++
 java/java.lsp.server/script/etc/nbcode.conf|   2 +-
 .../server/debugging/launch/NbLaunchDelegate.java  | 155 ++---
 .../server/protocol/NbCodeClientCapabilities.java  |  87 +
 .../lsp/server/protocol/NbCodeClientWrapper.java   | 120 +++
 .../lsp/server/protocol/NbCodeLanguageClient.java  |  49 +++
 .../modules/java/lsp/server/protocol/Server.java   |  83 -
 .../server/protocol/ShowStatusMessageParams.java   |  78 +
 .../server/protocol/TextDocumentServiceImpl.java   |  59 +++-
 .../lsp/server/protocol/WorkspaceServiceImpl.java  |  33 +-
 .../lsp/server/protocol/WorkspaceUIContext.java|  62 
 .../lsp/server/ui/AbstractLspStatusDisplayer.java  |   5 +-
 .../modules/java/lsp/server/ui/UIContext.java  |  15 +
 

[netbeans] 18/18: [NETBEANS-3588] Code Templates not working in Java Editor in for loops (#2444)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 45bf3b3beec5ee7bb1c41778a2be8ebb8b3a2f95
Author: Arthur Sadykov 
AuthorDate: Fri Oct 23 06:08:21 2020 +0500

[NETBEANS-3588] Code Templates not working in Java Editor in for loops 
(#2444)

* [NETBEANS-3588] Code Templates not working in Java Editor in for loops

* [NETBEANS-3588] Code Templates not working in Java Editor in for loops
---
 .../editor/java/JavaCodeTemplateFilter.java| 175 -
 .../editor/java/JavaCodeTemplateProcessorTest.java |  47 +-
 2 files changed, 150 insertions(+), 72 deletions(-)

diff --git 
a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateFilter.java
 
b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateFilter.java
index 3d8b6ef..bbfbe4f 100644
--- 
a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateFilter.java
+++ 
b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateFilter.java
@@ -20,27 +20,28 @@
 package org.netbeans.modules.editor.java;
 
 import com.sun.source.tree.Tree;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
 import javax.swing.text.JTextComponent;
-
 import com.sun.source.tree.CaseTree;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.util.SourcePositions;
+import com.sun.source.util.TreePath;
 import org.netbeans.api.java.lexer.JavaTokenId;
 import org.netbeans.api.java.source.CompilationController;
 import org.netbeans.api.java.source.JavaSource.Phase;
 import org.netbeans.api.java.source.SourceUtils;
 import org.netbeans.api.java.source.TreeUtilities;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenHierarchy;
+import org.netbeans.api.lexer.TokenId;
 import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.lib.editor.codetemplates.api.CodeTemplate;
 import org.netbeans.lib.editor.codetemplates.spi.CodeTemplateFilter;
 import org.netbeans.modules.parsing.api.ParserManager;
@@ -58,7 +59,6 @@ import org.openide.util.NbBundle;
  */
 public class JavaCodeTemplateFilter implements CodeTemplateFilter {
 
-private static final Logger LOG = 
Logger.getLogger(JavaCodeTemplateFilter.class.getName());
 private static final String EXPRESSION = "EXPRESSION"; //NOI18N
 private static final String CLASS_HEADER = "CLASS_HEADER"; //NOI18N
 
@@ -72,88 +72,121 @@ public class JavaCodeTemplateFilter implements 
CodeTemplateFilter {
 final Source source = Source.create(component.getDocument());
 if (source != null) {
 final AtomicBoolean cancel = new AtomicBoolean();
-ProgressUtils.runOffEventDispatchThread(new Runnable() {
-@Override
-public void run() {
-try {
-ParserManager.parse(Collections.singleton(source), 
new UserTask() {
-@Override
-public void run(ResultIterator resultIterator) 
throws Exception {
-if (cancel.get()) {
-return;
+BaseProgressUtils.runOffEventDispatchThread(() -> {
+try {
+ParserManager.parse(Collections.singleton(source), new 
UserTask() {
+@Override
+public void run(ResultIterator resultIterator) 
throws Exception {
+if (cancel.get()) {
+return;
+}
+Parser.Result result = 
resultIterator.getParserResult(startOffset);
+CompilationController controller = result != 
null ? CompilationController.get(result) : null;
+if (controller != null && 
Phase.PARSED.compareTo(controller.toPhase(Phase.PARSED)) <= 0) {
+TreeUtilities tu = 
controller.getTreeUtilities();
+int eo = endOffset;
+int so = startOffset;
+if (so >= 0) {
+so = 
result.getSnapshot().getEmbeddedOffset(startOffset);
 }
-Parser.Result result = 
resultIterator.getParserResult(startOffset);
-CompilationController controller = result 

[netbeans] 13/18: StatusDisplayer messages remoted to LSP client. (#2478)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 15099a794af75e5343b188517bbc652172cc3699
Author: Svatopluk Dedic 
AuthorDate: Thu Oct 22 20:25:18 2020 +0200

StatusDisplayer messages remoted to LSP client. (#2478)

* StatusDisplayer messages remoted to vscode.

* Extended capabilities negotiated with the client.
---
 .../server/protocol/NbCodeClientCapabilities.java  |  87 +++
 .../lsp/server/protocol/NbCodeClientWrapper.java   | 120 +
 .../lsp/server/protocol/NbCodeLanguageClient.java  |  49 +
 .../modules/java/lsp/server/protocol/Server.java   |  83 --
 .../server/protocol/ShowStatusMessageParams.java   |  78 ++
 .../server/protocol/TextDocumentServiceImpl.java   |   5 +-
 .../lsp/server/protocol/WorkspaceServiceImpl.java  |  33 +-
 .../lsp/server/protocol/WorkspaceUIContext.java|  62 +++
 .../lsp/server/ui/AbstractLspStatusDisplayer.java  |   5 +-
 .../modules/java/lsp/server/ui/UIContext.java  |  15 +++
 .../java/lsp/server/protocol/ServerTest.java   |  24 +++--
 java/java.lsp.server/vscode/src/extension.ts   |  38 ++-
 java/java.lsp.server/vscode/src/protocol.ts|  35 ++
 13 files changed, 583 insertions(+), 51 deletions(-)

diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientCapabilities.java
 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientCapabilities.java
new file mode 100644
index 000..41f7e0a
--- /dev/null
+++ 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientCapabilities.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   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.
+ */
+package org.netbeans.modules.java.lsp.server.protocol;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import org.eclipse.lsp4j.InitializeParams;
+
+/**
+ * Encapsulates all nbcode-specific client capabilities. Need to be passed in
+ * an object:
+ * 
+ * "nbcodeCapabilities" : {
+ *  "statusBarMessageSupport"? : boolean
+ *  ...
+ * }
+ * 
+ * @author sdedic
+ */
+public final class NbCodeClientCapabilities {
+/**
+ * Supports status bar messages:
+ * 
+ * window/showStatusBarMessage
+ * 
+ */
+private Boolean statusBarMessageSupport;
+
+public Boolean getStatusBarMessageSupport() {
+return statusBarMessageSupport;
+}
+
+public boolean hasStatusBarMessageSupport() {
+return statusBarMessageSupport != null && 
statusBarMessageSupport.booleanValue();
+}
+
+public void setStatusBarMessageSupport(Boolean statusBarMessageSupport) {
+this.statusBarMessageSupport = statusBarMessageSupport;
+}
+
+public static NbCodeClientCapabilities get(InitializeParams initParams) {
+if (initParams == null) {
+return null;
+}
+Object ext = initParams.getInitializationOptions();
+if (!(ext instanceof JsonElement)) {
+return null;
+}
+InitializationExtendedCapabilities root = new GsonBuilder().
+/*
+hypothetically needed for formatting options with Either 
type
+registerTypeAdapterFactory(new EitherTypeAdapter.Factory()).
+*/
+create().
+fromJson((JsonElement)ext, 
InitializationExtendedCapabilities.class);
+return root == null ? null : root.getNbcodeCapabilities();
+
+}
+
+static final class InitializationExtendedCapabilities {
+private NbCodeClientCapabilities nbcodeCapabilities;
+
+public NbCodeClientCapabilities getNbcodeCapabilities() {
+return nbcodeCapabilities;
+}
+
+public void setNbcodeCapabilities(NbCodeClientCapabilities 
nbcodeCapabilities) {
+this.nbcodeCapabilities = nbcodeCapabilities;
+}
+}
+}
diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java
 

[netbeans] 10/18: Read mainClass configuration or property.

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 693cab3474e05de1fd15c0043571e705efda81d7
Author: Martin Entlicher 
AuthorDate: Tue Oct 20 15:58:58 2020 +0200

Read mainClass configuration or property.
---
 .../modules/maven/runjar/RunJarPrereqChecker.java  |  60 -
 .../maven/runjar/RunJarPrereqCheckerTest.java  | 134 +
 2 files changed, 193 insertions(+), 1 deletion(-)

diff --git 
a/java/maven/src/org/netbeans/modules/maven/runjar/RunJarPrereqChecker.java 
b/java/maven/src/org/netbeans/modules/maven/runjar/RunJarPrereqChecker.java
index 26b6196..b3f3b2c 100644
--- a/java/maven/src/org/netbeans/modules/maven/runjar/RunJarPrereqChecker.java
+++ b/java/maven/src/org/netbeans/modules/maven/runjar/RunJarPrereqChecker.java
@@ -24,9 +24,13 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import javax.swing.JButton;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Plugin;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.netbeans.api.java.project.JavaProjectConstants;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectUtils;
@@ -57,6 +61,8 @@ import org.openide.util.NbBundle.Messages;
 @ProjectServiceProvider(service=PrerequisitesChecker.class, 
projectType="org-netbeans-modules-maven/" + NbMavenProject.TYPE_JAR)
 public class RunJarPrereqChecker implements PrerequisitesChecker {
 
+private static final String[] MAIN_CLASS_PROPERTIES = {"mainClass", 
"exec.mainClass", "project.mainClass", "project.mainclass"}; // NOI18N
+
 private String mainClass;
 
 @Override public boolean checkRunConfig(RunConfig config) {
@@ -82,7 +88,7 @@ public class RunJarPrereqChecker implements 
PrerequisitesChecker {
 if ((ActionProvider.COMMAND_RUN.equals(actionName) ||
 ActionProvider.COMMAND_DEBUG.equals(actionName) ||
 ActionProvider.COMMAND_PROFILE.equals(actionName))) {
-String mc = null;
+String mc = findMainClass(config);
 for (Map.Entry entry : 
config.getProperties().entrySet()) {
 if (entry.getValue().contains("${packageClassName}")) { 
//NOI18N
 //show dialog to choose main class.
@@ -99,6 +105,58 @@ public class RunJarPrereqChecker implements 
PrerequisitesChecker {
 return true;
 }
 
+private static String findMainClass(RunConfig config) {
+// Read main class from the manifest property:
+String mainClass = getConfiguration(config, "maven-jar-plugin", 
"archive", "manifest", "mainClass"); // NOI18N
+if (mainClass != null) {
+return mainClass;
+}
+// Read main class from exec-maven-plugin configuration:
+mainClass = getConfiguration(config, "exec-maven-plugin", 
"mainClass"); // NOI18N
+if (mainClass != null) {
+return mainClass;
+}
+// Check pom's properties:
+Properties properties = config.getMavenProject().getProperties();
+for (String name : MAIN_CLASS_PROPERTIES) {
+String mc = properties.getProperty(name);
+if (mc != null) {
+return mc;
+}
+}
+return null;
+}
+
+private static Plugin findPlugin(RunConfig config, String name) {
+List plugins = 
config.getMavenProject().getBuild().getPlugins();
+for (Plugin p : plugins) {
+if (name.equals(p.getArtifactId())) {
+return p;
+}
+}
+return null;
+}
+
+private static String getConfiguration(RunConfig config, String pluginId, 
String... configs) {
+Plugin plugin = findPlugin(config, pluginId);
+if (plugin != null) {
+Xpp3Dom configuration = (Xpp3Dom) plugin.getConfiguration();
+if (configuration != null) {
+Xpp3Dom child = configuration;
+for (String c : configs) {
+child = child.getChild(c);
+if (child == null) {
+break;
+}
+}
+if (child != null) {
+return child.getValue();
+}
+}
+}
+return null;
+}
+
 @Messages({
 "LBL_ChooseMainClass_Title=Select Main Class for Execution",
 "LBL_ChooseMainClass_OK=Select Main Class"
diff --git 
a/java/maven/test/unit/src/org/netbeans/modules/maven/runjar/RunJarPrereqCheckerTest.java
 
b/java/maven/test/unit/src/org/netbeans/modules/maven/runjar/RunJarPrereqCheckerTest.java
index a05f78e..9f4eafc 100644
--- 

[netbeans] 16/18: Handling of switch expressions and rule cases in Flow and NPECheck hint. (#2293)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit fc033ea496c648e4ce910695d58e3caf94502c95
Author: Jan Lahoda 
AuthorDate: Thu Oct 22 23:24:19 2020 +0200

Handling of switch expressions and rule cases in Flow and NPECheck hint. 
(#2293)

* Handling of switch expressions and rule cases in Flow and NPECheck hint.

* Using a correct overload if TreeScanner.scan

* Fixing FlowTest on JDK 8.

* Attempting to improve stability of HideFieldByVarTest.

* Using a diamond instead of explicit type parameters.
---
 java/java.hints/nbproject/project.xml  |  4 +
 .../netbeans/modules/java/hints/bugs/NPECheck.java | 97 +++---
 .../modules/java/hints/introduce/Flow.java | 79 --
 .../modules/java/hints/HideFieldByVarTest.java | 15 +++-
 .../modules/java/hints/bugs/NPECheckTest.java  | 38 +
 .../modules/java/hints/introduce/FlowTest.java | 49 +++
 .../netbeans/api/java/source/TreeUtilities.java|  5 +-
 .../netbeans/modules/java/source/TreeShims.java| 25 ++
 8 files changed, 290 insertions(+), 22 deletions(-)

diff --git a/java/java.hints/nbproject/project.xml 
b/java/java.hints/nbproject/project.xml
index a328b25..a94078f 100644
--- a/java/java.hints/nbproject/project.xml
+++ b/java/java.hints/nbproject/project.xml
@@ -487,6 +487,10 @@
 
 
 
+
org.netbeans.core.startup
+
+
+
 org.netbeans.insane
 
 
diff --git 
a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java 
b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java
index 1731632..d8bec25 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java
@@ -48,7 +48,8 @@ import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 import org.netbeans.api.annotations.common.CheckForNull;
 import org.netbeans.api.java.source.CompilationInfo;
-import org.netbeans.api.java.source.support.CancellableTreePathScanner;
+import org.netbeans.api.java.source.support.CancellableTreeScanner;
+import org.netbeans.modules.editor.java.TreeShims;
 import org.netbeans.spi.editor.hints.ErrorDescription;
 import org.openide.util.NbBundle;
 
@@ -542,7 +543,7 @@ public class NPECheck {
 public Iterable 
getAnnotationMirrors(CompilationInfo info, Element el);
 }
 
-private static final class VisitorImpl extends 
CancellableTreePathScanner {
+private static final class VisitorImpl extends 
CancellableTreeScanner {
 
 private final HintContext ctx;
 private final CompilationInfo info;
@@ -564,6 +565,7 @@ public class NPECheck {
 private   Map> 
resumeOnExceptionHandler = new IdentityHashMap<>();
 private final Map expressionState = new 
IdentityHashMap<>();
 private final List pendingFinally = new LinkedList<>();
+private   List pendingYields = new ArrayList<>();
 private boolean not;
 private boolean doNotRecord;
 private final TypeElement throwableEl;
@@ -617,11 +619,45 @@ public class NPECheck {
 
 }
 
+private TreePath currentPath;
+
+public TreePath getCurrentPath() {
+return currentPath;
+}
+
+public State scan(TreePath path, Void p) {
+TreePath oldPath = currentPath;
+try {
+currentPath = path;
+return super.scan(path.getLeaf(), p);
+} finally {
+currentPath = oldPath;
+}
+}
+
 @Override
 public State scan(Tree tree, Void p) {
 resume(tree, resumeBefore);
 
-State r = super.scan(tree, p);
+State r;
+
+if (tree != null) {
+TreePath oldPath = currentPath;
+try {
+currentPath = new TreePath(currentPath, tree);
+if 
(TreeShims.SWITCH_EXPRESSION.equals(tree.getKind().name())) {
+r = visitSwitchExpression(tree, p);
+} else if (TreeShims.YIELD.equals(tree.getKind().name())) {
+r = visitYield(tree, p);
+} else {
+r = super.scan(tree, p);
+}
+} finally {
+currentPath = oldPath;
+}
+} else {
+r = null;
+}
 
 TypeMirror currentType = tree != null ? 
info.getTrees().getTypeMirror(new 

[netbeans] 15/18: [NETBEANS-4910] Correcting open and close events sent from the LSP client to the LSP server.

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit af35c99def8e74b2cc7d47043e0c98e053ade829
Author: Jan Lahoda 
AuthorDate: Sat Oct 17 21:45:57 2020 +0200

[NETBEANS-4910] Correcting open and close events sent from the LSP client 
to the LSP server.
---
 .../org/netbeans/api/editor/EditorRegistry.java|   5 +
 .../editor/lib2/EditorApiPackageAccessor.java  |   3 +
 .../lsp/client/bindings/BreadcrumbsImpl.java   |   3 +
 .../TextDocumentSyncServerCapabilityHandler.java   | 141 ++---
 ...extDocumentSyncServerCapabilityHandlerTest.java | 349 +
 5 files changed, 457 insertions(+), 44 deletions(-)

diff --git a/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java 
b/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java
index ac3ea6c..8ca9bea 100644
--- a/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java
+++ b/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java
@@ -781,6 +781,11 @@ public final class EditorRegistry {
 }
 
 @Override
+public void forceRelease(JTextComponent c) {
+EditorRegistry.releasedByCloneableEditor(c);
+}
+
+@Override
 public void setIgnoredAncestorClass(Class ignoredAncestorClass) {
 EditorRegistry.setIgnoredAncestorClass(ignoredAncestorClass);
 }
diff --git 
a/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorApiPackageAccessor.java
 
b/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorApiPackageAccessor.java
index a1606a1..0ca1aee 100644
--- 
a/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorApiPackageAccessor.java
+++ 
b/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorApiPackageAccessor.java
@@ -51,6 +51,9 @@ public abstract class EditorApiPackageAccessor {
 
 /** Register text component to registry. */
 public abstract void register(JTextComponent c);
+
+/**Forcibly release from the registry - useful for tests.*/
+public abstract void forceRelease(JTextComponent c);
 
 public abstract void setIgnoredAncestorClass(Class ignoredAncestorClass);
 
diff --git 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/BreadcrumbsImpl.java
 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/BreadcrumbsImpl.java
index a19f481..fe9841c 100644
--- 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/BreadcrumbsImpl.java
+++ 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/BreadcrumbsImpl.java
@@ -278,6 +278,9 @@ public class BreadcrumbsImpl implements BackgroundTask {
 }
 
 public static List create(BreadcrumbsElement 
parent, List symbols, FileObject file, Document doc) {
+if (symbols == null) {
+return Collections.emptyList();
+}
 return symbols.stream()
   .map(c -> create(parent, file, doc, c))
   .filter(e -> e != null)
diff --git 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java
 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java
index 60e38d3..81d98c0 100644
--- 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java
+++ 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java
@@ -21,8 +21,10 @@ package org.netbeans.modules.lsp.client.bindings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
@@ -32,10 +34,12 @@ import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.StyledDocument;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;
+import org.eclipse.lsp4j.DidCloseTextDocumentParams;
 import org.eclipse.lsp4j.DidOpenTextDocumentParams;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextDocumentContentChangeEvent;
+import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.TextDocumentItem;
 import org.eclipse.lsp4j.TextDocumentSyncKind;
 import org.eclipse.lsp4j.TextDocumentSyncOptions;
@@ -55,8 +59,7 @@ import org.openide.text.NbDocument;
 import org.openide.util.Exceptions;
 import org.openide.util.RequestProcessor;
 
-/** TODO: follow the synchronization options
- *  TODO: close
+/**
  *
  * @author lahvac
  */
@@ -79,15 +82,57 @@ public class TextDocumentSyncServerCapabilityHandler {
 lastOpened.addAll(currentOpened);
 
 for (JTextComponent opened : newOpened) {
-

[netbeans] 04/18: Reload external changes automatically in headless mode.

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit f6ef4eaa13ee415c10c600700af25e7d3f0bbd84
Author: Martin Entlicher 
AuthorDate: Mon Oct 19 17:54:05 2020 +0200

Reload external changes automatically in headless mode.
---
 .../src/org/openide/text/DataEditorSupport.java| 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git 
a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java 
b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
index 2edd115..fe9254c 100644
--- a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
+++ b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
@@ -21,6 +21,7 @@ package org.openide.text;
 
 
 import java.awt.EventQueue;
+import java.awt.GraphicsEnvironment;
 import org.netbeans.modules.openide.loaders.SimpleES;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -1352,12 +1353,19 @@ public class DataEditorSupport extends 
CloneableEditorSupport {
 try {
 des.superSaveDoc();
 } catch (UserQuestionException ex) {
-NotifyDescriptor nd = new 
NotifyDescriptor.Confirmation(ex.getLocalizedMessage(),
-NotifyDescriptor.YES_NO_OPTION);
-Object res = DialogDisplayer.getDefault().notify(nd);
-
-if (NotifyDescriptor.OK_OPTION.equals(res)) {
+if (GraphicsEnvironment.isHeadless()) {
+// We cn not ask for anything in headless mode.
+// When there are e.g. external changes, we want to 
reload them,
+// otherwise we'd keep an inconsistent state.
 ex.confirmed();
+} else {
+NotifyDescriptor nd = new 
NotifyDescriptor.Confirmation(ex.getLocalizedMessage(),
+NotifyDescriptor.YES_NO_OPTION);
+Object res = DialogDisplayer.getDefault().notify(nd);
+
+if (NotifyDescriptor.OK_OPTION.equals(res) || true) {
+ex.confirmed();
+}
 }
 }
 } catch (IOException e) {


-
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] 07/18: Perform BUILD when no single run/debug action is available

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit cef1863f201ae82adf0c116af0c418b4033e8982
Author: Jaroslav Tulach 
AuthorDate: Tue Oct 20 08:29:27 2020 +0200

Perform BUILD when no single run/debug action is available
---
 .../server/debugging/launch/NbLaunchDelegate.java  | 155 ++---
 1 file changed, 104 insertions(+), 51 deletions(-)

diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
index 768b02b..14a0fa1 100644
--- 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
+++ 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
@@ -54,71 +54,119 @@ import org.openide.util.lookup.ProxyLookup;
  * @author martin
  */
 public abstract class NbLaunchDelegate {
-
 public abstract void preLaunch(Map launchArguments, 
DebugAdapterContext context);
 
 public abstract void postLaunch(Map launchArguments, 
DebugAdapterContext context);
 
 public final CompletableFuture nbLaunch(FileObject toRun, 
DebugAdapterContext context, boolean debug, 
Consumer consoleMessages) {
-Pair providerAndCommand = findTarget(toRun, 
debug);
 CompletableFuture launchFuture = new CompletableFuture<>();
-if (providerAndCommand == null) {
-launchFuture.completeExceptionally(new ResponseErrorException(new 
ResponseError(
-ResponseErrorCode.MethodNotFound,
-"Cannot find " + (debug ? "debug" : "run") + " action!", 
null)));
-return launchFuture;
-}
 NbProcessConsole ioContext = new NbProcessConsole(consoleMessages);
-ActionProgress progress = new ActionProgress() {
-@Override
-protected void started() {}
-@Override
-public void finished(boolean success) {
-ioContext.stop();
+CompletableFuture> commandFuture = 
findTargetWithPossibleRebuild(toRun, debug, ioContext);
+commandFuture.thenAccept((providerAndCommand) -> {
+if (debug) {
+DebuggerManager.getDebuggerManager().addDebuggerListener(new 
DebuggerManagerAdapter() {
+@Override
+public void sessionAdded(Session session) {
+JPDADebugger debugger = session.lookupFirst(null, 
JPDADebugger.class);
+if (debugger != null) {
+
DebuggerManager.getDebuggerManager().removeDebuggerListener(this);
+Map properties = session.lookupFirst(null, 
Map.class);
+NbSourceProvider sourceProvider = 
context.getSourceProvider();
+sourceProvider.setSourcePath(properties != null ? 
(ClassPath) properties.getOrDefault("sourcepath", ClassPath.EMPTY) : 
ClassPath.EMPTY);
+
debugger.addPropertyChangeListener(JPDADebugger.PROP_STATE, new 
PropertyChangeListener() {
+@Override
+public void propertyChange(PropertyChangeEvent 
evt) {
+int newState = (int) evt.getNewValue();
+if (newState == 
JPDADebugger.STATE_RUNNING) {
+
debugger.removePropertyChangeListener(JPDADebugger.PROP_STATE, this);
+NbDebugSession debugSession = new 
NbDebugSession(debugger);
+context.setDebugSession(debugSession);
+launchFuture.complete(null);
+
context.getConfigurationSemaphore().waitForConfigurationDone();
+}
+}
+});
+}
+}
+});
+} else {
+launchFuture.complete(null);
 }
-};
-if (debug) {
-DebuggerManager.getDebuggerManager().addDebuggerListener(new 
DebuggerManagerAdapter() {
+ActionProgress progress = new ActionProgress() {
 @Override
-public void sessionAdded(Session session) {
-JPDADebugger debugger = session.lookupFirst(null, 
JPDADebugger.class);
-if (debugger != null) {
-
DebuggerManager.getDebuggerManager().removeDebuggerListener(this);
-Map properties = session.lookupFirst(null, Map.class);
-NbSourceProvider sourceProvider = 
context.getSourceProvider();
-

[netbeans] 02/18: Using Incomplete classpath to indicate unloadable Gradle project

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 54e4bff47585561d4aaf3c0e7a7024c7f89dd7d4
Author: Jaroslav Tulach 
AuthorDate: Fri Oct 16 17:21:09 2020 +0200

Using Incomplete classpath to indicate unloadable Gradle project
---
 .../java/classpath/AbstractGradleClassPathImpl.java| 18 --
 java/java.hints/nbproject/project.properties   |  2 +-
 .../java/hints/project/IncompleteClassPath.java|  3 +--
 .../lsp/server/protocol/TextDocumentServiceImpl.java   |  8 
 .../java/source/parsing/CompilationInfoImpl.java   |  8 
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git 
a/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
 
b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
index e275ea5..f50e255 100644
--- 
a/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
+++ 
b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
@@ -27,11 +27,15 @@ import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import org.netbeans.api.annotations.common.NonNull;
+import org.netbeans.api.java.classpath.ClassPath;
 import org.netbeans.api.project.Project;
 import org.netbeans.spi.java.classpath.ClassPathImplementation;
+import org.netbeans.spi.java.classpath.FlaggedClassPathImplementation;
 import org.netbeans.spi.java.classpath.PathResourceImplementation;
 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
 import org.openide.filesystems.FileUtil;
@@ -41,7 +45,7 @@ import org.openide.util.WeakListeners;
  *
  * @author Laszlo Kishalmi
  */
-abstract class AbstractGradleClassPathImpl implements ClassPathImplementation {
+abstract class AbstractGradleClassPathImpl implements 
FlaggedClassPathImplementation {
 
 private final PropertyChangeSupport support = new 
PropertyChangeSupport(this);
 private final PropertyChangeListener listener;
@@ -49,10 +53,11 @@ abstract class AbstractGradleClassPathImpl implements 
ClassPathImplementation {
 private List resources;
 
 protected final Project project;
+private final NbGradleProject watcher;
 
 protected AbstractGradleClassPathImpl(Project proj) {
 this.project = proj;
-final NbGradleProject watcher = 
proj.getLookup().lookup(NbGradleProject.class);
+watcher = proj.getLookup().lookup(NbGradleProject.class);
 listener = (PropertyChangeEvent evt) -> {
 if (watcher.isUnloadable()) {
 return;
@@ -69,10 +74,19 @@ abstract class AbstractGradleClassPathImpl implements 
ClassPathImplementation {
 if (hasChanged) {
 
support.firePropertyChange(ClassPathImplementation.PROP_RESOURCES, null, null);
 }
+
support.firePropertyChange(FlaggedClassPathImplementation.PROP_FLAGS, null, 
null);
 };
 
watcher.addPropertyChangeListener(WeakListeners.propertyChange(listener, null));
 }
 
+@Override
+public Set getFlags() {
+if (watcher.isUnloadable()) {
+return Collections.singleton(ClassPath.Flag.INCOMPLETE);
+}
+return Collections.emptySet();
+}
+
 protected abstract List createPath();
 
 private boolean hasChanged(List oldValue, List newValue) {
diff --git a/java/java.hints/nbproject/project.properties 
b/java/java.hints/nbproject/project.properties
index f19d741..5fe007c 100644
--- a/java/java.hints/nbproject/project.properties
+++ b/java/java.hints/nbproject/project.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-spec.version.base=1.93.0
+spec.version.base=1.94.0
 
 javac.source=1.8
 
diff --git 
a/java/java.hints/src/org/netbeans/modules/java/hints/project/IncompleteClassPath.java
 
b/java/java.hints/src/org/netbeans/modules/java/hints/project/IncompleteClassPath.java
index 2c0ae3a..128372d 100644
--- 
a/java/java.hints/src/org/netbeans/modules/java/hints/project/IncompleteClassPath.java
+++ 
b/java/java.hints/src/org/netbeans/modules/java/hints/project/IncompleteClassPath.java
@@ -78,8 +78,7 @@ public class IncompleteClassPath implements ErrorRule {
 public void cancel() {
 }
 
-private static final class ResolveFix implements Fix {
-
+public static final class ResolveFix implements Fix {
 private final Project prj;
 
 ResolveFix(@NonNull final Project prj) {
diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
 

[netbeans] 11/18: [NETBEANS-4930] Upgrade Gradle Tooling 6.7 with JDK-15 Support

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 1b29b550ec7b7c7b170815de61d0b66c99f51ec9
Author: Laszlo Kishalmi 
AuthorDate: Wed Oct 21 17:15:35 2020 -0700

[NETBEANS-4930] Upgrade Gradle Tooling 6.7 with JDK-15 Support
---
 extide/gradle/external/binaries-list   |  2 +-
 ...-bin-license.txt => gradle-6.7-bin-license.txt} |  2 +-
 2-bin-notice.txt => gradle-6.7-bin-notice.txt} |  0
 extide/gradle/netbeans-gradle-tooling/build.gradle |  6 ++
 .../gradle/wrapper/gradle-wrapper.properties   |  2 +-
 .../api/execute/GradleDistributionManager.java |  1 +
 extide/libs.gradle/external/binaries-list  |  2 +-
 ...ense.txt => gradle-tooling-api-6.7-license.txt} |  4 ++--
 ...otice.txt => gradle-tooling-api-6.7-notice.txt} |  0
 extide/libs.gradle/manifest.mf |  2 +-
 extide/libs.gradle/nbproject/project.properties|  2 +-
 extide/libs.gradle/nbproject/project.xml   |  2 +-
 .../org/netbeans/nbbuild/extlibs/ignored-overlaps  | 25 +++---
 13 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/extide/gradle/external/binaries-list 
b/extide/gradle/external/binaries-list
index 12041c3..3b632ed 100644
--- a/extide/gradle/external/binaries-list
+++ b/extide/gradle/external/binaries-list
@@ -16,4 +16,4 @@
 # under the License.
 
 A271DEA739D4EBBD1A51F282AA130EB9314AD830 gradle-wrapper-4.10.2.jar
-2564503471E1FC18A4E7D2A120BC567EA3B26AA4 gradle-4.10.2-bin.zip
+E2E8BEBFCC5BA21D6FE9A27325D10EC1DB5D83FA gradle-6.7-bin.zip
diff --git a/extide/gradle/external/gradle-4.10.2-bin-license.txt 
b/extide/gradle/external/gradle-6.7-bin-license.txt
similarity index 99%
rename from extide/gradle/external/gradle-4.10.2-bin-license.txt
rename to extide/gradle/external/gradle-6.7-bin-license.txt
index 79fcd0e..3bbf060 100644
--- a/extide/gradle/external/gradle-4.10.2-bin-license.txt
+++ b/extide/gradle/external/gradle-6.7-bin-license.txt
@@ -1,6 +1,6 @@
 Name: Gradle
 Description: Gradle Build System
-Version: 4.10.2
+Version: 6.7
 License: Gradle
 Origin: Gradle Inc.
 URL: https://gradle.org/
diff --git a/extide/gradle/external/gradle-4.10.2-bin-notice.txt 
b/extide/gradle/external/gradle-6.7-bin-notice.txt
similarity index 100%
rename from extide/gradle/external/gradle-4.10.2-bin-notice.txt
rename to extide/gradle/external/gradle-6.7-bin-notice.txt
diff --git a/extide/gradle/netbeans-gradle-tooling/build.gradle 
b/extide/gradle/netbeans-gradle-tooling/build.gradle
index d9514eb..a8db3ec 100644
--- a/extide/gradle/netbeans-gradle-tooling/build.gradle
+++ b/extide/gradle/netbeans-gradle-tooling/build.gradle
@@ -21,19 +21,17 @@ apply plugin: 'groovy'
 apply plugin: 'application'
 
 mainClassName = 'org.netbeans.modules.gradle.DebugTooling'
-def toolingApiVersion = gradle.gradleVersion
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 repositories {
 jcenter()
-
 }
 
 dependencies {
-compile gradleApi()
-compile localGroovy()
+implementation gradleApi()
+implementation localGroovy()
 }
 
 testClasses.dependsOn('jar')
diff --git 
a/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties
 
b/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties
index 949ff8e..89a8925 100644
--- 
a/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties
+++ 
b/extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=../../../external/gradle-4.10.2-bin.zip
+distributionUrl=../../../external/gradle-6.7-bin.zip
diff --git 
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
 
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
index f0760ea..710c0a4 100644
--- 
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
+++ 
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
@@ -88,6 +88,7 @@ public final class GradleDistributionManager {
 GradleVersion.version("5.4"), // JDK-12
 GradleVersion.version("6.0"), // JDK-13
 GradleVersion.version("6.3"), // JDK-14
+GradleVersion.version("6.7"), // JDK-15
 };
 private static final int JAVA_VERSION;
 
diff --git a/extide/libs.gradle/external/binaries-list 
b/extide/libs.gradle/external/binaries-list
index d1a6c35..8b64f80 100644
--- a/extide/libs.gradle/external/binaries-list
+++ b/extide/libs.gradle/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.

[netbeans] 14/18: Reducing LSP server messages on startup.

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release122
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 78a833ac820149c0327ddb8c81b94c68ab6b0879
Author: Svata Dedic 
AuthorDate: Fri Oct 16 17:16:16 2020 +0200

Reducing LSP server messages on startup.
---
 java/java.lsp.server/script/etc/nbcode.conf  |  2 +-
 java/java.lsp.server/vscode/package.json |  7 ++-
 java/java.lsp.server/vscode/src/extension.ts | 15 ---
 java/java.lsp.server/vscode/src/nbcode.ts|  4 
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/java/java.lsp.server/script/etc/nbcode.conf 
b/java/java.lsp.server/script/etc/nbcode.conf
index 62849fe..2077e90 100644
--- a/java/java.lsp.server/script/etc/nbcode.conf
+++ b/java/java.lsp.server/script/etc/nbcode.conf
@@ -58,7 +58,7 @@ default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches
-default_options="--nogui --nosplash --branding nbcode 
-J-Dnetbeans.logger.console=true -J-Djava.awt.headless=true 
-J--add-opens=java.base/java.net=ALL-UNNAMED 
-J--add-opens=java.base/java.lang.ref=ALL-UNNAMED 
-J--add-opens=java.base/java.lang=ALL-UNNAMED 
-J--add-opens=java.base/java.security=ALL-UNNAMED 
-J--add-opens=java.base/java.util=ALL-UNNAMED 
-J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED 
-J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED -J--add-opens=java.desk 
[...]
+default_options="--nogui --nosplash --branding nbcode 
-J-Djava.awt.headless=true -J--add-opens=java.base/java.net=ALL-UNNAMED 
-J--add-opens=java.base/java.lang.ref=ALL-UNNAMED 
-J--add-opens=java.base/java.lang=ALL-UNNAMED 
-J--add-opens=java.base/java.security=ALL-UNNAMED 
-J--add-opens=java.base/java.util=ALL-UNNAMED 
-J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED 
-J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED 
-J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--a [...]
 # for development purposes you may wish to append: 
-J-Dnetbeans.logger.console=true -J-ea
 
 # default location of JDK/JRE, can be overridden by using --jdkhome  
switch
diff --git a/java/java.lsp.server/vscode/package.json 
b/java/java.lsp.server/vscode/package.json
index 221b262..2f9be73 100644
--- a/java/java.lsp.server/vscode/package.json
+++ b/java/java.lsp.server/vscode/package.json
@@ -35,7 +35,12 @@
],
"default": null,
"description": "Specifies the JDK on 
which the Java language server should be run"
-   }
+   },
+"netbeans.verbose": {
+"type": "boolean",
+"default": false,
+"description": "Enables verbose 
messages from the Java Language Server"
+}
}
},
"breakpoints": [
diff --git a/java/java.lsp.server/vscode/src/extension.ts 
b/java/java.lsp.server/vscode/src/extension.ts
index 5ce27ce..b3d8994 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -68,13 +68,16 @@ function findClusters(myPath : string): string[] {
 export function activate(context: ExtensionContext) {
 //verify acceptable JDK is available/set:
 let specifiedJDK = workspace.getConfiguration('netbeans').get('jdkhome');
-
+const beVerbose : boolean = 
workspace.getConfiguration('netbeans').get('verbose', false);
 let info = {
 clusters : findClusters(context.extensionPath),
 extensionPath: context.extensionPath,
 storagePath : context.globalStoragePath,
-jdkHome : specifiedJDK
+jdkHome : specifiedJDK,
+verbose: beVerbose
 };
+
+let log = vscode.window.createOutputChannel("Java Language Server");
 
 vscode.extensions.all.forEach((e, index) => {
 if (e.extensionPath.indexOf("redhat.java") >= 0) {
@@ -87,9 +90,8 @@ export function activate(context: ExtensionContext) {
 }
 });
 
-let log = vscode.window.createOutputChannel("Java Language Server");
 log.appendLine("Launching Java Language Server");
-vscode.window.showInformationMessage("Launching Java Language Server");
+vscode.window.setStatusBarMessage("Launching Java Language Server", 2000);
 
 let ideRunning = new Promise((resolve, reject) => {
 let collectedText : string | null = '';
@@ -183,8 +185,8 @@ export function activate(context: ExtensionContext) {
 workspace.createFileSystemWatcher('**/*.java')
 ]
 },
-outputChannelName: 'Java',
-revealOutputChannelOn: 4,
+outputChannel: log,
+

[netbeans] branch master updated (427251a -> 3a2cad1)

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 427251a  Update JUnit to version 4.13.1
 add b2d19c8  Stack trace analyzer needs to understand modular stack traces.
 add 9c1d310  Using Incomplete classpath to indicate unloadable Gradle 
project
 add 43e625b  Annotation processors may generate class files: -that have a 
name different from any source file in the source roots -even while running in 
the editor
 add 6900794  Reload external changes automatically in headless mode.
 add 468294c  Merge pull request #2473 from 
entlicher/headlessUQEinDES_delivery
 add d7d4faf  Notify successful execution as soon as Gradle build succeeds
 add c945e9a  Support ActionProgress to allow observing Gradle build process
 add ed95fe7  Perform BUILD when no single run/debug action is available
 add 5fc97b3  Make sure Maven project is refreshed before build is over
 add 5c8fd84  Merge pull request #2471 from 
JaroslavTulach/jtulach/RefreshGradleAfterSuccessfulBuild
 add a033ff8  [NETBEANS-4919] Avoiding dependency on javac internal classes 
from javadoc/.../Analyzer, using NetBeans' HTML information instead. (#2470)
 add 3b2dabe  Read mainClass configuration or property.
 add 832de2c  Merge pull request #2474 from 
entlicher/MavenMainClass_delivery
 add fa78c10  [NETBEANS-4930] Upgrade Gradle Tooling 6.7 with JDK-15 Support
 add 842baf1  [lsp] partial fix of invalidation of breakpoints during file 
open (#2462)
 add f643345  StatusDisplayer messages remoted to LSP client. (#2478)
 add 5689b67  Reducing LSP server messages on startup.
 add a171d50  [NETBEANS-4910] Correcting open and close events sent from 
the LSP client to the LSP server.
 add b6b73e7  Handling of switch expressions and rule cases in Flow and 
NPECheck hint. (#2293)
 add ea854e5  Add support for static imports in code templates
 add 2ae34a2  [NETBEANS-3588] Code Templates not working in Java Editor in 
for loops (#2444)
 new 3a2cad1  Merge NetBeans 12.2-beta1 -> NetBeans 12.2-beta2 changes to 
master form the delivery branch.

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:
 extide/gradle/external/binaries-list   |   2 +-
 ...-bin-license.txt => gradle-6.7-bin-license.txt} |   2 +-
 2-bin-notice.txt => gradle-6.7-bin-notice.txt} |   0
 extide/gradle/netbeans-gradle-tooling/build.gradle |   6 +-
 .../gradle/wrapper/gradle-wrapper.properties   |   2 +-
 .../modules/gradle/ActionProviderImpl.java |  13 +-
 .../modules/gradle/NbGradleProjectImpl.java|   4 +-
 .../api/execute/GradleDistributionManager.java |   1 +
 .../modules/gradle/api/execute/RunUtils.java   |   4 +-
 .../gradle/execute/GradleDaemonExecutor.java   |  44 +++
 extide/libs.gradle/external/binaries-list  |   2 +-
 ...ense.txt => gradle-tooling-api-6.7-license.txt} |   4 +-
 ...otice.txt => gradle-tooling-api-6.7-notice.txt} |   0
 extide/libs.gradle/nbproject/project.properties|   2 +-
 extide/libs.gradle/nbproject/project.xml   |   2 +-
 .../org/netbeans/api/editor/EditorRegistry.java|   5 +
 .../editor/lib2/EditorApiPackageAccessor.java  |   3 +
 ide/html.editor.lib/nbproject/project.xml  |   1 +
 .../lsp/client/bindings/BreadcrumbsImpl.java   |   3 +
 .../TextDocumentSyncServerCapabilityHandler.java   | 141 ++---
 ...extDocumentSyncServerCapabilityHandlerTest.java | 349 +
 .../classpath/AbstractGradleClassPathImpl.java |  18 +-
 .../editor/java/JavaCodeTemplateFilter.java| 175 ++-
 .../editor/java/JavaCodeTemplateProcessor.java |  40 ++-
 .../editor/java/JavaCodeTemplateProcessorTest.java | 122 ++-
 java/java.hints/nbproject/project.xml  |   4 +
 .../netbeans/modules/java/hints/bugs/NPECheck.java |  97 +-
 .../modules/java/hints/introduce/Flow.java |  79 -
 .../java/hints/project/IncompleteClassPath.java|   3 +-
 .../modules/java/hints/HideFieldByVarTest.java |  15 +-
 .../modules/java/hints/bugs/NPECheckTest.java  |  38 +++
 .../modules/java/hints/introduce/FlowTest.java |  49 +++
 java/java.lsp.server/script/etc/nbcode.conf|   2 +-
 .../server/debugging/launch/NbLaunchDelegate.java  | 155 ++---
 .../server/protocol/NbCodeClientCapabilities.java  |  87 +
 .../lsp/server/protocol/NbCodeClientWrapper.java   | 120 +++
 .../lsp/server/protocol/NbCodeLanguageClient.java  |  49 +++
 .../modules/java/lsp/server/protocol/Server.java   |  83 -
 .../server/protocol/ShowStatusMessageParams.java   |  78 +
 .../server/protocol/TextDocumentServiceImpl.java   |  59 +++-
 

[netbeans] 01/01: Merge NetBeans 12.2-beta1 -> NetBeans 12.2-beta2 changes to master form the delivery branch.

2020-10-22 Thread lkishalmi
This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 3a2cad159a2a60665653ce83a67547f679ec
Merge: 427251a 2ae34a2
Author: Laszlo Kishalmi 
AuthorDate: Thu Oct 22 18:16:17 2020 -0700

Merge NetBeans 12.2-beta1 -> NetBeans 12.2-beta2 changes to master form the 
delivery branch.

 extide/gradle/external/binaries-list   |   2 +-
 ...-bin-license.txt => gradle-6.7-bin-license.txt} |   2 +-
 2-bin-notice.txt => gradle-6.7-bin-notice.txt} |   0
 extide/gradle/netbeans-gradle-tooling/build.gradle |   6 +-
 .../gradle/wrapper/gradle-wrapper.properties   |   2 +-
 .../modules/gradle/ActionProviderImpl.java |  13 +-
 .../modules/gradle/NbGradleProjectImpl.java|   4 +-
 .../api/execute/GradleDistributionManager.java |   1 +
 .../modules/gradle/api/execute/RunUtils.java   |   4 +-
 .../gradle/execute/GradleDaemonExecutor.java   |  44 +++
 extide/libs.gradle/external/binaries-list  |   2 +-
 ...ense.txt => gradle-tooling-api-6.7-license.txt} |   4 +-
 ...otice.txt => gradle-tooling-api-6.7-notice.txt} |   0
 extide/libs.gradle/nbproject/project.properties|   2 +-
 extide/libs.gradle/nbproject/project.xml   |   2 +-
 .../org/netbeans/api/editor/EditorRegistry.java|   5 +
 .../editor/lib2/EditorApiPackageAccessor.java  |   3 +
 ide/html.editor.lib/nbproject/project.xml  |   1 +
 .../lsp/client/bindings/BreadcrumbsImpl.java   |   3 +
 .../TextDocumentSyncServerCapabilityHandler.java   | 141 ++---
 ...extDocumentSyncServerCapabilityHandlerTest.java | 349 +
 .../classpath/AbstractGradleClassPathImpl.java |  18 +-
 .../editor/java/JavaCodeTemplateFilter.java| 175 ++-
 .../editor/java/JavaCodeTemplateProcessor.java |  40 ++-
 .../editor/java/JavaCodeTemplateProcessorTest.java | 122 ++-
 java/java.hints/nbproject/project.xml  |   4 +
 .../netbeans/modules/java/hints/bugs/NPECheck.java |  97 +-
 .../modules/java/hints/introduce/Flow.java |  79 -
 .../java/hints/project/IncompleteClassPath.java|   3 +-
 .../modules/java/hints/HideFieldByVarTest.java |  15 +-
 .../modules/java/hints/bugs/NPECheckTest.java  |  38 +++
 .../modules/java/hints/introduce/FlowTest.java |  49 +++
 java/java.lsp.server/script/etc/nbcode.conf|   2 +-
 .../server/debugging/launch/NbLaunchDelegate.java  | 155 ++---
 .../server/protocol/NbCodeClientCapabilities.java  |  87 +
 .../lsp/server/protocol/NbCodeClientWrapper.java   | 120 +++
 .../lsp/server/protocol/NbCodeLanguageClient.java  |  49 +++
 .../modules/java/lsp/server/protocol/Server.java   |  83 -
 .../server/protocol/ShowStatusMessageParams.java   |  78 +
 .../server/protocol/TextDocumentServiceImpl.java   |  59 +++-
 .../lsp/server/protocol/WorkspaceServiceImpl.java  |  33 +-
 .../lsp/server/protocol/WorkspaceUIContext.java|  62 
 .../lsp/server/ui/AbstractLspStatusDisplayer.java  |   5 +-
 .../modules/java/lsp/server/ui/UIContext.java  |  15 +
 .../java/lsp/server/protocol/ServerTest.java   | 236 +++---
 java/java.lsp.server/vscode/package.json   |   7 +-
 java/java.lsp.server/vscode/src/extension.ts   |  51 ++-
 java/java.lsp.server/vscode/src/nbcode.ts  |   4 +
 .../java.lsp.server/vscode/src/protocol.ts |  47 +--
 .../java/stackanalyzer/StackLineAnalyser.java  |  21 +-
 .../java/stackanalyzer/StackLineAnalyserTest.java  |   8 +
 .../netbeans/api/java/source/TreeUtilities.java|   5 +-
 .../netbeans/modules/java/source/TreeShims.java|  25 ++
 .../java/source/parsing/CompilationInfoImpl.java   |   8 +-
 .../java/source/parsing/OutputFileManager.java |  48 ++-
 .../parsing/WriteArbitraryClassFileAPTest.java | 269 
 java/javadoc/nbproject/project.xml |  47 +--
 .../netbeans/modules/javadoc/hints/Analyzer.java   |  46 ++-
 .../netbeans/modules/maven/ActionProviderImpl.java |   6 +-
 .../netbeans/modules/maven/NbMavenProjectImpl.java |   7 +-
 .../netbeans/modules/maven/api/NbMavenProject.java |   5 +-
 .../maven/execute/MavenCommandLineExecutor.java|  19 +-
 .../modules/maven/runjar/RunJarPrereqChecker.java  |  60 +++-
 .../maven/runjar/RunJarPrereqCheckerTest.java  | 134 
 .../org/netbeans/nbbuild/extlibs/ignored-overlaps  |  24 +-
 .../src/org/openide/text/DataEditorSupport.java|  18 +-
 66 files changed, 2621 insertions(+), 452 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