From 2de068b9d5a884137132323725fd7e94dc04d1cf Mon Sep 17 00:00:00 2001 From: Jack Cherng Date: Wed, 5 Feb 2025 21:56:47 +0800 Subject: [PATCH] refactor: use "@github/copilot-language-server" instead Signed-off-by: Jack Cherng --- language-server/package-lock.json | 67 ++++++++++++++++++++++++++----- language-server/package.json | 2 +- plugin/client.py | 14 +++++-- 3 files changed, 68 insertions(+), 15 deletions(-) diff --git a/language-server/package-lock.json b/language-server/package-lock.json index 3f2e666..d5ebcea 100644 --- a/language-server/package-lock.json +++ b/language-server/package-lock.json @@ -5,23 +5,70 @@ "packages": { "": { "dependencies": { - "copilot-node-server": "^1.41.0" + "@github/copilot-language-server": "^1.264.0" } }, - "node_modules/copilot-node-server": { - "version": "1.41.0", - "resolved": "https://registry.npmjs.org/copilot-node-server/-/copilot-node-server-1.41.0.tgz", - "integrity": "sha512-r2+uaWa05wvxNALv8rLegRCOlcopUDLYOd8kAHTAM8xpqBNK5TcMqFbGufxKF7YIWpBwcyfNaAIb724Un5e1eA==", + "node_modules/@github/copilot-language-server": { + "version": "1.264.0", + "resolved": "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-1.264.0.tgz", + "integrity": "sha512-aIGcnBgiaehr8jH5Mp6LRETLNLwgnzVN0wfOkzrOyn7c57ONWAu4W/JL3TIRj0mZyL5mb57c5WUgsZ0TACHsxw==", + "dependencies": { + "vscode-languageserver-protocol": "^3.17.5" + }, "bin": { - "copilot-node-server": "copilot/dist/language-server.js" + "copilot-language-server": "dist/language-server.js" + } + }, + "node_modules/vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", + "dependencies": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" } + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" } }, "dependencies": { - "copilot-node-server": { - "version": "1.41.0", - "resolved": "https://registry.npmjs.org/copilot-node-server/-/copilot-node-server-1.41.0.tgz", - "integrity": "sha512-r2+uaWa05wvxNALv8rLegRCOlcopUDLYOd8kAHTAM8xpqBNK5TcMqFbGufxKF7YIWpBwcyfNaAIb724Un5e1eA==" + "@github/copilot-language-server": { + "version": "1.264.0", + "resolved": "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-1.264.0.tgz", + "integrity": "sha512-aIGcnBgiaehr8jH5Mp6LRETLNLwgnzVN0wfOkzrOyn7c57ONWAu4W/JL3TIRj0mZyL5mb57c5WUgsZ0TACHsxw==", + "requires": { + "vscode-languageserver-protocol": "^3.17.5" + } + }, + "vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==" + }, + "vscode-languageserver-protocol": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", + "requires": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" + } + }, + "vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" } } } diff --git a/language-server/package.json b/language-server/package.json index 75ecc76..c49d15d 100644 --- a/language-server/package.json +++ b/language-server/package.json @@ -1,6 +1,6 @@ { "private": true, "dependencies": { - "copilot-node-server": "^1.41.0" + "@github/copilot-language-server": "^1.264.0" } } diff --git a/plugin/client.py b/plugin/client.py index c72826f..53f2f34 100644 --- a/plugin/client.py +++ b/plugin/client.py @@ -102,14 +102,14 @@ class CopilotPlugin(NpmClientHandler): server_binary_path = os.path.join( server_directory, "node_modules", - "copilot-node-server", - "copilot", + "@github", + "copilot-language-server", "dist", "language-server.js", ) server_version = "" - """The version of the [copilot.vim](https://github.com/github/copilot.vim) package.""" + """The version of the "@github/copilot-language-server" package.""" server_version_gh = "" """The version of the Github Copilot language server.""" @@ -286,7 +286,13 @@ def from_view(cls, view: sublime.View) -> CopilotPlugin | None: @classmethod def parse_server_version(cls) -> str: lock_file_content = sublime.load_resource(f"Packages/{PACKAGE_NAME}/language-server/package-lock.json") - return jmespath.search('dependencies."copilot-node-server".version', json.loads(lock_file_content)) or "" + return ( + jmespath.search( + 'dependencies."@github/copilot-language-server".version', + json.loads(lock_file_content), + ) + or "" + ) @classmethod def plugin_session(cls, view: sublime.View) -> tuple[None, None] | tuple[CopilotPlugin, Session | None]: