Skip to content

Commit 3f0124d

Browse files
committed
[release] auto update RLS.
1 parent b3d2f1b commit 3f0124d

File tree

6 files changed

+15
-26
lines changed

6 files changed

+15
-26
lines changed

src/RustAnalyzer.TestAdapter/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace KS.RustAnalyzer.TestAdapter;
55

66
public static class Constants
77
{
8-
public const string ReleaseSummary = $"Relaxing VS version check based on user feedback. Please report any issues you face. Consider giving 5⭐ if you find this extension useful.";
8+
public const string ReleaseSummary = $"Rust Language Server will auto update from now on. Please report any issues you face. Consider giving 5⭐ if you find this extension useful.";
99
public const string ReleaseNotesUrl = $"https://github.com/kitamstudios/rust-analyzer.vs/releases/{Vsix.Version}";
1010
public const string DiscordUrl = "https://discord.gg/JyK55EsACr";
1111
public const string TestExperienceDemoUrl = "https://youtu.be/pE1Vr2zVCbg?t=170";

src/RustAnalyzer.UnitTests/RAExeReleaseTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public sealed class RAExeReleaseTests
1212
[Fact]
1313
public async Task LastUpdateShouldNotBeOlderThan30DaysAsync()
1414
{
15-
var ret = await RADownloaderService.GetLatestRAReleaseRedirectUriAsync();
15+
var ret = await RAInstallerService.GetLatestRAReleaseRedirectUriAsync();
1616

17-
var latestRelDate = DateTime.ParseExact(ret?.Version, RADownloaderService.RAVersionFormat, CultureInfo.InvariantCulture);
18-
var lastUpdateDate = DateTime.ParseExact(RADownloaderService.LatestInPackageRAVersion, RADownloaderService.RAVersionFormat, CultureInfo.InvariantCulture);
17+
var latestRelDate = DateTime.ParseExact(ret?.Version, RAInstallerService.RAVersionFormat, CultureInfo.InvariantCulture);
18+
var lastUpdateDate = DateTime.ParseExact(RAInstallerService.LatestInPackageRAVersion, RAInstallerService.RAVersionFormat, CultureInfo.InvariantCulture);
1919
lastUpdateDate.Should().NotBeBefore(latestRelDate.AddDays(-120), $"new rust-analyzer.exe is available {ret?.Uri}");
2020
}
2121
}

src/RustAnalyzer/Infrastructure/RADownloaderService.cs renamed to src/RustAnalyzer/Infrastructure/RAInstallerService.cs

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414

1515
namespace KS.RustAnalyzer.Infrastructure;
1616

17-
public interface IRADownloaderService
17+
public interface IRAInstallerService
1818
{
1919
Task<PathEx> GetRustAnalyzerExePathAsync();
2020

21-
Task DownloadLatestRAAsync();
21+
Task InstallLatestRAAsync();
2222
}
2323

24-
[Export(typeof(IRADownloaderService))]
24+
[Export(typeof(IRAInstallerService))]
2525
[PartCreationPolicy(CreationPolicy.Shared)]
26-
public class RADownloaderService : IRADownloaderService
26+
public class RAInstallerService : IRAInstallerService
2727
{
2828
public const string LatestInPackageRAVersion = "2024-01-08";
2929
public const string RAVersionFormat = "yyyy-MM-dd";
@@ -32,7 +32,7 @@ public class RADownloaderService : IRADownloaderService
3232
private readonly TL _tl;
3333

3434
[ImportingConstructor]
35-
public RADownloaderService(IRegistrySettingsService regSettings, [Import] ITelemetryService t, [Import] ILogger l)
35+
public RAInstallerService(IRegistrySettingsService regSettings, [Import] ITelemetryService t, [Import] ILogger l)
3636
{
3737
_regSettings = regSettings;
3838
_tl = new TL
@@ -42,13 +42,8 @@ public RADownloaderService(IRegistrySettingsService regSettings, [Import] ITelem
4242
};
4343
}
4444

45-
public async Task DownloadLatestRAAsync()
45+
public async Task InstallLatestRAAsync()
4646
{
47-
if (!IsDownloadEnabled())
48-
{
49-
return;
50-
}
51-
5247
_tl.L.WriteLine("Initiating download of RA...");
5348
try
5449
{
@@ -100,12 +95,6 @@ public async Task<PathEx> GetRustAnalyzerExePathAsync()
10095
}
10196
}
10297

103-
private bool IsDownloadEnabled()
104-
{
105-
var id = Environment.ExpandEnvironmentVariables("%USERNAME%@%COMPUTERNAME%.%USERDOMAIN%");
106-
return id?.Equals("[email protected]", StringComparison.OrdinalIgnoreCase) ?? false;
107-
}
108-
10998
private PathEx GetVersionedRAExePath(string version)
11099
{
111100
return GetRAFolder(version) + (PathEx)$"rust-analyzer.exe";

src/RustAnalyzer/LanguageService/LanguageClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class LanguageClient : ILanguageClient, ILanguageClientCustomMessage2
3737
public ITelemetryService T { get; set; }
3838

3939
[Import]
40-
public IRADownloaderService RADownloader { get; set; }
40+
public IRAInstallerService RADownloader { get; set; }
4141

4242
public JsonRpc Rpc { get; set; }
4343

src/RustAnalyzer/RustAnalyzer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Compile Include="Infrastructure\RADownloaderService.cs" />
48+
<Compile Include="Infrastructure\RAInstallerService.cs" />
4949
<Compile Include="Infrastructure\RegistrySettingsService.cs" />
5050
<Compile Include="Infrastructure\SettingsInfo.cs" />
5151
<Compile Include="LanguageService\CommentHelper.cs" />

src/RustAnalyzer/RustAnalyzerPackage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public sealed class RustAnalyzerPackage : ToolkitPackage
3636
private TL _tl;
3737
private IRegistrySettingsService _regSettings;
3838
private IPreReqsCheckService _preReqs;
39-
private IRADownloaderService _raDownloader;
39+
private IRAInstallerService _raDownloader;
4040

4141
protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
4242
{
@@ -52,7 +52,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
5252
};
5353
_regSettings = cmServiceProvider?.GetService<IRegistrySettingsService>();
5454
_preReqs = cmServiceProvider?.GetService<IPreReqsCheckService>();
55-
_raDownloader = cmServiceProvider?.GetService<IRADownloaderService>();
55+
_raDownloader = cmServiceProvider?.GetService<IRAInstallerService>();
5656
}
5757

5858
protected override async Task OnAfterPackageLoadedAsync(CancellationToken cancellationToken)
@@ -64,7 +64,7 @@ protected override async Task OnAfterPackageLoadedAsync(CancellationToken cancel
6464
await ReleaseSummaryNotification.ShowAsync(_regSettings, _tl);
6565
await SearchAndDisableIncompatibleExtensionsAsync();
6666
await _preReqs.SatisfyAsync();
67-
await _raDownloader.DownloadLatestRAAsync();
67+
await _raDownloader.InstallLatestRAAsync();
6868
}
6969

7070
#region Handling incompatible extensions

0 commit comments

Comments
 (0)