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

Fix analysis completion regression #696

Merged
Mikhail Arkhipov (MikhailArkhipov) merged 7 commits into from
Mar 5, 2019
Merged

Fix analysis completion regression #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8bca56b
Fix #668 (partial)
Mar 1, 2019
a731c2a
Merge branch 'master' of https://github.com/Microsoft/python-language…
Mar 1, 2019
069910b
Merge branch 'master' of https://github.com/Microsoft/python-language…
Mar 5, 2019
7ffc9db
Tests
Mar 5, 2019
6303c45
Revert "Tests"
Mar 5, 2019
2a2b182
Fix test regression
Mar 5, 2019
d825510
Rename resource
Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Analysis/Ast/Impl/Modules/PythonModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ private void LoadContent(string content) {
if (ContentState < State.Loading) {
try {
content = content ?? LoadContent();
_buffer.Reset(Version + 1, content);
_buffer.Reset(0, content);
ContentState = State.Loaded;
} catch (IOException) { } catch (UnauthorizedAccessException) { }
}
Expand Down
2 changes: 1 addition & 1 deletion src/LanguageServer/Impl/Implementation/Server.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public void NotifyPackagesChanged(CancellationToken cancellationToken) {
// by design at this time that the app should be restarted.
interpreter.ModuleResolution.ReloadAsync(cancellationToken).ContinueWith(t => {
_log?.Log(TraceEventType.Information, Resources.Done);
_log?.Log(TraceEventType.Information, Resources.RestartingAnalysis);
_log?.Log(TraceEventType.Information, Resources.AnalysisRestarted);
RestartAnalysis();
}, cancellationToken).DoNotWait();

Expand Down
18 changes: 9 additions & 9 deletions src/LanguageServer/Impl/Resources.Designer.cs
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions src/LanguageServer/Impl/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
<data name="AnalysisIsInProgressHover" xml:space="preserve">
<value>Code analysis is in progress...</value>
</data>
<data name="AnalysisRestarted" xml:space="preserve">
<value>Analysis restarted.</value>
</data>
<data name="Done" xml:space="preserve">
<value>done.</value>
</data>
Expand Down Expand Up @@ -156,7 +159,4 @@
<data name="RenameVariable_UnableGetExpressionAnalysis" xml:space="preserve">
<value>Unable to get analysis for the selected expression.</value>
</data>
<data name="RestartingAnalysis" xml:space="preserve">
<value>Restarting analysis...</value>
</data>
</root>