Skip to content

Commit

Permalink
refactor: use "@github/copilot-language-server" instead
Browse files Browse the repository at this point in the history
Signed-off-by: Jack Cherng <[email protected]>
  • Loading branch information
jfcherng committed Feb 5, 2025
1 parent d15ccde commit 2de068b
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 15 deletions.
67 changes: 57 additions & 10 deletions language-server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion language-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
"copilot-node-server": "^1.41.0"
"@github/copilot-language-server": "^1.264.0"
}
}
14 changes: 10 additions & 4 deletions plugin/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""

Expand Down Expand Up @@ -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]:
Expand Down

0 comments on commit 2de068b

Please sign in to comment.