diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/external/binaries-list index 3aef65dae49c..26c51c83ca3e 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. -F645ED69D595B24D4CF8B3FBB64CC505BEDE8829 com.google.code.gson:gson:2.8.5 +8A432C1D6825781E21A02DB2E2C33C5FDE2833B9 com.google.code.gson:gson:2.8.9 diff --git a/ide/c.google.gson/external/gson-2.8.5-license.txt b/ide/c.google.gson/external/gson-2.8.9-license.txt similarity index 99% rename from ide/c.google.gson/external/gson-2.8.5-license.txt rename to ide/c.google.gson/external/gson-2.8.9-license.txt index 4485fea77d42..2619e5f7cc1f 100644 --- a/ide/c.google.gson/external/gson-2.8.5-license.txt +++ b/ide/c.google.gson/external/gson-2.8.9-license.txt @@ -1,7 +1,7 @@ Name: GSon Description: JSon serialization/deserialization library Origin: GitHub -Version: 2.8.5 +Version: 2.8.9 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 3d88bdf177e2..8390fb7ebc51 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.5.jar=modules/com-google-gson.jar +release.external/gson-2.8.9.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 ba0c2f73248c..c777eee166c7 100644 --- a/ide/c.google.gson/nbproject/project.xml +++ b/ide/c.google.gson/nbproject/project.xml @@ -28,7 +28,7 @@ com-google-gson.jar - external/gson-2.8.5.jar + external/gson-2.8.9.jar diff --git a/java/java.lsp.server/build.xml b/java/java.lsp.server/build.xml index a88cf6d013f0..6bc4c5c799bf 100644 --- a/java/java.lsp.server/build.xml +++ b/java/java.lsp.server/build.xml @@ -97,9 +97,9 @@ - + - + diff --git a/java/java.lsp.server/external/binaries-list b/java/java.lsp.server/external/binaries-list index 39d428fe4750..a2351eb9039f 100644 --- a/java/java.lsp.server/external/binaries-list +++ b/java/java.lsp.server/external/binaries-list @@ -15,14 +15,14 @@ # specific language governing permissions and limitations # under the License. -271665493A1E35FB4C2D1DBABF19363C8AD27819 org.eclipse.lsp4j:org.eclipse.lsp4j:0.10.0 -18621C63F8D8587C0CC5EEB9CB945E49E9B5C900 org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.10.0 -ED2D6D876578B139AEA24289422435148FEF6B45 org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.10.0 -42CA44A49315A490804A3DED67163123748C1F19 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.10.0 -30A70C7AC5E722F25843669F124CDACA9772B9C8 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.10.0 -751B324BED8C077BF6B7B8C2055595EB8C28509D org.eclipse.xtend:org.eclipse.xtend.lib:2.19.0 -F3626A047A3ABFA47CF62D76BDEF1D246F7985F6 org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.19.0 -997BA9935D0069B3F1CD2F93B56B91D24E9C60A0 org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.19.0 +419B5181A4B2D054BF8FF764FCEB67DF09D87E7D org.eclipse.lsp4j:org.eclipse.lsp4j:0.12.0 +36F085FE35A24CD69A8E3F78F046E91D5DB8F360 org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.12.0 +80607078CEB77F92C6BFEC3CDEC050D3222EFDFF org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.12.0 +8A80D1368F19A2F6E328E41B9BC68E53C628C68B org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.12.0 +FB4B99875D4879475FFFD864E3FE94E4E74BEEC1 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.12.0 +A57306D5D523A4750FA09B2708062EA4972AFEA2 org.eclipse.xtend:org.eclipse.xtend.lib:2.24.0 +D8F5566BA67748ED9E91856E077EE99F00E86653 org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.24.0 +53FBD66084B08850258E61C838CC1FB94335E718 org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.24.0 2852E6E05FBB95076FC091F6D1780F1F8FE35E0F commons-io:commons-io:2.5 9D28A6B23650E8A7E9063C04588ACE6CF7012C17 org.apache.commons:commons-lang3:3.6 diff --git a/java/java.lsp.server/external/lsp4j-0.10.0-license.txt b/java/java.lsp.server/external/lsp4j-0.12.0-license.txt similarity index 98% rename from java/java.lsp.server/external/lsp4j-0.10.0-license.txt rename to java/java.lsp.server/external/lsp4j-0.12.0-license.txt index d90f3165e852..d35270897470 100644 --- a/java/java.lsp.server/external/lsp4j-0.10.0-license.txt +++ b/java/java.lsp.server/external/lsp4j-0.12.0-license.txt @@ -1,10 +1,10 @@ Name: Eclipse Language Server Protocol Library Origin: Eclipse -Version: 0.10.0 +Version: 0.12.0 License: EPL-v20 URL: http://www.eclipse.org/ Description: Eclipse Language Server Protocol Library -Files: org.eclipse.lsp4j-0.10.0.jar org.eclipse.lsp4j.debug-0.10.0.jar org.eclipse.lsp4j.generator-0.10.0.jar org.eclipse.lsp4j.jsonrpc-0.10.0.jar org.eclipse.lsp4j.jsonrpc.debug-0.10.0.jar +Files: org.eclipse.lsp4j-0.12.0.jar org.eclipse.lsp4j.debug-0.12.0.jar org.eclipse.lsp4j.generator-0.12.0.jar org.eclipse.lsp4j.jsonrpc-0.12.0.jar org.eclipse.lsp4j.jsonrpc.debug-0.12.0.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. diff --git a/java/java.lsp.server/external/xtend-2.19.0-license.txt b/java/java.lsp.server/external/xtend-2.19.0-license.txt deleted file mode 100644 index e679f21929ee..000000000000 --- a/java/java.lsp.server/external/xtend-2.19.0-license.txt +++ /dev/null @@ -1,73 +0,0 @@ -Name: Eclipse Xtend library -Origin: Eclipse -Version: 2.19.0 -License: EPL-v10 -URL: http://www.eclipse.org/ -Description: Eclipse Xtend library -Files: org.eclipse.xtend.lib-2.19.0.jar org.eclipse.xtend.lib.macro-2.19.0.jar org.eclipse.xtext.xbase.lib-2.19.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 Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. -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 hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. -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 Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -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 and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -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 Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -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 ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -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 Recipient relating to the Program shall continue and survive. -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 responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. 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. -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/java/java.lsp.server/external/xtend-2.24.0-license.txt b/java/java.lsp.server/external/xtend-2.24.0-license.txt new file mode 100644 index 000000000000..73a8a0cf7803 --- /dev/null +++ b/java/java.lsp.server/external/xtend-2.24.0-license.txt @@ -0,0 +1,94 @@ +Name: Eclipse Xtend library +Origin: Eclipse +Version: 2.24.0 +License: EPL-v20 +URL: http://www.eclipse.org/ +Description: Eclipse Xtend library +Files: org.eclipse.xtend.lib-2.24.0.jar org.eclipse.xtend.lib.macro-2.24.0.jar org.eclipse.xtext.xbase.lib-2.24.0.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 Modified Works thereof. + +“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 causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +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 hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +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 Contributor”) hereby agrees to defend and indemnify every other Contributor (“Indemnified Contributor”) against any losses, damages and costs (collectively “Losses”) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +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 and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +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 associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +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 EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +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 Recipient relating to the Program shall continue and survive. + +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 responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. + +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/java/java.lsp.server/nbproject/project.properties b/java/java.lsp.server/nbproject/project.properties index 4ecf12244306..beffa0cc493a 100644 --- a/java/java.lsp.server/nbproject/project.properties +++ b/java/java.lsp.server/nbproject/project.properties @@ -23,13 +23,13 @@ lsp.build.dir=vscode/nbcode test.unit.run.cp.extra= cp.extra=${tools.jar} -release.external/org.eclipse.lsp4j-0.10.0.jar=modules/ext/org.eclipse.lsp4j-0.10.0.jar -release.external/org.eclipse.lsp4j.debug-0.10.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.10.0.jar -release.external/org.eclipse.lsp4j.generator-0.10.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.10.0.jar -release.external/org.eclipse.lsp4j.jsonrpc-0.10.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.10.0.jar -release.external/org.eclipse.lsp4j.jsonrpc.debug-0.10.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.10.0.jar -release.external/org.eclipse.xtend.lib-2.19.0.jar=modules/ext/org.eclipse.xtend.lib-2.19.0.jar -release.external/org.eclipse.xtend.lib.macro-2.19.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.19.0.jar -release.external/org.eclipse.xtext.xbase.lib-2.19.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.19.0.jar +release.external/org.eclipse.lsp4j-0.12.0.jar=modules/ext/org.eclipse.lsp4j-0.12.0.jar +release.external/org.eclipse.lsp4j.debug-0.12.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.12.0.jar +release.external/org.eclipse.lsp4j.generator-0.12.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.12.0.jar +release.external/org.eclipse.lsp4j.jsonrpc-0.12.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.12.0.jar +release.external/org.eclipse.lsp4j.jsonrpc.debug-0.12.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.12.0.jar +release.external/org.eclipse.xtend.lib-2.24.0.jar=modules/ext/org.eclipse.xtend.lib-2.24.0.jar +release.external/org.eclipse.xtend.lib.macro-2.24.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar +release.external/org.eclipse.xtext.xbase.lib-2.24.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar release.external/commons-io-2.5.jar=modules/ext/commons-io-2.5.jar release.external/commons-lang3-3.6.jar=modules/ext/commons-lang3-3.6.jar diff --git a/java/java.lsp.server/nbproject/project.xml b/java/java.lsp.server/nbproject/project.xml index 37628bdbeb87..ca7b0cdd1c9f 100644 --- a/java/java.lsp.server/nbproject/project.xml +++ b/java/java.lsp.server/nbproject/project.xml @@ -689,36 +689,36 @@ org.netbeans.modules.java.lsp.server.ui - ext/org.eclipse.lsp4j.debug-0.10.0.jar - external/org.eclipse.lsp4j.debug-0.10.0.jar + ext/org.eclipse.lsp4j.debug-0.12.0.jar + external/org.eclipse.lsp4j.debug-0.12.0.jar - ext/org.eclipse.xtend.lib.macro-2.19.0.jar - external/org.eclipse.xtend.lib.macro-2.19.0.jar + ext/org.eclipse.xtend.lib.macro-2.24.0.jar + external/org.eclipse.xtend.lib.macro-2.24.0.jar - ext/org.eclipse.lsp4j.generator-0.10.0.jar - external/org.eclipse.lsp4j.generator-0.10.0.jar + ext/org.eclipse.lsp4j.generator-0.12.0.jar + external/org.eclipse.lsp4j.generator-0.12.0.jar - ext/org.eclipse.lsp4j.jsonrpc-0.10.0.jar - external/org.eclipse.lsp4j.jsonrpc-0.10.0.jar + ext/org.eclipse.lsp4j.jsonrpc-0.12.0.jar + external/org.eclipse.lsp4j.jsonrpc-0.12.0.jar - ext/org.eclipse.lsp4j.jsonrpc.debug-0.10.0.jar - external/org.eclipse.lsp4j.jsonrpc.debug-0.10.0.jar + ext/org.eclipse.lsp4j.jsonrpc.debug-0.12.0.jar + external/org.eclipse.lsp4j.jsonrpc.debug-0.12.0.jar - ext/org.eclipse.xtend.lib-2.19.0.jar - external/org.eclipse.xtend.lib-2.19.0.jar + ext/org.eclipse.xtend.lib-2.24.0.jar + external/org.eclipse.xtend.lib-2.24.0.jar - ext/org.eclipse.xtext.xbase.lib-2.19.0.jar - external/org.eclipse.xtext.xbase.lib-2.19.0.jar + ext/org.eclipse.xtext.xbase.lib-2.24.0.jar + external/org.eclipse.xtext.xbase.lib-2.24.0.jar - ext/org.eclipse.lsp4j-0.10.0.jar - external/org.eclipse.lsp4j-0.10.0.jar + ext/org.eclipse.lsp4j-0.12.0.jar + external/org.eclipse.lsp4j-0.12.0.jar ext/commons-io-2.5.jar diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/LspInternalHandle.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/LspInternalHandle.java index 322a7165816b..cbce53bcce7a 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/LspInternalHandle.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/LspInternalHandle.java @@ -54,7 +54,7 @@ public final class LspInternalHandle extends InternalHandle { */ private final StackTraceElement[] creatorTrace; - private CompletableFuture> tokenPromise; + private CompletableFuture> tokenPromise; private int reportedPercentage; /** @@ -198,7 +198,7 @@ void sendProgress(ProgressEvent e) { notify(report); } - Either token() { + Either token() { if (tokenPromise == null || tokenPromise.isCompletedExceptionally()) { return null; } else { @@ -213,7 +213,7 @@ void sendFinish(ProgressEvent e) { opContext.removeHandle(token(), this); } - CompletableFuture> findProgressToken() { + CompletableFuture> findProgressToken() { if (tokenPromise != null) { return tokenPromise; } @@ -222,12 +222,12 @@ CompletableFuture> findProgressToken() { void notify(WorkDoneProgressNotification msg) { findProgressToken().thenAccept(token -> { - LOG.log(Level.FINER, () -> - MessageFormat.format("Sending progress {0}, msg: {1}", + LOG.log(Level.FINER, () -> + MessageFormat.format("Sending progress {0}, msg: {1}", id(), msg ) ); - ProgressParams param = new ProgressParams(token, msg); + ProgressParams param = new ProgressParams(token, Either.forLeft(msg)); lspClient.notifyProgress(param); }); } diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/OperationContext.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/OperationContext.java index bdd726acc84e..514cf8ab5c9d 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/OperationContext.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/OperationContext.java @@ -67,7 +67,7 @@ public final class OperationContext { * Progress token for reporting progress to the client. The token is valid * for a single ProgressHandle created. */ - private Either progressToken; + private Either progressToken; /** * Token to report partial results to the client. @@ -111,8 +111,8 @@ private TaskModel getTaskModel() { * progress on the client, asking it to issue a token. * @return */ - public synchronized Either acquireProgressToken() { - Either t = progressToken; + public synchronized Either acquireProgressToken() { + Either t = progressToken; progressToken = null; return t; } @@ -126,7 +126,7 @@ public String getPartialResultsToken() { * soon. * @param s */ - public void setProgressToken(Either s) { + public void setProgressToken(Either s) { progressToken = s; } @@ -192,7 +192,7 @@ public boolean isActive() { * @param token token * @return handle instance or {@code null} */ - public InternalHandle findActiveHandle(Either token) { + public InternalHandle findActiveHandle(Either token) { if (top != this) { return top.findActiveHandle(token); } @@ -201,12 +201,12 @@ public InternalHandle findActiveHandle(Either token) { } } - private Either addHandle(Either token, InternalHandle h) { + private Either addHandle(Either token, InternalHandle h) { top.registerHandle(token, h); return token; } - void removeHandle(Either token, LspInternalHandle h) { + void removeHandle(Either token, LspInternalHandle h) { if (top != this) { top.unregisterHandle(token, h); } else { @@ -215,9 +215,9 @@ void removeHandle(Either token, LspInternalHandle h) { notifyHandleFinished(h); } - private Map, InternalHandle> handles = new HashMap<>(); + private Map, InternalHandle> handles = new HashMap<>(); - private synchronized void unregisterHandle(Either token, InternalHandle h) { + private synchronized void unregisterHandle(Either token, InternalHandle h) { if (token == null) { handles.values().remove(h); } else { @@ -225,19 +225,19 @@ private synchronized void unregisterHandle(Either token, Interna } } - private synchronized void registerHandle(Either token, InternalHandle h) { + private synchronized void registerHandle(Either token, InternalHandle h) { handles.put(token, h); } - CompletableFuture> acquireOrObtainToken(InternalHandle h) { - Either t = acquireProgressToken(); + CompletableFuture> acquireOrObtainToken(InternalHandle h) { + Either t = acquireProgressToken(); if (t != null) { return CompletableFuture.completedFuture(addHandle(t, h)); } else { WorkDoneProgressCreateParams params = new WorkDoneProgressCreateParams( Either.forLeft(UUID.randomUUID().toString()) ); - CompletableFuture> tokenPromise = client. + CompletableFuture> tokenPromise = client. createProgress(params).thenApply(v -> params.getToken()); return tokenPromise.thenApply((p) -> { synchronized (this) { diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java index 05520e0ee852..a3989bda9bdf 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java @@ -23,12 +23,15 @@ import org.eclipse.lsp4j.ApplyWorkspaceEditParams; import org.eclipse.lsp4j.ApplyWorkspaceEditResponse; import org.eclipse.lsp4j.ConfigurationParams; +import org.eclipse.lsp4j.LogTraceParams; import org.eclipse.lsp4j.MessageActionItem; import org.eclipse.lsp4j.MessageParams; import org.eclipse.lsp4j.ProgressParams; import org.eclipse.lsp4j.PublishDiagnosticsParams; import org.eclipse.lsp4j.RegistrationParams; -import org.eclipse.lsp4j.SemanticHighlightingParams; +import org.eclipse.lsp4j.SetTraceParams; +import org.eclipse.lsp4j.ShowDocumentParams; +import org.eclipse.lsp4j.ShowDocumentResult; import org.eclipse.lsp4j.ShowMessageRequestParams; import org.eclipse.lsp4j.UnregistrationParams; import org.eclipse.lsp4j.WorkDoneProgressCreateParams; @@ -37,7 +40,7 @@ /** * Convenience wrapper that binds language client's remote proxy together with * other useful methods. Will be sent out as THE client by the server core code. - * + * * @author sdedic */ class NbCodeClientWrapper implements NbCodeLanguageClient { @@ -115,6 +118,11 @@ public CompletableFuture showMessageRequest(ShowMessageReques return remote.showMessageRequest(requestParams); } + @Override + public CompletableFuture showDocument(ShowDocumentParams params) { + return remote.showDocument(params); + } + @Override public void logMessage(MessageParams message) { remote.logMessage(message); @@ -130,11 +138,6 @@ public CompletableFuture> configuration(ConfigurationParams configu return remote.configuration(configurationParams); } - @Override - public void semanticHighlighting(SemanticHighlightingParams params) { - remote.semanticHighlighting(params); - } - @Override public CompletableFuture createProgress(WorkDoneProgressCreateParams params) { return remote.createProgress(params); @@ -159,4 +162,24 @@ public void setTextEditorDecoration(SetTextEditorDecorationParams params) { public void disposeTextEditorDecoration(String params) { remote.disposeTextEditorDecoration(params); } + + @Override + public void logTrace(LogTraceParams params) { + remote.logTrace(params); + } + + @Override + public void setTrace(SetTraceParams params) { + remote.setTrace(params); + } + + @Override + public CompletableFuture refreshSemanticTokens() { + return remote.refreshSemanticTokens(); + } + + @Override + public CompletableFuture refreshCodeLenses() { + return remote.refreshCodeLenses(); + } } diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java index 652c8602fe70..f406c4759d0a 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java @@ -42,6 +42,7 @@ import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; +import com.google.gson.InstanceCreator; import org.eclipse.lsp4j.CodeActionKind; import org.eclipse.lsp4j.CodeActionOptions; import org.eclipse.lsp4j.CodeLensOptions; @@ -55,6 +56,7 @@ import org.eclipse.lsp4j.MessageType; import org.eclipse.lsp4j.PublishDiagnosticsParams; import org.eclipse.lsp4j.RenameOptions; +import org.eclipse.lsp4j.SemanticTokensCapabilities; import org.eclipse.lsp4j.ServerCapabilities; import org.eclipse.lsp4j.ShowMessageRequestParams; import org.eclipse.lsp4j.TextDocumentSyncKind; @@ -137,6 +139,7 @@ public static NbLspServer launchServer(Pair io, LspSe private static Launcher createLauncher(LanguageServerImpl server, Pair io, Function processor) { return new LSPLauncher.Builder() + .configureGson(gb -> gb.registerTypeAdapter(SemanticTokensCapabilities.class, (InstanceCreator) type -> new SemanticTokensCapabilities(false))) .setLocalService(server) .setRemoteInterface(NbCodeLanguageClient.class) .setInput(io.first()) diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java index 7b75f940dfce..faa927df94ce 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java @@ -352,7 +352,7 @@ public CompletableFuture, CompletionList>> completio } org.netbeans.api.lsp.TextEdit edit = completion.getTextEdit(); if (edit != null) { - item.setTextEdit(new TextEdit(new Range(Utils.createPosition(file, edit.getStartOffset()), Utils.createPosition(file, edit.getEndOffset())), edit.getNewText())); + item.setTextEdit(Either.forLeft(new TextEdit(new Range(Utils.createPosition(file, edit.getStartOffset()), Utils.createPosition(file, edit.getEndOffset())), edit.getNewText()))); } if (completion.getAdditionalTextEdits() != null && completion.getAdditionalTextEdits().isDone()) { List additionalTextEdits = completion.getAdditionalTextEdits().getNow(null); diff --git a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java index f1479456cbc6..fbcb3fd6a25e 100644 --- a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java +++ b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java @@ -1231,7 +1231,7 @@ public void logMessage(MessageParams arg0) { serverLauncher.startListening(); LanguageServer server = serverLauncher.getRemoteProxy(); InitializeResult result = server.initialize(new InitializeParams()).get(); - assertTrue(result.getCapabilities().getDocumentHighlightProvider()); + assertTrue(result.getCapabilities().getDocumentHighlightProvider().isLeft() && result.getCapabilities().getDocumentHighlightProvider().getLeft()); server.getTextDocumentService().didOpen(new DidOpenTextDocumentParams(new TextDocumentItem(toURI(src), "java", 0, code))); assertHighlights(server.getTextDocumentService().documentHighlight(new DocumentHighlightParams(new TextDocumentIdentifier(toURI(src)), new Position(1, 13))).get(), ":2:21-2:31", ":3:26-3:35", ":4:13-4:22"); @@ -1281,7 +1281,7 @@ public void logMessage(MessageParams arg0) { serverLauncher.startListening(); LanguageServer server = serverLauncher.getRemoteProxy(); InitializeResult result = server.initialize(new InitializeParams()).get(); - assertTrue(result.getCapabilities().getHoverProvider()); + assertTrue(result.getCapabilities().getHoverProvider().isLeft() && result.getCapabilities().getHoverProvider().getLeft()); server.getTextDocumentService().didOpen(new DidOpenTextDocumentParams(new TextDocumentItem(toURI(src), "java", 0, code))); Hover hover = server.getTextDocumentService().hover(new HoverParams(new TextDocumentIdentifier(toURI(src)), new Position(5, 10))).get(); assertNotNull(hover); @@ -5586,11 +5586,12 @@ class LC extends LspClient { @Override public void notifyProgress(ProgressParams params) { assertEquals(token, params.getToken().getLeft()); - if (params.getValue() instanceof WorkDoneProgressReport) { - WorkDoneProgressReport rep = (WorkDoneProgressReport)params.getValue(); + assertTrue(params.getValue().isLeft()); + if (params.getValue().getLeft() instanceof WorkDoneProgressReport) { + WorkDoneProgressReport rep = (WorkDoneProgressReport)params.getValue().getLeft(); perCent = Math.max(perCent, rep.getPercentage()); } - if (params.getValue().getKind() == WorkDoneProgressKind.end) { + if (params.getValue().getLeft().getKind() == WorkDoneProgressKind.end) { progressEnd.countDown(); } } diff --git a/java/java.lsp.server/vscode/package-lock.json b/java/java.lsp.server/vscode/package-lock.json index 4fd5197a23ec..0ce5eb801417 100644 --- a/java/java.lsp.server/vscode/package-lock.json +++ b/java/java.lsp.server/vscode/package-lock.json @@ -99,8 +99,7 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "binary-extensions": { "version": "2.2.0", @@ -112,7 +111,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -205,8 +203,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "connected-domain": { "version": "1.0.0", @@ -504,11 +501,18 @@ "is-unicode-supported": "^0.1.0" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -692,9 +696,12 @@ "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } }, "serialize-javascript": { "version": "6.0.0", @@ -779,32 +786,33 @@ "integrity": "sha512-nVsfVCat9FZlOso5SYB1LQQiFGifTyOALpkpJdudDlRXGTpI3mSFiDYXWaoFm7UcfqTOzn1SC7Hqw4d89btT0w==" }, "vscode-jsonrpc": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz", - "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==" + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", + "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==" }, "vscode-languageclient": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz", - "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", + "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", "requires": { - "semver": "^6.3.0", - "vscode-languageserver-protocol": "^3.15.3" + "minimatch": "^3.0.4", + "semver": "^7.3.4", + "vscode-languageserver-protocol": "3.16.0" } }, "vscode-languageserver-protocol": { - "version": "3.15.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz", - "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz", + "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==", "requires": { - "vscode-jsonrpc": "^5.0.1", - "vscode-languageserver-types": "3.15.1" + "vscode-jsonrpc": "6.0.0", + "vscode-languageserver-types": "3.16.0" } }, "vscode-languageserver-types": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz", - "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==" + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", + "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" }, "vscode-test": { "version": "1.4.0", @@ -855,6 +863,11 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json index fd73dc308a82..922b68e14015 100644 --- a/java/java.lsp.server/vscode/package.json +++ b/java/java.lsp.server/vscode/package.json @@ -426,6 +426,6 @@ "dependencies": { "jsonc-parser": "3.0.0", "vscode-debugadapter": "1.42.1", - "vscode-languageclient": "6.1.3" + "vscode-languageclient": "7.0.0" } } diff --git a/java/java.lsp.server/vscode/src/extension.ts b/java/java.lsp.server/vscode/src/extension.ts index 1775d38c7373..06c3704a2c94 100644 --- a/java/java.lsp.server/vscode/src/extension.ts +++ b/java/java.lsp.server/vscode/src/extension.ts @@ -21,11 +21,14 @@ import { commands, window, workspace, ExtensionContext, ProgressLocation, TextEditorDecorationType } from 'vscode'; import { - LanguageClient, - LanguageClientOptions, + LanguageClient, + LanguageClientOptions, + StreamInfo +} from 'vscode-languageclient/node'; + +import { CloseAction, ErrorAction, - StreamInfo, Message, MessageType, LogMessageNotification, diff --git a/java/java.lsp.server/vscode/src/protocol.ts b/java/java.lsp.server/vscode/src/protocol.ts index 64b3da21b2aa..8379f688c6f9 100644 --- a/java/java.lsp.server/vscode/src/protocol.ts +++ b/java/java.lsp.server/vscode/src/protocol.ts @@ -20,8 +20,8 @@ import * as vscode from 'vscode'; import { - NotificationType, - RequestType, + ProtocolNotificationType, + ProtocolRequestType, ShowMessageParams } from 'vscode-languageclient'; import { @@ -37,7 +37,7 @@ export interface ShowStatusMessageParams extends ShowMessageParams { } export namespace StatusMessageRequest { - export const type = new NotificationType('window/showStatusBarMessage'); + export const type = new ProtocolNotificationType('window/showStatusBarMessage'); }; export interface ShowQuickPickParams { @@ -56,7 +56,7 @@ export interface ShowQuickPickParams { } export namespace QuickPickRequest { - export const type = new RequestType('window/showQuickPick'); + export const type = new ProtocolRequestType('window/showQuickPick'); } export interface ShowInputBoxParams { @@ -71,7 +71,7 @@ export interface ShowInputBoxParams { } export namespace InputBoxRequest { - export const type = new RequestType('window/showInputBox'); + export const type = new ProtocolRequestType('window/showInputBox'); } export interface TestProgressParams { @@ -97,7 +97,7 @@ export interface TestCase { } export namespace TestProgressNotification { - export const type = new NotificationType('window/notifyTestProgress'); + export const type = new ProtocolNotificationType('window/notifyTestProgress'); }; export interface DebugConnector { @@ -116,15 +116,15 @@ export interface SetTextEditorDecorationParams { }; export namespace TextEditorDecorationCreateRequest { - export const type = new RequestType('window/createTextEditorDecoration'); + export const type = new ProtocolRequestType('window/createTextEditorDecoration'); }; export namespace TextEditorDecorationSetNotification { - export const type = new NotificationType('window/setTextEditorDecoration'); + export const type = new ProtocolNotificationType('window/setTextEditorDecoration'); }; export namespace TextEditorDecorationDisposeNotification { - export const type = new NotificationType('window/disposeTextEditorDecoration'); + export const type = new ProtocolNotificationType('window/disposeTextEditorDecoration'); }; export function asPosition(value: undefined | null): undefined; diff --git a/java/java.lsp.server/vscode/src/testAdapter.ts b/java/java.lsp.server/vscode/src/testAdapter.ts index 87962188e4ca..2b4953176385 100644 --- a/java/java.lsp.server/vscode/src/testAdapter.ts +++ b/java/java.lsp.server/vscode/src/testAdapter.ts @@ -21,7 +21,6 @@ import { commands, debug, tests, workspace, CancellationToken, TestController, TestItem, TestRunProfileKind, TestRunRequest, Uri, TestRun, TestMessage, Location, Position } from "vscode"; import * as path from 'path'; import { asRange, TestCase, TestSuite } from "./protocol"; -import { LanguageClient } from "vscode-languageclient"; export class NbTestAdapter {