Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Commit 2e74480

Browse files
author
MikhailArkhipov
committed
Add version display at startup
1 parent 4cf07fb commit 2e74480

3 files changed

Lines changed: 58 additions & 6 deletions

File tree

src/LanguageServer/Impl/Implementation/Server.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,7 @@ private async Task DoInitializeAsync(InitializeParams @params, CancellationToken
377377
}
378378
_displayTextBuilder = DocumentationBuilder.Create(DisplayOptions);
379379

380-
if (string.IsNullOrEmpty(Analyzer.InterpreterFactory?.Configuration?.InterpreterPath)) {
381-
LogMessage(MessageType._General, "Initializing for generic interpreter");
382-
} else {
383-
LogMessage(MessageType._General, $"Initializing for {Analyzer.InterpreterFactory.Configuration.InterpreterPath}");
384-
}
380+
DisplayStartupInfo();
385381

386382
if (@params.rootUri != null) {
387383
_rootDir = @params.rootUri.ToAbsolutePath();
@@ -395,6 +391,14 @@ private async Task DoInitializeAsync(InitializeParams @params, CancellationToken
395391
Analyzer.Interpreter.ModuleNamesChanged += Interpreter_ModuleNamesChanged;
396392
}
397393

394+
private void DisplayStartupInfo() {
395+
LogMessage(MessageType._General, Resources.LanguageServerVersion.FormatInvariant(Assembly.GetExecutingAssembly().GetName().Version));
396+
LogMessage(MessageType._General,
397+
string.IsNullOrEmpty(Analyzer.InterpreterFactory?.Configuration?.InterpreterPath)
398+
? Resources.InitializingForGenericInterpreter
399+
: Resources.InitializingForPythonInterpreter.FormatInvariant(Analyzer.InterpreterFactory.Configuration.InterpreterPath));
400+
}
401+
398402
private void Interpreter_ModuleNamesChanged(object sender, EventArgs e) {
399403
Analyzer.Modules.ReInit();
400404
foreach (var entry in Analyzer.ModulesByFilename) {
@@ -433,7 +437,7 @@ private async Task<PythonAnalyzer> CreateAnalyzer(PythonInitializationOptions.In
433437

434438
var interp = factory.CreateInterpreter();
435439
if (interp == null) {
436-
throw new InvalidOperationException("Failed to create interpreter");
440+
throw new InvalidOperationException(Resources.Error_FailedToCreateInterpreter);
437441
}
438442

439443
LogMessage(MessageType.Info, $"Created {interp.GetType().FullName} instance from {factory.GetType().FullName}");

src/LanguageServer/Impl/Resources.Designer.cs

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/LanguageServer/Impl/Resources.resx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,18 @@
123123
<data name="AnalysisProgress_SingleItemRemaining" xml:space="preserve">
124124
<value>Analyzing workspace, 1 item remaining...</value>
125125
</data>
126+
<data name="Error_FailedToCreateInterpreter" xml:space="preserve">
127+
<value>Failed to create interpreter</value>
128+
</data>
129+
<data name="InitializingForGenericInterpreter" xml:space="preserve">
130+
<value>Initializing for generic interpreter</value>
131+
</data>
132+
<data name="InitializingForPythonInterpreter" xml:space="preserve">
133+
<value>Initializing for {0}</value>
134+
</data>
135+
<data name="LanguageServerVersion" xml:space="preserve">
136+
<value>Microsoft Python Language Server version {0}</value>
137+
</data>
126138
<data name="RenameVariable_CannotRename" xml:space="preserve">
127139
<value>Cannot rename</value>
128140
</data>

0 commit comments

Comments
 (0)