This repository was archived by the owner on Apr 14, 2022. It is now read-only.
Repository navigation
Bug and test fixes - #1322
Merged
Alexander Sher (AlexanderSher) merged 4 commits intoJul 12, 2019
Merged
Bug and test fixes#1322
Conversation
- Fixes microsoft#1151: Reliable way to determine final analysis of a module - Fixes microsoft#1201: NRE in SymbolCollector.AddProperty - Fixes microsoft#1228: NRE in TryFindMissingDependencies - Fixes microsoft#1294: Handle valid case for reloading AST - Fixes microsoft#1295: FindReferences doesn't work on package init members - Fixes microsoft#1296: DependencyResolver graph misses intermediate imports - Part of the fix for microsoft#1174: All references are not listed when using ms language server
- Fix microsoft#1318: PathUtils.IsNormalizedPath and PathUtils.NormalizePath work incorrectly with UNC - Fix microsoft#1320: Incorrect relative import handling in Python 2x - Fix microsoft#1321: If one user paths is part of the name of another, PathResolverSnapshot is built incorrectly - Fix paths in tests - Remove IModuleManagement.SetUserSearchPaths
|
|
||
| public static bool PathStartsWith(string s, string prefix) | ||
| => s != null && s.StartsWith(prefix, StringExtensions.PathsStringComparison) && | ||
| (s.Length == prefix.Length || IsDirectorySeparator(s[prefix.Length])); |
Contributor
Author
| private void LogCompleted(IDependencyChainNode<PythonAnalyzerEntry> node, IPythonModule module, Stopwatch stopWatch, TimeSpan startTime) { | ||
| if (_log != null) { | ||
| var completed = node != null && module.Analysis is LibraryAnalysis ? "completed" : "completed for library"; | ||
| var completed = node != null && module.Analysis is LibraryAnalysis ? "completed for library" : "completed "; |
Contributor
Author
There was a problem hiding this comment.
Correct logging
| } else if (firstModule != default && !string.IsNullOrEmpty(importNames[0])) { | ||
| var firstName = moduleImportExpression.Names[0]; | ||
| Eval.DeclareVariable(importNames[0], variableModule, VariableSource.Import, firstName); | ||
| Eval.DeclareVariable(importNames[0], firstModule, VariableSource.Import, firstName); |
Contributor
Author
There was a problem hiding this comment.
This is part of the fix for #1320. Name of the module may not match the name of the variable in Python 2x
|
|
||
| // If __all__ is present, take it, otherwise declare all members from the module that do not begin with an underscore. | ||
| var memberNames = variableModule.Analysis.StarImportMemberNames ?? variableModule.GetMemberNames().Where(s => !s.StartsWithOrdinal("_")); | ||
| var memberNames = variableModule.Analysis?.StarImportMemberNames ?? variableModule.GetMemberNames().Where(s => !s.StartsWithOrdinal("_")); |
Contributor
Author
There was a problem hiding this comment.
If variableModule represents implicit package, Analysis will be null.
There was a problem hiding this comment.
Kinda dangerous... Maybe have it attach empty analysis?
Contributor
Author
There was a problem hiding this comment.
Empty analysis requires IDocument but there is actually no document - it is an implicit package.
Jake Bailey (jakebailey)
approved these changes
Jul 12, 2019
|
|
||
| // If __all__ is present, take it, otherwise declare all members from the module that do not begin with an underscore. | ||
| var memberNames = variableModule.Analysis.StarImportMemberNames ?? variableModule.GetMemberNames().Where(s => !s.StartsWithOrdinal("_")); | ||
| var memberNames = variableModule.Analysis?.StarImportMemberNames ?? variableModule.GetMemberNames().Where(s => !s.StartsWithOrdinal("_")); |
There was a problem hiding this comment.
Should module have at least empty analysis always? I think there is a lot of code that assumes that.
| return "\"{0}\"".FormatInvariant(arg); | ||
| } | ||
|
|
||
| public static bool PathStartsWith(this string s, string prefix) |
There was a problem hiding this comment.
Should we have it instead calling PathUtils.PathStartsWith ?
Contributor
Author
There was a problem hiding this comment.
We have a bit of a mess in our extensions. From my understanding, StringExtensions should have things that are applicable to any strings, PathUtils should have string operations that are related to paths only, and FileSystemExtensions should have things like FindFile.
Mikhail Arkhipov (MikhailArkhipov)
approved these changes
Jul 12, 2019
Jake Bailey (jakebailey)
pushed a commit
to jakebailey/python-language-server
that referenced
this pull request
Nov 1, 2019
- Fix microsoft#1314: NRE in HandleModuleImportStar bug - Fix microsoft#1318: PathUtils.IsNormalizedPath and PathUtils.NormalizePath work incorrectly with UNC - Fix microsoft#1320: Incorrect relative import handling in Python 2x - Fix microsoft#1321: If one user paths is part of the name of another, PathResolverSnapshot is built incorrectly - Fix paths in tests - Remove IModuleManagement.SetUserSearchPaths
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
IModuleManagement.SetUserSearchPaths