From 95df4021cda7f874ca8597e5c88532e4cac61fa0 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 27 Mar 2019 11:29:23 -0700 Subject: [PATCH] Same logic for stable and beta --- news/1 Enhancements/4960.md | 1 + src/client/activation/languageServer/downloadChannelRules.ts | 2 +- src/client/activation/serviceRegistry.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 news/1 Enhancements/4960.md diff --git a/news/1 Enhancements/4960.md b/news/1 Enhancements/4960.md new file mode 100644 index 000000000000..440fa216c765 --- /dev/null +++ b/news/1 Enhancements/4960.md @@ -0,0 +1 @@ +Use the download same logic for `stable` channel of the `Language Server` as that in `beta`. diff --git a/src/client/activation/languageServer/downloadChannelRules.ts b/src/client/activation/languageServer/downloadChannelRules.ts index 0aeb8382600a..59108a95e034 100644 --- a/src/client/activation/languageServer/downloadChannelRules.ts +++ b/src/client/activation/languageServer/downloadChannelRules.ts @@ -33,7 +33,7 @@ export class DownloadBetaChannelRule implements IDownloadChannelRule { true, frequencyForBetalLSDownloadCheck); - // If we haven't checked it in the last 24 hours, then ensure we don't do it again. + // If we have checked it in the last 24 hours, then ensure we don't do it again. if (globalState.value) { await globalState.updateValue(false); return true; diff --git a/src/client/activation/serviceRegistry.ts b/src/client/activation/serviceRegistry.ts index 987e3b5573b6..e15f7ab82554 100644 --- a/src/client/activation/serviceRegistry.ts +++ b/src/client/activation/serviceRegistry.ts @@ -15,7 +15,7 @@ import { LanguageServerExtensionActivationService } from './activationService'; import { JediExtensionActivator } from './jedi'; import { LanguageServerExtensionActivator } from './languageServer/activator'; import { LanguageServerAnalysisOptions } from './languageServer/analysisOptions'; -import { DownloadBetaChannelRule, DownloadDailyChannelRule, DownloadStableChannelRule } from './languageServer/downloadChannelRules'; +import { DownloadBetaChannelRule, DownloadDailyChannelRule } from './languageServer/downloadChannelRules'; import { LanguageServerDownloader } from './languageServer/downloader'; import { BaseLanguageClientFactory, DownloadedLanguageClientFactory, SimpleLanguageClientFactory } from './languageServer/languageClientFactory'; import { LanguageServer } from './languageServer/languageServer'; @@ -45,7 +45,7 @@ export function registerTypes(serviceManager: IServiceManager) { serviceManager.addSingleton(INugetRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel.daily); serviceManager.addSingleton(IDownloadChannelRule, DownloadDailyChannelRule, LanguageServerDownloadChannel.daily); serviceManager.addSingleton(IDownloadChannelRule, DownloadBetaChannelRule, LanguageServerDownloadChannel.beta); - serviceManager.addSingleton(IDownloadChannelRule, DownloadStableChannelRule, LanguageServerDownloadChannel.stable); + serviceManager.addSingleton(IDownloadChannelRule, DownloadBetaChannelRule, LanguageServerDownloadChannel.stable); serviceManager.addSingleton(ILanagueServerCompatibilityService, LanguageServerCompatibilityService); serviceManager.addSingleton(ILanguageClientFactory, BaseLanguageClientFactory, LanguageClientFactory.base); serviceManager.addSingleton(ILanguageClientFactory, DownloadedLanguageClientFactory, LanguageClientFactory.downloaded);