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 b4d2acaac50a..f2860f1b2e43 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 @@ -53,10 +53,12 @@ import java.util.stream.Collectors; import javax.swing.event.ChangeListener; import org.eclipse.lsp4j.ClientCapabilities; +import org.eclipse.lsp4j.DiagnosticWorkspaceCapabilities; import org.eclipse.lsp4j.DocumentSymbolCapabilities; import org.eclipse.lsp4j.InitializeParams; import org.eclipse.lsp4j.InitializeResult; import org.eclipse.lsp4j.InitializedParams; +import org.eclipse.lsp4j.PublishDiagnosticsCapabilities; import org.eclipse.lsp4j.ResourceOperationKind; import org.eclipse.lsp4j.SemanticTokens; import org.eclipse.lsp4j.SemanticTokensCapabilities; @@ -427,6 +429,8 @@ private static InitializeResult initServer(Process p, LanguageServer server, Fil wcc.getWorkspaceEdit().setResourceOperations(Arrays.asList(ResourceOperationKind.Create, ResourceOperationKind.Delete, ResourceOperationKind.Rename)); SymbolCapabilities sc = new SymbolCapabilities(new SymbolKindCapabilities(Arrays.asList(SymbolKind.values()))); wcc.setSymbol(sc); + PublishDiagnosticsCapabilities publishDiagnostics = new PublishDiagnosticsCapabilities(); + tdcc.setPublishDiagnostics(publishDiagnostics); initParams.setCapabilities(new ClientCapabilities(wcc, tdcc, null)); CompletableFuture initResult = server.initialize(initParams); while (true) { diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/SemanticHighlight.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/SemanticHighlight.java index a121a1e1bfd9..c5da5d415b6f 100644 --- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/SemanticHighlight.java +++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/SemanticHighlight.java @@ -87,8 +87,8 @@ public void run(LSPBindings bindings, FileObject file) { int lastColumn = 0; int offset = 0; for (int i = 0; i < data.size(); i += 5) { - int deltaLine = data.get(i).intValue(); - int deltaColumn = data.get(i + 1).intValue(); + int deltaLine = data.get(i); + int deltaColumn = data.get(i + 1); if (deltaLine == 0) { lastColumn += deltaColumn; offset += deltaColumn; @@ -97,11 +97,11 @@ public void run(LSPBindings bindings, FileObject file) { lastColumn = deltaColumn; offset = Utils.getOffset(doc, new Position(lastLine, lastColumn)); } - if (data.get(i + 2).intValue() <= 0) { + if (data.get(i + 2) <= 0) { continue; //XXX! } - AttributeSet tokenHighlight = fcs == null ? EMPTY : tokenHighlight(bindings, fcs, data.get(i + 3).intValue(), data.get(i + 4).intValue()); - target.addHighlight(offset, offset + data.get(i + 2).intValue(), tokenHighlight); + AttributeSet tokenHighlight = fcs == null ? EMPTY : tokenHighlight(bindings, fcs, data.get(i + 3), data.get(i + 4)); + target.addHighlight(offset, offset + data.get(i + 2), tokenHighlight); } getBag(doc).setHighlights(target); } catch (InterruptedException | ExecutionException ex) { @@ -111,6 +111,7 @@ public void run(LSPBindings bindings, FileObject file) { private final Map> tokenId2Highlight = new HashMap<>(); + @SuppressWarnings("AssignmentToMethodParameter") private AttributeSet tokenHighlight(final LSPBindings bindings, final FontColorSettings fcs, int tokenId, int modifiers) { assert fcs != null; return tokenId2Highlight.computeIfAbsent(tokenId, s -> new HashMap<>()) @@ -121,7 +122,7 @@ private AttributeSet tokenHighlight(final LSPBindings bindings, final FontColorS //invalid token id return EMPTY; } - String tokenName = tokenTypes.get(tokenId); + String tokenName = tokenId >= 0 ? tokenTypes.get(tokenId) : null; boolean isStatic = false; boolean isDeclaration = false; while (mods != 0) { @@ -134,7 +135,7 @@ private AttributeSet tokenHighlight(final LSPBindings bindings, final FontColorS mods &= ~mod; } - String colorSet = "mod-" + tokenName + (isDeclaration ? "-declaration" : ""); + String colorSet = "mod" + (tokenName != null ? ("-" + tokenName) : "") + (isDeclaration ? "-declaration" : ""); if (LOG.isLoggable(Level.FINE)) { LOG.log(Level.FINE, "LSP Semantic coloring. token kind: {0}", colorSet); } @@ -159,14 +160,15 @@ private static OffsetsBag getBag(Document doc) { OffsetsBag bag = (OffsetsBag) doc.getProperty(SemanticHighlight.class); if (bag == null) { - doc.putProperty(SemanticHighlight.class, bag = new OffsetsBag(doc)); + bag = new OffsetsBag(doc); + doc.putProperty(SemanticHighlight.class, bag); } return bag; } private static AttributeSet adjustAttributes(AttributeSet as) { - Collection attrs = new LinkedList(); + Collection attrs = new LinkedList<>(); for (Enumeration e = as.getAttributeNames(); e.hasMoreElements(); ) { Object key = e.nextElement(); diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java index 496828357f67..e60c49be829a 100644 --- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java +++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TextDocumentSyncServerCapabilityHandler.java @@ -311,6 +311,7 @@ private void ensureDidOpenSent(Document doc) { } }); + // @todo: the mimetype is not the language ID TextDocumentItem textDocumentItem = new TextDocumentItem(uri, FileUtil.getMIMEType(file), 0, diff --git a/nbbuild/licenses/Apache-2.0-typescript-language-server b/nbbuild/licenses/Apache-2.0-typescript-language-server index 8dada3edaf50..671b6d79c3b7 100644 --- a/nbbuild/licenses/Apache-2.0-typescript-language-server +++ b/nbbuild/licenses/Apache-2.0-typescript-language-server @@ -1,3 +1,42 @@ +Parts of the code copied from the https://github.com/microsoft/vscode repository are licensed under the following license: + +BEGIN LICENSE ---------------------------------------------------------------- + +MIT License + +Copyright (c) 2015 - present Microsoft Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +END LICESE ------------------------------------------------------------------- + +This applies to files that include the following license header: + +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + + +The rest of the code licensed under: + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/nbbuild/licenses/ISC-graceful-fs b/nbbuild/licenses/ISC-graceful-fs deleted file mode 100644 index 9d2c8036969b..000000000000 --- a/nbbuild/licenses/ISC-graceful-fs +++ /dev/null @@ -1,15 +0,0 @@ -The ISC License - -Copyright (c) Isaac Z. Schlueter, Ben Noordhuis, and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/nbbuild/licenses/MIT-command-exists b/nbbuild/licenses/MIT-command-exists deleted file mode 100644 index ebcae6641264..000000000000 --- a/nbbuild/licenses/MIT-command-exists +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Matthew Conlen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - diff --git a/nbbuild/licenses/MIT-commander b/nbbuild/licenses/MIT-commander deleted file mode 100644 index 10f997ab1045..000000000000 --- a/nbbuild/licenses/MIT-commander +++ /dev/null @@ -1,22 +0,0 @@ -(The MIT License) - -Copyright (c) 2011 TJ Holowaychuk - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/nbbuild/licenses/MIT-fs-extra b/nbbuild/licenses/MIT-fs-extra deleted file mode 100644 index 93546dfb7655..000000000000 --- a/nbbuild/licenses/MIT-fs-extra +++ /dev/null @@ -1,15 +0,0 @@ -(The MIT License) - -Copyright (c) 2011-2017 JP Richardson - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files -(the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/nbbuild/licenses/MIT-jsonfile b/nbbuild/licenses/MIT-jsonfile deleted file mode 100644 index cb7e807b9bdb..000000000000 --- a/nbbuild/licenses/MIT-jsonfile +++ /dev/null @@ -1,15 +0,0 @@ -(The MIT License) - -Copyright (c) 2012-2015, JP Richardson - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files -(the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/nbbuild/licenses/MIT-p-debounce-crypto-random-string-temp-dir-unique-string b/nbbuild/licenses/MIT-p-debounce-crypto-random-string-temp-dir-unique-string deleted file mode 100644 index 654d0bfe9434..000000000000 --- a/nbbuild/licenses/MIT-p-debounce-crypto-random-string-temp-dir-unique-string +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/nbbuild/licenses/MIT-tempy b/nbbuild/licenses/MIT-tempy deleted file mode 100644 index e7af2f77107d..000000000000 --- a/nbbuild/licenses/MIT-tempy +++ /dev/null @@ -1,9 +0,0 @@ -MIT License - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/nbbuild/licenses/MIT-universalify b/nbbuild/licenses/MIT-universalify deleted file mode 100644 index 514e84e648df..000000000000 --- a/nbbuild/licenses/MIT-universalify +++ /dev/null @@ -1,20 +0,0 @@ -(The MIT License) - -Copyright (c) 2017, Ryan Zimmerman - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the 'Software'), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/nbbuild/licenses/MIT-vscode-jsonrpc b/nbbuild/licenses/MIT-vscode-jsonrpc deleted file mode 100644 index 71c2ae32db71..000000000000 --- a/nbbuild/licenses/MIT-vscode-jsonrpc +++ /dev/null @@ -1,46 +0,0 @@ -Parts of this work are licensed: -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -Parts of this work are licensed: -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -For Microsoft vscode-jsonrpc - -This project incorporates material from the project(s) listed below (collectively, “Third Party Code”). -Microsoft is not the original author of the Third Party Code. The original copyright notice and license -under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed -to you under their original license terms set forth below. Microsoft reserves all other rights not expressly -granted, whether by implication, estoppel or otherwise. - -1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped) - -This project is licensed under the MIT license. -Copyrights are respective of each contributor listed at the beginning of each definition file. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/nbbuild/licenses/MIT-vscode-languageserver b/nbbuild/licenses/MIT-vscode-languageserver deleted file mode 100644 index 7e01fb52a443..000000000000 --- a/nbbuild/licenses/MIT-vscode-languageserver +++ /dev/null @@ -1,50 +0,0 @@ -Parts of this work are licensed: -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -Parts of this work are licensed: -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -For Microsoft vscode-languageserver - -This project incorporates material from the project(s) listed below (collectively, “Third Party Code”). -Microsoft is not the original author of the Third Party Code. The original copyright notice and license -under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed -to you under their original license terms set forth below. Microsoft reserves all other rights not expressly -granted, whether by implication, estoppel or otherwise. - -1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped) - -%% DefinitelyTyped NOTICES AND INFORMATION BEGIN HERE -========================================= -This project is licensed under the MIT license. -Copyrights are respective of each contributor listed at the beginning of each definition file. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -========================================= -END OF DefinitelyTyped NOTICES AND INFORMATION \ No newline at end of file diff --git a/nbbuild/licenses/MIT-vscode-languageserver-protocol b/nbbuild/licenses/MIT-vscode-languageserver-protocol deleted file mode 100644 index ed3c66039b9b..000000000000 --- a/nbbuild/licenses/MIT-vscode-languageserver-protocol +++ /dev/null @@ -1,46 +0,0 @@ -Parts of this work are licensed: -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -Parts of this work are licensed: -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -For Microsoft vscode-languageclient - -This project incorporates material from the project(s) listed below (collectively, “Third Party Code”). -Microsoft is not the original author of the Third Party Code. The original copyright notice and license -under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed -to you under their original license terms set forth below. Microsoft reserves all other rights not expressly -granted, whether by implication, estoppel or otherwise. - -1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped) - -This project is licensed under the MIT license. -Copyrights are respective of each contributor listed at the beginning of each definition file. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/nbbuild/licenses/MIT-vscode-languageserver-types b/nbbuild/licenses/MIT-vscode-languageserver-types deleted file mode 100644 index a07e3ae825f8..000000000000 --- a/nbbuild/licenses/MIT-vscode-languageserver-types +++ /dev/null @@ -1,11 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/nbbuild/licenses/MIT-vscode-textbuffer b/nbbuild/licenses/MIT-vscode-textbuffer deleted file mode 100644 index 21071075c245..000000000000 --- a/nbbuild/licenses/MIT-vscode-textbuffer +++ /dev/null @@ -1,21 +0,0 @@ - MIT License - - Copyright (c) Microsoft Corporation. All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE diff --git a/nbbuild/licenses/MIT-vscode-uri b/nbbuild/licenses/MIT-vscode-uri deleted file mode 100644 index 29db530db43f..000000000000 --- a/nbbuild/licenses/MIT-vscode-uri +++ /dev/null @@ -1,9 +0,0 @@ -The MIT License (MIT) - -Copyright (c) Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/nbbuild/licenses/names.properties b/nbbuild/licenses/names.properties index daf4f34a3395..36ea7e99937c 100644 --- a/nbbuild/licenses/names.properties +++ b/nbbuild/licenses/names.properties @@ -82,17 +82,3 @@ jflex=JFlex GNU GPL license with exception for generated code #NPM modules: Apache-2.0-typescript=Apache 2.0 license for typescript Apache-2.0-typescript-language-server=Apache 2.0 license for typescript-language-server -ISC-graceful-fs=ISC license for graceful-fs -MIT-commander=MIT license for commander -MIT-command-exists=MIT license for command-exists -MIT-fs-extra=MIT license for fs-extra -MIT-jsonfile=MIT license for jsonfile -MIT-p-debounce-crypto-random-string-temp-dir-unique-string=MIT license for p-debounce, crypto-random-string, temp-dir, unique-string -MIT-tempy=MIT license for tempy -MIT-universalify=MIT license for universalify -MIT-vscode-jsonrpc=MIT license for jsonrpc -MIT-vscode-languageserver=MIT license for vscode-languageserver -MIT-vscode-languageserver-protocol=MIT license for vscode-languageserver-protocol -MIT-vscode-languageserver-types=MIT license for vscode-languageserver-types -MIT-vscode-textbuffer=MIT license for vscode-textbuffer -MIT-vscode-uri=MIT license for vscode-uri diff --git a/webcommon/typescript.editor/.gitignore b/webcommon/typescript.editor/.gitignore index 4bf0b2a47bf8..e90fe9a1f2d3 100644 --- a/webcommon/typescript.editor/.gitignore +++ b/webcommon/typescript.editor/.gitignore @@ -2,5 +2,6 @@ bundles/bundles bundles/external bundles/licenses bundles/package/node_modules +bundles/package/package-lock.json bundles/prepare/nbactions.xml bundles/prepare/target/ \ No newline at end of file diff --git a/webcommon/typescript.editor/bundles/package/package.json b/webcommon/typescript.editor/bundles/package/package.json index 129824b69f21..a5e44b57482b 100644 --- a/webcommon/typescript.editor/bundles/package/package.json +++ b/webcommon/typescript.editor/bundles/package/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "typescript-language-server": "0.5.1", - "typescript": "4.1.4" + "typescript-language-server": "4.3.3", + "typescript": "5.5.4" } } diff --git a/webcommon/typescript.editor/bundles/prepare/README b/webcommon/typescript.editor/bundles/prepare/README index 4a6f542c8a1c..c5e08a5d2d59 100644 --- a/webcommon/typescript.editor/bundles/prepare/README +++ b/webcommon/typescript.editor/bundles/prepare/README @@ -11,3 +11,18 @@ following inside the "bundles" directory: your module. This directory includes licenses, binaries-list, and the zipped modules * external directory, which contains zips that should be uploaded to the binary storage server * licenses directory, which contains new license files that should be put into nbbuild/licenses + +Run directly +------------ + +The binary can be run directly using the maven exec module. The call assumes, +that the path to the netbeans checkout is placed into the environment variable +$NB_CHECKOUT. + +``` +cd $NB_CHECKOUT +mvn -f webcommon/typescript.editor/bundles/prepare \ + -Dexec.mainClass="org.netbeans.modules.learning.prepare.PrepareBundles" \ + -Dexec.args="$NB_CHECKOUT/webcommon/typescript.editor/bundles $NB_CHECKOUT" \ + package exec:java +``` \ No newline at end of file diff --git a/webcommon/typescript.editor/bundles/prepare/src/main/java/org/netbeans/modules/learning/prepare/PrepareBundles.java b/webcommon/typescript.editor/bundles/prepare/src/main/java/org/netbeans/modules/learning/prepare/PrepareBundles.java index b238952dc945..91de7f3bb908 100644 --- a/webcommon/typescript.editor/bundles/prepare/src/main/java/org/netbeans/modules/learning/prepare/PrepareBundles.java +++ b/webcommon/typescript.editor/bundles/prepare/src/main/java/org/netbeans/modules/learning/prepare/PrepareBundles.java @@ -99,6 +99,7 @@ public static void main(String... args) throws IOException, InterruptedException try (DirectoryStream ds = Files.newDirectoryStream(packagesDir.resolve("node_modules"))) { for (Path module : ds) { if (".bin".equals(module.getFileName().toString())) continue; + if (! Files.isDirectory(module)) continue; Path packageJson = module.resolve("package.json"); if (!Files.isReadable(packageJson)) { diff --git a/webcommon/typescript.editor/external/README-update.md b/webcommon/typescript.editor/external/README-update.md new file mode 100644 index 000000000000..fd0e601196b0 --- /dev/null +++ b/webcommon/typescript.editor/external/README-update.md @@ -0,0 +1,34 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor +license agreements; and to You under the Apache License, Version 2.0. + +Updating the Typescript Language Server +======================================= + +1. Update the versions in `bundles/package/package.json` +2. Run the `prepare` programm according to the documentation in + `bundles/prepare/README` +3. Clean the `external` folder from all binaries and license files and the + `binaries-list` file +4. Check the generated license files in `bundles/bundles` and copy the contents + of that folder to the `external` folder +5. Rebuild the `typescript.editor` module and test it +6. Upload the files to netbeans.osuosl.org + +For review it is advised to make use of the option to use arbitrary URLs in the +`binary-list` file. For example, if the list looks like this: + +``` +713D7D3E9651707669DE7452B0262D85DDC8344F typescript-5.5.4.zip +6895F0456E4B0FE3D857AA7D3F399932A026D060 typescript-language-server-4.3.3.zip +``` + +For review the two files `typescript-language-server-4.3.3.zip` and +`typescript-5.5.4.zip` can be placed on `my-webspace.org`. The `binary-list` +would then read: + +``` +713D7D3E9651707669DE7452B0262D85DDC8344F https://my-webspace.org/typescript-5.5.4.zip typescript-5.5.4.zip +6895F0456E4B0FE3D857AA7D3F399932A026D060 https://my-webspace.org/typescript-language-server-4.3.3.zip typescript-language-server-4.3.3.zip +``` + +Step 6 can then be executed once review is done. \ No newline at end of file diff --git a/webcommon/typescript.editor/external/binaries-list b/webcommon/typescript.editor/external/binaries-list index 67441f584754..5fcf73a7928a 100644 --- a/webcommon/typescript.editor/external/binaries-list +++ b/webcommon/typescript.editor/external/binaries-list @@ -15,22 +15,5 @@ # specific language governing permissions and limitations # under the License. -EEBA3C1183C93B924F59F99D18143C6854855140 command-exists-1.2.6.zip -D54E3334BE790F2AF65068B404E069AB7158795B commander-2.20.3.zip -9545FC9061706C762E852F3D4DA3164EDFD96FE1 crypto-random-string-1.0.0.zip -97705D5EE06EDD1981369ABD129EAC37C25DC5D5 fs-extra-7.0.1.zip -DB515913528F8F8C48678FEF88697875ADEF133C graceful-fs-4.2.6.zip -5A908B2D235A118C634F58E228B3992488847A98 jsonfile-4.0.0.zip -F176424C20EE59996C503BAEBF18D2C70F184840 p-debounce-1.0.0.zip -C553EC2693BF9B1E942E8DDFFBF6A591FE753F84 temp-dir-1.0.0.zip -5C31F32D7D10CAB54F13408C64B42B62D51796EE tempy-0.2.1.zip -B36AEE158BE444FD89CA51DBE61EC2BA4E7653AA typescript-4.1.4.zip -719BC3E8A6F6DDA67A7E9642B498386D6CAD022A typescript-language-server-0.5.1.zip -80FD5AA5DF32BE742BE353E5C4784868ED7D0D38 unique-string-1.0.0.zip -BE24C4558E26E8B7CDEAFF2F9AE70D3BB5BEB0A8 universalify-0.1.2.zip -09CF27455281E6C4FAA30571125D4F6E42EC3D5D vscode-jsonrpc-6.0.0.zip -06B648FCE1A5B1FBC0306C30DB593AAAF6989A52 vscode-languageserver-5.3.0-next.10.zip -6065994D322B86EB06D642F96F16018774E8440F vscode-languageserver-protocol-3.16.0.zip -BC9B7B5E8243882E6AFC2D26D1008EF3F960F22F vscode-languageserver-types-3.16.0.zip -191490D1923C11D2D7BFDB8F86CEB61567CA62A0 vscode-textbuffer-1.0.0.zip -75BF5DA9B1BFDFD1A85E0A67E86504B7E05482D8 vscode-uri-1.0.8.zip +713D7D3E9651707669DE7452B0262D85DDC8344F https://doppel-helix.eu/test-typescript-update/typescript-5.5.4.zip typescript-5.5.4.zip +6895F0456E4B0FE3D857AA7D3F399932A026D060 https://doppel-helix.eu/test-typescript-update/typescript-language-server-4.3.3.zip typescript-language-server-4.3.3.zip diff --git a/webcommon/typescript.editor/external/command-exists-1.2.6-license.txt b/webcommon/typescript.editor/external/command-exists-1.2.6-license.txt deleted file mode 100644 index 74ae42decad7..000000000000 --- a/webcommon/typescript.editor/external/command-exists-1.2.6-license.txt +++ /dev/null @@ -1,28 +0,0 @@ -Name: command-exists -Description: check whether a command line command exists in the current environment -Version: 1.2.6 -License: MIT-command-exists -Origin: https://github.com/mathisonian/command-exists - -The MIT License (MIT) - -Copyright (c) 2014 Matthew Conlen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - diff --git a/webcommon/typescript.editor/external/commander-2.20.3-license.txt b/webcommon/typescript.editor/external/commander-2.20.3-license.txt deleted file mode 100644 index 6621b82c515b..000000000000 --- a/webcommon/typescript.editor/external/commander-2.20.3-license.txt +++ /dev/null @@ -1,28 +0,0 @@ -Name: commander -Description: the complete solution for node.js command-line programs -Version: 2.20.3 -License: MIT-commander -Origin: https://github.com/tj/commander.js#readme - -(The MIT License) - -Copyright (c) 2011 TJ Holowaychuk - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/crypto-random-string-1.0.0-license.txt b/webcommon/typescript.editor/external/crypto-random-string-1.0.0-license.txt deleted file mode 100644 index cc61dc68c273..000000000000 --- a/webcommon/typescript.editor/external/crypto-random-string-1.0.0-license.txt +++ /dev/null @@ -1,27 +0,0 @@ -Name: crypto-random-string -Description: Generate a cryptographically strong random string -Version: 1.0.0 -License: MIT-p-debounce-crypto-random-string-temp-dir-unique-string -Origin: https://github.com/sindresorhus/crypto-random-string#readme - -The MIT License (MIT) - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/fs-extra-7.0.1-license.txt b/webcommon/typescript.editor/external/fs-extra-7.0.1-license.txt deleted file mode 100644 index 333e98f1c70c..000000000000 --- a/webcommon/typescript.editor/external/fs-extra-7.0.1-license.txt +++ /dev/null @@ -1,21 +0,0 @@ -Name: fs-extra -Description: fs-extra contains methods that aren't included in the vanilla Node.js fs package. Such as mkdir -p, cp -r, and rm -rf. -Version: 7.0.1 -License: MIT-fs-extra -Origin: https://github.com/jprichardson/node-fs-extra - -(The MIT License) - -Copyright (c) 2011-2017 JP Richardson - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files -(the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/graceful-fs-4.2.6-license.txt b/webcommon/typescript.editor/external/graceful-fs-4.2.6-license.txt deleted file mode 100644 index f4002122f08f..000000000000 --- a/webcommon/typescript.editor/external/graceful-fs-4.2.6-license.txt +++ /dev/null @@ -1,21 +0,0 @@ -Name: graceful-fs -Description: A drop-in replacement for fs, making various improvements. -Version: 4.2.6 -License: ISC-graceful-fs -Origin: https://github.com/isaacs/node-graceful-fs#readme - -The ISC License - -Copyright (c) Isaac Z. Schlueter, Ben Noordhuis, and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/webcommon/typescript.editor/external/jsonfile-4.0.0-license.txt b/webcommon/typescript.editor/external/jsonfile-4.0.0-license.txt deleted file mode 100644 index b1e959e01a87..000000000000 --- a/webcommon/typescript.editor/external/jsonfile-4.0.0-license.txt +++ /dev/null @@ -1,21 +0,0 @@ -Name: jsonfile -Description: Easily read/write JSON files. -Version: 4.0.0 -License: MIT-jsonfile -Origin: https://github.com/jprichardson/node-jsonfile#readme - -(The MIT License) - -Copyright (c) 2012-2015, JP Richardson - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files -(the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/p-debounce-1.0.0-license.txt b/webcommon/typescript.editor/external/p-debounce-1.0.0-license.txt deleted file mode 100644 index 37f214c8367c..000000000000 --- a/webcommon/typescript.editor/external/p-debounce-1.0.0-license.txt +++ /dev/null @@ -1,27 +0,0 @@ -Name: p-debounce -Description: Debounce promise-returning & async functions -Version: 1.0.0 -License: MIT-p-debounce-crypto-random-string-temp-dir-unique-string -Origin: https://github.com/sindresorhus/p-debounce#readme - -The MIT License (MIT) - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/temp-dir-1.0.0-license.txt b/webcommon/typescript.editor/external/temp-dir-1.0.0-license.txt deleted file mode 100644 index 847205556cd9..000000000000 --- a/webcommon/typescript.editor/external/temp-dir-1.0.0-license.txt +++ /dev/null @@ -1,27 +0,0 @@ -Name: temp-dir -Description: Get the real path of the system temp directory -Version: 1.0.0 -License: MIT-p-debounce-crypto-random-string-temp-dir-unique-string -Origin: https://github.com/sindresorhus/temp-dir#readme - -The MIT License (MIT) - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/tempy-0.2.1-license.txt b/webcommon/typescript.editor/external/tempy-0.2.1-license.txt deleted file mode 100644 index d1caac1567c3..000000000000 --- a/webcommon/typescript.editor/external/tempy-0.2.1-license.txt +++ /dev/null @@ -1,15 +0,0 @@ -Name: tempy -Description: Get a random temporary file or directory path -Version: 0.2.1 -License: MIT-tempy -Origin: https://github.com/sindresorhus/tempy#readme - -MIT License - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/typescript-4.1.4-license.txt b/webcommon/typescript.editor/external/typescript-5.5.4-license.txt similarity index 99% rename from webcommon/typescript.editor/external/typescript-4.1.4-license.txt rename to webcommon/typescript.editor/external/typescript-5.5.4-license.txt index 81740a2fa758..e95fd258598c 100644 --- a/webcommon/typescript.editor/external/typescript-4.1.4-license.txt +++ b/webcommon/typescript.editor/external/typescript-5.5.4-license.txt @@ -1,6 +1,6 @@ Name: typescript Description: TypeScript is a language for application scale JavaScript development -Version: 4.1.4 +Version: 5.5.4 License: Apache-2.0-typescript Origin: https://www.typescriptlang.org/ diff --git a/webcommon/typescript.editor/external/typescript-language-server-0.5.1-license.txt b/webcommon/typescript.editor/external/typescript-language-server-4.3.3-license.txt similarity index 86% rename from webcommon/typescript.editor/external/typescript-language-server-0.5.1-license.txt rename to webcommon/typescript.editor/external/typescript-language-server-4.3.3-license.txt index ddf582aa7786..8a0fa39350b8 100644 --- a/webcommon/typescript.editor/external/typescript-language-server-0.5.1-license.txt +++ b/webcommon/typescript.editor/external/typescript-language-server-4.3.3-license.txt @@ -1,8 +1,47 @@ Name: typescript-language-server Description: Language Server Protocol (LSP) implementation for TypeScript using tsserver -Version: 0.5.1 +Version: 4.3.3 License: Apache-2.0-typescript-language-server -Origin: https://github.com/theia-ide/typescript-language-server#readme +Origin: null + +Parts of the code copied from the https://github.com/microsoft/vscode repository are licensed under the following license: + +BEGIN LICENSE ---------------------------------------------------------------- + +MIT License + +Copyright (c) 2015 - present Microsoft Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +END LICESE ------------------------------------------------------------------- + +This applies to files that include the following license header: + +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + + +The rest of the code licensed under: + Apache License Version 2.0, January 2004 diff --git a/webcommon/typescript.editor/external/unique-string-1.0.0-license.txt b/webcommon/typescript.editor/external/unique-string-1.0.0-license.txt deleted file mode 100644 index 4100fba4d22e..000000000000 --- a/webcommon/typescript.editor/external/unique-string-1.0.0-license.txt +++ /dev/null @@ -1,27 +0,0 @@ -Name: unique-string -Description: Generate a unique random string -Version: 1.0.0 -License: MIT-p-debounce-crypto-random-string-temp-dir-unique-string -Origin: https://github.com/sindresorhus/unique-string#readme - -The MIT License (MIT) - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/universalify-0.1.2-license.txt b/webcommon/typescript.editor/external/universalify-0.1.2-license.txt deleted file mode 100644 index efdb0cafa524..000000000000 --- a/webcommon/typescript.editor/external/universalify-0.1.2-license.txt +++ /dev/null @@ -1,26 +0,0 @@ -Name: universalify -Description: Make a callback- or promise-based function support both promises and callbacks. -Version: 0.1.2 -License: MIT-universalify -Origin: https://github.com/RyanZim/universalify#readme - -(The MIT License) - -Copyright (c) 2017, Ryan Zimmerman - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the 'Software'), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/vscode-jsonrpc-6.0.0-license.txt b/webcommon/typescript.editor/external/vscode-jsonrpc-6.0.0-license.txt deleted file mode 100644 index 1083b8b7ce47..000000000000 --- a/webcommon/typescript.editor/external/vscode-jsonrpc-6.0.0-license.txt +++ /dev/null @@ -1,52 +0,0 @@ -Name: vscode-jsonrpc -Description: A json rpc implementation over streams -Version: 6.0.0 -License: MIT-vscode-jsonrpc -Origin: https://github.com/Microsoft/vscode-languageserver-node#readme - -Parts of this work are licensed: -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -Parts of this work are licensed: -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -For Microsoft vscode-jsonrpc - -This project incorporates material from the project(s) listed below (collectively, “Third Party Code”). -Microsoft is not the original author of the Third Party Code. The original copyright notice and license -under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed -to you under their original license terms set forth below. Microsoft reserves all other rights not expressly -granted, whether by implication, estoppel or otherwise. - -1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped) - -This project is licensed under the MIT license. -Copyrights are respective of each contributor listed at the beginning of each definition file. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/vscode-languageserver-5.3.0-next.10-license.txt b/webcommon/typescript.editor/external/vscode-languageserver-5.3.0-next.10-license.txt deleted file mode 100644 index 18725fed7fd8..000000000000 --- a/webcommon/typescript.editor/external/vscode-languageserver-5.3.0-next.10-license.txt +++ /dev/null @@ -1,56 +0,0 @@ -Name: vscode-languageserver -Description: Language server implementation for node -Version: 5.3.0-next.10 -License: MIT-vscode-languageserver -Origin: https://github.com/Microsoft/vscode-languageserver-node#readme - -Parts of this work are licensed: -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -Parts of this work are licensed: -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -For Microsoft vscode-languageserver - -This project incorporates material from the project(s) listed below (collectively, “Third Party Code”). -Microsoft is not the original author of the Third Party Code. The original copyright notice and license -under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed -to you under their original license terms set forth below. Microsoft reserves all other rights not expressly -granted, whether by implication, estoppel or otherwise. - -1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped) - -%% DefinitelyTyped NOTICES AND INFORMATION BEGIN HERE -========================================= -This project is licensed under the MIT license. -Copyrights are respective of each contributor listed at the beginning of each definition file. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -========================================= -END OF DefinitelyTyped NOTICES AND INFORMATION diff --git a/webcommon/typescript.editor/external/vscode-languageserver-protocol-3.16.0-license.txt b/webcommon/typescript.editor/external/vscode-languageserver-protocol-3.16.0-license.txt deleted file mode 100644 index 8dbfa2be8912..000000000000 --- a/webcommon/typescript.editor/external/vscode-languageserver-protocol-3.16.0-license.txt +++ /dev/null @@ -1,52 +0,0 @@ -Name: vscode-languageserver-protocol -Description: VSCode Language Server Protocol implementation -Version: 3.16.0 -License: MIT-vscode-languageserver-protocol -Origin: https://github.com/Microsoft/vscode-languageserver-node#readme - -Parts of this work are licensed: -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -Parts of this work are licensed: -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -For Microsoft vscode-languageclient - -This project incorporates material from the project(s) listed below (collectively, “Third Party Code”). -Microsoft is not the original author of the Third Party Code. The original copyright notice and license -under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed -to you under their original license terms set forth below. Microsoft reserves all other rights not expressly -granted, whether by implication, estoppel or otherwise. - -1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped) - -This project is licensed under the MIT license. -Copyrights are respective of each contributor listed at the beginning of each definition file. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/vscode-languageserver-types-3.16.0-license.txt b/webcommon/typescript.editor/external/vscode-languageserver-types-3.16.0-license.txt deleted file mode 100644 index f1c1bad65a4a..000000000000 --- a/webcommon/typescript.editor/external/vscode-languageserver-types-3.16.0-license.txt +++ /dev/null @@ -1,17 +0,0 @@ -Name: vscode-languageserver-types -Description: Types used by the Language server for node -Version: 3.16.0 -License: MIT-vscode-languageserver-types -Origin: https://github.com/Microsoft/vscode-languageserver-node#readme - -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/webcommon/typescript.editor/external/vscode-textbuffer-1.0.0-license.txt b/webcommon/typescript.editor/external/vscode-textbuffer-1.0.0-license.txt deleted file mode 100644 index 99e653a1e529..000000000000 --- a/webcommon/typescript.editor/external/vscode-textbuffer-1.0.0-license.txt +++ /dev/null @@ -1,27 +0,0 @@ -Name: vscode-textbuffer -Description: The underling text buffer used in VS Code/Monaco -Version: 1.0.0 -License: MIT-vscode-textbuffer -Origin: httpshttps://github.com/microsoft/vscode-textbuffer#readme - - MIT License - - Copyright (c) Microsoft Corporation. All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE diff --git a/webcommon/typescript.editor/external/vscode-uri-1.0.8-license.txt b/webcommon/typescript.editor/external/vscode-uri-1.0.8-license.txt deleted file mode 100644 index 9813dc86fa34..000000000000 --- a/webcommon/typescript.editor/external/vscode-uri-1.0.8-license.txt +++ /dev/null @@ -1,15 +0,0 @@ -Name: vscode-uri -Description: The URI implementation that is used by VS Code and its extensions -Version: 1.0.8 -License: MIT-vscode-uri -Origin: https://github.com/Microsoft/vscode-uri#readme - -The MIT License (MIT) - -Copyright (c) Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/webcommon/typescript.editor/src/org/netbeans/modules/typescript/editor/TypeScriptLSP.java b/webcommon/typescript.editor/src/org/netbeans/modules/typescript/editor/TypeScriptLSP.java index f7410445e686..c54c6f33ccbf 100644 --- a/webcommon/typescript.editor/src/org/netbeans/modules/typescript/editor/TypeScriptLSP.java +++ b/webcommon/typescript.editor/src/org/netbeans/modules/typescript/editor/TypeScriptLSP.java @@ -61,7 +61,7 @@ public LanguageServerDescription startServer(Lookup lookup) { } return null; } - File server = InstalledFileLocator.getDefault().locate("typescript-lsp/node_modules/typescript-language-server/lib/cli.js", null, false); + File server = InstalledFileLocator.getDefault().locate("typescript-lsp/node_modules/typescript-language-server/lib/cli.mjs", "org.netbeans.modules.typescript.editor", false); try { Process p = new ProcessBuilder(new String[] {node, server.getAbsolutePath(), "--stdio"}).directory(server.getParentFile().getParentFile()).redirectError(ProcessBuilder.Redirect.INHERIT).start(); return LanguageServerDescription.create(p.getInputStream(), p.getOutputStream(), p);