JaroslavTulach opened a new pull request #2626:
URL: https://github.com/apache/netbeans/pull/2626
Here is my attempt to backport fixes made in `master` since 12.2 onto
`release122` branch. I have executed following script:
```bash
#!/bin/bash
git log -r 12.2...origin/master java/java.lsp.server/ | grep commit | cut -f
2 -d " " | while read X; do
git show $X --oneline | head -n 1
done
```
to generate all commits that touch `java/java.lsp.server` folder. Then I
commented few merges out and got:
```
2ad9135514d0 Fixing typo in licenseinfo.xml.
e1ceda7c0c9d Licenseinfo for templates added.
0c290b4d9703 Generate Overrride method puts in misleading comment - fixed.
5aca5b2cc57b Make CreateElement fixes available as LSP CodeActions.
ca08952ef45f LSP: Hoover the mouse over identifier shows JavaDoc. (#2601)
b6104f59cea7 Existing CodeGenerators exposed as CodeActions via LSP. (#2587)
c9dc923f39d6 Disable 7th and 8th stage of Maven compilation test in
VSNetBeans. It started to fail for unknown reason after integration.
637c7c232c97 Merge pull request #2576 from JaroslavTulach/jtulach/RobustCLI
2b9979d61e58 Merge pull request #2574 from
entlicher/CorrectJavaScriptMIMEType
1e18b08852f8 VSCode: Auto import of types on code completion. (#2571)
ad38e1d7b0c7 Avoid 'Apache NetBeans Language Server not enabled\!' by
ignoring StdErr when looking for match
b9049ee49c69 Inform VSCode that application/javascript is also a MIME type
of JavaScript.
d01392798985 Merge pull request #2572 from entlicher/TruffleSourcesFromString
053312430951 First attempt for Java getter/setter generator for the Java LSP
server.
5870c7e78f2b Display sources loaded from String and find their MIME type.
#b9a3bfb5f348 Snapshot of APIs for 12.2 (#2504)
887f6b6446a6 Merge pull request #2554 from jlahoda/fix-java.lsp.server-tests
eb4ee48877a2 Merge pull request #2549 from JaroslavTulach/TestVSCode
1c7145c144b3 Wait for build to be over before completing actions's
CompletableFuture
923704569822 Wait for LanguageClient to get started before running
java.compile.workspace command
234392d4fc12 Use ant -f java/java.lsp.server test-vscode-ext to execute
integration tests for VSNetBeans
bcdd20ffaa5d Provide shorter evaluation error, without the unneccessary
prefix.
a3101ebbb48e Fixing java/java.lsp.server tests.
#32e634b916e4 Merge NetBeans 12.2-rc3 changes to master
#b423c37f2d22 Turning on lexer.nbbridge enables Go to declaration in VSCode
c954f48dbad0 Adding support for workspace/symbol to both the LSP client and
Java LSP server.
#c9d7ae811cdb Merge Apache NetBeans 12.2-rc2 changes
#54987ffb73ae Merging Apache NetBeans 12.2-rc1 changes to master.
0008febcb7c0 Enable limited DialogDisplayer emulation over LSP.
#9d6b92085dfe Merge Apache NetBeans 12.2-beta3 changes to master
#3a2cad159a2a Merge NetBeans 12.2-beta1 -> NetBeans 12.2-beta2 changes to
master form the delivery branch.
#1104ec1d4832 Version bump for 12.3
```
then I applied the changes using this script:
```bash
#!/bin/bash
tac out | grep -v ^# | while read C M; do
echo $C $M
git show $C | patch -p1
find . | grep rej$ | xargs rm
git add .
git status
git commit -m "Backport of $C: $M"
done
```
after doing all of that the content of `java/java.lsp.server` is quite
similar to its state in `master` branch (except version information):
```bash
netbeans$ git diff -r origin/master java/java.lsp.server/ | grep ^diff
diff --git
a/java/java.lsp.server/nbproject/org-netbeans-modules-java-lsp-server.sig
b/java/java.lsp.server/nbproject/org-netbeans-modules-java-lsp-server.sig
diff --git a/java/java.lsp.server/nbproject/project.properties
b/java/java.lsp.server/nbproject/project.properties
diff --git a/java/java.lsp.server/vscode/package.json
b/java/java.lsp.server/vscode/package.json
```
Let's see if everything builds OK. Guys, please verify your changes are in.
@lkishalmi please confirm it is OK to merge into `release122` - I have seen it
was OK when producing `12.0-u1`, so hopefully it is OK to continue pushing to
`release122` as well.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
