-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2567 from salexdv/feature/websocket
- Loading branch information
Showing
18 changed files
with
562 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/WebsocketCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * This file is a part of BSL Language Server. | ||
| * | ||
| * Copyright (c) 2018-2022 | ||
| * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors | ||
| * | ||
| * SPDX-License-Identifier: LGPL-3.0-or-later | ||
| * | ||
| * BSL Language Server is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3.0 of the License, or (at your option) any later version. | ||
| * | ||
| * BSL Language Server is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with BSL Language Server. | ||
| */ | ||
| package com.github._1c_syntax.bsl.languageserver.cli; | ||
|
|
||
| import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import java.io.File; | ||
| import java.util.concurrent.Callable; | ||
|
|
||
| import static picocli.CommandLine.Command; | ||
| import static picocli.CommandLine.Option; | ||
|
|
||
| /** | ||
| * Запускает приложение в режиме Websocket Language Server. | ||
| * Ключ команды: | ||
| * -w, (--websocket) | ||
| * Параметры: | ||
| * -c, (--configuration) <arg> - Путь к конфигурационному файлу BSL Language Server (.bsl-language-server.json). | ||
| * Возможно указывать как в абсолютном, так и относительном виде. | ||
| * Если параметр опущен, то будут использованы настройки по умолчанию. | ||
| * --server.port - Порт, на котором открывается соединение. Если параметр опущен, | ||
| * то будет использован порт по умолчанию, а именно 8025. | ||
| * --app.websocket.lsp-path - Адрес, по которому открывается соединение. Если параметр опущен, | ||
| * то будет использован адрес по умолчанию, а именно /lsp. | ||
| * Выводимая информация: | ||
| * Данный режим используется для взаимодействия с клиентом по протоколу LSP через websocket. | ||
| * | ||
| */ | ||
| @Slf4j | ||
| @Command( | ||
| name = "websocket", | ||
| aliases = {"-w", "--websocket"}, | ||
| description = "Websocket server mode", | ||
| usageHelpAutoWidth = true, | ||
| footer = "@|green Copyright(c) 2018-2022|@") | ||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class WebsocketCommand implements Callable<Integer> { | ||
| @Option( | ||
| names = {"-h", "--help"}, | ||
| usageHelp = true, | ||
| description = "Show this help message and exit") | ||
| private boolean usageHelpRequested; | ||
|
|
||
| @Option( | ||
| names = {"-c", "--configuration"}, | ||
| description = "Path to language server configuration file", | ||
| paramLabel = "<path>", | ||
| defaultValue = "") | ||
| private String configurationOption; | ||
|
|
||
| @Option( | ||
| names = {"--server.port"}, | ||
| description = "Port to listen. Default is 8025", | ||
| paramLabel = "<port>", | ||
| defaultValue = "8025") | ||
| private int serverPort; | ||
|
|
||
| @Option( | ||
| names = {"--app.websocket.lsp-path"}, | ||
| description = "Path to LSP endpoint. Default is /lsp", | ||
| paramLabel = "<path>", | ||
| defaultValue = "/lsp") | ||
| private String endpointPath; | ||
|
|
||
| private final LanguageServerConfiguration configuration; | ||
|
|
||
| public Integer call() { | ||
| var configurationFile = new File(configurationOption); | ||
| if (configurationFile.exists()) { | ||
| configuration.update(configurationFile); | ||
| } | ||
|
|
||
| return -1; | ||
| } | ||
|
|
||
| } |
56 changes: 56 additions & 0 deletions
56
src/main/java/com/github/_1c_syntax/bsl/languageserver/websocket/LSPWebSocketEndpoint.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * This file is a part of BSL Language Server. | ||
| * | ||
| * Copyright (c) 2018-2022 | ||
| * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors | ||
| * | ||
| * SPDX-License-Identifier: LGPL-3.0-or-later | ||
| * | ||
| * BSL Language Server is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3.0 of the License, or (at your option) any later version. | ||
| * | ||
| * BSL Language Server is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with BSL Language Server. | ||
| */ | ||
| package com.github._1c_syntax.bsl.languageserver.websocket; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.eclipse.lsp4j.jsonrpc.Launcher.Builder; | ||
| import org.eclipse.lsp4j.services.LanguageClient; | ||
| import org.eclipse.lsp4j.services.LanguageClientAware; | ||
| import org.eclipse.lsp4j.services.LanguageServer; | ||
| import org.eclipse.lsp4j.websocket.WebSocketEndpoint; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Конечная точка для подключения к Language Server через websocket. | ||
| */ | ||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class LSPWebSocketEndpoint extends WebSocketEndpoint<LanguageClient> { | ||
|
|
||
| private final LanguageServer languageServer; | ||
| private final List<LanguageClientAware> languageClientAwares; | ||
|
|
||
| @Override | ||
| protected void configure(Builder<LanguageClient> builder) { | ||
| builder.setLocalService(languageServer); | ||
| builder.setRemoteInterface(LanguageClient.class); | ||
| } | ||
|
|
||
| @Override | ||
| protected void connect(Collection<Object> localServices, LanguageClient remoteProxy) { | ||
| languageClientAwares.forEach(languageClientAware -> languageClientAware.connect(remoteProxy)); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.