You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2021/05/03 09:18:24 UTC

[netbeans] 01/01: Merge pull request #2926 from apache/delivery

This is an automated email from the ASF dual-hosted git repository.

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

commit 1dffe6bd95113b8b0af5fc647d287b681e525311
Merge: f75348c 4cf8454
Author: Geertjan Wielenga <ge...@apache.org>
AuthorDate: Mon May 3 11:18:07 2021 +0200

    Merge pull request #2926 from apache/delivery
    
    Sync delivery to master after 12.4 rc2

 .../cpplite/debugger/CPPLiteActionsProvider.java   |   2 +-
 .../modules/cpplite/debugger/CPPLiteDebugger.java  |  21 +-
 .../debugger/ni/NIDebuggerProviderImpl.java        |  59 +-
 .../modules/gradle/GradleModuleFileCache21.java    |  17 +-
 .../gradle/GradleModuleFileCache21Test.java        |  60 ++
 ide/libs.flexmark/external/binaries-list           |   2 +
 .../external/flexmark-0.50.36-license.txt          |   2 +-
 ide/libs.flexmark/nbproject/project.properties     |   2 +
 ide/libs.flexmark/nbproject/project.xml            |   8 +
 .../netbeans/modules/lsp/client/LSPBindings.java   |   2 +-
 .../project/ui/SimpleTargetChooserPanelGUI.java    |   2 +-
 .../jpda/truffle/access/TruffleAccess.java         |  18 +-
 .../jpda/truffle/source/SourceFilesCache.java      |  13 +-
 .../gradle/java/GradleJavaTokenProvider.java       |  12 +-
 .../gradle/java/queries/FileBuiltQueryImpl.java    |  18 +-
 .../java/completion/JavaCompletionTask.java        |  20 +-
 .../editor/java/JavaCompletionCollector.java       | 963 ++++++++++++++++++---
 .../modules/editor/java/JavaCompletionItem.java    |  13 +-
 .../java/editor/overridden/ElementDescription.java |   4 +
 .../modules/java/lsp/server/ConnectionSpec.java    |  44 +-
 .../modules/java/lsp/server/LspArgsProcessor.java  |   9 +-
 .../modules/java/lsp/server/LspSession.java        | 127 +++
 .../lsp/server/debugging/DebugAdapterContext.java  |   9 +-
 .../java/lsp/server/debugging/Debugger.java        |  21 +-
 .../lsp/server/debugging/NbProtocolServer.java     |  15 +-
 .../server/debugging/launch/NbLaunchDelegate.java  |  70 +-
 .../java/lsp/server/protocol/NbLspServer.java      |  60 ++
 .../modules/java/lsp/server/protocol/Server.java   |  18 +-
 .../server/protocol/TextDocumentServiceImpl.java   |  99 ++-
 .../lsp/server/protocol/WorkspaceServiceImpl.java  |   2 +-
 .../java/lsp/server/ConnectionSpecTest.java        |  68 +-
 .../java/lsp/server/protocol/ServerTest.java       |   5 +-
 java/java.lsp.server/vscode/package-lock.json      |   8 +-
 java/java.lsp.server/vscode/package.json           |   7 +
 java/java.lsp.server/vscode/src/extension.ts       |  12 +-
 .../java/mx/project/SuiteActionProvider.java       | 100 ++-
 .../java/mx/project/SuiteActionProviderTest.java   |  98 +++
 .../nativeimage/debugger/api/NIDebugRunner.java    |  43 +-
 .../java/source/indexing/VanillaCompileWorker.java |   1 +
 .../source/indexing/CompileWorkerTestBase.java     |  30 +-
 .../source/indexing/VanillaCompileWorkerTest.java  |  43 +
 .../netbeans/api/java/source/ui/ElementOpen.java   |  32 +-
 .../filebasedfs/fileobjects/BaseFileObj.java       |   8 +-
 .../filebasedfs/fileobjects/FolderObjTest.java     |   8 +
 .../src/org/openide/filesystems/FileObject.java    |  18 +-
 .../org/openide/filesystems/FileObjectTestHid.java |  81 +-
 46 files changed, 1890 insertions(+), 384 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists