You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2020/01/15 04:21:20 UTC
[netbeans] branch master updated: Various fixes for the LSP client.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 14b801d Various fixes for the LSP client.
14b801d is described below
commit 14b801dbc92579d84f97548a2aa553138dbf2b8e
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Wed Jan 15 05:21:13 2020 +0100
Various fixes for the LSP client.
---
ide/c.google.gson/external/binaries-list | 2 +-
...on-2.8.4-license.txt => gson-2.8.5-license.txt} | 2 +-
ide/c.google.gson/nbproject/project.properties | 2 +-
ide/c.google.gson/nbproject/project.xml | 2 +-
ide/lsp.client/external/binaries-list | 12 +--
ide/lsp.client/external/lsp4j-0.7.0-license.txt | 73 ----------------
ide/lsp.client/external/lsp4j-0.8.1-license.txt | 94 ++++++++++++++++++++
ide/lsp.client/external/lsp4j-0.8.1-p1-license.txt | 94 ++++++++++++++++++++
...2.14.0-license.txt => xtend-2.18.0-license.txt} | 4 +-
ide/lsp.client/nbproject/project.properties | 12 +--
ide/lsp.client/nbproject/project.xml | 24 ++---
.../netbeans/modules/lsp/client/LSPBindings.java | 3 +
.../src/org/netbeans/modules/lsp/client/Utils.java | 27 ++++++
.../lsp/client/bindings/HyperlinkProviderImpl.java | 21 +----
.../modules/lsp/client/bindings/Icons.java | 4 +
.../lsp/client/bindings/MarkOccurrences.java | 4 +
.../lsp/client/bindings/NavigatorPanelImpl.java | 97 +++++++++++++++------
.../modules/lsp/client/bindings/icons/empty.png | Bin 0 -> 157 bytes
18 files changed, 326 insertions(+), 151 deletions(-)
diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/external/binaries-list
index 06974da..3aef65d 100644
--- a/ide/c.google.gson/external/binaries-list
+++ b/ide/c.google.gson/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-D0DE1CA9B69E69D1D497EE3C6009D015F64DAD57 com.google.code.gson:gson:2.8.4
+F645ED69D595B24D4CF8B3FBB64CC505BEDE8829 com.google.code.gson:gson:2.8.5
diff --git a/ide/c.google.gson/external/gson-2.8.4-license.txt b/ide/c.google.gson/external/gson-2.8.5-license.txt
similarity index 99%
rename from ide/c.google.gson/external/gson-2.8.4-license.txt
rename to ide/c.google.gson/external/gson-2.8.5-license.txt
index ac9e002..4485fea 100644
--- a/ide/c.google.gson/external/gson-2.8.4-license.txt
+++ b/ide/c.google.gson/external/gson-2.8.5-license.txt
@@ -1,7 +1,7 @@
Name: GSon
Description: JSon serialization/deserialization library
Origin: GitHub
-Version: 2.8.4
+Version: 2.8.5
License: Apache-2.0
Apache License
diff --git a/ide/c.google.gson/nbproject/project.properties b/ide/c.google.gson/nbproject/project.properties
index d2e8d54..3d88bdf 100644
--- a/ide/c.google.gson/nbproject/project.properties
+++ b/ide/c.google.gson/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/gson-2.8.4.jar=modules/com-google-gson.jar
+release.external/gson-2.8.5.jar=modules/com-google-gson.jar
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
diff --git a/ide/c.google.gson/nbproject/project.xml b/ide/c.google.gson/nbproject/project.xml
index 919c9fe..ba0c2f7 100644
--- a/ide/c.google.gson/nbproject/project.xml
+++ b/ide/c.google.gson/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>com-google-gson.jar</runtime-relative-path>
- <binary-origin>external/gson-2.8.4.jar</binary-origin>
+ <binary-origin>external/gson-2.8.5.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/ide/lsp.client/external/binaries-list b/ide/lsp.client/external/binaries-list
index 1779fd7..dae32bf 100644
--- a/ide/lsp.client/external/binaries-list
+++ b/ide/lsp.client/external/binaries-list
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-22FA797D3E83E92ABBA55D1020DECFB6FC7454BA org.eclipse.lsp4j:org.eclipse.lsp4j:0.7.0
-D5DA405216BFF241A78DDA7F44F35362E09BBDC2 org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.7.0
-4017EAB62A0845A1D166A1B902AE4EEFCA6594EB org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.7.0
-56459301B64C92BBBB6E13988B91CDBE1FC6264E org.eclipse.xtend:org.eclipse.xtend.lib:2.14.0
-F2FCA7A70C8A29374E79487417CEFB5F51A84867 org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.14.0
-C40FFE7E5E6244DD094AE95009AA45072C629254 org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.14.0
+7C6F663CCE381A3498D676F080B79E33F4D4761C org.eclipse.lsp4j-0.8.1-p1.jar
+A9BC24A06267C6495439A4D998FCD49899399384 org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.8.1
+4535BD0485FC3E6867B7D5CE0C74E7E7274A3CA4 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.8.1
+C33EA2BD646E28DE06DF4695142A237C1237CCBC org.eclipse.xtend:org.eclipse.xtend.lib:2.18.0
+AD3EC3339240D8CC24A4B8F3549B559AC3BC7CDD org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.18.0
+BA7AFE66B8FC19CCE0C2DA203C56291DA74D410E org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.18.0
diff --git a/ide/lsp.client/external/lsp4j-0.7.0-license.txt b/ide/lsp.client/external/lsp4j-0.7.0-license.txt
deleted file mode 100644
index 1cff7fa..0000000
--- a/ide/lsp.client/external/lsp4j-0.7.0-license.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Name: Eclipse Language Server Protocol Library
-Origin: Eclipse
-Version: 0.7.0
-License: EPL-v10
-URL: http://www.eclipse.org/
-Description: Eclipse Language Server Protocol Library
-Files: org.eclipse.lsp4j-0.7.0.jar org.eclipse.lsp4j.generator-0.7.0.jar org.eclipse.lsp4j.jsonrpc-0.7.0.jar
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-"Program" means the Contributions distributed in accordance with this Agreement.
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contributio [...]
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Con [...]
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Ag [...]
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF [...]
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/ide/lsp.client/external/lsp4j-0.8.1-license.txt b/ide/lsp.client/external/lsp4j-0.8.1-license.txt
new file mode 100644
index 0000000..1193c3b
--- /dev/null
+++ b/ide/lsp.client/external/lsp4j-0.8.1-license.txt
@@ -0,0 +1,94 @@
+Name: Eclipse Language Server Protocol Library
+Origin: Eclipse
+Version: 0.8.1
+License: EPL-v20
+URL: http://www.eclipse.org/
+Description: Eclipse Language Server Protocol Library
+Files: org.eclipse.lsp4j.generator-0.8.1.jar org.eclipse.lsp4j.jsonrpc-0.8.1.jar
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/ide/lsp.client/external/lsp4j-0.8.1-p1-license.txt b/ide/lsp.client/external/lsp4j-0.8.1-p1-license.txt
new file mode 100644
index 0000000..f7c6a02
--- /dev/null
+++ b/ide/lsp.client/external/lsp4j-0.8.1-p1-license.txt
@@ -0,0 +1,94 @@
+Name: Eclipse Language Server Protocol Library
+Origin: Eclipse
+Version: 0.8.1-p1
+License: EPL-v20
+URL: http://www.eclipse.org/
+Description: Eclipse Language Server Protocol Library
+Files: org.eclipse.lsp4j-0.8.1-p1.jar
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/ide/lsp.client/external/xtend-2.14.0-license.txt b/ide/lsp.client/external/xtend-2.18.0-license.txt
similarity index 98%
rename from ide/lsp.client/external/xtend-2.14.0-license.txt
rename to ide/lsp.client/external/xtend-2.18.0-license.txt
index 2158078..19b947d 100644
--- a/ide/lsp.client/external/xtend-2.14.0-license.txt
+++ b/ide/lsp.client/external/xtend-2.18.0-license.txt
@@ -1,10 +1,10 @@
Name: Eclipse Xtend library
Origin: Eclipse
-Version: 2.14.0
+Version: 2.18.0
License: EPL-v10
URL: http://www.eclipse.org/
Description: Eclipse Xtend library
-Files: org.eclipse.xtend.lib-2.14.0.jar org.eclipse.xtend.lib.macro-2.14.0.jar org.eclipse.xtext.xbase.lib-2.14.0.jar
+Files: org.eclipse.xtend.lib-2.18.0.jar org.eclipse.xtend.lib.macro-2.18.0.jar org.eclipse.xtext.xbase.lib-2.18.0.jar
Eclipse Public License - v 1.0
diff --git a/ide/lsp.client/nbproject/project.properties b/ide/lsp.client/nbproject/project.properties
index 88f0a84..19ce1ed 100644
--- a/ide/lsp.client/nbproject/project.properties
+++ b/ide/lsp.client/nbproject/project.properties
@@ -18,10 +18,10 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
-release.external/org.eclipse.lsp4j-0.7.0.jar=modules/ext/org.eclipse.lsp4j-0.7.0.jar
-release.external/org.eclipse.lsp4j.generator-0.7.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.7.0.jar
-release.external/org.eclipse.lsp4j.jsonrpc-0.7.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.7.0.jar
-release.external/org.eclipse.xtend.lib-2.14.0.jar=modules/ext/org.eclipse.xtend.lib-2.14.0.jar
-release.external/org.eclipse.xtend.lib.macro-2.14.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.14.0.jar
-release.external/org.eclipse.xtext.xbase.lib-2.14.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.14.0.jar
+release.external/org.eclipse.lsp4j-0.8.1-p1.jar=modules/ext/org.eclipse.lsp4j-0.8.1-p1.jar
+release.external/org.eclipse.lsp4j.generator-0.8.1.jar=modules/ext/org.eclipse.lsp4j.generator-0.8.1.jar
+release.external/org.eclipse.lsp4j.jsonrpc-0.8.1.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.8.1.jar
+release.external/org.eclipse.xtend.lib-2.18.0.jar=modules/ext/org.eclipse.xtend.lib-2.18.0.jar
+release.external/org.eclipse.xtend.lib.macro-2.18.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.18.0.jar
+release.external/org.eclipse.xtext.xbase.lib-2.18.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.18.0.jar
spec.version.base=1.4
diff --git a/ide/lsp.client/nbproject/project.xml b/ide/lsp.client/nbproject/project.xml
index de8dd35..4baad62 100644
--- a/ide/lsp.client/nbproject/project.xml
+++ b/ide/lsp.client/nbproject/project.xml
@@ -354,28 +354,28 @@
<package>org.netbeans.modules.lsp.client.spi</package>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/org.eclipse.lsp4j-0.7.0.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.lsp4j-0.7.0.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.lsp4j-0.8.1-p1.jar</runtime-relative-path>
+ <binary-origin>external/org.eclipse.lsp4j-0.8.1-p1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/org.eclipse.xtend.lib.macro-2.14.0.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.xtend.lib.macro-2.14.0.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.xtend.lib.macro-2.18.0.jar</runtime-relative-path>
+ <binary-origin>external/org.eclipse.xtend.lib.macro-2.18.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/org.eclipse.lsp4j.generator-0.7.0.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.lsp4j.generator-0.7.0.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.lsp4j.generator-0.8.1.jar</runtime-relative-path>
+ <binary-origin>external/org.eclipse.lsp4j.generator-0.8.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/org.eclipse.xtend.lib-2.14.0.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.xtend.lib-2.14.0.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.xtend.lib-2.18.0.jar</runtime-relative-path>
+ <binary-origin>external/org.eclipse.xtend.lib-2.18.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/org.eclipse.xtext.xbase.lib-2.14.0.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.xtext.xbase.lib-2.14.0.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.xtext.xbase.lib-2.18.0.jar</runtime-relative-path>
+ <binary-origin>external/org.eclipse.xtext.xbase.lib-2.18.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc-0.7.0.jar</runtime-relative-path>
- <binary-origin>external/org.eclipse.lsp4j.jsonrpc-0.7.0.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc-0.8.1.jar</runtime-relative-path>
+ <binary-origin>external/org.eclipse.lsp4j.jsonrpc-0.8.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
index 1917646..e3a2ca1 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
@@ -45,6 +45,8 @@ import org.eclipse.lsp4j.InitializeParams;
import org.eclipse.lsp4j.InitializeResult;
import org.eclipse.lsp4j.ResourceOperationKind;
import org.eclipse.lsp4j.ServerCapabilities;
+import org.eclipse.lsp4j.SymbolKind;
+import org.eclipse.lsp4j.SymbolKindCapabilities;
import org.eclipse.lsp4j.TextDocumentClientCapabilities;
import org.eclipse.lsp4j.WorkspaceClientCapabilities;
import org.eclipse.lsp4j.WorkspaceEditCapabilities;
@@ -194,6 +196,7 @@ public class LSPBindings {
TextDocumentClientCapabilities tdcc = new TextDocumentClientCapabilities();
DocumentSymbolCapabilities dsc = new DocumentSymbolCapabilities();
dsc.setHierarchicalDocumentSymbolSupport(true);
+ dsc.setSymbolKind(new SymbolKindCapabilities(Arrays.asList(SymbolKind.values())));
tdcc.setDocumentSymbol(dsc);
WorkspaceClientCapabilities wcc = new WorkspaceClientCapabilities();
wcc.setWorkspaceEdit(new WorkspaceEditCapabilities());
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java
index bb1d873..c67722b 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java
@@ -20,12 +20,14 @@ package org.netbeans.modules.lsp.client;
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
+import javax.swing.SwingUtilities;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.StyledDocument;
@@ -48,11 +50,13 @@ import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
import org.netbeans.modules.editor.indent.api.IndentUtils;
import org.openide.cookies.EditorCookie;
+import org.openide.cookies.LineCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
+import org.openide.text.Line;
import org.openide.text.NbDocument;
import org.openide.util.Exceptions;
@@ -220,4 +224,27 @@ public class Utils {
}
return edits;
}
+
+ public static void open(String targetUri, Range targetRange) {
+ try {
+ URI target = URI.create(targetUri);
+ FileObject targetFile = URLMapper.findFileObject(target.toURL());
+
+ if (targetFile != null) {
+ LineCookie lc = targetFile.getLookup().lookup(LineCookie.class);
+
+ //TODO: expecting lc != null!
+
+ Line line = lc.getLineSet().getCurrent(targetRange.getStart().getLine());
+
+ SwingUtilities.invokeLater(() ->
+ line.show(Line.ShowOpenType.OPEN, Line.ShowVisibilityType.FOCUS, targetRange.getStart().getCharacter())
+ );
+ } else {
+ //TODO: beep
+ }
+ } catch (MalformedURLException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
}
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/HyperlinkProviderImpl.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/HyperlinkProviderImpl.java
index e427a89..c652743 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/HyperlinkProviderImpl.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/HyperlinkProviderImpl.java
@@ -118,26 +118,7 @@ public class HyperlinkProviderImpl implements HyperlinkProviderExt {
} else {
return null;
}
- try {
- URI target = URI.create(targetUri);
- FileObject targetFile = URLMapper.findFileObject(target.toURL());
-
- if (targetFile != null) {
- LineCookie lc = targetFile.getLookup().lookup(LineCookie.class);
-
- //TODO: expecting lc != null!
-
- Line line = lc.getLineSet().getCurrent(targetRange.getStart().getLine());
-
- SwingUtilities.invokeLater(() ->
- line.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS, targetRange.getStart().getCharacter())
- );
- } else {
- //TODO: beep
- }
- } catch (MalformedURLException ex) {
- Exceptions.printStackTrace(ex);
- }
+ Utils.open(targetUri, targetRange);
return null;
}).get();
} catch (BadLocationException ex) {
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Icons.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Icons.java
index d254334..6570b06 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Icons.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Icons.java
@@ -61,6 +61,10 @@ public final class Icons {
}
public static String getSymbolIconBase(SymbolKind symbolKind) {
+ if (symbolKind == null) {
+ return ICON_BASE + "empty.png";
+ }
+
for (String variant : new String[] {
ICON_BASE + symbolKind.name().toLowerCase(Locale.US) + PNG_EXTENSION,
ICON_BASE + symbolKind.name().toLowerCase(Locale.US) + GIF_EXTENSION,
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/MarkOccurrences.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/MarkOccurrences.java
index 4e83557..5ba0ea6 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/MarkOccurrences.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/MarkOccurrences.java
@@ -93,6 +93,10 @@ public class MarkOccurrences implements BackgroundTask, CaretListener, PropertyC
if (server == null) {
return result;
}
+ Boolean hasDocumentHighlight = server.getInitResult().getCapabilities().getDocumentHighlightProvider();
+ if (hasDocumentHighlight == null || !hasDocumentHighlight) {
+ return result;
+ }
String uri = Utils.toURI(file);
try {
List<? extends DocumentHighlight> highlights =
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/NavigatorPanelImpl.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/NavigatorPanelImpl.java
index 56c01b9..6c22f2e 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/NavigatorPanelImpl.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/NavigatorPanelImpl.java
@@ -19,17 +19,26 @@
package org.netbeans.modules.lsp.client.bindings;
import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
import java.net.MalformedURLException;
import java.net.URI;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
import javax.swing.JComponent;
import javax.swing.JPanel;
import org.eclipse.lsp4j.DocumentSymbol;
import org.eclipse.lsp4j.DocumentSymbolParams;
+import org.eclipse.lsp4j.Location;
+import org.eclipse.lsp4j.Position;
+import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.SymbolInformation;
+import org.eclipse.lsp4j.SymbolKind;
import org.eclipse.lsp4j.TextDocumentIdentifier;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.netbeans.modules.lsp.client.LSPBindings;
@@ -56,10 +65,11 @@ import org.openide.util.lookup.ServiceProvider;
*/
public class NavigatorPanelImpl extends Children.Keys<Either<SymbolInformation, DocumentSymbol>> implements NavigatorPanel, BackgroundTask, LookupListener {
+ private static final Logger LOG = Logger.getLogger(NavigatorPanelImpl.class.getName());
private static final NavigatorPanelImpl INSTANCE = new NavigatorPanelImpl();
private final ExplorerManager manager;
- private JComponent view;
+ private View view;
private Lookup.Result<FileObject> result;
private FileObject file;
@@ -82,21 +92,6 @@ public class NavigatorPanelImpl extends Children.Keys<Either<SymbolInformation,
@Override
public JComponent getComponent() {
if (view == null) {
- class View extends JPanel implements ExplorerManager.Provider {
-
- public View() {
- setLayout(new BorderLayout());
- BeanTreeView btv = new BeanTreeView();
- add(btv, BorderLayout.CENTER);
-
- btv.setRootVisible(false);
- }
-
- @Override
- public ExplorerManager getExplorerManager() {
- return manager;
- }
- }
view = new View();
}
return view;
@@ -142,17 +137,22 @@ public class NavigatorPanelImpl extends Children.Keys<Either<SymbolInformation,
List<Either<SymbolInformation, DocumentSymbol>> symbols = bindings.getTextDocumentService().documentSymbol(new DocumentSymbolParams(new TextDocumentIdentifier(uri))).get();
setKeys(symbols);
- } catch (InterruptedException | ExecutionException ex) {
- Exceptions.printStackTrace(ex);
+ view.expandAll();
+ } catch (ExecutionException ex) {
+ LOG.log(Level.FINE, null, ex);
+ setKeys(Collections.emptyList());
+ } catch (InterruptedException ex) {
+ //try again:
+ LSPBindings.addBackgroundTask(file, this);
}
} else {
- System.err.println("!!!");
+ //ignore, should be called with the other file eventually.
}
}
@Override
protected Node[] createNodes(Either<SymbolInformation, DocumentSymbol> sym) {
- return new Node[] {new NodeImpl(sym)};
+ return new Node[] {new NodeImpl(Utils.toURI(file), sym)};
}
@Override
@@ -162,14 +162,14 @@ public class NavigatorPanelImpl extends Children.Keys<Either<SymbolInformation,
private static final class NodeImpl extends AbstractNode {
- private static Children createChildren(Either<SymbolInformation, DocumentSymbol> sym) {
+ private static Children createChildren(String currentFileUri, Either<SymbolInformation, DocumentSymbol> sym) {
if (sym.isLeft()) {
return LEAF;
}
- return createChildren(sym.getRight());
+ return createChildren(currentFileUri, sym.getRight());
}
- private static Children createChildren(DocumentSymbol sym) {
+ private static Children createChildren(String currentFileUri, DocumentSymbol sym) {
if (sym.getChildren().isEmpty()) {
return LEAF;
}
@@ -182,7 +182,7 @@ public class NavigatorPanelImpl extends Children.Keys<Either<SymbolInformation,
@Override
protected Node[] createNodes(DocumentSymbol sym) {
return new Node[] {
- new NodeImpl(sym)
+ new NodeImpl(currentFileUri, sym)
};
}
@@ -194,23 +194,64 @@ public class NavigatorPanelImpl extends Children.Keys<Either<SymbolInformation,
};
}
- public NodeImpl(Either<SymbolInformation, DocumentSymbol> symbol) {
- super(createChildren(symbol));
+ private static Action createOpenAction(String uri, Range range) {
+ return new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ Utils.open(uri, range);
+ }
+ };
+ }
+
+ private final Action open;
+
+ public NodeImpl(String currentFileUri, Either<SymbolInformation, DocumentSymbol> symbol) {
+ super(createChildren(currentFileUri, symbol));
if (symbol.isLeft()) {
setDisplayName(symbol.getLeft().getName());
setIconBaseWithExtension(Icons.getSymbolIconBase(symbol.getLeft().getKind()));
+ this.open = createOpenAction(symbol.getLeft().getLocation().getUri(), symbol.getLeft().getLocation().getRange());
} else {
setDisplayName(symbol.getRight().getName());
setIconBaseWithExtension(Icons.getSymbolIconBase(symbol.getRight().getKind()));
+ this.open = createOpenAction(currentFileUri, symbol.getRight().getRange());
}
}
- public NodeImpl(DocumentSymbol symbol) {
- super(createChildren(symbol));
+ public NodeImpl(String currentFileUri, DocumentSymbol symbol) {
+ super(createChildren(currentFileUri, symbol));
setDisplayName(symbol.getName());
setIconBaseWithExtension(Icons.getSymbolIconBase(symbol.getKind()));
+ this.open = createOpenAction(currentFileUri, symbol.getRange());
}
+ @Override
+ public Action getPreferredAction() {
+ return open;
+ }
+
+ }
+
+ private class View extends JPanel implements ExplorerManager.Provider {
+
+ private final BeanTreeView internalView;
+
+ public View() {
+ setLayout(new BorderLayout());
+ this.internalView = new BeanTreeView();
+ add(internalView, BorderLayout.CENTER);
+
+ internalView.setRootVisible(false);
+ }
+
+ @Override
+ public ExplorerManager getExplorerManager() {
+ return manager;
+ }
+
+ public void expandAll() {
+ internalView.expandAll();
+ }
}
@ServiceProvider(service=DynamicRegistration.class)
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/empty.png b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/empty.png
new file mode 100644
index 0000000..c4be7c4
Binary files /dev/null and b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/empty.png differ
---------------------------------------------------------------------
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