This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 8d1b804287e8b98822e623d0ee27c7a377d7d856
Merge: f8bc196 3819880
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Thu Feb 4 18:35:58 2021 +0000
Merge pull request #2716 from apache/delivery
Sync delivery to master after 12.3-beta2
.../ide/ergonomics/fod/FeatureProjectFactory.java | 2 +
.../ergonomics/fod/FeatureProjectFactoryTest.java | 14 +++++
.../main/StandardPropertiesHelpResolver.java | 22 +------
.../editor/api/completion/HtmlCompletionItem.java | 64 +++++++++----------
.../web/common/ui/api/FileReferenceCompletion.java | 3 +-
.../debugger/jpda/truffle/TruffleDebugManager.java | 2 +-
.../jpda/truffle/access/TruffleAccess.java | 25 ++++++--
.../debugger/jpda/truffle/access/TruffleEval.java | 16 ++++-
.../jpda/truffle/actions/StepActionProvider.java | 5 ++
.../jpda/truffle/frames/TruffleStackFrame.java | 12 +++-
.../jpda/truffle/frames/TruffleStackInfo.java | 11 +++-
.../models/DebuggingTruffleActionsProvider.java | 16 ++++-
.../frames/models/DebuggingTruffleNodeModel.java | 30 +++++++--
.../frames/models/DebuggingTruffleTreeModel.java | 17 ++++-
.../truffle/vars/impl/TruffleVariableImpl.java | 33 +++++-----
.../TruffleVariablesActionsProviderFilter.java | 13 ++--
.../truffle/vars/tooltip/ToolTipAnnotation.java | 6 +-
.../jpda/backend/truffle/JPDATruffleAccessor.java | 32 ++++++++--
.../models/DebuggingTreeExpansionModelFilter.java | 8 +++
.../debugger/jpda/ui/models/WatchesModel.java | 9 +--
.../jpda/expr/InvocationExceptionTranslated.java | 72 +++++++++++++++++++---
.../debugger/jpda/models/AbstractVariable.java | 28 +++++----
java/java.lsp.server/build.xml | 1 +
java/java.lsp.server/vscode/src/extension.ts | 37 +++++++----
platform/libs.flatlaf/external/binaries-list | 2 +-
...rc1-license.txt => flatlaf-1.0-rc2-license.txt} | 4 +-
.../nbproject/org-netbeans-libs-flatlaf.sig | 3 +
platform/libs.flatlaf/nbproject/project.properties | 2 +-
platform/libs.flatlaf/nbproject/project.xml | 4 +-
29 files changed, 350 insertions(+), 143 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
