diff --git a/src/Analysis/Ast/Impl/Extensions/ScopeExtensions.cs b/src/Analysis/Ast/Impl/Extensions/ScopeExtensions.cs index 6ba17ce62..69a5d536a 100644 --- a/src/Analysis/Ast/Impl/Extensions/ScopeExtensions.cs +++ b/src/Analysis/Ast/Impl/Extensions/ScopeExtensions.cs @@ -27,6 +27,8 @@ public static int GetBodyStartIndex(this IScope scope) { return cd.HeaderIndex; case FunctionDefinition fd: return fd.HeaderIndex; + case null: + return 0; default: return scope.Node.StartIndex; } diff --git a/src/Analysis/Ast/Impl/Values/Scope.cs b/src/Analysis/Ast/Impl/Values/Scope.cs index d517c4457..2d19cec6d 100644 --- a/src/Analysis/Ast/Impl/Values/Scope.cs +++ b/src/Analysis/Ast/Impl/Values/Scope.cs @@ -126,9 +126,9 @@ public EmptyGlobalScope(IPythonModule module) { } public IPythonModule Module { get; } public string Name => string.Empty; - public ScopeStatement Node => null; + public ScopeStatement Node => Module.Analysis.Ast; public IScope OuterScope => null; - public IGlobalScope GlobalScope { get; protected set; } + public IGlobalScope GlobalScope { get; } public IReadOnlyList Children => Array.Empty(); public IEnumerable EnumerateTowardsGlobal => Enumerable.Repeat(this, 1); public IEnumerable EnumerateFromGlobal => Enumerable.Repeat(this, 1);