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

Fix NullRef in module name calculation #88

Merged
Mikhail Arkhipov (MikhailArkhipov) merged 2 commits into from
Sep 13, 2018
Merged

Fix NullRef in module name calculation #88

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c012a1
Fix null ref
Sep 12, 2018
a4b3a29
Merge branch 'master' of https://github.com/Microsoft/python-language…
Sep 13, 2018
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
4 changes: 2 additions & 2 deletions src/Analysis/Engine/Impl/ModuleResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ internal static IEnumerable<string> ResolvePotentialModuleNames(
string relativeModuleName,
bool absoluteImports
) {
string importingFrom = null;
string importingFrom = string.Empty;
if (!string.IsNullOrEmpty(importingFromModuleName)) {
importingFrom = importingFromModuleName;
if (!string.IsNullOrEmpty(importingFromFilePath) && ModulePath.IsInitPyFile(importingFromFilePath)) {
Expand Down Expand Up @@ -149,7 +149,7 @@ bool absoluteImports

private static string GetModuleFullName(string originatingModule, string relativePath) {
// Check if it is indeed relative
if (string.IsNullOrEmpty(relativePath) || relativePath[0] != '.') {
if (string.IsNullOrEmpty(originatingModule) || string.IsNullOrEmpty(relativePath) || relativePath[0] != '.') {
return relativePath;
}

Expand Down