You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2020/08/24 14:09:43 UTC
[netbeans] 01/01: Merge pull request #2330 from apache/master
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release121
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit cade25887c5450e4595fa59e616daee4d2520ee0
Merge: 26e6ce8 35c4357
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Mon Aug 24 15:09:25 2020 +0100
Merge pull request #2330 from apache/master
Sync master to release121 for 12.1-beta4
.../editor/search/SearchComboBoxEditor.java | 21 +-
.../debugger/ui/DebuggerManagerListener.java | 5 +
java/debugger.jpda.truffle/manifest.mf | 1 +
java/debugger.jpda.truffle/nbproject/project.xml | 6 -
java/java.lsp.server/build.xml | 1 +
java/java.lsp.server/licenseinfo.xml | 9 +
.../script/etc/nb-java-lsp-server.conf | 2 +-
java/java.lsp.server/vscode/.eslintrc.json | 19 +
.../java.lsp.server/vscode/.vscode/extensions.json | 7 +
java/java.lsp.server/vscode/.vscode/launch.json | 36 +
java/java.lsp.server/vscode/.vscode/settings.json | 11 +
java/java.lsp.server/vscode/.vscode/tasks.json | 20 +
java/java.lsp.server/vscode/.vscodeignore | 10 +
java/java.lsp.server/vscode/README.md | 50 +-
java/java.lsp.server/vscode/package-lock.json | 1160 +++++++++++++-------
java/java.lsp.server/vscode/package.json | 60 +-
java/java.lsp.server/vscode/src/extension.ts | 148 ++-
java/java.lsp.server/vscode/src/test/runTest.ts | 23 +
.../vscode/src/test/suite/extension.test.ts | 15 +
.../java.lsp.server/vscode/src/test/suite/index.ts | 38 +
java/java.lsp.server/vscode/tsconfig.json | 21 +-
.../modules/maven/api/execute/RunUtils.java | 45 +-
.../maven/execute/cmd/ExecutionEventObject.java | 33 +-
nbbuild/build.xml | 17 +-
.../netbeans/prepare/bundles/PrepareBundles.java | 21 +-
.../netbeans/prepare/bundles/esprima-4.0.1-license | 21 +
.../org/netbeans/prepare/bundles/has-1.0.3-license | 22 +
.../core/windows/services/DialogDisplayerImpl.java | 3 +
.../swing/laf/flatlaf/FlatDarkLaf.properties | 2 +-
.../swing/laf/flatlaf/FlatLightLaf.properties | 3 +
30 files changed, 1283 insertions(+), 547 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