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

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

commit 321d779a21b1cc303f043f87d3ed7b5e4186ee7c
Merge: d77f069 c9af6ea
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Tue Jan 25 16:14:34 2022 +0000

    Merge pull request #3483 from apache/delivery
    
    Sync delivery to release130 for 13-rc2

 .gitignore                                         |  1 +
 README.md                                          |  5 +-
 ergonomics/ide.ergonomics/javafx.properties        |  3 -
 .../modules/gradle/ActionProviderImpl.java         |  3 +-
 .../gradle/loaders/AbstractProjectLoader.java      |  2 +-
 .../gradle/spi/newproject/TemplateOperation.java   | 40 +++++----
 .../netbeans/modules/lsp/client/LSPBindings.java   | 13 +++
 .../client/bindings/CompletionProviderImpl.java    |  6 +-
 .../lsp/client/bindings/SemanticHighlight.java     | 73 ++++++----------
 .../textmate/lexer/resources/fontsColors.xml       |  2 +
 .../modules/java/hints/OrganizeImports.java        |  1 +
 .../netbeans/modules/java/lsp/server/Utils.java    |  4 +
 .../server/protocol/TextDocumentServiceImpl.java   |  7 +-
 .../java/lsp/server/protocol/ServerTest.java       | 99 +++++++++++++++++++++-
 java/maven.embedder/external/binariesembedded-list |  4 +-
 .../netbeans/nbbuild/ReleaseJsonProperties.java    |  2 +-
 nbbuild/build.xml                                  | 85 +++++++++++++------
 nbbuild/rat-exclusions.txt                         |  1 +
 .../netbeans/modules/search/BasicSearchForm.java   | 19 ++++-
 .../modules/search/BasicSearchProvider.java        |  3 +-
 .../org/netbeans/modules/search/Bundle.properties  |  1 +
 .../netbeans/modules/search/PatternSandbox.java    |  2 +-
 .../search/matcher/BufferedCharSequence.java       |  2 +-
 .../modules/search/ui/ShorteningCellRenderer.java  |  2 +-
 24 files changed, 267 insertions(+), 113 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

Reply via email to