diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index dcf9d0c0673..33d9b66dfbd 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts @@ -2,7 +2,7 @@ import * as lc from 'vscode-languageclient'; import * as vscode from 'vscode'; import { Config } from './config'; -import { ensureLanguageServerBinary } from './installation/language_server'; +import { ensureLangServerBinary } from './installation/lang_server'; import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed'; export async function createClient(config: Config): Promise<null | lc.LanguageClient> { @@ -11,7 +11,7 @@ export async function createClient(config: Config): Promise<null | lc.LanguageCl // It might be a good idea to test if the uri points to a file. const workspaceFolderPath = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '.'; - const langServerPath = await ensureLanguageServerBinary(config.langServerBinarySource); + const langServerPath = await ensureLangServerBinary(config.langServerBinarySource); if (!langServerPath) return null; const run: lc.Executable = { diff --git a/editors/code/src/installation/fetch_latest_artifact_metadata.ts b/editors/code/src/installation/fetch_latest_artifact_release_info.ts similarity index 89% rename from editors/code/src/installation/fetch_latest_artifact_metadata.ts rename to editors/code/src/installation/fetch_latest_artifact_release_info.ts index 7e370060313..29ee029a708 100644 --- a/editors/code/src/installation/fetch_latest_artifact_metadata.ts +++ b/editors/code/src/installation/fetch_latest_artifact_release_info.ts @@ -1,5 +1,5 @@ import fetch from "node-fetch"; -import { GithubRepo, ArtifactMetadata } from "./interfaces"; +import { GithubRepo, ArtifactReleaseInfo } from "./interfaces"; const GITHUB_API_ENDPOINT_URL = "https://api.github.com"; @@ -7,9 +7,9 @@ const GITHUB_API_ENDPOINT_URL = "https://api.github.com"; * Fetches the latest release from GitHub `repo` and returns metadata about * `artifactFileName` shipped with this release or `null` if no such artifact was published. */ -export async function fetchLatestArtifactMetadata( +export async function fetchLatestArtifactReleaseInfo( repo: GithubRepo, artifactFileName: string -): Promise<null | ArtifactMetadata> { +): Promise<null | ArtifactReleaseInfo> { const repoOwner = encodeURIComponent(repo.owner); const repoName = encodeURIComponent(repo.name); diff --git a/editors/code/src/installation/interfaces.ts b/editors/code/src/installation/interfaces.ts index 8039d0b90f6..93ea577d4a6 100644 --- a/editors/code/src/installation/interfaces.ts +++ b/editors/code/src/installation/interfaces.ts @@ -6,7 +6,7 @@ export interface GithubRepo { /** * Metadata about particular artifact retrieved from GitHub releases. */ -export interface ArtifactMetadata { +export interface ArtifactReleaseInfo { releaseName: string; downloadUrl: string; } diff --git a/editors/code/src/installation/language_server.ts b/editors/code/src/installation/lang_server.ts similarity index 95% rename from editors/code/src/installation/language_server.ts rename to editors/code/src/installation/lang_server.ts index 4797c3f01ad..ccb936bf5ff 100644 --- a/editors/code/src/installation/language_server.ts +++ b/editors/code/src/installation/lang_server.ts @@ -7,13 +7,13 @@ import { spawnSync } from "child_process"; import { throttle } from "throttle-debounce"; import { BinarySource } from "./interfaces"; -import { fetchLatestArtifactMetadata } from "./fetch_latest_artifact_metadata"; +import { fetchLatestArtifactReleaseInfo } from "./fetch_latest_artifact_release_info"; import { downloadFile } from "./download_file"; -export async function downloadLatestLanguageServer( +export async function downloadLatestLangServer( {file: artifactFileName, dir: installationDir, repo}: BinarySource.GithubRelease ) { - const { releaseName, downloadUrl } = (await fetchLatestArtifactMetadata( + const { releaseName, downloadUrl } = (await fetchLatestArtifactReleaseInfo( repo, artifactFileName ))!; @@ -53,7 +53,7 @@ export async function downloadLatestLanguageServer( ); console.timeEnd("Downloading ra_lsp_server"); } -export async function ensureLanguageServerBinary( +export async function ensureLangServerBinary( langServerSource: null | BinarySource ): Promise<null | string> { @@ -97,7 +97,7 @@ export async function ensureLanguageServerBinary( if (userResponse !== "Download now") return null; try { - await downloadLatestLanguageServer(langServerSource); + await downloadLatestLangServer(langServerSource); } catch (err) { vscode.window.showErrorMessage( `Failed to download language server from ${langServerSource.repo.name} ` +